From 8e92597dc9422b0bb6a22d3d39ff2ed0b5954652 Mon Sep 17 00:00:00 2001
From: tom5079 <tom5079@naver.com>
Date: Sun, 12 May 2019 20:06:16 +0900
Subject: [PATCH] Added ko/ja language support

---
 app/build.gradle                              |  4 +-
 .../java/xyz/quaver/pupil/SettingsActivity.kt |  4 +-
 app/src/main/res/values-ja/strings.xml        | 23 +++++++++++
 app/src/main/res/values-ko/strings.xml        | 23 +++++++++++
 app/src/main/res/values/strings.xml           | 38 +++++++++----------
 app/src/main/res/xml/root_preferences.xml     |  4 +-
 6 files changed, 70 insertions(+), 26 deletions(-)
 create mode 100644 app/src/main/res/values-ja/strings.xml
 create mode 100644 app/src/main/res/values-ko/strings.xml

diff --git a/app/build.gradle b/app/build.gradle
index 9f4d114b..66bcddaa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "xyz.quaver.pupil"
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/app/src/main/java/xyz/quaver/pupil/SettingsActivity.kt b/app/src/main/java/xyz/quaver/pupil/SettingsActivity.kt
index 3df30a5a..871ce357 100644
--- a/app/src/main/java/xyz/quaver/pupil/SettingsActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/SettingsActivity.kt
@@ -38,7 +38,7 @@ class SettingsActivity : AppCompatActivity() {
                 suffixIndex++
             }
 
-            return getString(R.string.settings_delete_cache_summary, size, suffix[suffixIndex])
+            return getString(R.string.settings_clear_cache_summary, size, suffix[suffixIndex])
         }
 
         override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
