aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-07-02 14:51:11 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-07-02 14:51:11 +0200
commit287b74885e68ef1d922fc3178f9f446440c4e530 (patch)
tree882b21700b7f215a2fdfbadc18d85520ab561315 /OpenKeychain/src
parenta9010045889d307ede37d154b0a2fece566c1845 (diff)
downloadopen-keychain-287b74885e68ef1d922fc3178f9f446440c4e530.tar.gz
open-keychain-287b74885e68ef1d922fc3178f9f446440c4e530.tar.bz2
open-keychain-287b74885e68ef1d922fc3178f9f446440c4e530.zip
don't use zero plural string for english
closes #703
Diffstat (limited to 'OpenKeychain/src')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java6
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml2
2 files changed, 6 insertions, 2 deletions
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>