From 5b8fe1e748af0e489478cde879cca8eba8150c33 Mon Sep 17 00:00:00 2001
From: JosJuice <josjuice@gmail.com>
Date: Tue, 22 Jun 2021 14:21:33 +0200
Subject: [PATCH] Android: Clean up some hardcoded strings
These would lead to problems if we ever add translation support.
---
Source/Android/app/src/main/AndroidManifest.xml | 2 +-
.../dolphinemu/dialogs/GameDetailsDialog.java | 3 ++-
.../dolphinemu/dialogs/GamePropertiesDialog.java | 12 +++++++-----
.../dolphinemu/features/settings/model/Settings.java | 8 ++++++--
.../settings/ui/SettingsActivityPresenter.java | 2 +-
.../features/settings/ui/SettingsFragment.java | 2 +-
.../settings/ui/SettingsFragmentPresenter.java | 5 ++---
.../dolphinemu/ui/main/TvMainActivity.java | 3 +--
Source/Android/app/src/main/res/values/strings.xml | 11 ++++++++++-
9 files changed, 31 insertions(+), 17 deletions(-)
diff --git a/Source/Android/app/src/main/AndroidManifest.xml b/Source/Android/app/src/main/AndroidManifest.xml
index c70716affe..6c49619945 100644
--- a/Source/Android/app/src/main/AndroidManifest.xml
+++ b/Source/Android/app/src/main/AndroidManifest.xml
@@ -74,7 +74,7 @@
android:exported="false"
android:configChanges="orientation|screenSize"
android:theme="@style/DolphinSettingsBase"
- android:label="@string/preferences_settings"/>
+ android:label="@string/settings"/>
<activity
android:name=".activities.EmulationActivity"
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java
index a6c0148032..bad0bc28da 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java
@@ -90,7 +90,8 @@ public final class GameDetailsDialog extends DialogFragment
long blockSize = gameFile.getBlockSize();
String compression = gameFile.getCompressionMethod();
- textFileFormat.setText(String.format("%1$s (%2$s)", gameFile.getFileFormatName(), fileSize));
+ textFileFormat.setText(getResources().getString(R.string.game_details_size_and_format,
+ gameFile.getFileFormatName(), fileSize));
if (compression.isEmpty())
{
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GamePropertiesDialog.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GamePropertiesDialog.java
index 8ef63c3d6a..91f6076d6a 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GamePropertiesDialog.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GamePropertiesDialog.java
@@ -96,7 +96,7 @@ public class GamePropertiesDialog extends DialogFragment
R.style.DolphinDialogBase);
itemsBuilder.applyToBuilder(builder);
builder.setTitle(requireContext()
- .getString(R.string.preferences_game_properties) + ": " + gameId);
+ .getString(R.string.preferences_game_properties_with_game_id, gameId));
return builder.create();
}
@@ -113,18 +113,20 @@ public class GamePropertiesDialog extends DialogFragment
{
if (gameSettingsFile.delete() || hadGameProfiles)
{
- Toast.makeText(getContext(), "Cleared settings for " + gameId, Toast.LENGTH_SHORT)
- .show();
+ Toast.makeText(getContext(),
+ getResources().getString(R.string.properties_clear_success, gameId),
+ Toast.LENGTH_SHORT).show();
}
else
{
- Toast.makeText(getContext(), "Unable to clear settings for " + gameId,
+ Toast.makeText(getContext(),
+ getResources().getString(R.string.properties_clear_failure, gameId),
Toast.LENGTH_SHORT).show();
}
}
else
{
- Toast.makeText(getContext(), "No game settings to delete", Toast.LENGTH_SHORT).show();
+ Toast.makeText(getContext(), R.string.properties_clear_missing, Toast.LENGTH_SHORT).show();
}
}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java
index aac533562d..b2a8e89389 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java
@@ -5,6 +5,7 @@ import android.text.TextUtils;
import android.widget.Toast;
import org.dolphinemu.dolphinemu.NativeLibrary;
+import org.dolphinemu.dolphinemu.R;
import org.dolphinemu.dolphinemu.features.settings.ui.SettingsActivityView;
import org.dolphinemu.dolphinemu.features.settings.utils.SettingsFile;
import org.dolphinemu.dolphinemu.services.GameFileCacheService;
@@ -207,7 +208,7 @@ public class Settings implements Closeable
if (!isGameSpecific())
{
if (context != null)
- Toast.makeText(context, "Saved settings to INI files", Toast.LENGTH_SHORT).show();
+ Toast.makeText(context, R.string.settings_saved, Toast.LENGTH_SHORT).show();
for (Map.Entry<String, IniFile> entry : mIniFiles.entrySet())
{
@@ -238,7 +239,10 @@ public class Settings implements Closeable
// custom game settings
if (context != null)
- Toast.makeText(context, "Saved settings for " + mGameId, Toast.LENGTH_SHORT).show();
+ {
+ Toast.makeText(context, context.getString(R.string.settings_saved_game_specific, mGameId),
+ Toast.LENGTH_SHORT).show();
+ }
SettingsFile.saveCustomGameSettings(mGameId, getGameSpecificFile());
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityPresenter.java
index 12b842c009..066f0322c3 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityPresenter.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityPresenter.java
@@ -170,7 +170,7 @@ public final class SettingsActivityPresenter
break;
case 2:
- mView.showToastMessage("Please make sure Continuous Scanning is enabled in Core Settings.");
+ mView.showToastMessage(mContext.getString(R.string.make_sure_continuous_scan_enabled));
break;
}
}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragment.java
index f0d6ffe2ea..f09a172c88 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragment.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragment.java
@@ -35,7 +35,7 @@ public final class SettingsFragment extends Fragment implements SettingsFragment
static
{
- titles.put(MenuTag.SETTINGS, R.string.preferences_settings);
+ titles.put(MenuTag.SETTINGS, R.string.settings);
titles.put(MenuTag.CONFIG, R.string.config);
titles.put(MenuTag.CONFIG_GENERAL, R.string.general_submenu);
titles.put(MenuTag.CONFIG_INTERFACE, R.string.interface_submenu);
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java
index 75c0faaa09..af16420b7f 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java
@@ -121,7 +121,7 @@ public final class SettingsFragmentPresenter
{
if (!TextUtils.isEmpty(mGameID))
{
- mView.getActivity().setTitle("Game Settings: " + mGameID);
+ mView.getActivity().setTitle(mContext.getString(R.string.game_settings, mGameID));
}
ArrayList<SettingsItem> sl = new ArrayList<>();
@@ -217,8 +217,7 @@ public final class SettingsFragmentPresenter
break;
default:
- mView.showToastMessage("Unimplemented menu");
- return;
+ throw new UnsupportedOperationException("Unimplemented menu");
}
mSettingsList = sl;
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java
index d35f440c0c..e7b522a10d 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java
@@ -388,8 +388,7 @@ public final class TvMainActivity extends FragmentActivity
R.string.grid_menu_import_nand_backup));
// Create a header for this row.
- HeaderItem header =
- new HeaderItem(R.string.preferences_settings, getString(R.string.preferences_settings));
+ HeaderItem header = new HeaderItem(R.string.settings, getString(R.string.settings));
return new ListRow(header, rowItems);
}
diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml
index 93c9c0c030..9c59383d33 100644
--- a/Source/Android/app/src/main/res/values/strings.xml
+++ b/Source/Android/app/src/main/res/values/strings.xml
@@ -122,10 +122,14 @@
<string name="turntable_crossfade">Crossfade</string>
<!-- Main Preference Fragment -->
+ <string name="settings">Settings</string>
+ <string name="game_settings">Game Settings: %1$s</string>
<string name="config">Config</string>
<string name="graphics_settings">Graphics Settings</string>
<string name="gcpad_settings">GameCube Input</string>
<string name="wiimote_settings">Wii Input</string>
+ <string name="settings_saved">Saved settings to INI files</string>
+ <string name="settings_saved_game_specific">Saved settings for %1$s</string>
<!-- General Preference Fragment -->
<string name="general_submenu">General</string>
@@ -354,9 +358,12 @@
<string name="properties_set_default_iso">Set as Default ISO</string>
<string name="properties_edit_game_settings">Edit Game Settings</string>
<string name="properties_clear_game_settings">Clear Game Settings</string>
+ <string name="properties_clear_success">Cleared settings for %1$s</string>
+ <string name="properties_clear_failure">Unable to clear settings for %1$s</string>
+ <string name="properties_clear_missing">No game settings to delete</string>
<string name="preferences_save_exit">Save and Exit</string>
- <string name="preferences_settings">Settings</string>
<string name="preferences_game_properties">Game Properties</string>
+ <string name="preferences_game_properties_with_game_id">Game Properties: %1$s</string>
<string name="preferences_extensions">Extension Bindings</string>
<string name="game_ini_junk_title">Junk Data Found</string>
<string name="game_ini_junk_question">The settings file for this game contains extraneous data added by an old version of Dolphin. This will likely prevent global settings from working as intended.\n\nWould you like to fix this by deleting the settings file for this game? All game-specific settings and cheats that you have added will be removed. This cannot be undone.</string>
@@ -369,6 +376,7 @@
<string name="game_details_compression">Compression</string>
<string name="game_details_block_size">Block Size</string>
<string name="game_details_no_compression">No Compression</string>
+ <string name="game_details_size_and_format">%1$s (%2$s)</string>
<!-- Convert Screen -->
<string name="convert_format">Format</string>
@@ -468,5 +476,6 @@ It can efficiently compress both junk data and encrypted Wii data.
<string name="disc_number">Disc %1$d</string>
<string name="disabled_gc_overlay_notice">GameCube Controller 1 is set to \"None\"</string>
<string name="ignore_warning_alert_messages">Ignore for this session</string>
+ <string name="make_sure_continuous_scan_enabled">Please make sure Continuous Scanning is enabled in Core Settings.</string>
</resources>