From 4874ea567a81f5b2e67895296782f36d294a8d77 Mon Sep 17 00:00:00 2001
From: grait <grandhiajit9@gmail.com>
Date: Sun, 9 Mar 2014 17:45:58 +0530
Subject: [PATCH] progress bar while key creation - added plurals based on
 no.of keys while key creation

---
 .../keychain/service/KeychainIntentService.java            | 3 ++-
 OpenPGP-Keychain/src/main/res/values/strings.xml           | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
index be9d126b3..67ce7a395 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
@@ -598,7 +598,8 @@ public class KeychainIntentService extends IntentService implements ProgressDial
                 /* Operation */
                 int keysTotal = 2;
                 int keysCreated =0;
-                this.setProgress(keysCreated, keysTotal);
+                setProgress(getApplicationContext().getResources().getQuantityString(R.plurals.progress_generating,keysTotal),
+                        keysCreated, keysTotal);
                 PgpKeyOperation keyOperations = new PgpKeyOperation(this, this);
 
                 PGPSecretKey masterKey = keyOperations.createKey(Id.choice.algorithm.rsa,
diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 2e0aed998..57e42e84f 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -313,7 +313,7 @@
     <string name="progress_saving">saving…</string>
     <string name="progress_importing">importing…</string>
     <string name="progress_exporting">exporting…</string>
-    <string name="progress_generating">generating keys, this can take up to 3 minutes…</string>
+    <string name="progress_generating">generating key, this can take up to 3 minutes…</string>
     <string name="progress_building_key">building key…</string>
     <string name="progress_preparing_master_key">preparing master key…</string>
     <string name="progress_certifying_master_key">certifying master key…</string>
@@ -326,6 +326,11 @@
         <item quantity="other">exporting keys…</item>
     </plurals>
 
+    <plurals name="progress_generating">
+        <item quantity="one">generating key, this can take up to 3 minutes…</item>
+        <item quantity="other">generating keys, this can take up to 3 minutes…</item>
+    </plurals>
+
     <string name="progress_extracting_signature_key">extracting signature key…</string>
     <string name="progress_extracting_key">extracting key…</string>
     <string name="progress_preparing_streams">preparing streams…</string>