From a0eda8150007928074d06c09ea2c72c699176158 Mon Sep 17 00:00:00 2001
From: Ian Neal <iann_cvs@blueyonder.co.uk>
Date: Wed, 15 Apr 2020 15:51:27 +0100
Subject: [PATCH] Bug 1630282 - Not all locales have the same number of map
 service prefs. r=rjl

---
 mail/locales/filter.py  | 3 ++-
 mail/locales/l10n.toml  | 6 ++++++
 suite/locales/filter.py | 4 ++++
 suite/locales/l10n.toml | 6 ++++++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/mail/locales/filter.py b/mail/locales/filter.py
index e69fbbd0b0..7330a3cb4d 100644
--- a/mail/locales/filter.py
+++ b/mail/locales/filter.py
@@ -19,7 +19,8 @@ def test(mod, path, entity=None):
     return "ignore"
 
   if path == "chrome/messenger-region/region.properties":
-    return ("ignore" if (re.match(r"browser\.search\.order\.[1-9]", entity))
+    return ("ignore" if (re.match(r"browser\.search\.order\.[1-9]", entity) or
+                         re.match(r"mail\.addr_book\.mapit_url\.[1-5]", entity))
             else "error")
 
   return "error"
diff --git a/mail/locales/l10n.toml b/mail/locales/l10n.toml
index fb6b494f12..6d8b4ecabc 100644
--- a/mail/locales/l10n.toml
+++ b/mail/locales/l10n.toml
@@ -132,3 +132,9 @@ locales = [
     path = "{l}mail/chrome/messenger-region/region.properties"
     key = "re:browser\\.search\\.order\\.[1-9].*"
     action = "ignore"
+
+# map service prefs don't have the same number for all locales
+[[filters]]
+    path = "{l}mail/chrome/messenger-region/region.properties"
+    key = "re:mail\\.addr_book\\.mapit_url\\.[1-5].*"
+    action = "ignore"
diff --git a/suite/locales/filter.py b/suite/locales/filter.py
index e5c846ba7e..ff121b15e7 100644
--- a/suite/locales/filter.py
+++ b/suite/locales/filter.py
@@ -37,6 +37,10 @@ def test(mod, path, entity=None):
     return ("ignore" if (re.match(r"browser\.search\.order\.[1-9]", entity))
             else "error")
 
+  if path == "chrome/mailnews/region.properties":
+    return ("ignore" if (re.match(r"mail\.addr_book\.mapit_url\.[1-5]", entity))
+            else "error")
+
   if path != "chrome/browser/region.properties":
     # only region.properties exceptions remain, compare all others
     return "error"
diff --git a/suite/locales/l10n.toml b/suite/locales/l10n.toml
index ffc2da48b5..6818d23f55 100644
--- a/suite/locales/l10n.toml
+++ b/suite/locales/l10n.toml
@@ -99,6 +99,12 @@ locales = [
     key = "re:browser\\.contentHandlers\\.types\\.[0-5].*"
     action = "ignore"
 
+# map service prefs don't have the same number for all locales
+[[filters]]
+    path = "{l}suite/chrome/mailnews/region.properties"
+    key = "re:mail\\.addr_book\\.mapit_url\\.[1-5].*"
+    action = "ignore"
+
 # search plugins are different per locale, ignore file difference
 [[filters]]
     path = "{l}suite/searchplugins/*.xml"