Ticket #27050: 27050.2.diff

wp-settings.php

@@ -300 +300 @@
 load_default_textdomain();
 
 $locale = get_locale();
-$locale_file = WP_LANG_DIR . "/$locale.php";
-if ( ( 0 === validate_file( $locale ) ) && is_readable( $locale_file ) )
-        require( $locale_file );
+foreach ( array( WP_LANG_DIR . "/$locale.php", WP_LANG_DIR . "/$locale/$locale.php" ) as $locale_file) {
+        if ( ( 0 === validate_file( $locale ) ) && is_readable( $locale_file ) ) {
+                require( $locale_file );
+                break;
+        }
+}
 unset( $locale_file );
 
 // Pull in locale data after loading text domain.