Changes from branches/2.8/wp-includes/l10n.php at r11681 to trunk/wp-includes/l10n.php at r11411

File:

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

trunk/wp-includes/l10n.php

@@ -302 +302 @@
 
 /**
- * Loads a MO file into the domain $domain.
- *
- * If the domain already exists, the translations will be merged. If both
- * sets have the same string, the translation from the original value will be taken.
+ * Loads MO file into the list of domains.
+ *
+ * If the domain already exists, the inclusion will fail. If the MO file is not
+ * readable, the inclusion will fail.
  *
  * On success, the .mo file will be placed in the $l10n global by $domain
- * and will be a MO object.
+ * and will be an gettext_reader object.
  *
  * @since 1.5.0
- * @uses $l10n Gets list of domain translated string objects
+ * @uses $l10n Gets list of domain translated string (gettext_reader) objects
+ * @uses CacheFileReader Reads the MO file
+ * @uses gettext_reader Allows for retrieving translated strings
  *
  * @param string $domain Unique identifier for retrieving translated strings
  * @param string $mofile Path to the .mo file
- * @return bool true on success, false on failure
+ * @return null On failure returns null and also on success returns nothing.
  */
 function load_textdomain($domain, $mofile) {
     global $l10n;
 
-    if ( !is_readable( $mofile ) ) return false;
+    if ( !is_readable($mofile)) return;
 
     $mo = new MO();
-    if ( !$mo->import_from_file( $mofile ) ) return false;
-
-    if ( isset( $l10n[$domain] ) )
+    $mo->import_from_file( $mofile );
+
+    if (isset($l10n[$domain]))
         $mo->merge_with( $l10n[$domain] );
 
     $l10n[$domain] = &$mo;
-    return true;
 }
 
@@ -345 +346 @@
     $mofile = WP_LANG_DIR . "/$locale.mo";
 
-    return load_textdomain('default', $mofile);
+    load_textdomain('default', $mofile);
 }
 
@@ -372 +373 @@
 
     $mofile = $path . '/'. $domain . '-' . $locale . '.mo';
-    return load_textdomain($domain, $mofile);
+    load_textdomain($domain, $mofile);
 }
 
@@ -393 +394 @@
 
     $mofile = "$path/$locale.mo";
-    return load_textdomain($domain, $mofile);
+    load_textdomain($domain, $mofile);
 }
 
@@ -423 +424 @@
  */
 function translate_user_role( $name ) {
-    return translate_with_gettext_context( before_last_bar($name), 'User role' );
+    return before_last_bar( translate_with_gettext_context( $name, 'User role' ) );
 }
 ?>