Changeset 41889

Timestamp:

10/18/2017 12:07:30 AM (7 years ago)

Author:

westonruter

Message:

Media: Use user locale as ME.js language in admin and add mejsL10n inline script before mediaelement-core so WP-exported translation strings are used.

See #39686.
Fixes #42241.

File:

• trunk/src/wp-includes/script-loader.php (modified) (2 diffs)

trunk/src/wp-includes/script-loader.php

@@ -356 +356 @@
     $scripts->add( 'mediaelement-core', "/wp-includes/js/mediaelement/mediaelement-and-player$suffix.js", array(), '4.2.6-78496d1', 1 );
     $scripts->add( 'mediaelement-migrate', "/wp-includes/js/mediaelement/mediaelement-migrate$suffix.js", array(), false, 1);
-    did_action( 'init' ) && $scripts->localize( 'mediaelement', 'mejsL10n', array(
-        'language' => get_bloginfo( 'language' ),
+
+    did_action( 'init' ) && $scripts->add_inline_script( 'mediaelement-core', sprintf( 'var mejsL10n = %s;', wp_json_encode( array(
+        'language' => strtolower( str_replace( '_', '-', is_admin() ? get_user_locale() : get_locale() ) ),
         'strings'  => array(
             'mejs.install-flash'       => __( 'You are using a browser that does not have Flash player enabled or installed. Please turn on your Flash player plugin or download the latest version from https://get.adobe.com/flashplayer/' ),
@@ -444 +445 @@
             'mejs.yiddish'             => __( 'Yiddish' ),
             ),
-        ) );
+        ) ) ), 'before' );