From 7a3fe61a1f497ba431ed5fe3c68b11ed9578eaba Mon Sep 17 00:00:00 2001
From: Daniel Albert <albert_daniel@t-online.de>
Date: Sat, 12 Jul 2014 12:52:44 +0200
Subject: Put text into strings.xml, for internationalization

---
 .../keychain/service/PassphraseCacheService.java             | 12 ++++++------
 OpenKeychain/src/main/res/values/strings.xml                 |  6 ++++++
 2 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'OpenKeychain')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
index 84ad441cb..9b868c859 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
@@ -358,12 +358,12 @@ public class PassphraseCacheService extends Service {
                 NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
 
                 builder.setSmallIcon(R.drawable.ic_launcher)
-                    .setContentTitle("Open Keychain")
-                    .setContentText("Open Keychain has cached " + mPassphraseCache.size() + " keys.");
+                    .setContentTitle(getString(R.string.app_name))
+                    .setContentText(String.format(getString(R.string.passp_cache_notif_n_keys, mPassphraseCache.size())));
 
                 NotificationCompat.InboxStyle inboxStyle = new NotificationCompat.InboxStyle();
 
-                inboxStyle.setBigContentTitle("Cached Passphrases:");
+                inboxStyle.setBigContentTitle(getString(R.string.passp_cache_notif_keys));
 
                 // Moves events into the big view
                 for (int i = 0; i < mPassphraseCache.size(); i++) {
@@ -378,7 +378,7 @@ public class PassphraseCacheService extends Service {
                 intent.setAction(ACTION_PASSPHRASE_CACHE_PURGE);
                 builder.addAction(
                     R.drawable.abc_ic_clear_normal,
-                    "Purge Cache",
+                    getString(R.string.passp_cache_notif_purge),
                     PendingIntent.getService(
                         getApplicationContext(),
                         0,
@@ -392,8 +392,8 @@ public class PassphraseCacheService extends Service {
                 NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
 
                 builder.setSmallIcon(R.drawable.ic_launcher)
-                    .setContentTitle("Open Keychain has cached " + mPassphraseCache.size() + " keys.")
-                    .setContentText("Click to purge the cache");
+                    .setContentTitle(String.format(getString(R.string.passp_cache_notif_n_keys, mPassphraseCache.size())))
+                    .setContentText(getString(R.string.passp_cache_notif_click_to_purge));
 
                 Intent intent = new Intent(getApplicationContext(), PassphraseCacheService.class);
                 intent.setAction(ACTION_PASSPHRASE_CACHE_PURGE);
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 274309fd0..456a22086 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -660,6 +660,12 @@
     <string name="msg_mf_unlock_error">Error unlocking keyring!</string>
     <string name="msg_mf_unlock">Unlocking keyring</string>
 
+    <!-- PassphraseCache -->
+    <string name="passp_cache_notif_click_to_purge">Click to purge cached passphrases</string>
+    <string name="passp_cache_notif_n_keys">OpenKeychain has cached %i keys</string>
+    <string name="passp_cache_notif_keys">Cached Keys:</string>
+    <string name="passp_cache_notif_purge">Purge Cache</string>
+
     <!-- unsorted -->
     <string name="section_certifier_id">Certifier</string>
     <string name="section_cert">Certificate Details</string>
-- 
cgit v1.2.3