From d5972aaa8dfce86b9792ea2bc598e8b3bee8653c Mon Sep 17 00:00:00 2001 From: calvin Date: Mon, 20 Sep 2004 12:11:32 +0000 Subject: [PATCH] use plural forms git-svn-id: https://linkchecker.svn.sourceforge.net/svnroot/linkchecker/trunk/linkchecker@1831 e7d03fd6-7b0d-0410-9947-9c21f3af8025 --- linkcheck/logger/html.py | 16 +++++++--------- linkcheck/logger/text.py | 19 +++++++++---------- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/linkcheck/logger/html.py b/linkcheck/logger/html.py index 202c15f6..aae3b7db 100644 --- a/linkcheck/logger/html.py +++ b/linkcheck/logger/html.py @@ -238,16 +238,14 @@ class HtmlLogger (linkcheck.logger.Logger): return if self.has_field("outro"): self.fd.write(os.linesep+_("Thats it. ")) - if self.errors == 1: - self.fd.write(_("1 error")) - else: - self.fd.write(_("%d errors") % self.errors) if linknumber >= 0: - if linknumber == 1: - self.fd.write(_(" in 1 link")) - else: - self.fd.write(_(" in %d links") % linknumber) - self.fd.write(_(" found")+"
"+os.linesep) + self.fd.write(gettext.ngettext("%d link checked.", + "%d links checked.", linknumber) % linknumber) + self.fd.write(" ") + self.fd.write(gettext.ngettext("%d error found.", + "%d errors found.", self.errors) % self.errors) + self.fd.write(os.linesep) + self.fd.write("
"+os.linesep) self.stoptime = time.time() duration = self.stoptime - self.starttime self.fd.write(_("Stopped checking at %s (%s)")%\ diff --git a/linkcheck/logger/text.py b/linkcheck/logger/text.py index 4f26af04..0ea37a7d 100644 --- a/linkcheck/logger/text.py +++ b/linkcheck/logger/text.py @@ -19,6 +19,7 @@ import sys import os import time +import gettext import linkcheck import linkcheck.ansicolor @@ -224,17 +225,15 @@ class TextLogger (linkcheck.logger.Logger): if self.fd is None: return if self.has_field('outro'): - self.fd.write(os.linesep+_("Thats it. ")) - if self.errors == 1: - self.fd.write(_("1 error")) - else: - self.fd.write(str(self.errors)+_(" errors")) + self.fd.write(os.linesep+_("Thats it.")+" ") if linknumber >= 0: - if linknumber == 1: - self.fd.write(_(" in 1 link")) - else: - self.fd.write(_(" in %d links") % linknumber) - self.fd.write(_(" found")+os.linesep) + self.fd.write(gettext.ngettext("%d link checked.", + "%d links checked.", linknumber) % linknumber) + self.fd.write(" ") + + self.fd.write(gettext.ngettext("%d error found.", + "%d errors found.", self.errors) % self.errors) + self.fd.write(os.linesep) self.stoptime = time.time() duration = self.stoptime - self.starttime self.fd.write(_("Stopped checking at %s (%s)") % \