Left: | ||
Right: |
OLD | NEW |
---|---|
1 /* | 1 /* |
2 * This file is part of Adblock Plus <http://adblockplus.org/>, | 2 * This file is part of Adblock Plus <http://adblockplus.org/>, |
3 * Copyright (C) 2006-2014 Eyeo GmbH | 3 * Copyright (C) 2006-2014 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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
97 candidates.push(language + "_" + region); | 97 candidates.push(language + "_" + region); |
98 | 98 |
99 candidates.push(language); | 99 candidates.push(language); |
100 | 100 |
101 if (candidates.indexOf(defaultLocale) == -1) | 101 if (candidates.indexOf(defaultLocale) == -1) |
102 candidates.push(defaultLocale); | 102 candidates.push(defaultLocale); |
103 | 103 |
104 return candidates; | 104 return candidates; |
105 }; | 105 }; |
106 | 106 |
107 var initCatalog = function(ui_locale) | |
Thomas Greiner
2014/12/10 10:29:42
Style nit: I do see why you used underscores here
Sebastian Noack
2014/12/10 10:37:29
That wasn't an aware decision. It happened rather
| |
108 { | |
109 var bidi_dir = /^(ar|fa|he|ug|ur)_|$/.test(ui_locale) ? "rtl" : "ltr"; | |
Thomas Greiner
2014/12/10 10:29:42
This regular expression will match any string due
Sebastian Noack
2014/12/10 10:37:29
Ouch, I forgot to set parentheses.
Thomas Greiner
2014/12/10 11:12:12
The corrected version still matches "ar_". By addi
Sebastian Noack
2014/12/10 11:32:06
Why should we care? We want to match "ar" and "ar_
Thomas Greiner
2014/12/10 12:06:02
I can agree with that line of argument.
| |
110 var catalog = Object.create(null); | |
111 | |
112 catalog["@@ui_locale"] = [ui_locale, []]; | |
113 catalog["@@bidi_dir" ] = [bidi_dir, []]; | |
114 | |
115 return catalog; | |
116 }; | |
117 | |
107 var locales = getLocaleCandidates(); | 118 var locales = getLocaleCandidates(); |
108 var catalog = {__proto__: null, "@@ui_locale": [locales[0], []]}; | 119 var catalog = initCatalog(locales[0]); |
109 | 120 |
110 var replacePlaceholder = function(text, placeholder, content) | 121 var replacePlaceholder = function(text, placeholder, content) |
111 { | 122 { |
112 return text.split("$" + placeholder + "$").join(content || ""); | 123 return text.split("$" + placeholder + "$").join(content || ""); |
113 }; | 124 }; |
114 | 125 |
115 var parseMessage = function(rawMessage) | 126 var parseMessage = function(rawMessage) |
116 { | 127 { |
117 var text = rawMessage.message; | 128 var text = rawMessage.message; |
118 var placeholders = []; | 129 var placeholders = []; |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
183 }; | 194 }; |
184 | 195 |
185 | 196 |
186 /* Utils */ | 197 /* Utils */ |
187 | 198 |
188 ext.getURL = function(path) | 199 ext.getURL = function(path) |
189 { | 200 { |
190 return safari.extension.baseURI + path; | 201 return safari.extension.baseURI + path; |
191 }; | 202 }; |
192 })(); | 203 })(); |
OLD | NEW |