Changeset 5258

Timestamp:

04/12/2007 09:15:44 PM (17 years ago)

Author:

ryan

Message:

Refactor l10n code to reduce duplication. Change placement of context. Props nbachiyski. fixes #3687

File:

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

trunk/wp-includes/l10n.php

@@ -18 +18 @@
 }
 
-// Return a translated string.
-function __($text, $domain = 'default') {
+function translate($text, $domain) {
     global $l10n;
 
@@ -28 +27 @@
 }
 
+
+
+
+
+
 // Echo a translated string.
 function _e($text, $domain = 'default') {
-    global $l10n;
-
-    if (isset($l10n[$domain]))
-        echo apply_filters('gettext', $l10n[$domain]->translate($text), $text);
-    else
-        echo $text;
+    echo translate($text, $domain);
 }
 
 function _c($text, $domain = 'default') {
-    global $l10n;
-
-    if ( isset($l10n[$domain]) )
-        $whole = apply_filters('gettext', $l10n[$domain]->translate($text), $text);
-    else
-        $whole = $text;
-
-    $trans = explode('|', $whole, 2); 
-    if ( isset( $trans[1] ) )
-        return $trans[1];
-    else
-        return $trans[0];   
+    $whole = translate($text, $domain);
+    $last_bar = strrpos($whole, '|');
+    if ( false == $last_bar ) {
+        return $whole;
+    } else {
+        return substr($whole, 0, $last_bar);
+    }
 }
 
@@ -58 +52 @@
 
     if (isset($l10n[$domain])) {
-        return $l10n[$domain]->ngettext($single, $plural, $number);
+        return $single, $plural, $number);
     } else {
         if ($number != 1)