Bug 1128991 - [mobile] Update filter.py to ignore US specific keys in region.properties. r=mfinkle, a=sledru
authorFrancesco Lodolo (:flod) <flod@lodolo.net>
Tue, 03 Feb 2015 08:43:00 +0100
changeset 249631 5754ca42b8d3c8809c0efab5ea338303a607fb5b
parent 249630 5e50ea349b4730e368c4804a085e827ec541dec0
child 249632 eae47bdf207cc8d2a58639070da4ff9a3ac69bb5
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle, sledru
bugs1128991
milestone37.0a2
Bug 1128991 - [mobile] Update filter.py to ignore US specific keys in region.properties. r=mfinkle, a=sledru
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"