Changeset 6:5157af557cfb

Timestamp:

02/09/10 02:49:47 (6 months ago)

Author:

sgk

Branch:

default

Message:

The update tool should be working.

Location:

app/src/processing/app

Files:

• update.py (modified) (1 diff)
• update.sh (modified) (1 diff)

app/src/processing/app/update.py

@@ -10 +10 @@
 def read_po(fp):
   st = 1
-  comment = key = value = ''
+  comment = key = value = rkey = rvalue = ''
   for line in fp:
     if line[0] == '#' or line.strip() == '':
       if st == 2:
-        yield (comment, key, value)
+        yield (comment, key, value, rkey, rvalue)
         st = 1
-        comment = key = value = ''
+        comment = key = value = rkey = rvalue = ''
       comment += line
     elif line[0] == '"':
-      line = unquote(line)
       if st == 1:
-        key += line
+        key += unquote(line)
+        rkey += line
       else:
-        value += line
+        value += unquote(line)
+        rvalue += line
     elif line.startswith('msgid '):
       st = 1
       key = unquote(line[5:])
+      rkey = line
     elif line.startswith('msgstr '):
       st = 2
       value = unquote(line[6:])
+      rvalue = line
     else:
       raise RuntimeError
 
-def current(fp):
-  d = {}
-  it = read_po(fp)
-  (comment, key, value) = it.next()
-  d[key] = value
-  header = comment
-  for (comment, key, value) in it:
-    d[key] = value
-  return (header, d)
-
 def main():
   import sys
-  (header, d) = current(file(sys.argv[1]))
-  sys.stdout.write(header)
+
+  d = {}
+  it = read_po(file(sys.argv[1]))
+  (comment, key, value, rkey, rvalue) = it.next()
+  d[key] = rvalue
+  sys.stdout.write(comment)
+  for (comment, key, value, rkey, rvalue) in it:
+    d[key] = rvalue
 
   it = read_po(file(sys.argv[2]))
-  (comment, key, value) = it.next()
-  print 'msgid "%s"' % key
-  print 'msgstr "%s"' % d.get(key, '')
-  for (comment, key, value) in it:
+  (comment, key, value, rkey, rvalue) = it.next()
+  sys.stdout.write(rkey)
+  sys.stdout.write(d.get(key, rvalue))
+  for (comment, key, value, rkey, rvalue) in it:
     sys.stdout.write(comment)
-    print 'msgid "%s"' % key
-    print 'msgstr "%s"' % d.get(key, '')
+    sys.stdout.write(rkey)
+    sys.stdout.write(d.get(key, rvalue))
 
 if __name__ == '__main__':

app/src/processing/app/update.sh

@@ -4 +4 @@
 xgettext -L Java --from-code=utf-8 -k_ -d "$domain" `find . -name '*.java' -print`
 python update.py "$target" "$domain".po > new.po
-#mv new.po "$target"
+mv new.po "$target"
 rm -f "$domain".po