yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Remove Language class. App's language and hidden languages settings were reset

Browse Source
This commit is contained in:
len
2016-12-26 15:44:59 +01:00
parent 97fa659283
commit 1a3a1db4ff
23 changed files with 66 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/res/values-it/strings.xml
View File

@@ -112,13 +112,7 @@
<string name="dark_theme">Tema scuro</string>
<string name="pref_start_screen">Schermata iniziale</string>
<string name="pref_language">Lingua</string>
<!-- Languages -->
<string name="system_default">Predefinita di sistema</string>
<string name="english">Inglese</string>
<string name="spanish">Spagnolo</string>
<string name="italian">Italiano</string>
<string name="portuguese">Portoghese</string>
<!-- Reader section -->
<string name="pref_fullscreen">Schermo intero</string>

18
app/src/main/res/values/arrays.xml
View File

@@ -188,20 +188,12 @@
<item>2</item>
</string-array>
<string-array name="languages">
<item>@string/system_default</item>
<item>@string/english</item>
<item>@string/spanish</item>
<item>@string/italian</item>
<item>@string/portuguese</item>
</string-array>
<string-array name="languages_values">
<item>0</item>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item></item>
<item>en</item>
<item>es</item>
<item>it</item>
<item>pt</item>
</string-array>
</resources>

4
app/src/main/res/values/keys.xml
View File

@@ -21,7 +21,7 @@
<string name="pref_theme_key">pref_theme_key</string>
<string name="pref_library_update_restriction_key">library_update_restriction</string>
<string name="pref_start_screen_key">start_screen</string>
<string name="pref_language_key">language</string>
<string name="pref_language_key">app_language</string>
<string name="pref_default_viewer_key">pref_default_viewer_key</string>
<string name="pref_image_scale_type_key">pref_image_scale_type_key</string>
@@ -51,7 +51,7 @@
<string name="pref_remove_after_marked_as_read_key">pref_remove_after_marked_as_read_key</string>
<string name="pref_last_used_category_key">last_used_category</string>
<string name="pref_source_languages">pref_source_languages</string>
<string name="pref_source_languages">source_languages</string>
<string name="pref_category_tracking_accounts_key">category_tracking_accounts</string>
<string name="pref_clear_chapter_cache_key">pref_clear_chapter_cache_key</string>

8
app/src/main/res/values/strings.xml
View File

@@ -112,13 +112,7 @@
<string name="dark_theme">Dark theme</string>
<string name="pref_start_screen">Start screen</string>
<string name="pref_language">Language</string>
<!-- Languages -->
<string name="system_default">System Default</string>
<string name="english">English</string>
<string name="spanish">Spanish</string>
<string name="italian">Italian</string>
<string name="portuguese">Portuguese</string>
<string name="system_default">System default</string>
<!-- Reader section -->
<string name="pref_fullscreen">Fullscreen</string>

5
app/src/main/res/xml/pref_general.xml
View File

@@ -10,9 +10,8 @@
android:title="@string/pref_category_general"
app:asp_tintEnabled="true">
<eu.kanade.tachiyomi.widget.preference.IntListPreference
android:defaultValue="0"
android:entries="@array/languages"
<ListPreference
android:defaultValue=""
android:entryValues="@array/languages_values"
android:key="@string/pref_language_key"
android:summary="%s"