Merge "Set the language for the settings panel for correct webfonts"

This commit is contained in:
jenkins-bot
2013-06-13 09:51:16 +00:00
committed by Gerrit Code Review

View File

@@ -200,6 +200,9 @@
$( 'div.uls-ui-languages button.button' ).removeClass( 'down' ); $( 'div.uls-ui-languages button.button' ).removeClass( 'down' );
button.addClass( 'down' ); button.addClass( 'down' );
displaySettings.prepareUIFonts(); displaySettings.prepareUIFonts();
// set the language for the settings panel so that webfonts
// are correctly applied.
displaySettings.$template.attr( 'lang', displaySettings.uiLanguage );
$.i18n().locale = displaySettings.uiLanguage; $.i18n().locale = displaySettings.uiLanguage;
displaySettings.i18n(); displaySettings.i18n();
}; };
@@ -293,6 +296,9 @@
displaySettings.$parent.show(); displaySettings.$parent.show();
displaySettings.prepareUIFonts(); displaySettings.prepareUIFonts();
displaySettings.prepareLanguages(); displaySettings.prepareLanguages();
// set the language for the settings panel so that webfonts
// are correctly applied.
displaySettings.$template.attr( 'lang', langCode );
$.i18n().locale = langCode; $.i18n().locale = langCode;
displaySettings.i18n(); displaySettings.i18n();
}, },