diff options
| author | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-02 08:48:05 +0000 |
|---|---|---|
| committer | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-02 08:48:05 +0000 |
| commit | 1793397ab880bab2990f834b14d121bb311c274e (patch) | |
| tree | 02d18bccc22ca41ac9ad5f28f08e590730aa34d3 /chrome | |
| parent | e57ec4c1653c7f08cf6d92f3341a04f242885814 (diff) | |
| download | chromium_src-1793397ab880bab2990f834b14d121bb311c274e.zip chromium_src-1793397ab880bab2990f834b14d121bb311c274e.tar.gz chromium_src-1793397ab880bab2990f834b14d121bb311c274e.tar.bz2 | |
Add the UI language to preferred languages in the language settings UI
BUG=chromium-os:14283
TEST=Manual
Review URL: http://codereview.chromium.org/6893088
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83711 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/resources/options/language_list.js | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/resources/options/language_list.js b/chrome/browser/resources/options/language_list.js index a6983e1..2c033a5 100644 --- a/chrome/browser/resources/options/language_list.js +++ b/chrome/browser/resources/options/language_list.js @@ -316,8 +316,14 @@ cr.define('options', function() { */ handlePreferredLanguagesPrefChange_: function(e) { var languageCodesInCsv = e.value.value; - var languageCodes = this.filterBadLanguageCodes_( - languageCodesInCsv.split(',')); + var languageCodes = languageCodesInCsv.split(','); + + // Add the UI language to the initial list of languages. This is to avoid + // a bug where the UI language would be removed from the preferred + // language list by sync on first login. + // See: crosbug.com/14283 + languageCodes.push(navigator.language); + languageCodes = this.filterBadLanguageCodes_(languageCodes); this.load_(languageCodes); }, |