Citra-emu/citra-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android: Make more Strings translatable

Browse Source
This commit is contained in:
FearlessTobi 2020-04-12 17:32:36 +02:00 committed by xperia64
parent aa7bc0f579
commit a9319baaf4
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/Settings.java
View File

@ -2,6 +2,8 @@ package org.citra.citra_emu.features.settings.model;
import android.text.TextUtils; 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.ui.SettingsActivityView;
import org.citra.citra_emu.features.settings.utils.SettingsFile; import org.citra.citra_emu.features.settings.utils.SettingsFile;
@ -103,7 +105,7 @@ public class Settings {
public void saveSettings(SettingsActivityView view) { public void saveSettings(SettingsActivityView view) {
if (TextUtils.isEmpty(gameId)) { 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()) { for (Map.Entry<String, List<String>> entry : configFileSectionsMap.entrySet()) {
String fileName = entry.getKey(); String fileName = entry.getKey();
@ -117,7 +119,7 @@ public class Settings {
} }
} else { } else {
// custom game settings // 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); SettingsFile.saveCustomGameSettings(gameId, sections);
} }

4
src/android/app/src/main/java/org/citra/citra_emu/features/settings/utils/SettingsFile.java
View File

@ -2,7 +2,9 @@ package org.citra.citra_emu.features.settings.utils;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import org.citra.citra_emu.CitraApplication;
import org.citra.citra_emu.NativeLibrary; 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.FloatSetting;
import org.citra.citra_emu.features.settings.model.IntSetting; import org.citra.citra_emu.features.settings.model.IntSetting;
import org.citra.citra_emu.features.settings.model.Setting; import org.citra.citra_emu.features.settings.model.Setting;
@ -202,7 +204,7 @@ public final class SettingsFile {
writer.store(); writer.store();
} catch (IOException e) { } catch (IOException e) {
Log.error("[SettingsFile] File not found: " + fileName + ".ini: " + e.getMessage()); 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);
} }
} }

2
src/android/app/src/main/res/values/arrays.xml
View File

@ -2,7 +2,7 @@
<!-- All lists for ListPreference keys/values are placed here --> <!-- All lists for ListPreference keys/values are placed here -->
<resources> <resources>
<string-array name="systemClockNames" translatable="false"> <string-array name="systemClockNames" translatable="true">
<item>Device clock</item> <item>Device clock</item>
<item>Simulated clock</item> <item>Simulated clock</item>
</string-array> </string-array>

3
src/android/app/src/main/res/values/strings.xml
View File

@ -79,6 +79,9 @@
<!-- Miscellaneous --> <!-- Miscellaneous -->
<string name="clear">Clear</string> <string name="clear">Clear</string>
<string name="slider_default">Default</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--> <!-- Game Grid Screen-->
<string name="grid_menu_core_settings">Settings</string> <string name="grid_menu_core_settings">Settings</string>