From: Hans-Christoph Steiner <hans@guardianproject.info>
Date: Sat, 16 Sep 2017 08:11:06 +0000 (+0000)
Subject: Merge branch 'plural' into 'master'
X-Git-Tag: 0.9~77
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c7d45b95153021530bffcdc5f1ca8de1652fa669;p=fdroidserver.git

Merge branch 'plural' into 'master'

Correct plurals

See merge request fdroid/fdroidserver!334
---

c7d45b95153021530bffcdc5f1ca8de1652fa669
diff --cc fdroidserver/build.py
index 889945d3,d5092a6d..6410226c
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@@ -31,8 -31,8 +31,9 @@@ import tempfil
  from configparser import ConfigParser
  from argparse import ArgumentParser
  import logging
+ from gettext import ngettext
  
 +from . import _
  from . import common
  from . import net
  from . import metadata
@@@ -1317,11 -1320,13 +1321,13 @@@ def main()
          logging.info("Cleaning up after ourselves.")
          docker.clean()
  
 -    logging.info("Finished.")
 +    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 --cc fdroidserver/publish.py
index 94cf166b,4ef20591..b15c12a8
--- a/fdroidserver/publish.py
+++ b/fdroidserver/publish.py
@@@ -25,8 -25,8 +25,9 @@@ import glo
  import hashlib
  from argparse import ArgumentParser
  import logging
+ from gettext import ngettext
  
 +from . import _
  from . import common
  from . import metadata
  from .common import FDroidPopen, SdkToolsPopen
@@@ -96,11 -96,11 +97,11 @@@ def main()
          m.update(appid.encode('utf-8'))
          keyalias = m.hexdigest()[:8]
          if keyalias in allaliases:
 -            logging.error("There is a keyalias collision - publishing halted")
 +            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'))