Changeset 2893

Timestamp:

04/10/08 19:35:51 (5 years ago)

Author:

ggpolo

Message:

Added support for fuzzy strings in output.

Files:

• trunk/install_scripts/utils/i18n/msgfmt.py (modified) (12 diffs)

trunk/install_scripts/utils/i18n/msgfmt.py

@@ -2 +2 @@
 # -*- coding: iso-8859-1 -*-
 # Written by Martin v. L� <loewis@informatik.hu-berlin.de>
+#
+# Changelog: (Guilherme Polo)
+#   2008-04-10
+#    - Support for fuzzy strings in output.
+#    - Bumped to version 1.1.1
 
 """Generate binary message catalog from textual translation description.
@@ -17 +22 @@
         file named filename.mo (based off the input file name).
 
+    -f
+    --use-fuzzy
+        Use fuzzy entries in output
+
     -h
     --help
@@ -24 +33 @@
     --version
         Display version information and exit.
+
+Before using the -f (fuzzy) option, read this:
+    http://www.finesheer.com:8457/cgi-bin/info2html?(gettext)Fuzzy%20Entries&lang=en
 """
 
@@ -32 +44 @@
 import array
 
-__version__ = "1.1"
+__version__ = "1.1.1"
 
 MESSAGES = {}
 
 
-
 def usage(code, msg=''):
     print >> sys.stderr, __doc__
@@ -45 +56 @@
 
 
-
-def add(id, str, fuzzy):
-    "Add a non-fuzzy translation to the dictionary."
+def add(id, str, fuzzy, use_fuzzy):
+    "Add a translation to the dictionary."
     global MESSAGES
-    if not fuzzy and str:
+    if (not fuzzy or use_fuzzy) and str:
         MESSAGES[id] = str
 
 
-
 def generate():
     "Return the generated output."
@@ -96 +105 @@
 
 
-
-def make(filename, outfile):
+def make(filename, outfile, use_fuzzy):
     ID = 1
     STR = 2
@@ -124 +132 @@
         # If we get a comment line after a msgstr, this is a new entry
         if l[0] == '#' and section == STR:
-            add(msgid, msgstr, fuzzy)
+            add(msgid, msgstr, fuzzy, use_fuzzy)
             section = None
             fuzzy = 0
@@ -136 +144 @@
         if l.startswith('msgid'):
             if section == STR:
-                add(msgid, msgstr, fuzzy)
+                add(msgid, msgstr, fuzzy, use_fuzzy)
             section = ID
             l = l[5:]
@@ -161 +169 @@
     # Add last entry
     if section == STR:
-        add(msgid, msgstr, fuzzy)
+        add(msgid, msgstr, fuzzy, use_fuzzy)
 
     # Compute output
@@ -172 +180 @@
 
 
-
 def main():
     try:
-        opts, args = getopt.getopt(sys.argv[1:], 'hVo:',
-                                   ['help', 'version', 'output-file='])
+        opts, args = getopt.getopt(sys.argv[1:], 'hVo:f',
+            ['help', 'version', 'output-file=', 'use-fuzzy'])
     except getopt.error, msg:
         usage(1, msg)
 
     outfile = None
+    use_fuzzy = False
     # parse options
     for opt, arg in opts:
@@ -188 +196 @@
             print >> sys.stderr, "msgfmt.py", __version__
             sys.exit(0)
+        elif opt in ('-f', '--use-fuzzy'):
+            use_fuzzy = True
         elif opt in ('-o', '--output-file'):
             outfile = arg
@@ -197 +207 @@
 
     for filename in args:
-        make(filename, outfile)
+        make(filename, outfile, use_fuzzy)