Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: i18n.js

Issue 29375899: Issue 4871 - Start using ESLint for adblockplusui (Closed)
Left Patch Set: Fix regressions with the new options page Created March 1, 2017, 8:25 a.m.
Right Patch Set: Avoid violating operator-linebreak rule Created March 15, 2017, 4:43 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « firstRun.js ('k') | lib/.eslintrc.json » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2016 Eyeo GmbH 3 * Copyright (C) 2006-2016 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 12 matching lines...) Expand all
23 23
24 // Getting UI locale cannot be done synchronously on Firefox, 24 // Getting UI locale cannot be done synchronously on Firefox,
25 // requires messaging the background page. For Chrome and Safari, 25 // requires messaging the background page. For Chrome and Safari,
26 // we could get the UI locale here, but would need to duplicate 26 // we could get the UI locale here, but would need to duplicate
27 // the logic implemented in Utils.appLocale. 27 // the logic implemented in Utils.appLocale.
28 ext.backgroundPage.sendMessage( 28 ext.backgroundPage.sendMessage(
29 { 29 {
30 type: "app.get", 30 type: "app.get",
31 what: "localeInfo" 31 what: "localeInfo"
32 }, 32 },
33 localeInfo => 33 (localeInfo) =>
34 { 34 {
35 document.documentElement.lang = localeInfo.locale; 35 document.documentElement.lang = localeInfo.locale;
36 document.documentElement.dir = localeInfo.bidiDir; 36 document.documentElement.dir = localeInfo.bidiDir;
37 } 37 }
38 ); 38 );
39 39
40 // Inserts i18n strings into matching elements. Any inner HTML already 40 // Inserts i18n strings into matching elements. Any inner HTML already
41 // in the element is parsed as JSON and used as parameters to 41 // in the element is parsed as JSON and used as parameters to
42 // substitute into placeholders in the i18n message. 42 // substitute into placeholders in the i18n message.
43 ext.i18n.setElementText = function(element, stringName, args) 43 ext.i18n.setElementText = function(element, stringName, args)
(...skipping 18 matching lines...) Expand all
62 while (element.lastChild) 62 while (element.lastChild)
63 element.removeChild(element.lastChild); 63 element.removeChild(element.lastChild);
64 processString(ext.i18n.getMessage(stringName, args), element); 64 processString(ext.i18n.getMessage(stringName, args), element);
65 }; 65 };
66 66
67 // Loads i18n strings 67 // Loads i18n strings
68 function loadI18nStrings() 68 function loadI18nStrings()
69 { 69 {
70 function addI18nStringsToElements(containerElement) 70 function addI18nStringsToElements(containerElement)
71 { 71 {
72 for (let node of containerElement.querySelectorAll("[class^='i18n_']")) 72 let elements = containerElement.querySelectorAll("[class^='i18n_']");
Thomas Greiner 2017/03/01 17:39:35 Detail: Again, it'd be nice if we could keep this
kzar 2017/03/07 12:48:32 Done.
73 for (let node of elements)
73 { 74 {
74 let args = JSON.parse("[" + node.textContent + "]"); 75 let args = JSON.parse("[" + node.textContent + "]");
75 if (args.length == 0) 76 if (args.length == 0)
76 args = null; 77 args = null;
77 78
78 let {className} = node; 79 let {className} = node;
79 if (className instanceof SVGAnimatedString) 80 if (className instanceof SVGAnimatedString)
80 className = className.animVal; 81 className = className.animVal;
81 let stringName = className.split(/\s/)[0].substring(5); 82 let stringName = className.split(/\s/)[0].substring(5);
82 83
83 ext.i18n.setElementText(node, stringName, args); 84 ext.i18n.setElementText(node, stringName, args);
84 } 85 }
85 } 86 }
86 addI18nStringsToElements(document); 87 addI18nStringsToElements(document);
87 // Content of Template is not rendered on runtime so we need to add 88 // Content of Template is not rendered on runtime so we need to add
88 // translation strings for each Template documentFragment content 89 // translation strings for each Template documentFragment content
89 // individually. 90 // individually.
90 for (let template of document.querySelectorAll("template")) 91 for (let template of document.querySelectorAll("template"))
91 addI18nStringsToElements(template.content); 92 addI18nStringsToElements(template.content);
92 } 93 }
93 94
94 // Provides a more readable string of the current date and time 95 // Provides a more readable string of the current date and time
95 function i18nTimeDateStrings(when) 96 function i18nTimeDateStrings(when)
Thomas Greiner 2017/03/01 17:39:35 Note that this function is used in the current opt
kzar 2017/03/02 04:36:01 Yep, don't worry I've done that. Actually come to
Thomas Greiner 2017/03/07 13:33:01 Great, thanks.
96 { 97 {
97 let d = new Date(when); 98 let d = new Date(when);
98 let timeString = d.toLocaleTimeString(); 99 let timeString = d.toLocaleTimeString();
99 100
100 let now = new Date(); 101 let now = new Date();
101 if (d.toDateString() == now.toDateString()) 102 if (d.toDateString() == now.toDateString())
102 return [timeString]; 103 return [timeString];
103 return [timeString, d.toLocaleDateString()]; 104 return [timeString, d.toLocaleDateString()];
104 } 105 }
105 106
106 // Formats date string to ["YYYY-MM-DD", "mm:ss"] format 107 // Formats date string to ["YYYY-MM-DD", "mm:ss"] format
107 function i18nFormatDateTime(when) 108 function i18nFormatDateTime(when)
108 { 109 {
109 let date = new Date(when); 110 let date = new Date(when);
110 let dateParts = [date.getFullYear(), date.getMonth() + 1, date.getDate(), 111 let dateParts = [date.getFullYear(), date.getMonth() + 1, date.getDate(),
111 date.getHours(), date.getMinutes()]; 112 date.getHours(), date.getMinutes()];
112 113
113 dateParts = dateParts.map( 114 dateParts = dateParts.map(
114 datePart => datePart < 10 ? "0" + datePart : datePart 115 (datePart) => datePart < 10 ? "0" + datePart : datePart
115 ); 116 );
116 117
117 return [dateParts.splice(0, 3).join("-"), dateParts.join(":")]; 118 return [dateParts.splice(0, 3).join("-"), dateParts.join(":")];
118 } 119 }
119 120
120 // Fill in the strings as soon as possible 121 // Fill in the strings as soon as possible
121 window.addEventListener("DOMContentLoaded", loadI18nStrings, true); 122 window.addEventListener("DOMContentLoaded", loadI18nStrings, true);
LEFTRIGHT

Powered by Google App Engine
This is Rietveld