Bug fix: Append a language to the list after blocking it for Translate on Chrome OS

chrome/browser/resources/options/language_list.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 cr.define('options', function() {
   /** @const */ var ArrayDataModel = cr.ui.ArrayDataModel;
   /** @const */ var DeletableItem = options.DeletableItem;
   /** @const */ var DeletableItemList = options.DeletableItemList;
   /** @const */ var List = cr.ui.List;
   /** @const */ var ListItem = cr.ui.ListItem;
@@ skipping 389 matching lines @@
         // Note that ListSingleSelectionModel won't select an item
         // automatically, hence we manually select the first item here.
         this.selectionModel.selectedIndex = 0;
       }
     },
 
     /**
      * Saves the preference.
      */
     savePreference_: function() {
-      // Encode the language codes into a CSV string.
-      if (cr.isChromeOS)

[Takashi Toyoshima, 2013/09/09 12:26:11]

Originally, preferredLanguagesPref is used by other platforms, too.
http://src.chromium.org/viewvc/chrome?revision=69521&view=revision
Did you investigate why this is changed to be used only by Chrome OS?

[hajimehoshi, 2013/09/10 03:21:45]

I guess that this option page was just only for Chrome OS, but now it is used
for all platforms. Originally Windows, Mac OS X, Linux didn't have the option
pages in Chrome, and instead, 'Accept-Languages' was managed in each way.

See: https://codereview.chromium.org/6296017/ and
https://code.google.com/p/chromium/issues/detail?id=43716

-        Preferences.setStringPref(this.preferredLanguagesPref,
-                                  this.dataModel.slice().join(','), true);
-      // Save the same language list as accept languages preference as
-      // well, but we need to expand the language list, to make it more
-      // acceptable. For instance, some web sites don't understand 'en-US'
-      // but 'en'. See crosbug.com/9884.
-      var acceptLanguages = this.expandLanguageCodes(this.dataModel.slice());
-      Preferences.setStringPref(this.acceptLanguagesPref,
-                                acceptLanguages.join(','), true);
+      chrome.send('updateLanguageList', [this.dataModel.slice()]);
       cr.dispatchSimpleEvent(this, 'save');
     },
 
     /**
-     * Expands language codes to make these more suitable for Accept-Language.
-     * Example: ['en-US', 'ja', 'en-CA'] => ['en-US', 'en', 'ja', 'en-CA'].
-     * 'en' won't appear twice as this function eliminates duplicates.
-     * @param {Array} languageCodes List of language codes.
-     * @private
-     */
-    expandLanguageCodes: function(languageCodes) {
-      var expandedLanguageCodes = [];
-      var seen = {};  // Used to eliminiate duplicates.
-      for (var i = 0; i < languageCodes.length; i++) {
-        var languageCode = languageCodes[i];
-        if (!(languageCode in seen)) {
-          expandedLanguageCodes.push(languageCode);
-          seen[languageCode] = true;
-        }
-        var parts = languageCode.split('-');
-        if (!(parts[0] in seen)) {
-          expandedLanguageCodes.push(parts[0]);
-          seen[parts[0]] = true;
-        }
-      }
-      return expandedLanguageCodes;
-    },
-
-    /**
      * Filters bad language codes in case bad language codes are
      * stored in the preference. Removes duplicates as well.
      * @param {Array} languageCodes List of language codes.
      * @private
      */
     filterBadLanguageCodes_: function(languageCodes) {
       var filteredLanguageCodes = [];
       var seen = {};
       for (var i = 0; i < languageCodes.length; i++) {
         // Check if the the language code is valid, and not
         // duplicate. Otherwise, skip it.
         if (LanguageList.isValidLanguageCode(languageCodes[i]) &&
             !(languageCodes[i] in seen)) {
           filteredLanguageCodes.push(languageCodes[i]);
           seen[languageCodes[i]] = true;
         }
       }
       return filteredLanguageCodes;
     },
   };
 
   return {
     LanguageList: LanguageList,
     LanguageListItem: LanguageListItem
   };
 });