Merge pull request #28876 from stasm/1143140-pseudol10n-exclude-html-…

…entities Bug 1143140 - Don't pseudolocalize HTML entities. r=gandalf
mozilla-b2g · Mar 14, 2015 · 4868c56 · 4868c56
2 parents 3eee5ce + 0ee7336
commit 4868c56
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/build/l10n/qps.js b/build/l10n/qps.js
@@ -111,8 +111,8 @@ function makeRTL(val) {
   });
 }
 
-// strftime tokens (%a, %Eb) and template {vars}
-var reExcluded = /(%[EO]?\w|\{\s*.+?\s*\})/;
+// strftime tokens (%a, %Eb), template {vars} and HTML entities (&#x202a;)
+var reExcluded = /(%[EO]?\w|\{\s*.+?\s*\}|&[#\w]+;)/;
 
 function mapContent(fn, val) {
   if (!val) {

diff --git a/shared/js/l10n.js b/shared/js/l10n.js
@@ -1076,8 +1076,8 @@
     });
   }
 
-  // strftime tokens (%a, %Eb) and template {vars}
-  var reExcluded = /(%[EO]?\w|\{\s*.+?\s*\})/;
+  // strftime tokens (%a, %Eb), template {vars} and HTML entities (&#x202a;)
+  var reExcluded = /(%[EO]?\w|\{\s*.+?\s*\}|&[#\w]+;)/;
 
   function mapContent(fn, val) {
     if (!val) {