diff options
Diffstat (limited to 'app/src/main/java')
3 files changed, 10 insertions, 12 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java index 0c8d5b39..d7187749 100644 --- a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java +++ b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java @@ -517,8 +517,8 @@ public class PasswordStore extends AppCompatActivity { if (settings.getStringSet("openpgp_key_ids_set", new HashSet<String>()).isEmpty()) { new AlertDialog.Builder(this) - .setTitle("OpenPGP key not selected") - .setMessage("We will redirect you to settings. Please select your OpenPGP Key.") + .setTitle(this.getResources().getString(R.string.no_key_selected_dialog_title)) + .setMessage(this.getResources().getString(R.string.no_key_selected_dialog_text)) .setPositiveButton(this.getResources().getString(R.string.dialog_ok), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialogInterface, int i) { @@ -761,9 +761,9 @@ public class PasswordStore extends AppCompatActivity { PasswordRepository.closeRepository(); new AlertDialog.Builder(this) - .setTitle("Repository location") - .setMessage("Select where to create or clone your password repository.") - .setPositiveButton("Hidden (preferred)", new DialogInterface.OnClickListener() { + .setTitle(this.getResources().getString(R.string.location_dialog_title)) + .setMessage(this.getResources().getString(R.string.location_dialog_text)) + .setPositiveButton(this.getResources().getString(R.string.location_hidden), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { settings.edit().putBoolean("git_external", false).apply(); @@ -781,7 +781,7 @@ public class PasswordStore extends AppCompatActivity { } } }) - .setNegativeButton("SD-Card", new DialogInterface.OnClickListener() { + .setNegativeButton(this.getResources().getString(R.string.location_sdcard), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { settings.edit().putBoolean("git_external", true).apply(); diff --git a/app/src/main/java/com/zeapo/pwdstore/UserPreference.kt b/app/src/main/java/com/zeapo/pwdstore/UserPreference.kt index bba9e605..69a1cf1a 100644 --- a/app/src/main/java/com/zeapo/pwdstore/UserPreference.kt +++ b/app/src/main/java/com/zeapo/pwdstore/UserPreference.kt @@ -172,7 +172,7 @@ class UserPreference : AppCompatActivity() { val keyPref = findPreference("openpgp_key_id_pref") val selectedKeys: Array<String> = ArrayList<String>(sharedPreferences.getStringSet("openpgp_key_ids_set", HashSet<String>())).toTypedArray() if (selectedKeys.isEmpty()) { - keyPref.summary = "No key selected" + keyPref.summary = this.resources.getString(R.string.pref_no_key_selected) } else { keyPref.summary = selectedKeys.joinToString(separator = ";") { s -> @@ -203,10 +203,8 @@ class UserPreference : AppCompatActivity() { fun selectExternalGitRepository() { val activity = this AlertDialog.Builder(this) - .setTitle("Choose where to store the passwords") - .setMessage("You must select a directory where to store your passwords. If you want " + - "to store your passwords within the hidden storage of the application, " + - "cancel this dialog and disable the \"External Repository\" option.") + .setTitle(this.resources.getString(R.string.external_repository_dialog_title)) + .setMessage(this.resources.getString(R.string.external_repository_dialog_text)) .setPositiveButton(R.string.dialog_ok) { _, _ -> // This always works val i = Intent(activity.applicationContext, FilePickerActivity::class.java) diff --git a/app/src/main/java/com/zeapo/pwdstore/pwgenDialogFragment.java b/app/src/main/java/com/zeapo/pwdstore/pwgenDialogFragment.java index 0272f43a..d7d1ae45 100644 --- a/app/src/main/java/com/zeapo/pwdstore/pwgenDialogFragment.java +++ b/app/src/main/java/com/zeapo/pwdstore/pwgenDialogFragment.java @@ -84,7 +84,7 @@ public class pwgenDialogFragment extends DialogFragment { builder.setNeutralButton(getResources().getString(R.string.pwgen_generate), null); - final AlertDialog ad = builder.setTitle("Generate Password").create(); + final AlertDialog ad = builder.setTitle(this.getResources().getString(R.string.pwgen_title)).create(); ad.setOnShowListener(new DialogInterface.OnShowListener() { @Override public void onShow(DialogInterface dialog) { |