Bug 1478219 - Remove search default and search order from l10n checks (mobile, desktop) r=Pike
authorFrancesco Lodolo (:flod) <flod@lodolo.net>
Tue, 16 Oct 2018 11:12:34 +0000
changeset 497194 0f0249190e74309e4de3a16e9b15400e39ce518e
parent 497193 451ad77036b5068485a7affd6cc74768295d14e1
child 497195 bf88501c1f8af00508f0a13029329ea2f005f51c
push id9996
push userarchaeopteryx@coole-files.de
push dateThu, 18 Oct 2018 18:37:15 +0000
treeherdermozilla-beta@8efe26839243 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersPike
bugs1478219
milestone64.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1478219 - Remove search default and search order from l10n checks (mobile, desktop) r=Pike Differential Revision: https://phabricator.services.mozilla.com/D8832
browser/locales/filter.py
browser/locales/l10n.toml
mobile/android/locales/filter.py
mobile/android/locales/l10n.toml
mobile/locales/filter.py
--- a/browser/locales/filter.py
+++ b/browser/locales/filter.py
@@ -28,14 +28,13 @@ def test(mod, path, entity=None):
         # l10n ships en-US dictionary or something, do compare
         return "error"
     if path == "defines.inc":
         return "ignore" if entity == "MOZ_LANGPACK_CONTRIBUTORS" else "error"
 
     if mod == "browser" and path == "chrome/browser-region/region.properties":
         # only region.properties exceptions remain, compare all others
         return ("ignore"
-                if (re.match(r"browser\.search\.order\.[1-9]", entity) or
-                    re.match(r"browser\.contentHandlers\.types\.[0-5]", entity) or
+                if (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))
                 else "error")
     return "error"
--- a/browser/locales/l10n.toml
+++ b/browser/locales/l10n.toml
@@ -174,14 +174,13 @@ locales = [
         "{l}browser/defines.inc",
         "{l}browser/firefox-l10n.js",
     ]
     action = "ignore"
 
 [[filters]]
     path = "{l}browser/chrome/browser-region/region.properties"
     key = [
-        "re:^browser\\.search\\.order\\.[1-9]$",
         "re:^browser\\.contentHandlers\\.types\\.[0-5]\\..*$",
         "re:^gecko\\.handlerService\\.schemes\\..*$",
         "re:^gecko\\.handlerService\\.defaultHandlersVersion$"
     ]
     action = "ignore"
--- a/mobile/android/locales/filter.py
+++ b/mobile/android/locales/filter.py
@@ -63,17 +63,15 @@ def test(mod, path, entity=None):
         if path == "defines.inc":
             if entity == "MOZ_LANGPACK_CONTRIBUTORS":
                 return "ignore"
         return "error"
 
     # we're in mod == "mobile"
     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
+        if (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/android/locales/l10n.toml
+++ b/mobile/android/locales/l10n.toml
@@ -244,16 +244,14 @@ exclude-multi-locale = [
 [[filters]]
     path = "{l}mobile/android/defines.inc"
     key = "MOZ_LANGPACK_CONTRIBUTORS"
     action = "ignore"
 
 [[filters]]
     path = "{l}mobile/chrome/region.properties"
     key = [
-        "re:^browser\\.search\\.order\\.[1-9]$",
-        "re:^browser\\.search\\.[a-zA-Z]+\\.US",
         "re:^browser\\.contentHandlers\\.types\\.[0-5]\\..*$",
         "re:^gecko\\.handlerService\\.schemes\\..+$",
         "re:^gecko\\.handlerService\\.defaultHandlersVersion$",
         "re:^browser\\.suggestedsites\\..+$",
     ]
     action = "ignore"
--- a/mobile/locales/filter.py
+++ b/mobile/locales/filter.py
@@ -64,17 +64,15 @@ def test(mod, path, entity=None):
         if path == "defines.inc":
             if entity == "MOZ_LANGPACK_CONTRIBUTORS":
                 return "ignore"
         return "error"
 
     # we're in mod == "mobile"
     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
+        if (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"