Changes in trunk/wp-includes/l10n.php [15138:14924]

File:

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

trunk/wp-includes/l10n.php

@@ -366 +366 @@
     $locale = get_locale();
 
-    load_textdomain( 'default', WP_LANG_DIR . "/$locale.mo" );
-
-    if ( is_multisite() || ( defined( 'WP_NETWORK_ADMIN_PAGE' ) && WP_NETWORK_ADMIN_PAGE ) ) {
-        load_textdomain( 'default', WP_LANG_DIR . "/ms-$locale.mo" );
-    }
+    $mofile = WP_LANG_DIR . "/$locale.mo";
+
+    return load_textdomain( 'default', $mofile );
 }
 
@@ -512 +510 @@
 
     foreach( (array)glob( ( is_null( $dir) ? WP_LANG_DIR : $dir ) . '/*.mo' ) as $lang_file ) {
-        $lang_file = basename($lang_file, '.mo');
-        if ( 0 !== strpos( $lang_file, 'continents-cities' ) && 0 !== strpos( $lang_file, 'ms-' ) )
-            $languages[] = $lang_file;
+        if ( false === strpos( $lang_file, 'continents-cities' ) ) {
+            $languages[] = basename($lang_file, '.mo');
+        }
     }