WP Merge

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@498 7be80a69-a1ef-0310-a953-fb0f7c49ff36

3 files changed, 18 insertions, 24 deletions

diff --git a/wp-inst/wp-admin/import/dotclear.php b/wp-inst/wp-admin/import/dotclear.php
index b94fa1d..2caab8c 100644
--- a/wp-inst/wp-admin/import/dotclear.php
+++ b/wp-inst/wp-admin/import/dotclear.php
@@ -142,7 +142,7 @@ class Dotclear_Import {
 		echo '<p>'.__('Your Dotclear Configuration settings are as follows:').'</p>';
 		echo '<form action="admin.php?import=dotclear&amp;step=1" method="post">';
 		$this->db_form();
-		echo '<input type="submit" name="submit" value="Import Categories" />';
+		echo '<input type="submit" name="submit" value="'.__('Import Categories').'" />';
 		echo '</form>';
 	}
 
@@ -202,7 +202,7 @@ class Dotclear_Import {
 		$dcdb = new wpdb(get_option('dcuser'), get_option('dcpass'), get_option('dcname'), get_option('dchost'));
 		set_magic_quotes_runtime(0);
 		$prefix = get_option('tpre');
-		
+
 		return $dcdb->get_results('SELECT * FROM dc_link ORDER BY position', ARRAY_A);
 	}
 	
diff --git a/wp-inst/wp-admin/import/textpattern.php b/wp-inst/wp-admin/import/textpattern.php
index 48202a9..2901081 100644
--- a/wp-inst/wp-admin/import/textpattern.php
+++ b/wp-inst/wp-admin/import/textpattern.php
@@ -56,11 +56,11 @@ class Textpattern_Import {
 		echo '<p>'.__('Your Textpattern Configuration settings are as follows:').'</p>';
 		echo '<form action="admin.php?import=textpattern&amp;step=1" method="post">';
 		$this->db_form();
-		echo '<input type="submit" name="submit" value="Import Categories" />';
+		echo '<input type="submit" name="submit" value="'.__('Import Categories').'" />';
 		echo '</form>';
 	}
 
-	function get_txp_cats() 
+	function get_txp_cats()
 	{
 		global $wpdb;
 		// General Housekeeping
diff --git a/wp-inst/wp-includes/wp-l10n.php b/wp-inst/wp-includes/wp-l10n.php
index 609e194..a259746 100644
--- a/wp-inst/wp-includes/wp-l10n.php
+++ b/wp-inst/wp-includes/wp-l10n.php
@@ -12,13 +12,11 @@ function get_locale() {
 		return $locale;
 
 	// WPLANG is defined in wp-config.
-	if (defined('WPLANG')) {
-    $locale = WPLANG;
-	}
+	if (defined('WPLANG'))
+		$locale = WPLANG;
 	
-	if (empty($locale)) {
-    $locale = 'en_US';
-	}
+	if (empty($locale))
+		$locale = 'en_US';
 
 	$locale = apply_filters('locale', $locale);
 
@@ -29,22 +27,20 @@ function get_locale() {
 function __($text, $domain = 'default') {
 	global $l10n;
 
-	if (isset($l10n[$domain])) {
-		return $l10n[$domain]->translate($text);
-	} else {
+	if (isset($l10n[$domain]))
+		return apply_filters('gettext', $l10n[$domain]->translate($text), $text);
+	else
 		return $text;
-	}
 }
 
 // Echo a translated string.
 function _e($text, $domain = 'default') {
 	global $l10n;
 
-	if (isset($l10n[$domain])) {
-		echo $l10n[$domain]->translate($text);
-	} else {
+	if (isset($l10n[$domain]))
+		echo apply_filters('gettext', $l10n[$domain]->translate($text), $text);
+	else
 		echo $text;
-	}
 }
 
 // Return the plural form.
@@ -64,15 +60,13 @@ function __ngettext($single, $plural, $number, $domain = 'default') {
 function load_textdomain($domain, $mofile) {
 	global $l10n;
 
-	if (isset($l10n[$domain])) {
+	if (isset($l10n[$domain]))
 		return;
-	}
 
-	if ( is_readable($mofile)) {
-    $input = new CachedFileReader($mofile);
-	}	else {
+	if ( is_readable($mofile))
+		$input = new CachedFileReader($mofile);
+	else
 		return;
-	}
 
 	$l10n[$domain] = new gettext_reader($input);
 }