Changeset 4047

Timestamp:

02/15/09 13:45:47 (4 years ago)

Author:

gpolo

Message:

Making xgettext happy now

Location:

branch/NetworkInventory

Files:

• umitDB/InventoryChanges.py (modified) (4 diffs)
• umitInventory/HostDiscovery.py (modified) (3 diffs)
• umitInventory/InventoryTree.py (modified) (4 diffs)
• umitInventory/Utils.py (added)
• umitInventory/Viewer.py (modified) (2 diffs)

branch/NetworkInventory/umitDB/InventoryChanges.py

@@ -250 +250 @@
                 ports_only = True
 
-            verb, plural = self.conjugate(info_changes, False)
+            word, verb = self.conjugate(_("Port"), info_changes, False)
             ports_str = ', '.join([str(p) for p in info_changes])
             this_port_diff = ' '.join([
-                _("Port") + plural, ports_str, verb, _("changed info")])
+                word, ports_str, verb, _("changed info")])
             host_diff = ''.join([host_diff, this_port_diff])
 
@@ -310 +310 @@
 
 
-    def conjugate(self, alist, toBe=True):
+    def conjugate(self, word, alist, toBe=True):
         """
         Do conjugation based on alist size.
@@ -322 +322 @@
         if len(alist) > 1:
             verb = verbs[0]
-            plural = _("s")
+            word += _("s")
         else:
             verb = verbs[1]
-            plural = _("")
-
-        return verb, plural
+
+        return word, verb
 
 
@@ -376 +375 @@
         text = ''
         if closed_ports:
-            verb, plural = self.conjugate(closed_ports)
+            word, verb = self.conjugate(port_text, closed_ports)
             closed_ports = ', '.join([str(p) for p in closed_ports])
-            closed_ports = "%s%s %s %s %s %s." % (port_text, plural,
+            closed_ports = "%s %s %s %s %s." % (word,
                 closed_ports, verb, closed_text, now_text)
 
         if open_ports:
-            verb, plural = self.conjugate(open_ports)
+            word, verb = self.conjugate(port_text, open_ports)
             open_ports = ', '.join([str(p) for p in open_ports])
-            open_ports = "%s%s %s %s %s %s." % (port_text, plural,
+            open_ports = "%s %s %s %s %s." % (word,
                 open_ports, verb, open_text, now_text)
 

branch/NetworkInventory/umitInventory/HostDiscovery.py

@@ -30 +30 @@
 from umitCore.Paths import Path
 from umitCore.I18N import _
+
+from umitInventory.Utils import append_s
 
 from higwidgets.higbuttons import HIGButton
@@ -323 +325 @@
         self.target_model.clear()
         self.hostdetect_btn.set_sensitive(False)
-        p = (self.scount > 1) and 's' or ''
+        self._adjust_target_label()
+        gobject.timeout_add(500, self._check_scans)
+
+
+    def _adjust_target_label(self):
+        """Update target_lbl according to the current scount (assumes that
+        scount > 0)."""
+        word = append_s(_("scan"), self.scount)
         self.target_lbl.set_label(
-            _("Target list (%d scan%s running)") % (self.scount, p))
-        gobject.timeout_add(500, self._check_scans)
+                _("Target list") +
+                (" (%d " % self.scount) + word +
+                _("running"))
 
 
@@ -350 +360 @@
                 self.scount -= 1
                 if self.scount:
-                    p = (self.scount > 1) and 's' or ''
-                    self.target_lbl.set_label(
-                        _("Target list (%d scan%s running)") % (self.scount, p))
+                    self._adjust_target_label()
 
                 # clean up temp files

branch/NetworkInventory/umitInventory/InventoryTree.py

@@ -38 +38 @@
 from umitInventory.InventoryLoad import InventoryLoad
 from umitInventory.InventoryCommonDialog import NoScheduleDlg
+from umitInventory.Utils import append_s
 
 INVENTORY_INFO = _("Info")
@@ -52 +53 @@
     factory.add(NI_INVENTORY_ROOT_ICON, gtk.IconSet(pixbuf))
     factory.add_default()
-
-def get_plural(count):
-    if count == 0 or count > 1:
-        return _("s")
-    else:
-        return _("")
 
 class InventoryTree(gtk.Notebook):
@@ -269 +264 @@
             self.running_scans[scan] = inv
             running_scans = len(self.running_scans)
-            plural = get_plural(running_scans)
             self.daddy._write_statusbar(("%d " % running_scans) +
-                    _("scan") + plural + _(" running"))
+                    append_s(_("scan"), running_scans) + _(" running"))
 
     def _check_scans(self):
@@ -322 +316 @@
 
         running_scans = len(self.running_scans)
-        plural = get_plural(running_scans)
+        word = append_s(_("scan"), running_scans)
         self.daddy._write_statusbar(
-                ("%d " % running_scans) + _("scan") + plural + _(" running"))
+                ("%d " % running_scans) + word + _(" running"))
 
         if not self.running_scans:

branch/NetworkInventory/umitInventory/Viewer.py

@@ -55 +55 @@
 from umitInventory.About import About
 from umitInventory.InventoryException import NoInventory
+from umitInventory.Utils import append_s
+
 
 umitdb = Path.umitdb_ng
@@ -543 +545 @@
             # layout
             matches = len(args[1])
-            if matches > 1 or matches == 0:
-                plural = _("s")
-            else:
-                plural = _("")
+            word = append_s(_("result"), matches)
             upper_title = gtk.Label()
             upper_title.set_markup(
-                    ("<b>%d " % plural) + _("result") + plural + _(" found.") +
+                    ("<b>%d " % matches) + word + _(" found.") +
                     "</b>")
             hutbox = HIGHBox()