Browse Source

Merge pull request #676 from jjlin/import-export-msg

Fix missing app name in import/export dialog message
master
Eric Kok 2 months ago committed by GitHub
parent
commit
0f286760d6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 4
      app/src/main/java/org/transdroid/core/gui/settings/SystemSettingsActivity.java

4
app/src/main/java/org/transdroid/core/gui/settings/SystemSettingsActivity.java

@ -224,7 +224,7 @@ public class SystemSettingsActivity extends PreferenceCompatActivity { @@ -224,7 +224,7 @@ public class SystemSettingsActivity extends PreferenceCompatActivity {
case DIALOG_IMPORTSETTINGS:
// @formatter:off
return new AlertDialog.Builder(this)
.setMessage(getString(R.string.pref_import_dialog_android10))
.setMessage(getString(R.string.pref_import_dialog_android10, getString(R.string.app_name)))
.setPositiveButton(R.string.pref_import_fromfile, importSettingsFromFile)
.setNeutralButton(R.string.pref_import_fromqr, importSettingsFromQr)
.setNegativeButton(android.R.string.cancel, null)
@ -233,7 +233,7 @@ public class SystemSettingsActivity extends PreferenceCompatActivity { @@ -233,7 +233,7 @@ public class SystemSettingsActivity extends PreferenceCompatActivity {
case DIALOG_EXPORTSETTINGS:
// @formatter:off
return new AlertDialog.Builder(this)
.setMessage(getString(R.string.pref_export_dialog_android10))
.setMessage(getString(R.string.pref_export_dialog_android10, getString(R.string.app_name)))
.setPositiveButton(R.string.pref_export_tofile, exportSettingsToFile)
.setNeutralButton(R.string.pref_export_toqr, exportSettingsToQr)
.setNegativeButton(android.R.string.cancel, null)

Loading…
Cancel
Save