Ticket #19852: load_default_textdomain.diff

wp-includes/l10n.php

@@ -372 +372 @@
 /**
  * Loads default translated strings based on locale.
  *
- * Loads the .mo file in WP_LANG_DIR constant path from WordPress root. The
- * translated (.mo) file is named based on the locale.
+ * Loads the .mo files in WP_LANG_DIR constant path from WordPress root. The
+ * translated (.mo) files are named based on the locale.
  *
  * @since 1.5.0
  */
 function load_default_textdomain() {
+        global $pagenow;
         $locale = get_locale();
 
         load_textdomain( 'default', WP_LANG_DIR . "/$locale.mo" );
 
-        if ( ( is_multisite() || ( defined( 'WP_INSTALLING_NETWORK' ) && WP_INSTALLING_NETWORK ) ) && ! file_exists(  WP_LANG_DIR . "/admin-$locale.mo" ) ) {
+        if ( ( is_multisite() || 'network.php' == $pagenow ) && ! file_exists( WP_LANG_DIR . "/admin-$locale.mo" ) ) {
                 load_textdomain( 'default', WP_LANG_DIR . "/ms-$locale.mo" );
                 return;
         }
 
-        if ( is_admin()  )
+        if ( is_admin() || 'wp-login.php' == $pagenow )
                 load_textdomain( 'default', WP_LANG_DIR . "/admin-$locale.mo" );
 
-        if ( is_network_admin() || ( defined( 'WP_INSTALLING_NETWORK' ) && WP_INSTALLING_NETWORK ) )
+        if ( is_network_admin() || 'network.php' == $pagenow )
                 load_textdomain( 'default', WP_LANG_DIR . "/admin-network-$locale.mo" );
-
 }
 
 /**