From: Jan Berkel <jan@berkel.fr>
Date: Wed, 13 Sep 2017 15:33:57 +0000 (+0200)
Subject: Correct plurals
X-Git-Tag: 0.9~77^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4723cff0c82668382553af64100b2f711f213a12;p=fdroidserver.git

Correct plurals
---

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 5dfe63ba..d5092a6d 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -31,6 +31,7 @@ import tempfile
 from configparser import ConfigParser
 from argparse import ArgumentParser
 import logging
+from gettext import ngettext
 
 from . import common
 from . import net
@@ -522,9 +523,12 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext
         count = scanner.scan_source(build_dir, build)
         if count > 0:
             if force:
-                logging.warn('Scanner found %d problems' % count)
+                logging.warning(ngettext('Scanner found {} problem',
+                                         'Scanner found {} problems', count).format(count))
             else:
-                raise BuildException("Can't build due to %d errors while scanning" % count)
+                raise BuildException(ngettext(
+                    "Can't build due to {} error while scanning",
+                    "Can't build due to {} errors while scanning", count).format(count))
 
     if not options.notarball:
         # Build the source tarball right before we build the release...
@@ -1318,9 +1322,11 @@ def main():
 
     logging.info("Finished.")
     if len(build_succeeded) > 0:
-        logging.info(str(len(build_succeeded)) + ' builds succeeded')
+        logging.info(ngettext("{} build succeeded",
+                              "{} builds succeeded", len(build_succeeded)).format(len(build_succeeded)))
     if len(failed_apps) > 0:
-        logging.info(str(len(failed_apps)) + ' builds failed')
+        logging.info(ngettext("{} build failed",
+                              "{} builds failed", len(failed_apps)).format(len(failed_apps)))
 
     sys.exit(0)
 
diff --git a/fdroidserver/publish.py b/fdroidserver/publish.py
index ad200906..4ef20591 100644
--- a/fdroidserver/publish.py
+++ b/fdroidserver/publish.py
@@ -25,6 +25,7 @@ import glob
 import hashlib
 from argparse import ArgumentParser
 import logging
+from gettext import ngettext
 
 from . import common
 from . import metadata
@@ -98,8 +99,8 @@ def main():
             logging.error("There is a keyalias collision - publishing halted")
             sys.exit(1)
         allaliases.append(keyalias)
-    logging.info("{0} apps, {0} key aliases".format(len(allapps),
-                                                    len(allaliases)))
+    logging.info(ngettext('{0} app, {1} key aliases',
+                          '{0} apps, {1} key aliases', len(allapps)).format(len(allapps), len(allaliases)))
 
     # Process any APKs or ZIPs that are waiting to be signed...
     for apkfile in sorted(glob.glob(os.path.join(unsigned_dir, '*.apk'))