Commit efc85605 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

fixup! [android] Implement Android-native Connection Assist UI 

TB 43633: Include regionNames.ftl in Android builds.
parent d969f332

mobile/android/locales/filter.py

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ def test(mod, path, entity=None): 
            "chrome/global/commonDialogs.properties",

            "chrome/global/intl.properties",

            "chrome/global/intl.css",

            "toolkit/intl/regionNames.ftl",

        ):

            return "error"

        if re.match(r"toolkit/about/[^/]*About.ftl", path):

mobile/android/locales/jar.mn

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ relativesrcdir toolkit/locales: 
  toolkit/about                                    (%toolkit/about/*Compat.ftl)

#about:webrtc

  toolkit/about                                    (%toolkit/about/*Webrtc.ftl)

#country/region names (used by TorConnect; see tor-browser#43633)

  toolkit/intl/regionNames.ftl                     (%toolkit/intl/regionNames.ftl)

#endif

# Do not add files below the endif. Reviewers, expand more context above

# for comments.

mobile/android/locales/l10n.toml

+4 −0
Original line number Diff line number Diff line
@@ -173,6 +173,10 @@ exclude-multi-locale = [ 
    reference = "toolkit/locales/en-US/toolkit/about/*Webrtc.ftl"

    l10n = "{l}toolkit/toolkit/about/*Webrtc.ftl"



[[paths]]

    reference = "toolkit/locales/en-US/toolkit/intl/regionNames.ftl"

    l10n = "{l}toolkit/toolkit/intl/regionNames.ftl"



[[filters]]

    path = [

        "{l}mobile/android/mobile-l10n.js",

mobile/locales/filter.py

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ def test(mod, path, entity=None): 
            "chrome/global/commonDialogs.properties",

            "chrome/global/intl.properties",

            "chrome/global/intl.css",

            "toolkit/intl/regionNames.ftl",

        ):

            return "error"

        if re.match(r"toolkit/about/[^/]*About.ftl", path):