Changeset 39068

Timestamp:

11/01/2016 09:15:42 AM (10 years ago)

Author:

swissspidy

Message:

I18N: Show available timezones in the user's locale on the settings screen.

Adds a $locale parameter to wp_timezone_choice() to only reload translations when necessary.

Props yale01.
See #38485.

Location:

trunk/src

Files:

• wp-admin/options-general.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)

trunk/src/wp-admin/options-general.php

@@ -148 +148 @@
 
 <select id="timezone_string" name="timezone_string" aria-describedby="timezone-description">
-<?php echo wp_timezone_choice($tzstring); ?>
+        <?php echo wp_timezone_choice( $tzstring, get_user_locale() ); ?>
 </select>
 

trunk/src/wp-includes/functions.php

@@ -4502 +4502 @@
  *
  * @since 2.9.0
+ * @since 4.7.0 Added the `$locale` parameter.
  *
  * @staticvar bool $mo_loaded
+ * @staticvar string $locale_loaded
  *
  * @param string $selected_zone Selected timezone.
+ * @param string $locale        Optional. Locale to load the timezones in. Default current site locale.
  * @return string
  */
-function wp_timezone_choice( $selected_zone ) {
-        static $mo_loaded = false;
+function wp_timezone_choice( $selected_zone, $locale = null ) {
+        static $mo_loaded = false, $locale_loaded = null;
 
         $continents = array( 'Africa', 'America', 'Antarctica', 'Arctic', 'Asia', 'Atlantic', 'Australia', 'Europe', 'Indian', 'Pacific');
 
-        // Load translations for continents and cities
-        if ( !$mo_loaded ) {
-                $locale = get_locale();
-                $mofile = WP_LANG_DIR . '/continents-cities-' . $locale . '.mo';
+        // Load translations for continents and cities.
+        if ( ! $mo_loaded || $locale !== $locale_loaded ) {
+                $locale_loaded = $locale ? $locale : get_locale();
+                $mofile = WP_LANG_DIR . '/continents-cities-' . $locale_loaded . '.mo';
+                unload_textdomain( 'continents-cities' );
                 load_textdomain( 'continents-cities', $mofile );
                 $mo_loaded = true;