Bug 1128991 - [mobile] Update filter.py to ignore US specific keys in region.properties. r=mfinkle
authorFrancesco Lodolo (:flod) <flod@lodolo.net>
Tue, 03 Feb 2015 08:43:00 +0100
changeset 240809 ff6d8e6788bd693ade26d66d560bf4fc71db1a4f
parent 240808 06587e963dfcec64a4d4136a85e0c4a58540d32c
child 240810 76666ba94d14d03689ae6c1603918be53990b19b
push id557
push usermleibovic@mozilla.com
push dateWed, 04 Feb 2015 21:57:30 +0000
reviewersmfinkle
bugs1128991
milestone38.0a1
Bug 1128991 - [mobile] Update filter.py to ignore US specific keys in region.properties. r=mfinkle
mobile/android/locales/filter.py
mobile/locales/filter.py
--- a/mobile/android/locales/filter.py
+++ b/mobile/android/locales/filter.py
@@ -29,15 +29,16 @@ def test(mod, path, entity = None):
     return "error"
 
   # we're in mod == "mobile"
   if re.match(r"searchplugins\/.+\.xml", path):
     return "ignore"
   if path == "chrome/region.properties":
     # only region.properties exceptions remain
     if (re.match(r"browser\.search\.order\.[1-9]", entity) or
+        re.match(r"browser\.search\.[a-zA-Z]+\.US", entity) or
         re.match(r"browser\.contentHandlers\.types\.[0-5]", entity) or
         re.match(r"gecko\.handlerService\.schemes\.", entity) or
         re.match(r"gecko\.handlerService\.defaultHandlersVersion", entity) or
         re.match(r"browser\.suggestedsites\.", entity)):
       return "ignore"
 
   return "error"
--- a/mobile/locales/filter.py
+++ b/mobile/locales/filter.py
@@ -29,15 +29,16 @@ def test(mod, path, entity = None):
     return "error"
 
   # we're in mod == "mobile"
   if re.match(r"searchplugins\/.+\.xml", path):
     return "ignore"
   if path == "chrome/region.properties":
     # only region.properties exceptions remain
     if (re.match(r"browser\.search\.order\.[1-9]", entity) or
+        re.match(r"browser\.search\.[a-zA-Z]+\.US", entity) or
         re.match(r"browser\.contentHandlers\.types\.[0-5]", entity) or
         re.match(r"gecko\.handlerService\.schemes\.", entity) or
         re.match(r"gecko\.handlerService\.defaultHandlersVersion", entity) or
         re.match(r"browser\.suggestedsites\.", entity)):
       return "ignore"
 
   return "error"