Add fallback to language if a key is not translated in a specific reg…

…ion of a language
B3nedikt · Aug 6, 2024 · 7867be2 · 7867be2
1 parent 57bb94f
commit 7867be2
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 1 deletion.
diff --git a/restring/src/main/java/dev/b3nedikt/restring/internal/ResourcesDelegate.kt b/restring/src/main/java/dev/b3nedikt/restring/internal/ResourcesDelegate.kt
@@ -129,10 +129,15 @@ internal class ResourcesDelegate(
 
     private fun getStringFromRepository(id: Int): CharSequence? {
 
-        val resultLocale = getLocale() ?: return null
+        var resultLocale = getLocale() ?: return null
 
         try {
             val stringKey = baseResources.getResourceEntryName(id)
+
+            if(resultLocale.country.isNotEmpty() && stringRepository.strings[resultLocale]?.containsKey(stringKey) == false) {
+                resultLocale = Locale(resultLocale.language)
+            }
+
             return stringRepository.strings[resultLocale]?.get(stringKey)
         } catch (e: Resources.NotFoundException) {
 

diff --git a/restring/src/test/java/dev/b3nedikt/restring/RestringResourcesTest.kt b/restring/src/test/java/dev/b3nedikt/restring/RestringResourcesTest.kt
@@ -110,6 +110,29 @@ class RestringResourcesTest {
         STR_VALUE shouldBeEqualTo stringValue
     }
 
+    @Test
+    fun shouldGetStringFromRepositoryIfLanguageFallbackExists() {
+        val fallbackLocale = Locale("de")
+        val regionLocale = Locale("de", "AT")
+
+        val repository = mock<StringRepository> {
+            on { supportedLocales } doReturn setOf(fallbackLocale, regionLocale)
+        }
+        val restringResources = spy(RestringResources(resources, repository, context))
+
+        whenever(repository.strings).thenReturn(
+            mutableMapOf(
+                fallbackLocale to mutableMapOf(STR_KEY to STR_VALUE as CharSequence),
+                regionLocale to mutableMapOf()
+            )
+        )
+
+        Locale.setDefault(regionLocale)
+        val stringValue = restringResources.getString(STR_RES_ID)
+
+        STR_VALUE shouldBeEqualTo stringValue
+    }
+
     @Test
     fun shouldGetStringFromResourceIfNotExists() {
         whenever(repository.strings).thenReturn(
@@ -122,6 +145,30 @@ class RestringResourcesTest {
         assertEquals(expected, stringValue)
     }
 
+    @Test
+    fun shouldGetStringFromResourceIfLanguageFallbackNotExists() {
+        val fallbackLocale = Locale("de")
+        val regionLocale = Locale("de", "AT")
+
+        val repository = mock<StringRepository> {
+            on { supportedLocales } doReturn setOf(fallbackLocale, regionLocale)
+        }
+        val restringResources = spy(RestringResources(resources, repository, context))
+
+        whenever(repository.strings).thenReturn(
+            mutableMapOf(
+                fallbackLocale to mutableMapOf(),
+                regionLocale to mutableMapOf()
+            )
+        )
+
+        Locale.setDefault(regionLocale)
+        val stringValue = restringResources.getString(STR_RES_ID)
+
+        val expected = resources.getText(STR_RES_ID)
+        assertEquals(expected, stringValue)
+    }
+
     @Test
     fun shouldGetStringWithParamsFromRepositoryIfExists() {
         val param = "PARAM"