Turkish (F) subtype locale fixed

rkkr · May 12, 2021 · bce1f41 · bce1f41
1 parent 2cf2a05
commit bce1f41
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "rkr.simplekeyboard.inputmethod"
         minSdkVersion 19
         targetSdkVersion 30
-        versionCode 85
-        versionName "5.0"
+        versionCode 86
+        versionName "5.1"
     }
     buildTypes {
         release {

diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
@@ -28,19 +28,16 @@
         <item>es_US</item>
         <item>hi_ZZ</item>
         <item>sr_ZZ</item>
-        <item>tr_F</item>
     </string-array>
 
     <!-- Subtype locale whose name should be displayed in Locale.ROOT. -->
     <string-array name="subtype_locale_displayed_in_root_locale">
         <item>hi_ZZ</item>
         <item>sr_ZZ</item>
-        <item>tr_F</item>
     </string-array>
 
     <string name="subtype_in_root_locale_hi_ZZ">Hinglish</string>
     <string name="subtype_in_root_locale_sr_ZZ">Srpski</string>
-    <string name="subtype_in_root_locale_tr_F">Turkish (F)</string>
 
     <!-- Generic subtype label -->
     <string name="subtype_generic">%s</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -96,8 +96,6 @@
     <string name="subtype_generic_compact"><xliff:g id="LANGUAGE_NAME" example="Hindi">%s</xliff:g> (Compact)</string>
     <!-- Description for Bulgarian (BDS) subtype. -->
     <string name="subtype_bulgarian_bds"><xliff:g id="LANGUAGE_NAME" example="Bulgarian">%s</xliff:g> (BDS)</string>
-    <!-- Description for Turkish (F) subtype. -->
-    <string name="subtype_turkish_f"><xliff:g id="LANGUAGE_NAME" example="Turkish">%s</xliff:g> (F)</string>
 
     <string name="keyboard_theme_dark_border" translatable="false">Material Dark Border</string>
     <string name="keyboard_theme_light_border" translatable="false">Material Light Border</string>

diff --git a/app/src/main/res/xml/method.xml b/app/src/main/res/xml/method.xml
@@ -99,7 +99,7 @@
     th: Thai/thai
     tl: Tagalog/spanish
     tr: Turkish/qwerty
-    tr_F: Turkish/F-layout
+    tr__F: Turkish/F-layout
     uk: Ukrainian/east_slavic
     ur: Urdu/urdu
     uz_UZ: Uzbek (Uzbekistan)/uzbek # This is a preliminary keyboard layout.
@@ -175,9 +175,9 @@
             android:isAsciiCapable="false"
     />
     <subtype android:icon="@drawable/ic_ime_switcher_dark"
-            android:label="@string/subtype_turkish_f"
+            android:label="@string/subtype_generic"
             android:subtypeId="0x5f51ba31"
-            android:imeSubtypeLocale="tr"
+            android:imeSubtypeLocale="tr__F"
             android:imeSubtypeMode="keyboard"
             android:imeSubtypeExtraValue="KeyboardLayoutSet=turkish_f"
             android:isAsciiCapable="true"