From 287b74885e68ef1d922fc3178f9f446440c4e530 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 2 Jul 2014 14:51:11 +0200
Subject: don't use zero plural string for english

closes #703
---
 .../org/sufficientlysecure/keychain/provider/ProviderHelper.java    | 6 +++++-
 OpenKeychain/src/main/res/values/strings.xml                        | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'OpenKeychain/src')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
index 28495d51d..b5609a327 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
@@ -405,7 +405,11 @@ public class ProviderHelper {
 
             // classify and order user ids. primary are moved to the front, revoked to the back,
             // otherwise the order in the keyfile is preserved.
-            log(LogLevel.INFO, LogType.MSG_IP_UID_CLASSIFYING, trustedKeys.size());
+            if (trustedKeys.size() == 0) {
+                log(LogLevel.INFO, LogType.MSG_IP_UID_CLASSIFYING_ZERO);
+            } else {
+                log(LogLevel.INFO, LogType.MSG_IP_UID_CLASSIFYING, trustedKeys.size());
+            }
             mIndent += 1;
             List<UserIdItem> uids = new ArrayList<UserIdItem>();
             for (String userId : new IterableIterator<String>(
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 39b105664..54ce523ce 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -546,8 +546,8 @@
         <item quantity="one">Ignoring one certificate issued by an unknown public key</item>
         <item quantity="other">Ignoring %s certificates issued by unknown public keys</item>
     </plurals>
+    <string name="msg_ip_uid_classifying_zero">Classifying user ids (no trusted keys available)</string>
     <plurals name="msg_ip_uid_classifying">
-        <item quantity="zero">Classifying user ids (no trusted keys available)</item>
         <item quantity="one">Classifying user ids (using one trusted key)</item>
         <item quantity="other">Classifying user ids (using %s trusted keys)</item>
     </plurals>
-- 
cgit v1.2.3


From 144a10a3d043686755651852419c5a8bc6619f2a Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 2 Jul 2014 14:53:25 +0200
Subject: forgot a line in previous commit

---
 .../org/sufficientlysecure/keychain/service/OperationResultParcel.java   | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenKeychain/src')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
index 7f91ab490..575180505 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
@@ -165,6 +165,7 @@ public class OperationResultParcel implements Parcelable {
         MSG_IP_UID_CERT_ERROR (R.string.msg_ip_uid_cert_error),
         MSG_IP_UID_CERT_GOOD (R.string.msg_ip_uid_cert_good),
         MSG_IP_UID_CERTS_UNKNOWN (R.plurals.msg_ip_uid_certs_unknown),
+        MSG_IP_UID_CLASSIFYING_ZERO (R.string.msg_ip_uid_classifying_zero),
         MSG_IP_UID_CLASSIFYING (R.plurals.msg_ip_uid_classifying),
         MSG_IP_UID_REORDER(R.string.msg_ip_uid_reorder),
         MSG_IP_UID_PROCESSING (R.string.msg_ip_uid_processing),
-- 
cgit v1.2.3