From f741213c4aadc1ee0f05bfbfac01f1122181939e Mon Sep 17 00:00:00 2001 From: Jeff Boek Date: Thu, 18 Apr 2019 12:05:17 -0700 Subject: [PATCH] For #1116 - Fix the language code generation --- .../java/org/mozilla/fenix/settings/SupportUtils.kt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt b/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt index e0d628d39..7b2622c5d 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt @@ -27,7 +27,7 @@ object SupportUtils { val escapedTopic = getEncodedTopicUTF8(topic.topicStr) val appVersion = getAppVersion(context) val osTarget = "Android" - val langTag = Locale.getDefault().isO3Language + val langTag = getLanguageTag(Locale.getDefault()) return "https://support.mozilla.org/1/mobile/$appVersion/$osTarget/$langTag/$escapedTopic" } @@ -47,4 +47,12 @@ object SupportUtils { throw IllegalStateException("Unable find package details for Fenix", e) } } + + private fun getLanguageTag(locale: Locale): String { + val language = locale.language + val country = locale.country // Can be an empty string. + return if (country == "") { + language + } else "$language-$country" + } }