Merge branch 'master' of git@github.com:gallery/gallery3

3 files changed, 48 insertions, 46 deletions

diff --git a/modules/gallery/helpers/locales.php b/modules/gallery/helpers/locales.php
index dc32b12f..d209d414 100644
--- a/modules/gallery/helpers/locales.php
+++ b/modules/gallery/helpers/locales.php
@@ -63,50 +63,50 @@ class locales_Core {
 
   // @todo Might want to add a localizable language name as well.
   private static function _init_language_data() {
-    $l["af_ZA"] = "Afrikaans";                            // Afrikaans
-    $l["ar_SA"] = "العربية"; // Arabic
-    $l["be_BY"] = "Беларускі"; // Belarusian
-    $l["bg_BG"] = "Български"; // Bulgarian
-    $l["ca_ES"] = "Catalan";                              // Catalan
-    $l["cs_CZ"] = "Česky";                         // Czech
-    $l["da_DK"] = "Dansk";                                // Danish
-    $l["de_DE"] = "Deutsch";                              // German
-    $l["el_GR"] = "Greek";                                // Greek
-    $l["en_GB"] = "English (UK)";                         // English (UK)
-    $l["en_US"] = "English (US)";                         // English (US)
-    $l["es_AR"] = "Español (AR)";                    // Spanish (AR)
-    $l["es_ES"] = "Español";                         // Spanish (ES)
-    $l["es_MX"] = "Español (MX)";                    // Spanish (MX)
-    $l["et_EE"] = "Eesti";                                // Estonian
-    $l["eu_ES"] = "Euskara";                              // Basque
-    $l["fa_IR"] = "فارسي";  // Farsi
-    $l["fi_FI"] = "Suomi";                                // Finnish
-    $l["fr_FR"] = "Français";                        // French
-    $l["ga_IE"] = "Gaeilge";                              // Irish
-    $l["he_IL"] = "עברית";  // Hebrew
-    $l["hu_HU"] = "Magyar";                               // Hungarian
-    $l["is_IS"] = "Icelandic";                            // Icelandic
-    $l["it_IT"] = "Italiano";                             // Italian
-    $l["ja_JP"] = "日本語";             // Japanese
-    $l["ko_KR"] = "한국말";             // Korean
-    $l["lt_LT"] = "Lietuvių";                        // Lithuanian
-    $l["lv_LV"] = "Latviešu";                        // Latvian
-    $l["nl_NL"] = "Nederlands";                           // Dutch
-    $l["no_NO"] = "Norsk bokmål";                    // Norwegian
-    $l["pl_PL"] = "Polski";                               // Polish
-    $l["pt_BR"] = "Português Brasileiro";            // Portuguese (BR)
-    $l["pt_PT"] = "Português";                       // Portuguese (PT)
-    $l["ro_RO"] = "Română";                     // Romanian
-    $l["ru_RU"] = "Русский"; // Russian
-    $l["sk_SK"] = "Slovenčina";                      // Slovak
-    $l["sl_SI"] = "Slovenščina";                // Slovenian
-    $l["sr_CS"] = "Srpski";                               // Serbian
-    $l["sv_SE"] = "Svenska";                              // Swedish
-    $l["tr_TR"] = "Türkçe";                     // Turkish
-    $l["uk_UA"] = "Українська";     // Ukrainian
-    $l["vi_VN"] = "Tiếng Việt";               // Vietnamese
-    $l["zh_CN"] = "简体中文";     // Chinese (CN)
-    $l["zh_TW"] = "繁體中文";     // Chinese (TW)
+    $l["af_ZA"] = "Afrikaans";                // Afrikaans
+    $l["ar_SA"] = "العربي";                   // Arabic
+    $l["be_BY"] = "Беларускі";           // Belarusian
+    $l["bg_BG"] = "български";           // Bulgarian
+    $l["ca_ES"] = "Catalan";                  // Catalan
+    $l["cs_CZ"] = "čeština";                  // Czech
+    $l["da_DK"] = "Dansk";                    // Danish
+    $l["de_DE"] = "Deutsch";                  // German
+    $l["el_GR"] = "Greek";                    // Greek
+    $l["en_GB"] = "English (UK)";             // English (UK)
+    $l["en_US"] = "English (US)";             // English (US)
+    $l["es_AR"] = "Español (AR)";             // Spanish (AR)
+    $l["es_ES"] = "Español";                  // Spanish (ES)
+    $l["es_MX"] = "Español (MX)";             // Spanish (MX)
+    $l["et_EE"] = "Eesti";                    // Estonian
+    $l["eu_ES"] = "Euskara";                  // Basque
+    $l["fa_IR"] = "فارس";                     // Farsi
+    $l["fi_FI"] = "Suomi";                    // Finnish
+    $l["fr_FR"] = "Français";                 // French
+    $l["ga_IE"] = "Gaeilge";                  // Irish
+    $l["he_IL"] = "עברית";                    // Hebrew
+    $l["hu_HU"] = "Magyar";                   // Hungarian
+    $l["is_IS"] = "Icelandic";                // Icelandic
+    $l["it_IT"] = "Italiano";                 // Italian
+    $l["ja_JP"] = "日本語";                    // Japanese
+    $l["ko_KR"] = "한국어";                    // Korean
+    $l["lt_LT"] = "Lietuvių";                 // Lithuanian
+    $l["lv_LV"] = "Latviešu";                 // Latvian
+    $l["nl_NL"] = "Nederlands";               // Dutch
+    $l["no_NO"] = "Norsk bokmål";             // Norwegian
+    $l["pl_PL"] = "Polski";                   // Polish
+    $l["pt_BR"] = "Português do Brasil";      // Portuguese (BR)
+    $l["pt_PT"] = "Português ibérico";        // Portuguese (PT)
+    $l["ro_RO"] = "Română";                   // Romanian
+    $l["ru_RU"] = "Русский";              // Russian
+    $l["sk_SK"] = "Slovenčina";               // Slovak
+    $l["sl_SI"] = "Slovenščina";              // Slovenian
+    $l["sr_CS"] = "Srpski";                   // Serbian
+    $l["sv_SE"] = "Svenska";                  // Swedish
+    $l["tr_TR"] = "Türkçe";                   // Turkish
+    $l["uk_UA"] = "українська";         // Ukrainian
+    $l["vi_VN"] = "Tiếng Việt";               // Vietnamese
+    $l["zh_CN"] = "简体中文";                  // Chinese (CN)
+    $l["zh_TW"] = "繁體中文";                  // Chinese (TW)
     asort($l, SORT_LOCALE_STRING);
     self::$locales = $l;
 
diff --git a/modules/gallery/tests/File_Structure_Test.php b/modules/gallery/tests/File_Structure_Test.php
index 4590e95d..9b2b1480 100644
--- a/modules/gallery/tests/File_Structure_Test.php
+++ b/modules/gallery/tests/File_Structure_Test.php
@@ -195,7 +195,7 @@ class File_Structure_Test extends Gallery_Unit_Test_Case {
     foreach ($dir as $file) {
       $file_as_string = file_get_contents($file);
       if (preg_match('/\t/', $file_as_string)) {
-        foreach (split("\n", $file_as_string) as $l => $line) {
+        foreach (explode("\n", $file_as_string) as $l => $line) {
           if (preg_match('/\t/', $line)) {
             $errors[] = "$file:$l has tab(s) ($line)";
           }
diff --git a/modules/gallery/views/upgrader.html.php b/modules/gallery/views/upgrader.html.php
index 6cf0068d..4490557c 100644
--- a/modules/gallery/views/upgrader.html.php
+++ b/modules/gallery/views/upgrader.html.php
@@ -112,7 +112,9 @@
         <? else: // can_upgrade ?>
         <h1> <?= t("Who are you?") ?> </h1>
         <p>
-          <?= t("You're not logged in as an administrator, so we have to verify you to make sure it's ok for you to do an upgrade.  To prove you can run an upgrade, create a file called <br/><b>%name</b> in your <b>gallery3/var/tmp</b> directory.", array("name" => "$upgrade_token")) ?>
+          <?= t("You're not logged in as an administrator, so we have to verify you to make sure it's ok for you to do an upgrade.  To prove you can run an upgrade, create a file called <b>%name</b> in your <b>%tmp_dir_path</b> directory.",
+                array("name" => "$upgrade_token",
+                      "tmp_dir_path" => "gallery3/var/tmp")) ?>
         </p>
         <a href="<?= url::site("upgrader?") ?>"><?= t("Ok, I've done that") ?></a>
         <? endif // can_upgrade ?>