From 7179268c6ad87fe8363a6b0079c66273f6be84a3 Mon Sep 17 00:00:00 2001
From: FearlessTobi <thm.frey@gmail.com>
Date: Sun, 12 Apr 2020 17:32:36 +0200
Subject: [PATCH] android: Make more Strings translatable

---
 .../citra/citra_emu/features/settings/model/Settings.java   | 6 ++++--
 .../citra_emu/features/settings/utils/SettingsFile.java     | 4 +++-
 src/android/app/src/main/res/values/arrays.xml              | 2 +-
 src/android/app/src/main/res/values/strings.xml             | 3 +++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/Settings.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/Settings.java
index c7bb345c4..0c70870bb 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/Settings.java
+++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/Settings.java
@@ -2,6 +2,8 @@ package org.citra.citra_emu.features.settings.model;
 
 import android.text.TextUtils;
 
+import org.citra.citra_emu.CitraApplication;
+import org.citra.citra_emu.R;
 import org.citra.citra_emu.features.settings.ui.SettingsActivityView;
 import org.citra.citra_emu.features.settings.utils.SettingsFile;
 
@@ -103,7 +105,7 @@ public class Settings {
 
     public void saveSettings(SettingsActivityView view) {
         if (TextUtils.isEmpty(gameId)) {
-            view.showToastMessage("Saved settings to INI files", false);
+            view.showToastMessage(CitraApplication.getAppContext().getString(R.string.ini_saved), false);
 
             for (Map.Entry<String, List<String>> entry : configFileSectionsMap.entrySet()) {
                 String fileName = entry.getKey();
@@ -117,7 +119,7 @@ public class Settings {
             }
         } else {
             // custom game settings
-            view.showToastMessage("Saved settings for " + gameId, false);
+            view.showToastMessage(CitraApplication.getAppContext().getString(R.string.gameid_saved, gameId), false);
 
             SettingsFile.saveCustomGameSettings(gameId, sections);
         }
diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/utils/SettingsFile.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/utils/SettingsFile.java
index 6e4803f17..46ccea7b9 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/utils/SettingsFile.java
+++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/utils/SettingsFile.java
@@ -2,7 +2,9 @@ package org.citra.citra_emu.features.settings.utils;
 
 import androidx.annotation.NonNull;
 
+import org.citra.citra_emu.CitraApplication;
 import org.citra.citra_emu.NativeLibrary;
+import org.citra.citra_emu.R;
 import org.citra.citra_emu.features.settings.model.FloatSetting;
 import org.citra.citra_emu.features.settings.model.IntSetting;
 import org.citra.citra_emu.features.settings.model.Setting;
@@ -202,7 +204,7 @@ public final class SettingsFile {
             writer.store();
         } catch (IOException e) {
             Log.error("[SettingsFile] File not found: " + fileName + ".ini: " + e.getMessage());
-            view.showToastMessage("Error saving " + fileName + ".ini: " + e.getMessage(), false);
+            view.showToastMessage(CitraApplication.getAppContext().getString(R.string.error_saving, fileName, e.getMessage()), false);
         }
     }
 
diff --git a/src/android/app/src/main/res/values/arrays.xml b/src/android/app/src/main/res/values/arrays.xml
index 134ee0754..6e44f9ea7 100644
--- a/src/android/app/src/main/res/values/arrays.xml
+++ b/src/android/app/src/main/res/values/arrays.xml
@@ -2,7 +2,7 @@
 
 <!-- All lists for ListPreference keys/values are placed here -->
 <resources>
-    <string-array name="systemClockNames" translatable="false">
+    <string-array name="systemClockNames" translatable="true">
         <item>Device clock</item>
         <item>Simulated clock</item>
     </string-array>
diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml
index 22d58cdf5..a68d11f0d 100644
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@@ -79,6 +79,9 @@
     <!-- Miscellaneous -->
     <string name="clear">Clear</string>
     <string name="slider_default">Default</string>
+    <string name="ini_saved">Saved settings to INI files</string>
+    <string name="gameid_saved">Saved settings for %1$s</string>
+    <string name="error_saving">Error saving %1$s.ini: %2$s</string>
 
     <!-- Game Grid Screen-->
     <string name="grid_menu_core_settings">Settings</string>