Changeset 11332

Timestamp:

05/14/2009 06:58:37 PM (15 years ago)

Author:

ryan

Message:

Sort tz continents and cities by translated names. Load translations from separate mo to avoid cluttering default pot. Props Denis-de-Bernardy. see #9794

File:

• trunk/wp-includes/functions.php (modified) (3 diffs)

trunk/wp-includes/functions.php

@@ -3107 +3107 @@
  */
 function wp_timezone_choice($selectedzone) {
+    static $mo_loaded = false;
+
     $continents = array('Africa', 'America', 'Antarctica', 'Arctic', 'Asia', 'Atlantic', 'Australia', 'Europe', 'Indian', 'Pacific', 'Etc');
+
+    // Load translations for continents and cities
+    if ( ! $mo_loaded ) {
+        $locale = get_locale();
+        $mofile = WP_LANG_DIR . "/continents-cities-$locale.mo";
+        load_textdomain('default', $mofile);
+        $mo_loaded = true;
+    }
 
     $all = timezone_identifiers_list();
@@ -3124 +3134 @@
     usort($zonen, create_function(
         '$a, $b', '
-        if ( $a["continent"] == $b["continent"] && $a["city"] == $b["city"] )
-            return strnatcasecmp($a["subcity"], $b["subcity"]);
-        elseif ( $a["continent"] == $b["continent"] )
-            return strnatcasecmp($a["city"], $b["city"]);
+        $a_continent = translate($a["continent"]);
+        $b_continent = translate($b["continent"]);
+        $a_city = translate($a["city"]);
+        $b_city = translate($b["city"]);
+        $a_subcity = translate($a["subcity"]);
+        $b_subcity = translate($b["subcity"]);
+        if ( $a_continent == $b_continent && $a_city == $b_city )
+            return strnatcasecmp($a_subcity, $b_subcity);
+        elseif ( $a_continent == $b_continent )
+            return strnatcasecmp($a_city, $b_city);
         else
-            return strnatcasecmp($a["continent"], $b["continent"]);
+            return strnatcasecmp($a_continent, $b_continent);
         '));
     
@@ -3152 +3168 @@
 
         if ( !empty($city) ) {
-            if ( !empty($subcity) ) {
-                $city = $city . '/'. $subcity;
-            }
             $display = str_replace('_',' ',$city);
             $display = translate($display);
+            if ( !empty($subcity) ) {
+                $display_subcity = str_replace('_', ' ', $subcity);
+                $display_subcity = translate($display_subcity);
+                $city = $city . '/'. $subcity;
+                $display = $display . '/' . $display_subcity;
+            }
             if ( $continent == 'Etc' )
                 $display = strtr($display, '+-', '-+');