Fix issues.

streetcomplete · Aug 27, 2020 · b816b26 · b816b26
1 parent 5de54b0
commit b816b26
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git a/.../main/java/de/westnordost/streetcomplete/quests/localized_name/AddLocalizedNameAdapter.kt b/.../main/java/de/westnordost/streetcomplete/quests/localized_name/AddLocalizedNameAdapter.kt
@@ -135,9 +135,8 @@ class AddLocalizedNameAdapter(
     private fun getLanguageMenuItemTitle(languageTag: String): String {
         if (languageTag.isEmpty()) return context.getString(R.string.quest_streetName_menuItem_nolanguage)
         if (languageTag == "international") return context.getString(R.string.quest_streetName_menuItem_international)
-        val languageCode = languageTag.substringBefore('-')
         val isRomanization = languageTag.endsWith("Latn")
-        val locale = Locale.forLanguageTag(languageCode)
+        val locale = Locale.forLanguageTag(languageTag)
 
         val displayLanguage = locale.displayLanguage
         val nativeDisplayLanguage = locale.getDisplayLanguage(locale)
@@ -154,17 +153,7 @@ class AddLocalizedNameAdapter(
                 )
             }
         } else {
-            if (displayLanguage == nativeDisplayLanguage) {
-                String.format(
-                    context.getString(R.string.quest_streetName_menuItem_language_with_script_simple),
-                    languageTag, displayLanguage, context.getString(R.string.quest_streetName_menuItem_romanized)
-                )
-            } else {
-                String.format(
-                    context.getString(R.string.quest_streetName_menuItem_language_with_script_native),
-                    languageTag, nativeDisplayLanguage, displayLanguage, context.getString(R.string.quest_streetName_menuItem_romanized)
-                )
-            }
+            return locale.displayScript
         }
     }
 

diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/localized_name/AddRoadNameForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/localized_name/AddRoadNameForm.kt
@@ -51,7 +51,7 @@ class AddRoadNameForm : AAddLocalizedNameForm<RoadNameAnswer>() {
     override fun onClickOk(names: List<LocalizedName>) {
         val possibleAbbreviations = LinkedList<String>()
         for ((languageTag, name) in adapter.localizedNames) {
-            val locale = Locale.forLanguageTag(languageTag)
+            val locale = if (languageTag.isEmpty()) countryInfo.locale else Locale.forLanguageTag(languageTag)
             val abbr = abbreviationsByLocale.get(locale)
             val containsLocalizedAbbreviations = abbr?.containsAbbreviations(name) == true