diff --git a/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt b/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt index 6f59e0dd..29d4f625 100644 --- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt +++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt @@ -124,7 +124,7 @@ class SettingsFragment : this ?: return false when (key) { - "tag_language" -> { + "tag_translation" -> { updateTranslations() } "nomedia" -> { @@ -247,7 +247,7 @@ class SettingsFragment : onPreferenceClickListener = this@SettingsFragment } - "tag_language" -> { + "tag_translation" -> { this as ListPreference isEnabled = false diff --git a/app/src/main/java/xyz/quaver/pupil/util/translation.kt b/app/src/main/java/xyz/quaver/pupil/util/translation.kt index 18f8235e..33b7ba05 100644 --- a/app/src/main/java/xyz/quaver/pupil/util/translation.kt +++ b/app/src/main/java/xyz/quaver/pupil/util/translation.kt @@ -45,7 +45,7 @@ fun updateTranslations() = CoroutineScope(Dispatchers.IO).launch { kotlin.runCatching { translations = Json.decodeFromString>(client.newCall( Request.Builder() - .url(contentURL + "${Preferences["tag_language", ""]}.json") + .url(contentURL + "${Preferences["tag_translation", ""].let { if (it.isEmpty()) Locale.getDefault().language else it }}.json") .build() ).execute().also { if (it.code() != 200) return@launch }.body()?.use { it.string() } ?: return@launch).filterValues { it.isNotEmpty() } } diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 231faee4..c351ff4f 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -152,7 +152,7 @@ エラー キャッシュサイズ制限 制限なし - タグ言語 - Githubにて翻訳に参加できます + タグ言語 + Githubにて翻訳に参加できます 並列ダウンロード \ No newline at end of file diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index a5b041b7..d7f74f3c 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -152,7 +152,7 @@ 오류 캐시 크기 제한 무제한 - 태그 언어 - Github에서 번역에 참여하세요 + 태그 언어 + Github에서 번역에 참여하세요 병렬 다운로드 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index efb5d22c..6173bf9e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -177,9 +177,9 @@ Miscellaneous - Tag Language + Tag Language Concurrent Download - Participate in translation on Github + Participate in translation on Github Load images from mirrors Proxy Turn pages Right-to-Left diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml index 93ffa2af..816c44b4 100644 --- a/app/src/main/res/xml/root_preferences.xml +++ b/app/src/main/res/xml/root_preferences.xml @@ -76,9 +76,8 @@ app:title="@string/settings_miscellaneous_title">