Merge branch 'add-support-for-app-languages-droid-471'

mullvad · Nov 10, 2023 · 68ec03b · 68ec03b
2 parents c348289 + 21f6811
commit 68ec03b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -46,6 +46,7 @@ Line wrap the file at 100 chars.                                              Th
 - Migrate View Logs view to compose.
 - Migrate voucher dialog to compose.
 - Add "New Device" in app notification & rework notification system
+- Add support for setting per-app language in system settings.
 
 #### Linux
 - Don't block forwarding of traffic when the split tunnel mark (ct mark) is set.

diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
@@ -46,6 +46,11 @@ android {
         }
     }
 
+    androidResources {
+        @Suppress("UnstableApiUsage")
+        generateLocaleConfig = true
+    }
+
     if (keystorePropertiesFile.exists()) {
         signingConfigs {
             create(SigningConfigs.RELEASE) {

diff --git a/android/app/src/main/res/resources.properties b/android/app/src/main/res/resources.properties
@@ -0,0 +1 @@
+unqualifiedResLocale=en-US