IETF language changes in MediaElement:

mediaelement/mediaelement#1270 Reverts [28801]. Fixes #29182. Built from https://develop.svn.wordpress.org/trunk@30637 git-svn-id: http://core.svn.wordpress.org/trunk@30627 1a063a9b-81f0-0310-95a4-ce76da25c4cd
markjaquith · Nov 30, 2014 · 0b54cfd · 0b54cfd
1 parent d12eb2e
commit 0b54cfd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
@@ -308,7 +308,7 @@ function wp_default_scripts( &$scripts ) {
 
 	$scripts->add( 'mediaelement', "/wp-includes/js/mediaelement/mediaelement-and-player.min.js", array('jquery'), '2.15.1', 1 );
 	did_action( 'init' ) && $scripts->localize( 'mediaelement', 'mejsL10n', array(
-		'language' => substr( get_bloginfo( 'language' ), 0, 2 ),
+		'language' => get_bloginfo( 'language' ),
 		'strings'  => array(
 			'Close'               => __( 'Close' ),
 			'Fullscreen'          => __( 'Fullscreen' ),

diff --git a/wp-includes/version.php b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-beta2-30636';
+$wp_version = '4.1-beta2-30637';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.