translate

Author: ipcjs

app/build.gradle

@@ -19,8 +19,8 @@ android {
         applicationId "com.github.ipcjs.screenshottile"
         minSdkVersion 24
         targetSdkVersion 25
-        versionCode 7
-        versionName "1.1.1"
+        versionCode 8
+        versionName "1.1.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

app/src/main/java/com/github/ipcjs/screenshottile/dialog/SettingDialogFragment.kt

@@ -60,6 +60,6 @@ class SettingDialogFragment : DialogFragment(), DialogInterface.OnClickListener
 
     override fun onDismiss(dialog: DialogInterface?) {
         super.onDismiss(dialog)
-        activity.finish()
+        activity?.finish()
     }
 }

app/src/main/res/values-zh/strings.xml

@@ -8,11 +8,10 @@
     <string name="dialog_i_know">我知道了</string>
     <string name="dialog_uninstall">卸载</string>
     <string name="title_delay">延时</string>
-    <array name="setting_delays">
-        <item>立即</item>
-        <item>1秒</item>
-        <item>2秒</item>
-        <item>5秒</item>
-    </array>
     <string name="more_setting">更多设置</string>
+    <string name="setting_delay_entry_default">立即</string>
+    <string name="setting_delay_entry_1s">1秒</string>
+    <string name="setting_delay_entry_2s">2秒</string>
+    <string name="setting_delay_entry_5s">5秒</string>
+    <string name="show_count_down">显示倒计时</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -8,20 +8,28 @@
     <string name="dialog_uninstall">Uninstall</string>
     <string name="title_delay">Delay</string>
     <string name="more_setting">More Settings</string>
-    <string-array name="setting_delay_entries">
-        <item>@string/setting_delay_default_entry</item>
-        <item>1s</item>
-        <item>2s</item>
-        <item>5s</item>
+    <string name="setting_delay_entry_default">Instant</string>
+    <string name="setting_delay_entry_1s">1s</string>
+    <string name="setting_delay_entry_2s">2s</string>
+    <string name="setting_delay_entry_5s">5s</string>
+    <string name="show_count_down">Show count down</string>
+
+    <!-- translatable="false" -->
+    <string name="setting_delay_value_default" translatable="false">0</string>
+    <string-array name="setting_delay_entries" translatable="false">
+        <item>@string/setting_delay_entry_default</item>
+        <item>@string/setting_delay_entry_1s</item>
+        <item>@string/setting_delay_entry_2s</item>
+        <item>@string/setting_delay_entry_5s</item>
     </string-array>
-    <string name="setting_delay_default_entry">Instant</string>
-    <string name="setting_delay_default_value">0</string>
-    <string-array name="setting_delay_values">
-        <item>@string/setting_delay_default_value</item>
+    <string-array name="setting_delay_values" translatable="false">
+        <item>@string/setting_delay_value_default</item>
         <item>1</item>
         <item>2</item>
         <item>5</item>
     </string-array>
     <string name="pref_key_delay" translatable="false">delays_string</string>
     <string name="pref_key_show_count_down" translatable="false">show_count_down</string>
+
+
 </resources>

app/src/main/res/xml/pref.xml

@@ -2,13 +2,13 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <SwitchPreference
         android:defaultValue="true"
-        android:key="show_count_down"
-        android:title="显示倒计时"/>
+        android:key="@string/pref_key_show_count_down"
+        android:title="@string/show_count_down"/>
     <ListPreference
-        android:defaultValue="@string/setting_delay_default_value"
+        android:defaultValue="@string/setting_delay_value_default"
         android:entries="@array/setting_delay_entries"
         android:entryValues="@array/setting_delay_values"
         android:key="@string/pref_key_delay"
-        android:summary="@string/setting_delay_default_entry"
-        android:title="延时"/>
+        android:summary="@string/setting_delay_entry_default"
+        android:title="@string/title_delay"/>
 </PreferenceScreen>