vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-06-30 23:30:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Give continents-cities their own textdomain. Props nbachiyski, Denis-de-Bernardy . fixes #9794

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@11333 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren
2009-05-14 20:05:25 +00:00
parent 163e71b06e
commit bf908fe2f1
2 changed files with 498 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
wp-includes/functions.php
View File

@@ -3114,7 +3114,7 @@ function wp_timezone_choice($selectedzone) {
if ( ! $mo_loaded ) {
$locale = get_locale();
$mofile = WP_LANG_DIR . "/continents-cities-$locale.mo";
load_textdomain('default', $mofile);
load_textdomain('continents-cities', $mofile);
$mo_loaded = true;
}
@@ -3133,12 +3133,12 @@ function wp_timezone_choice($selectedzone) {
usort($zonen, create_function(
'$a, $b', '
$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"]);
$a_continent = translate($a["continent"], "continents-cities");
$b_continent = translate($b["continent"], "continents-cities");
$a_city = translate($a["city"], "continents-cities");
$b_city = translate($b["city"], "continents-cities");
$a_subcity = translate($a["subcity"], "continents-cities");
$b_subcity = translate($b["subcity"], "continents-cities");
if ( $a_continent == $b_continent && $a_city == $b_city )
return strnatcasecmp($a_subcity, $b_subcity);
elseif ( $a_continent == $b_continent )
@@ -3156,7 +3156,7 @@ function wp_timezone_choice($selectedzone) {
extract($zone);
if ( empty($selectcontinent) && !empty($city) ) {
$selectcontinent = $continent;
$structure .= '<optgroup label="'. esc_attr( translate( $continent ) ) .'">' . "\n"; // continent
$structure .= '<optgroup label="'. esc_attr( translate( $continent, "continents-cities" ) ) .'">' . "\n"; // continent
} elseif ( !empty($selectcontinent) && $selectcontinent != $continent ) {
$structure .= "</optgroup>\n";
$selectcontinent = '';
@@ -3168,10 +3168,10 @@ function wp_timezone_choice($selectedzone) {
if ( !empty($city) ) {
$display = str_replace('_',' ',$city);
$display = translate($display);
$display = translate($display, "continents-cities");
if ( !empty($subcity) ) {
$display_subcity = str_replace('_', ' ', $subcity);
$display_subcity = translate($display_subcity);
$display_subcity = translate($display_subcity, "continents-cities");
$city = $city . '/'. $subcity;
$display = $display . '/' . $display_subcity;
}
@@ -3179,7 +3179,7 @@ function wp_timezone_choice($selectedzone) {
$display = strtr($display, '+-', '-+');
$structure .= "\t<option ".((($continent.'/'.$city)==$selectedzone)?'selected="selected"':'')." value=\"".($continent.'/'.$city)."\">$pad".$display."</option>\n"; //Timezone
} else {
$structure .= "<option ".(($continent==$selectedzone)?'selected="selected"':'')." value=\"".$continent."\">" . translate($continent) . "</option>\n"; //Timezone
$structure .= "<option ".(($continent==$selectedzone)?'selected="selected"':'')." value=\"".$continent."\">" . translate($continent, "continents-cities") . "</option>\n"; //Timezone
}
}