Sulkta-OSS/straw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

created default_localization_key

Browse source
This commit is contained in:
bopol 2020-02-15 16:29:46 +01:00
parent 5b541cc9fb
commit e62e34fd5c
6 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/res/values/settings_keys.xml
View file

@ -161,8 +161,6 @@
<string name="show_comments_key" translatable="false">show_comments</string>
<string name="stream_info_selected_tab_key" translatable="false">stream_info_selected_tab</string>
<string name="show_hold_to_append_key" translatable="false">show_hold_to_append</string>
<string name="default_language_value" translatable="false">system</string>
<string name="default_country_value" translatable="false">system</string>
<string name="content_language_key" translatable="false">content_language</string>
<string name="peertube_instance_setup_key" translatable="false">peertube_instance_setup</string>
<string name="peertube_selected_instance_key" translatable="false">peertube_selected_instance</string>
@ -265,9 +263,11 @@
<string name="update_app_key" translatable="false">update_app_key</string>
<string name="update_pref_screen_key" translatable="false">update_pref_screen_key</string>
<!-- Localizations -->
<string name="default_localization_key" translatable="false">system</string>
<!-- alternatively, load these from some local android data store -->
<string-array name="language_codes" translatable="false">
<item>system</item>
<item>@string/default_localization_key</item>
<item>af</item>
<item>az</item>
<item>id</item>
@ -680,7 +680,7 @@
</string-array>
<string-array name="country_codes" translatable="false">
<item>system</item>
<item>@string/default_localization_key</item>
<item>AF</item>
<item>AX</item>
<item>AL</item>
@ -932,7 +932,7 @@
<!--The next two arrays are set to change the app language-->
<string-array name="app_language_code" translatable="false">
<item>system</item>
<item>@string/default_localization_key</item>
<item>ar</item>
<item>az</item>
<item>ast</item>

6
app/src/main/res/xml/content_settings.xml
View file

@ -6,7 +6,7 @@
<ListPreference
app:iconSpaceReserved="false"
android:defaultValue="system"
android:defaultValue="@string/default_localization_key"
android:entries="@array/app_language_name"
android:entryValues="@array/app_language_code"
android:key="@string/app_language_key"
@ -15,7 +15,7 @@
<ListPreference
app:iconSpaceReserved="false"
android:defaultValue="@string/default_language_value"
android:defaultValue="@string/default_localization_key"
android:entries="@array/language_names"
android:entryValues="@array/language_codes"
android:key="@string/content_language_key"
@ -24,7 +24,7 @@
<ListPreference
app:iconSpaceReserved="false"
android:defaultValue="@string/default_country_value"
android:defaultValue="@string/default_localization_key"
android:entries="@array/country_names"
android:entryValues="@array/country_codes"
android:key="@string/content_country_key"