@@ -52,7 +52,7 @@ class SettingsActivity : AppCompatActivity() {
                 setOnPreferenceClickListener {
                     AlertDialog.Builder(context).apply {
                         setTitle(R.string.warning)
-                        setMessage(R.string.settings_delete_cache_alert_message)
+                        setMessage(R.string.settings_clear_cache_alert_message)
                         setPositiveButton(android.R.string.yes) { _, _ ->
                             with(context.cacheDir) {
                                 if (exists())
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
new file mode 100644
index 00000000..2d50f270
--- /dev/null
+++ b/app/src/main/res/values-ja/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Pupil</string>
+    <string name="galleryblock_language">言語: %1$s</string>
+    <string name="galleryblock_series">シリーズ: %1$s</string>
+    <string name="galleryblock_type">タイプ: %1$s</string>
+    <string name="main_no_result">結果なし</string>
+    <string name="main_search">検索</string>
+    <string name="search_hint">ギャラリー検索</string>
+    <string name="settings_cache_title">キャッシュ</string>
+    <string name="settings_clear_cache">キャッシュクリア</string>
+    <string name="settings_clear_cache_alert_message">キャッシュをクリアするとイメージのロード速度に影響を与えます。実行しますか？</string>
+    <string name="settings_clear_cache_summary">キャッシュサイズ: %1$d%2$s</string>
+    <string name="settings_default_query">デフォルト検索キーワード</string>
+    <string name="permission_explain">権限を拒否すると一部の機能が利用できません</string>
+    <string name="settings_galleries_per_page">一回にロードするギャラリー数</string>
+    <string name="settings_search_title">検索設定</string>
+    <string name="settings_title">設定</string>
+    <string name="update_message">新バージョン%1$sをリリースしました\n(現バージョン: %2$s)\nアップデートしますか？</string>
+    <string name="update_notification_description">アップデートダウンロード中</string>
+    <string name="update_title">新しいアップデートがあります</string>
+    <string name="warning">注意</string>
+</resources>
\ 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
new file mode 100644
index 00000000..c443a4b4
--- /dev/null
+++ b/app/src/main/res/values-ko/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Pupil</string>
+    <string name="galleryblock_language">언어: %1$s</string>
+    <string name="galleryblock_series">시리즈: %1$s</string>
+    <string name="galleryblock_type">종류: %1$s</string>
+    <string name="permission_explain">권한을 거부하면 일부 기능이 작동하지 않을 수 있습니다</string>
+    <string name="search_hint">갤러리 검색</string>
+    <string name="settings_default_query">기본 검색어</string>
+    <string name="settings_clear_cache">캐시 정리하기</string>
+    <string name="settings_clear_cache_alert_message">캐시를 정리하면 이미지 로딩속도가 느려질 수 있습니다. 계속하시겠습니까?</string>
+    <string name="settings_clear_cache_summary">현재 캐시 사용량: %1$d%2$s</string>
+    <string name="settings_galleries_per_page">한 번에 로드할 갤러리 수</string>
+    <string name="settings_search_title">검색 설정</string>
+    <string name="settings_title">설정</string>
+    <string name="update_message">버전 %1$s이 출시되었습니다.\n(현재 %2$s)\n업데이트 하시겠습니까?</string>
+    <string name="update_notification_description">apk 다운로드중&#8230;</string>
+    <string name="update_title">업데이트가 있습니다!</string>
+    <string name="warning">경고</string>
+    <string name="main_no_result">결과 없음</string>
+    <string name="main_search">검색</string>
+    <string name="settings_cache_title">캐시</string>
+</resources>
\ 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 ea030bd9..6544d152 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,42 +1,40 @@
 <resources>
-    <string name="warning">Warning</string>
+    <string name="app_name" translatable="false">Pupil</string>
 
-    <string name="app_name">Pupil</string>
+    <string name="release_url" translatable="false">https://api.github.com/repos/tom5079/Pupil-issue/releases</string>
+    <string name="release_name" translatable="false">Pupil-v(\\d+\\.)+\\d+\\.apk</string>
+
+    <string name="main_settings" translatable="false">Settings</string>
+    <string name="galleryblock_thumbnail_description" translatable="false">Thumbnail</string>
+
+    <string name="reader_imageview_description" translatable="false">Content ImageView</string>
+
+    <!-- Translate needed down here -->
+
+    <string name="warning">Warning</string>
 
     <string name="permission_explain">Denying any permission can deactivate some functions</string>
 
-    <string name="release_url">https://api.github.com/repos/tom5079/Pupil-issue/releases</string>
-    <string name="release_name">Pupil-v(\\d+\\.)+\\d+\\.apk</string>
+    <string name="main_search">Search</string>
+    <string name="main_no_result">No result</string>
 
     <string name="update_title">Update available</string>
     <string name="update_message">Version %1$s is available!\n(current version is %2$s)\nDo you want to update?</string>
     <string name="update_notification_description">Downloading apk&#8230;</string>
 
-    <string name="main_settings">Settings</string>
-    <string name="main_search">Search</string>
-    <string name="main_no_result">No result</string>
-
     <string name="search_hint">Search galleries</string>
 
-    <string name="galleryblock_thumbnail_description">Thumbnail</string>
-
     <string name="galleryblock_series">Series: %1$s</string>
     <string name="galleryblock_type">Type: %1$s</string>
     <string name="galleryblock_language">Language: %1$s</string>
 
-    <string name="reader_imageview_description">Content ImageView</string>  //No need to translate
-    <string name="reader_fullscreen">Fullscreen</string>
-
-    <!-- Settings Activity -->
     <string name="settings_title">Settings</string>
-
     <string name="settings_search_title">Search Settings</string>
     <string name="settings_galleries_per_page">Galleries per page</string>
-
     <string name="settings_default_query">Default query</string>
-
-    <string name="settings_delete_cache">Delete Cache</string>
-    <string name="settings_delete_cache_summary">Currently using %1$d%2$s of cache</string>
-    <string name="settings_delete_cache_alert_message">Deleting cache can affect image loading speed. Do you want to continue?</string>
+    <string name="settings_cache_title">Cache</string>
+    <string name="settings_clear_cache">Clear cache</string>
+    <string name="settings_clear_cache_summary">Currently using %1$d%2$s of cache</string>
+    <string name="settings_clear_cache_alert_message">Deleting cache can affect image loading speed. Do you want to continue?</string>
 
 </resources>
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index 86a4e5d2..b85c107d 100644
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -22,10 +22,10 @@
     </PreferenceCategory>
 
     <PreferenceCategory
-        app:title="Cache">
+        app:title="@string/settings_cache_title">
 
         <Preference
-            app:title="Delete Cache"
+            app:title="@string/settings_clear_cache"
             app:key="delete_cache"/>
 
     </PreferenceCategory>