Changeset 19772

Timestamp:

01/27/2012 10:19:56 PM (13 years ago)

Author:

ryan

Message:

Load the new admin and network admin mo files, if present. see #19852

Location:

trunk

Files:

• wp-admin/includes/admin.php (modified) (1 diff)
• wp-includes/l10n.php (modified) (1 diff)

trunk/wp-admin/includes/admin.php

@@ -6 +6 @@
  * @subpackage Administration
  */
+
+if ( ! defined('WP_ADMIN') ) {
+    // This file is being included from a file other than wp-admin/admin.php, so
+    // some setup was skipped. Make sure the admin message catalog is loaded since
+    // load_default_textdomain() will not have done so in this context.
+    load_textdomain( 'default', WP_LANG_DIR . '/admin-' . get_locale() . '.mo' );
+}
 
 /** WordPress Bookmark Administration API */

trunk/wp-includes/l10n.php

@@ -383 +383 @@
     load_textdomain( 'default', WP_LANG_DIR . "/$locale.mo" );
 
-    if ( is_multisite() || ( defined( 'WP_INSTALLING_NETWORK' ) && WP_INSTALLING_NETWORK ) ) {
+    if ( ( is_multisite() || ( defined( 'WP_INSTALLING_NETWORK' ) && WP_INSTALLING_NETWORK ) ) && ! file_exists(  WP_LANG_DIR . "/admin-$locale.mo" ) ) {
         load_textdomain( 'default', WP_LANG_DIR . "/ms-$locale.mo" );
-    }
+        return;
+    }
+
+    if ( is_admin()  )
+        load_textdomain( 'default', WP_LANG_DIR . "/admin-$locale.mo" );
+
+    if ( is_network_admin() || ( defined( 'WP_INSTALLING_NETWORK' ) && WP_INSTALLING_NETWORK ) )
+        load_textdomain( 'default', WP_LANG_DIR . "/admin-network-$locale.mo" );
+
 }