Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(88)

Unified Diff: ui/webui/resources/js/i18n_behavior.js

Issue 1920253002: Refactors parse_html_subset() into i18n_behavior. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/webui/resources/js/compiled_resources2.gyp ('k') | ui/webui/resources/js/parse_html_subset.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/webui/resources/js/i18n_behavior.js
diff --git a/ui/webui/resources/js/i18n_behavior.js b/ui/webui/resources/js/i18n_behavior.js
index 64dd57c4253f99f2faddc591acb01eac54d1a3d2..2a8a6c38797042f467fe2719b7e4aabd1d63f86b 100644
--- a/ui/webui/resources/js/i18n_behavior.js
+++ b/ui/webui/resources/js/i18n_behavior.js
@@ -16,12 +16,44 @@
/** @polymerBehavior */
var I18nBehavior = {
/**
+ * Returns a translated string where $1 to $9 are replaced by the given
+ * values.
* @param {string} id The ID of the string to translate.
- * @param {...string} var_args Placeholders required by the string ($0-9).
+ * @param {...string} var_args Values to replace the placeholders $1 to $9
+ * in the string.
* @return {string} A translated, substituted string.
*/
- i18n: function(id, var_args) {
+ 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.
+ * @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);
+ return parseHtmlSubset('<b>' + rawString + '</b>').firstChild.innerHTML;
+ },
+
+ /**
+ * 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.
+ * @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
+ */
+ i18nAdvanced: function(id, 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;
+ }
};
« no previous file with comments | « ui/webui/resources/js/compiled_resources2.gyp ('k') | ui/webui/resources/js/parse_html_subset.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698