[MD settings] I18nBehavior return textContent from i18n()

ui/webui/resources/js/i18n_behavior.js

 // Copyright 2015 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.
 
 /**
  * @fileoverview
  * 'I18nBehavior' is a behavior to mix in loading of internationalization
  * strings.
  */
 
@@ skipping 21 matching lines @@
    */
   i18nRaw_: function(id, var_args) {
     return arguments.length == 1 ?
         loadTimeData.getString(id) :
         loadTimeData.getStringF.apply(loadTimeData, arguments);
   },
 
   /**
    * Returns a translated string where $1 to $9 are replaced by the given
    * values. Also sanitizes the output to filter out dangerous HTML/JS.
+   * Use with Polymer bindings that are *not* inner-h-t-m-l.
    * @param {string} id The ID of the string to translate.
    * @param {...string} var_args Values to replace the placeholders $1 to $9
    *     in the string.
    * @return {string} A translated, sanitized, substituted string.
    */
   i18n: function(id, var_args) {
     var rawString = this.i18nRaw_.apply(this, arguments);
-    var htmlStr =
-        parseHtmlSubset('<b>' + rawString + '</b>').firstChild.innerHTML;
-    // TODO(dschuyler): use textContent rather than innerHTML; remove replace().
-    return htmlStr.replace(/&nbsp;/g, '\u00a0');
+    return parseHtmlSubset('<b>' + rawString + '</b>').firstChild.textContent;
   },
 
   /**
    * Similar to 'i18n', returns a translated, sanitized, substituted string.
    * It receives the string ID and a dictionary containing the substitutions
-   * as well as optional additional allowed tags and attributes.
+   * as well as optional additional allowed tags and attributes. Use with
+   * Polymer bindings that are inner-h-t-m-l, for example.
    * @param {string} id The ID of the string to translate.
-   * @param {{substitutions: (Array<string>|undefined),
-   *          attrs: (Object<function(Node, string):boolean>|undefined),
-   *          tags: (Array<string>|undefined)}} opts
+   * @param {I18nAdvancedOpts=} opts
+   * @return {string}
    */
   i18nAdvanced: function(id, opts) {
+    opts = opts || {};
     var args = [id].concat(opts.substitutions || []);
     var rawString = this.i18nRaw_.apply(this, args);
     return parseHtmlSubset('<b>' + rawString + '</b>', opts.tags, opts.attrs)
         .firstChild.innerHTML;
   },
 
   /**
    * Similar to 'i18n', with an unused |locale| parameter used to trigger
    * updates when |this.locale| changes.
    * @param {string} locale The UI language used.
    * @param {string} id The ID of the string to translate.
    * @param {...string} var_args Values to replace the placeholders $1 to $9
    *     in the string.
    * @return {string} A translated, sanitized, substituted string.
    */
   i18nDynamic: function(locale, id, var_args) {
     return this.i18n.apply(this, Array.prototype.slice.call(arguments, 1));
   },
 
   /**
    * Returns true if a translation exists for |id|.
    * @param {string} id
    * @return {boolean}
    */
   i18nExists: function(id) {
     return loadTimeData.valueExists(id);
   },
 
   /**
-   * Call this when UI strings may have changed. This will send an update to any
-   * data bindings to i18nDynamic(locale, ...).
+   * Call this when UI strings may have changed. This will send an update to
+   * any data bindings to i18nDynamic(locale, ...).
    */
   i18nUpdateLocale: function() {
     this.locale = loadTimeData.getString('language');
   },
 };
 
 /**
+ * @typedef {{
+ *   substitutions: (Array<string>|undefined),
+ *   attrs: (Object<function(Node, string):boolean>|undefined),
+ *   tags: (Array<string>|undefined),
+ * }}
+ */
+var I18nAdvancedOpts;
+
+/**
  * TODO(stevenjb): Replace with an interface. b/24294625
  * @typedef {{
- *   i18n: function(string, ...string): string}},
- *   i18nAdvanced: function({
- *     substitutions: (Array<string>|undefined),
- *     attrs: (Object<function(Node, string):boolean>|undefined),
- *     tags: (Array<string>|undefined)}, opts),
- *   i18nExists: function(string)
+ *   i18n: function(string, ...string): string,
+ *   i18nAdvanced: function(string, I18nAdvancedOpts=): string,
+ *   i18nDynamic: function(string, string, ...string): string,
+ *   i18nExists: function(string),
+ *   i18nUpdateLocale: function()
  * }}
  */
 I18nBehavior.Proto;