From c2de12e1a36b092d305abc0c8d76b969d1522c2e Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Tue, 13 Apr 2021 14:37:42 +0200 Subject: [PATCH] let LocalHelpActivity detect language-region combinations --- src/org/thoughtcrime/securesms/LocalHelpActivity.java | 3 +++ src/org/thoughtcrime/securesms/LogViewFragment.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/org/thoughtcrime/securesms/LocalHelpActivity.java b/src/org/thoughtcrime/securesms/LocalHelpActivity.java index 6a8873ad4..77bf3ec3e 100644 --- a/src/org/thoughtcrime/securesms/LocalHelpActivity.java +++ b/src/org/thoughtcrime/securesms/LocalHelpActivity.java @@ -20,8 +20,11 @@ public class LocalHelpActivity extends WebViewActivity try { Locale locale = dynamicLanguage.getCurrentLocale(); String appLang = locale.getLanguage(); + String appCountry = locale.getCountry(); if (assetExists(helpPath.replace("LANG", appLang))) { helpLang = appLang; + } else if (assetExists(helpPath.replace("LANG", appLang+"_"+appCountry))) { + helpLang = appLang+"_"+appCountry; } else { appLang = appLang.substring(0, 2); if (assetExists(helpPath.replace("LANG", appLang))) { diff --git a/src/org/thoughtcrime/securesms/LogViewFragment.java b/src/org/thoughtcrime/securesms/LogViewFragment.java index 14a83cd02..6a7633819 100644 --- a/src/org/thoughtcrime/securesms/LogViewFragment.java +++ b/src/org/thoughtcrime/securesms/LogViewFragment.java @@ -247,7 +247,7 @@ public class LogViewFragment extends Fragment { Prefs.reliableService(context)).append("\n"); Locale locale = fragment.dynamicLanguage.getCurrentLocale(); - builder.append("lang=").append(locale.getLanguage()).append("\n"); + builder.append("lang=").append(locale.toString()).append("\n"); if (VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN_MR1) { boolean isRtl = DynamicLanguage.getLayoutDirection(context) == View.LAYOUT_DIRECTION_RTL; builder.append("rtl=").append(isRtl).append("\n");