From 47aa7fc191c2345e83741131d4d21f538eb96d44 Mon Sep 17 00:00:00 2001
From: Arthur-GYT <a.gayot@posteo.com>
Date: Sat, 9 Mar 2024 19:07:04 +0100
Subject: [PATCH] Enable auto generated per-app language file

---
 mastodon/build.gradle                        |  5 +-
 mastodon/src/main/AndroidManifest.xml        |  1 -
 mastodon/src/main/res/resources.properties   |  1 +
 mastodon/src/main/res/xml/locales_config.xml | 55 --------------------
 4 files changed, 5 insertions(+), 57 deletions(-)
 create mode 100644 mastodon/src/main/res/resources.properties
 delete mode 100644 mastodon/src/main/res/xml/locales_config.xml

diff --git a/mastodon/build.gradle b/mastodon/build.gradle
index 232ca837..a8263374 100644
--- a/mastodon/build.gradle
+++ b/mastodon/build.gradle
@@ -4,6 +4,10 @@ plugins {
 }
 
 android {
+	androidResources {
+		generateLocaleConfig = true
+	}
+
 	compileSdk 33
 	defaultConfig {
 		applicationId "org.joinmastodon.android"
@@ -12,7 +16,6 @@ android {
 		versionCode 89
 		versionName "2.4.1"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-		resConfigs "ar-rSA", "be-rBY", "bn-rBD", "bs-rBA", "ca-rES", "cs-rCZ", "da-rDK", "de-rDE", "el-rGR", "es-rES", "eu-rES", "fa-rIR", "fi-rFI", "fil-rPH", "fr-rFR", "ga-rIE", "gd-rGB", "gl-rES", "hi-rIN", "hr-rHR", "hu-rHU", "hy-rAM", "ig-rNG", "in-rID", "is-rIS", "it-rIT", "iw-rIL", "ja-rJP", "ka-rGE", "kab", "ko-rKR", "lt-rLT", "my-rMM", "nl-rNL", "no-rNO", "oc-rFR", "pl-rPL", "pt-rBR", "pt-rPT", "ro-rRO", "ru-rRU", "si-rLK", "sl-rSI", "sv-rSE", "th-rTH", "tr-rTR", "uk-rUA", "ur-rIN", "vi-rVN", "zh-rCN", "zh-rTW"
 	}
 
 	buildTypes {
diff --git a/mastodon/src/main/AndroidManifest.xml b/mastodon/src/main/AndroidManifest.xml
index 77799c15..1cc532fd 100644
--- a/mastodon/src/main/AndroidManifest.xml
+++ b/mastodon/src/main/AndroidManifest.xml
@@ -31,7 +31,6 @@
 		android:allowBackup="true"
 		android:label="@string/app_name"
 		android:supportsRtl="true"
-		android:localeConfig="@xml/locales_config"
 		android:icon="@mipmap/ic_launcher"
 		android:theme="@style/Theme.Mastodon.AutoLightDark"
 		android:largeHeap="true">
diff --git a/mastodon/src/main/res/resources.properties b/mastodon/src/main/res/resources.properties
new file mode 100644
index 00000000..d5a3ddc9
--- /dev/null
+++ b/mastodon/src/main/res/resources.properties
@@ -0,0 +1 @@
+unqualifiedResLocale=en-US
\ No newline at end of file
diff --git a/mastodon/src/main/res/xml/locales_config.xml b/mastodon/src/main/res/xml/locales_config.xml
deleted file mode 100644
index 739afeec..00000000
--- a/mastodon/src/main/res/xml/locales_config.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
-	<locale android:name="ar-SA"/>
-	<locale android:name="be-BY"/>
-	<locale android:name="bn-BD"/>
-	<locale android:name="bs-BA"/>
-	<locale android:name="ca-ES"/>
-	<locale android:name="cs-CZ"/>
-	<locale android:name="da-DK"/>
-	<locale android:name="de-DE"/>
-	<locale android:name="el-GR"/>
-	<locale android:name="en"/>
-	<locale android:name="es-ES"/>
-	<locale android:name="eu-ES"/>
-	<locale android:name="fa-IR"/>
-	<locale android:name="fi-FI"/>
-	<locale android:name="fil-PH"/>
-	<locale android:name="fr-FR"/>
-	<locale android:name="ga-IE"/>
-	<locale android:name="gd-GB"/>
-	<locale android:name="gl-ES"/>
-	<locale android:name="hi-IN"/>
-	<locale android:name="hr-HR"/>
-	<locale android:name="hu-HU"/>
-	<locale android:name="hy-AM"/>
-	<locale android:name="ig-NG"/>
-	<locale android:name="in-ID"/>
-	<locale android:name="is-IS"/>
-	<locale android:name="it-IT"/>
-	<locale android:name="iw-IL"/>
-	<locale android:name="ja-JP"/>
-	<locale android:name="ka-GE"/>
-	<locale android:name="kab"/>
-	<locale android:name="ko-KR"/>
-	<locale android:name="lt-LT"/>
-	<locale android:name="my-MM"/>
-	<locale android:name="nl-NL"/>
-	<locale android:name="no-NO"/>
-	<locale android:name="oc-FR"/>
-	<locale android:name="pl-PL"/>
-	<locale android:name="pt-BR"/>
-	<locale android:name="pt-PT"/>
-	<locale android:name="ro-RO"/>
-	<locale android:name="ru-RU"/>
-	<locale android:name="si-LK"/>
-	<locale android:name="sl-SI"/>
-	<locale android:name="sv-SE"/>
-	<locale android:name="th-TH"/>
-	<locale android:name="tr-TR"/>
-	<locale android:name="uk-UA"/>
-	<locale android:name="ur-IN"/>
-	<locale android:name="vi-VN"/>
-	<locale android:name="zh-CN"/>
-	<locale android:name="zh-TW"/>
-</locale-config>
\ No newline at end of file