mediawiki.action.edit.preview: Apply mw.language.bcp47 to lang
authorFomafix <fomafix@googlemail.com>
Sat, 16 Sep 2017 10:31:02 +0000 (12:31 +0200)
committerFomafix <fomafix@googlemail.com>
Sat, 16 Sep 2017 10:32:57 +0000 (12:32 +0200)
Apply mw.language.bcp47 to the language codes before using as values
for the HTML attributes lang and hreflang.

Change-Id: I4321d32f3b3a9729650060d59450701710b8c8f2

resources/Resources.php
resources/src/mediawiki.action/mediawiki.action.edit.preview.js

index 10786da..246d9f3 100644 (file)
@@ -1451,6 +1451,7 @@ return [
                        'jquery.textSelection',
                        'mediawiki.api',
                        'mediawiki.diff.styles',
+                       'mediawiki.language',
                        'mediawiki.util',
                        'mediawiki.jqueryMsg',
                        'oojs-ui-core',
index 7602dae..ab1ce27 100644 (file)
                                if ( response.parse.langlinks && mw.config.get( 'skin' ) === 'vector' ) {
                                        newList = [];
                                        $.each( response.parse.langlinks, function ( i, langlink ) {
+                                               var bcp47 = mw.language.bcp47( langlink.lang );
                                                li = $( '<li>' )
                                                        .addClass( 'interlanguage-link interwiki-' + langlink.lang )
                                                        .append( $( '<a>' )
                                                                .attr( {
                                                                        href: langlink.url,
                                                                        title: langlink.title + ' - ' + langlink.langname,
-                                                                       lang: langlink.lang,
-                                                                       hreflang: langlink.lang
+                                                                       lang: bcp47,
+                                                                       hreflang: bcp47
                                                                } )
                                                                .text( langlink.autonym )
                                                        );