#2657,#1718 use ngettext

svn: r11800

src/plugins/import/ImportCsv.py

@@ -692,7 +692,7 @@ class CSVParser:
             else:
                 print "Warning: ignoring line %d" % line_number
         t = time.time() - t
-        msg = ngettext('Import Complete: 1 second','Import Complete: %d seconds', t ) % t
+        msg = ngettext('Import Complete: %d second','Import Complete: %d seconds', t ) % t
         self.db.transaction_commit(self.trans,_("CSV import"))
         self.db.enable_signals()
         self.db.request_rebuild()

src/plugins/import/ImportGeneWeb.py

@@ -178,7 +178,7 @@ class GeneWebParser:
             self.errmsg(str(err))
             
         t = time.time() - t
-        msg = ngettext('Import Complete: 1 second','Import Complete: %d seconds', t ) % t
+        msg = ngettext('Import Complete: %d second','Import Complete: %d seconds', t ) % t
 
         self.db.transaction_commit(self.trans,_("GeneWeb import"))
         self.db.enable_signals()

src/plugins/import/ImportVCard.py

@@ -142,7 +142,7 @@ class VCardParser:
             self.errmsg(str(err))
             
         t = time.time() - t
-        msg = ngettext('Import Complete: 1 second','Import Complete: %d seconds', t ) % t
+        msg = ngettext('Import Complete: %d second','Import Complete: %d seconds', t ) % t
 
         self.db.transaction_commit(self.trans,_("vCard import"))
         self.db.enable_signals()

src/plugins/quickview/FilterByName.py

@@ -32,6 +32,7 @@ import DateHandler
 
 import posixpath
 from gettext import gettext as _
+from gettext import ngettext
 
 # force translation
 [_('all people'), _('males'), _('females'), _('people with unknown gender'),
@@ -216,7 +217,9 @@ def run(database, document, filter_name, *args, **kwargs):
             matches += 1
     else:
         raise AttributeError, ("invalid filter name: '%s'" % filter_name)
-    sdoc.paragraph(_("Filter matched %d records.") % matches)
+    sdoc.paragraph(ngettext("Filter matched %d record."
+                   ,
+                   "Filter matched %d records.", matches) % matches)
     sdoc.paragraph("")
     if matches > 0:
         stab.write(sdoc)

src/plugins/quickview/SameSurnames.py

@@ -26,6 +26,7 @@ Display a people who have a person's same surname or given name
 
 from Simple import SimpleAccess, SimpleDoc, SimpleTable
 from gettext import gettext as _
+from gettext import ngettext
 from gen.plug import PluginManager
 import gen.lib
 from ReportBase import CATEGORY_QR_PERSON, CATEGORY_QR_MISC
@@ -118,7 +119,10 @@ def run(database, document, person):
         stab.row(person, sdb.birth_date_obj(person),
                  str(person.get_primary_name().get_type()))
         matches += 1
-    sdoc.paragraph(_("There are %d people with a matching name, or alternate name.\n") % matches)
+    sdoc.paragraph(ngettext("There is %d person with a matching name, or alternate name.\n"
+                   ,
+                   "There are %d people with a matching name, or alternate name.\n"
+                   , matches) % matches)
     stab.write(sdoc)
 
 def run_given(database, document, person):
@@ -154,7 +158,10 @@ def run_given(database, document, person):
         stab.row(person, sdb.birth_date_obj(person),
                  str(person.get_primary_name().get_type()))
         matches += 1
-    sdoc.paragraph(_("There are %d people with a matching name, or alternate name.\n") % matches)
+    sdoc.paragraph(ngettext("There is %d person with a matching name, or alternate name.\n"
+                   ,
+                   "There are %d people with a matching name, or alternate name.\n"
+                   , matches) % matches)
     stab.write(sdoc)
 
 #------------------------------------------------------------------------

src/plugins/tool/ChangeTypes.py

@@ -139,8 +139,11 @@ class ChangeTypes(Tool.BatchTool, ManagedWindow.ManagedWindow):
         self.db.enable_signals()
         self.db.request_rebuild()
 
-        msg = ngettext("1 event record was modified.", \
+        if modified == 0:
-        "%d event records were modified.", modified) % modified
+            msg = _("No event record was modified.")
+        else:
+            msg = ngettext("%d event record was modified."
+                  , "%d event records were modified.", modified) % modified
 
         if cli:
             print "Done: ", msg