[phpwiki-checkins] SF.net SVN: phpwiki:[9429] trunk/lib/upgrade.php

[<var...@us...>]

Revision: 9429
          http://sourceforge.net/p/phpwiki/code/9429
Author:   vargenau
Date:     2014-12-08 10:50:45 +0000 (Mon, 08 Dec 2014)
Log Message:
-----------
Allow upgrading pages with non-English locale

Modified Paths:
--------------
    trunk/lib/upgrade.php

Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2014-12-08 09:37:54 UTC (rev 9428)
+++ trunk/lib/upgrade.php	2014-12-08 10:50:45 UTC (rev 9429)
@@ -143,7 +143,7 @@
             if (substr($filename, -5, 5) == '.orig') continue;
             $pagename = urldecode($filename);
             if (isActionPage($pagename)) {
-                $translation = gettext($pagename);
+                $translation = __($pagename);
                 if ($translation == $pagename)
                     $this->doPgsrcUpdate($pagename, $path, $filename);
                 elseif (FindLocalizedFile('pgsrc/' . urlencode($translation), 1))
@@ -180,7 +180,12 @@
         if ($this->db_version < 1030.12200612) {
             echo "<h4>", _("rename to Help: pages"), "</h4>\n";
         }
-        $path = FindLocalizedFile(WIKI_PGSRC);
+        $translation = __("HomePage");
+        if ($translation == "HomePage") {
+            $path = FindFile(WIKI_PGSRC);
+        } else {
+            $path = FindLocalizedFile(WIKI_PGSRC);
+        }
         $pgsrc = new fileSet($path);
         // fixme: verification, ...
         foreach ($pgsrc->getFiles() as $filename) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.