Use sript-based Chinese Han values

Author: Radiokot

CHANGELOG.md

@@ -16,6 +16,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Ability to change the download behavior for RAWs in the preferences:
   you can choose between downloading the original file or a compatible JPEG, if available
 
+### Changed
+
+- Switched to a script-based Traditional/Simplified Chinese selection,
+  which should make it more accurate
+
 ### Removed
 
 - Redundant encryption of the stored credentials and library connection parameters.

app/build.gradle

@@ -26,7 +26,8 @@ android {
         versionName "1.38.0"
 
         // Must be aligned with @xml/locale_config and values-*.
-        resConfigs "en", "cs", "de", "el", "es", "fr", "it", "ru", "tr", "uk", "zh", "zh-rTW"
+        resConfigs "en", "cs", "de", "el", "es", "fr", "it", "ru", "tr", "uk",
+                "b+zh+Hans", "b+zh+Hant"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

app/src/main/java/ua/com/radiokot/photoprism/util/LocalizedContextFactory.kt

@@ -16,9 +16,9 @@ class LocalizedContextFactory(
 ) {
     private fun getLocaleOfStrings(resources: Resources): Locale {
         val configurationLocales = ConfigurationCompat.getLocales(resources.configuration)
-        val stringsLanguageCode = resources.getString(R.string.language_code)
         return Locale.Builder()
-            .setLanguage(stringsLanguageCode)
+            .setLanguage(resources.getString(R.string.language_code))
+            .setScript(resources.getString(R.string.script_code).takeUnless(String::isEmpty))
             .setRegion(configurationLocales.get(0).checkNotNull().country)
             .build()
     }

app/src/main/res/values-zh/plurals.xml renamed to app/src/main/res/values-b+zh+Hans/plurals.xml

@@ -1,6 +1,7 @@
 <resources>
     <!-- Chinese Han Simplified -->
     <string name="language_code">zh</string>
+    <string name="script_code">Hans</string>
     <string name="app_name">PhotoPrism 画廊</string>
 
     <string name="media_type_image">图片</string>

app/src/main/res/values-zh/strings.xml renamed to app/src/main/res/values-b+zh+Hans/strings.xml

@@ -1,6 +1,7 @@
 <resources>
-    <!-- Chinese Han Traditional. Taivan region because "-Hant" is not allowed as a dir name -->
+    <!-- Chinese Han Traditional -->
     <string name="language_code">zh</string>
+    <string name="script_code">Hant</string>
     <string name="app_name">PhotoPrism 相簿</string>
 
     <string name="media_type_image">照片</string>

app/src/main/res/values-zh-rTW/plurals.xml renamed to app/src/main/res/values-b+zh+Hant/plurals.xml

@@ -2,6 +2,7 @@
 <resources>
     <!-- Czech -->
     <string name="language_code">cs</string>
+    <string name="script_code" />
     <string name="app_name">PhotoPrism Galerie</string>
 
     <string name="media_type_image">Obrázek</string>

app/src/main/res/values-zh-rTW/strings.xml renamed to app/src/main/res/values-b+zh+Hant/strings.xml

@@ -2,6 +2,7 @@
 <resources>
     <!-- German -->
     <string name="language_code">de</string>
+    <string name="script_code" />
     <string name="app_name">PhotoPrism Galerie</string>
 
     <string name="media_type_image">Bild</string>

app/src/main/res/values-cs/strings.xml

@@ -1,6 +1,7 @@
 <resources>
     <!-- Greek -->
     <string name="language_code">el</string>
+    <string name="script_code" />
     <string name="app_name">PhotoPrism Γκαλερί</string>
 
     <string name="media_type_image">εικόνα</string>