Skip to content
This repository was archived by the owner on Nov 15, 2017. It is now read-only.

Commit 09e5f49

Browse files
committed
more localization work
1 parent 673287a commit 09e5f49

File tree

5 files changed

+20
-6
lines changed

5 files changed

+20
-6
lines changed

_locales/de/messages.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,10 @@
401401
"message": "{{ubiquitousBlacklistCount}} distinct blocked hostnames from:",
402402
"description": "English: {{ubiquitousBlacklistCount}} distinct blocked hostnames from:"
403403
},
404+
"ubiquitousListsOfBlockedHostsPerListStats" : {
405+
"message": "{{used}} used out of {{total}}",
406+
"description": "English: {{used}} used out of {{total}}"
407+
},
404408
"ubiquitousParseAllABPFiltersPrompt1" : {
405409
"message": "Parse and enforce Adblock+ complex filters (beta).",
406410
"description": "English: Parse and enforce Adblock+ complex filters (beta)."

_locales/en/messages.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,10 @@
401401
"message": "{{ubiquitousBlacklistCount}} distinct blocked hostnames from:",
402402
"description": "English: {{ubiquitousBlacklistCount}} distinct blocked hostnames from:"
403403
},
404+
"ubiquitousListsOfBlockedHostsPerListStats" : {
405+
"message": "{{used}} used out of {{total}}",
406+
"description": "English: {{used}} used out of {{total}}"
407+
},
404408
"ubiquitousParseAllABPFiltersPrompt1" : {
405409
"message": "Parse and enforce Adblock+ complex filters (beta).",
406410
"description": "English: Parse and enforce Adblock+ complex filters (beta)."

_locales/fr/messages.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,10 @@
401401
"message": "{{ubiquitousBlacklistCount}} hôtes actuellement bloqués :",
402402
"description": "English: {{ubiquitousBlacklistCount}} distinct blocked hostnames from:"
403403
},
404+
"ubiquitousListsOfBlockedHostsPerListStats" : {
405+
"message": "{{used}} utilisés sur un total de {{total}}",
406+
"description": "English: {{used}} used out of {{total}}"
407+
},
404408
"ubiquitousParseAllABPFiltersPrompt1" : {
405409
"message": "Utiliser en plus les règles Adblock Plus avancées (beta).",
406410
"description": "English: Parse and enforce Adblock+ complex filters (beta)."

js/ubiquitous-rules.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ function renderBlacklists() {
8080
var i = keys.length;
8181
var blacklist, blacklistName;
8282
var liTemplate = $('#blacklistTemplate .blacklistDetails').first();
83-
var li, child;
83+
var li, child, text;
8484
while ( i-- ) {
8585
blacklistName = keys[i];
8686
blacklist = blacklists[blacklistName];
@@ -96,10 +96,12 @@ function renderBlacklists() {
9696
child.attr('href', encodeURI(blacklistName));
9797
child.text(blacklistName);
9898
}
99-
child = $('span span:nth-of-type(1)', li);
100-
child.text(!blacklist.off && !isNaN(+blacklist.entryUsedCount) ? renderNumber(blacklist.entryUsedCount) : '0');
101-
child = $('span span:nth-of-type(2)', li);
102-
child.text(!isNaN(+blacklist.entryCount) ? renderNumber(blacklist.entryCount) : '?');
99+
child = $('span', li);
100+
text = child.text()
101+
.replace('{{used}}', !blacklist.off && !isNaN(+blacklist.entryUsedCount) ? renderNumber(blacklist.entryUsedCount) : '0')
102+
.replace('{{total}}', !isNaN(+blacklist.entryCount) ? renderNumber(blacklist.entryCount) : '?')
103+
;
104+
child.text(text);
103105
ul.prepend(li);
104106
}
105107
$('#parseAllABPFilters').attr('checked', httpsb.userSettings.parseAllABPFilters === true);

ubiquitous-rules.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ <h2 data-i18n="ubiquitousListsOfBlockedHostsHeader"></h2>
4242
<p id="ubiquitousListsOfBlockedHostsPrompt2"></p>
4343
<ul id="blacklistTemplate" style="display:none">
4444
<li class="blacklistDetails"><input type="checkbox" value="">&thinsp;<a href="" type="text/plain"></a>:
45-
<span class="dim"><span>?</span> used out of <span>?</span></span>
45+
<span class="dim" data-i18n="ubiquitousListsOfBlockedHostsPerListStats"></span>
4646
</ul>
4747
<ul id="blacklists" style="margin:0.5em 0 0 0;padding-left:1em;list-style-type:none">
4848
<li style="margin-top:0.75em"><input type="checkbox" id="parseAllABPFilters"><span data-i18n="ubiquitousParseAllABPFiltersPrompt1"></span>

0 commit comments

Comments
 (0)