aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain
diff options
context:
space:
mode:
authorgrait <grandhiajit9@gmail.com>2014-03-09 17:45:58 +0530
committergrait <grandhiajit9@gmail.com>2014-03-09 17:45:58 +0530
commit4874ea567a81f5b2e67895296782f36d294a8d77 (patch)
tree0fb28b8d24ee481e0f4de8da2aaffc2d0b413d7f /OpenPGP-Keychain
parente471560e25c99aeffb53295b3615876e38522639 (diff)
downloadopen-keychain-4874ea567a81f5b2e67895296782f36d294a8d77.tar.gz
open-keychain-4874ea567a81f5b2e67895296782f36d294a8d77.tar.bz2
open-keychain-4874ea567a81f5b2e67895296782f36d294a8d77.zip
progress bar while key creation - added plurals based on no.of keys while key creation
Diffstat (limited to 'OpenPGP-Keychain')
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java3
-rw-r--r--OpenPGP-Keychain/src/main/res/values/strings.xml7
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>