From b0b65abbc63bda61a39ce9c7418132af728d0203 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Tue, 29 Sep 2015 03:35:55 +0200
Subject: enc-export: localize snackbar strings

---
 .../org/sufficientlysecure/keychain/ui/BackupCodeFragment.java | 10 +++++-----
 .../java/org/sufficientlysecure/keychain/ui/util/Notify.java   |  4 ++--
 OpenKeychain/src/main/res/values/strings.xml                   |  4 ++++
 3 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'OpenKeychain/src/main')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java
index aa7fe5571..34fbe4a9b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java
@@ -423,7 +423,7 @@ public class BackupCodeFragment extends CryptoOperationFragment<ExportKeyringPar
         File file = new File(Constants.Path.APP_DIR, "backup_" + date + (mExportSecret ? ".gpg" : ".pub.gpg"));
 
         if (!overwrite && file.exists()) {
-            Notify.create(activity, "Backup already exists!", Style.WARN, new ActionListener() {
+            Notify.create(activity, R.string.snack_backup_exists, Style.WARN, new ActionListener() {
                 @Override
                 public void onAction() {
                     saveFile(true);
@@ -434,9 +434,9 @@ public class BackupCodeFragment extends CryptoOperationFragment<ExportKeyringPar
 
         try {
             FileHelper.copyUriData(activity, mCachedExportUri, Uri.fromFile(file));
-            Notify.create(activity, "Saved to /sdcard/OpenKeychain", Style.OK).show();
+            Notify.create(activity, R.string.snack_backup_saved_dir, Style.OK).show();
         } catch (IOException e) {
-            Notify.create(activity, "Error saving backup", Style.ERROR).show();
+            Notify.create(activity, R.string.snack_backup_error_saving, Style.ERROR).show();
         }
     }
 
@@ -458,9 +458,9 @@ public class BackupCodeFragment extends CryptoOperationFragment<ExportKeyringPar
         try {
             Uri outputUri = data.getData();
             FileHelper.copyUriData(activity, mCachedExportUri, outputUri);
-            Notify.create(activity, "Backup saved", Style.OK).show();
+            Notify.create(activity, R.string.snack_backup_saved, Style.OK).show();
         } catch (IOException e) {
-            Notify.create(activity, "Error saving backup!", Style.ERROR).show();
+            Notify.create(activity, R.string.snack_backup_error_saving, Style.ERROR).show();
         }
     }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/Notify.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/Notify.java
index 9cf5907bc..71f6ecc1a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/Notify.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/Notify.java
@@ -142,9 +142,9 @@ public class Notify {
         return create(activity, text, LENGTH_LONG, style);
     }
 
-    public static Showable create(Activity activity, String text, Style style,
+    public static Showable create(Activity activity, int textResId, Style style,
             ActionListener actionListener, int actionResId) {
-        return create(activity, text, LENGTH_LONG, style, actionListener, actionResId);
+        return create(activity, textResId, LENGTH_LONG, style, actionListener, actionResId);
     }
 
     public static Showable create(Activity activity, int textResId, int duration, Style style,
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 07877f5fa..78fdda3af 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1651,5 +1651,9 @@
     <string name="backup_code_wrong">"The backup code you entered is wrong!\nDid you write it down correctly?"</string>
     <string name="btn_backup_share">"Share backup"</string>
     <string name="btn_backup_save">"Save backup"</string>
+    <string name="snack_backup_error_saving">"Error saving backup!"</string>
+    <string name="snack_backup_saved">"Backup saved"</string>
+    <string name="snack_backup_exists">"Backup already exists!"</string>
+    <string name="snack_backup_saved_dir">"Saved to OpenKeychain directory"</string>
 
 </resources>
-- 
cgit v1.2.3