Mercurial > babel > old > mirror
annotate babel/messages/catalog.py @ 337:662d332c0a2b
More preparation for msgctxt support (#54).
author | cmlenz |
---|---|
date | Wed, 11 Jun 2008 18:56:27 +0000 |
parents | 355a977c92aa |
children | 6811369cb912 |
rev | line source |
---|---|
58
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
1 # -*- coding: utf-8 -*- |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
2 # |
337 | 3 # Copyright (C) 2007-2008 Edgewall Software |
58
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
4 # All rights reserved. |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
5 # |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
6 # This software is licensed as described in the file COPYING, which |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
7 # you should have received as part of this distribution. The terms |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
8 # are also available at http://babel.edgewall.org/wiki/License. |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
9 # |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
10 # This software consists of voluntary contributions made by many |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
11 # individuals. For the exact contribution history, see the revision |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
12 # history and logs, available at http://babel.edgewall.org/log/. |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
13 |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
14 """Data structures for message catalogs.""" |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
15 |
151
12e5f21dfcda
Respect charset specified in PO headers in `read_po()`. Fixes #17.
cmlenz
parents:
133
diff
changeset
|
16 from cgi import parse_header |
69 | 17 from datetime import datetime |
167
533baef258bb
Implement fuzzy matching to catalog updates. No frontend yet.
cmlenz
parents:
165
diff
changeset
|
18 from difflib import get_close_matches |
108
8ea225f33f28
Fix for #16: the header message (`msgid = ""`) is now treated specially by `read_po` and `Catalog`.
cmlenz
parents:
107
diff
changeset
|
19 from email import message_from_string |
58
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
20 import re |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
21 try: |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
22 set |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
23 except NameError: |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
24 from sets import Set as set |
69 | 25 import time |
58
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
26 |
69 | 27 from babel import __version__ as VERSION |
66 | 28 from babel.core import Locale |
133
9d58665d134c
Use `dates.format_datetime` for dates in PO(T) header, as `datetime.strftime` produces wrong results on windows.
cmlenz
parents:
123
diff
changeset
|
29 from babel.dates import format_datetime |
69 | 30 from babel.messages.plurals import PLURALS |
229 | 31 from babel.util import odict, distinct, LOCALTZ, UTC, FixedOffsetTimezone |
58
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
32 |
222
bd8b1301b27e
Added infrastructure for adding catalog checkers, and implement a checker that validations Python format parameters in translations, closing #19.
cmlenz
parents:
212
diff
changeset
|
33 __all__ = ['Message', 'Catalog', 'TranslationError'] |
58
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
34 __docformat__ = 'restructuredtext en' |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
35 |
231 | 36 PYTHON_FORMAT = re.compile(r'\%(\([\w]+\))?([-#0\ +])?(\*|[\d]+)?' |
37 r'(\.(\*|[\d]+))?([hlL])?[diouxXeEfFgGcrs]') | |
58
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
38 |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
39 |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
40 class Message(object): |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
41 """Representation of a single message in a catalog.""" |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
42 |
151
12e5f21dfcda
Respect charset specified in PO headers in `read_po()`. Fixes #17.
cmlenz
parents:
133
diff
changeset
|
43 def __init__(self, id, string=u'', locations=(), flags=(), auto_comments=(), |
337 | 44 user_comments=(), previous_id=(), lineno=None, context=None): |
58
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
45 """Create the message object. |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
46 |
58
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
47 :param id: the message ID, or a ``(singular, plural)`` tuple for |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
48 pluralizable messages |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
49 :param string: the translated message string, or a |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
50 ``(singular, plural)`` tuple for pluralizable messages |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
51 :param locations: a sequence of ``(filenname, lineno)`` tuples |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
52 :param flags: a set or sequence of flags |
108
8ea225f33f28
Fix for #16: the header message (`msgid = ""`) is now treated specially by `read_po` and `Catalog`.
cmlenz
parents:
107
diff
changeset
|
53 :param auto_comments: a sequence of automatic comments for the message |
8ea225f33f28
Fix for #16: the header message (`msgid = ""`) is now treated specially by `read_po` and `Catalog`.
cmlenz
parents:
107
diff
changeset
|
54 :param user_comments: a sequence of user comments for the message |
205 | 55 :param previous_id: the previous message ID, or a ``(singular, plural)`` |
56 tuple for pluralizable messages | |
222
bd8b1301b27e
Added infrastructure for adding catalog checkers, and implement a checker that validations Python format parameters in translations, closing #19.
cmlenz
parents:
212
diff
changeset
|
57 :param lineno: the line number on which the msgid line was found in the |
bd8b1301b27e
Added infrastructure for adding catalog checkers, and implement a checker that validations Python format parameters in translations, closing #19.
cmlenz
parents:
212
diff
changeset
|
58 PO file, if any |
337 | 59 :param context: the message context |
58
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
60 """ |
109 | 61 self.id = id #: The message ID |
70 | 62 if not string and self.pluralizable: |
63 string = (u'', u'') | |
109 | 64 self.string = string #: The message translation |
231 | 65 self.locations = list(distinct(locations)) |
58
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
66 self.flags = set(flags) |
69 | 67 if id and self.python_format: |
58
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
68 self.flags.add('python-format') |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
69 else: |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
70 self.flags.discard('python-format') |
229 | 71 self.auto_comments = list(distinct(auto_comments)) |
72 self.user_comments = list(distinct(user_comments)) | |
205 | 73 if isinstance(previous_id, basestring): |
74 self.previous_id = [previous_id] | |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
75 else: |
205 | 76 self.previous_id = list(previous_id) |
222
bd8b1301b27e
Added infrastructure for adding catalog checkers, and implement a checker that validations Python format parameters in translations, closing #19.
cmlenz
parents:
212
diff
changeset
|
77 self.lineno = lineno |
337 | 78 self.context = context |
58
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
79 |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
80 def __repr__(self): |
198
982d7e704fdc
Fix for #35, and a minor improvement to how we parse the catalog fuzzy bit.
cmlenz
parents:
190
diff
changeset
|
81 return '<%s %r (flags: %r)>' % (type(self).__name__, self.id, |
982d7e704fdc
Fix for #35, and a minor improvement to how we parse the catalog fuzzy bit.
cmlenz
parents:
190
diff
changeset
|
82 list(self.flags)) |
58
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
83 |
250
194f927d8c5a
add a __cmp__ to Message that correctly sorts by id, taking into account plurals
pjenvey
parents:
231
diff
changeset
|
84 def __cmp__(self, obj): |
194f927d8c5a
add a __cmp__ to Message that correctly sorts by id, taking into account plurals
pjenvey
parents:
231
diff
changeset
|
85 """Compare Messages, taking into account plural ids""" |
194f927d8c5a
add a __cmp__ to Message that correctly sorts by id, taking into account plurals
pjenvey
parents:
231
diff
changeset
|
86 if isinstance(obj, Message): |
194f927d8c5a
add a __cmp__ to Message that correctly sorts by id, taking into account plurals
pjenvey
parents:
231
diff
changeset
|
87 plural = self.pluralizable |
194f927d8c5a
add a __cmp__ to Message that correctly sorts by id, taking into account plurals
pjenvey
parents:
231
diff
changeset
|
88 obj_plural = obj.pluralizable |
194f927d8c5a
add a __cmp__ to Message that correctly sorts by id, taking into account plurals
pjenvey
parents:
231
diff
changeset
|
89 if plural and obj_plural: |
194f927d8c5a
add a __cmp__ to Message that correctly sorts by id, taking into account plurals
pjenvey
parents:
231
diff
changeset
|
90 return cmp(self.id[0], obj.id[0]) |
194f927d8c5a
add a __cmp__ to Message that correctly sorts by id, taking into account plurals
pjenvey
parents:
231
diff
changeset
|
91 elif plural: |
194f927d8c5a
add a __cmp__ to Message that correctly sorts by id, taking into account plurals
pjenvey
parents:
231
diff
changeset
|
92 return cmp(self.id[0], obj.id) |
194f927d8c5a
add a __cmp__ to Message that correctly sorts by id, taking into account plurals
pjenvey
parents:
231
diff
changeset
|
93 elif obj_plural: |
194f927d8c5a
add a __cmp__ to Message that correctly sorts by id, taking into account plurals
pjenvey
parents:
231
diff
changeset
|
94 return cmp(self.id, obj.id[0]) |
194f927d8c5a
add a __cmp__ to Message that correctly sorts by id, taking into account plurals
pjenvey
parents:
231
diff
changeset
|
95 return cmp(self.id, obj.id) |
194f927d8c5a
add a __cmp__ to Message that correctly sorts by id, taking into account plurals
pjenvey
parents:
231
diff
changeset
|
96 |
315
654b632e5482
Merging catalogs would sometimes mix translations from different runs.
cmlenz
parents:
314
diff
changeset
|
97 def clone(self): |
654b632e5482
Merging catalogs would sometimes mix translations from different runs.
cmlenz
parents:
314
diff
changeset
|
98 return Message(self.id, self.string, self.locations, self.flags, |
654b632e5482
Merging catalogs would sometimes mix translations from different runs.
cmlenz
parents:
314
diff
changeset
|
99 self.auto_comments, self.user_comments, |
337 | 100 self.previous_id, self.lineno, self.context) |
315
654b632e5482
Merging catalogs would sometimes mix translations from different runs.
cmlenz
parents:
314
diff
changeset
|
101 |
69 | 102 def fuzzy(self): |
103 return 'fuzzy' in self.flags | |
104 fuzzy = property(fuzzy, doc="""\ | |
105 Whether the translation is fuzzy. | |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
106 |
69 | 107 >>> Message('foo').fuzzy |
108 False | |
177
47f6c31e9a24
Changed the `__repr__` output to include the flags(it can be changed back, but it was usefull to implement the fuzzy header parsing).
palgarvio
parents:
167
diff
changeset
|
109 >>> msg = Message('foo', 'foo', flags=['fuzzy']) |
47f6c31e9a24
Changed the `__repr__` output to include the flags(it can be changed back, but it was usefull to implement the fuzzy header parsing).
palgarvio
parents:
167
diff
changeset
|
110 >>> msg.fuzzy |
69 | 111 True |
177
47f6c31e9a24
Changed the `__repr__` output to include the flags(it can be changed back, but it was usefull to implement the fuzzy header parsing).
palgarvio
parents:
167
diff
changeset
|
112 >>> msg |
198
982d7e704fdc
Fix for #35, and a minor improvement to how we parse the catalog fuzzy bit.
cmlenz
parents:
190
diff
changeset
|
113 <Message 'foo' (flags: ['fuzzy'])> |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
114 |
69 | 115 :type: `bool` |
116 """) | |
117 | |
58
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
118 def pluralizable(self): |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
119 return isinstance(self.id, (list, tuple)) |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
120 pluralizable = property(pluralizable, doc="""\ |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
121 Whether the message is plurizable. |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
122 |
58
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
123 >>> Message('foo').pluralizable |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
124 False |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
125 >>> Message(('foo', 'bar')).pluralizable |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
126 True |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
127 |
63
a60ecd4a4954
Move `Translations` and `LazyProxy` to new `babel.support` module, which should contain any convenience code that is useful for applications using Babel/I18n, but not used by Babel itself.
cmlenz
parents:
58
diff
changeset
|
128 :type: `bool` |
58
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
129 """) |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
130 |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
131 def python_format(self): |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
132 ids = self.id |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
133 if not isinstance(ids, (list, tuple)): |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
134 ids = [ids] |
222
bd8b1301b27e
Added infrastructure for adding catalog checkers, and implement a checker that validations Python format parameters in translations, closing #19.
cmlenz
parents:
212
diff
changeset
|
135 return bool(filter(None, [PYTHON_FORMAT.search(id) for id in ids])) |
58
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
136 python_format = property(python_format, doc="""\ |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
137 Whether the message contains Python-style parameters. |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
138 |
58
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
139 >>> Message('foo %(name)s bar').python_format |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
140 True |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
141 >>> Message(('foo %(name)s', 'foo %(name)s')).python_format |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
142 True |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
143 |
63
a60ecd4a4954
Move `Translations` and `LazyProxy` to new `babel.support` module, which should contain any convenience code that is useful for applications using Babel/I18n, but not used by Babel itself.
cmlenz
parents:
58
diff
changeset
|
144 :type: `bool` |
58
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
145 """) |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
146 |
107
4b42e23644e5
`Message`, `read_po` and `write_po` now all handle user/auto comments correctly.
palgarvio
parents:
106
diff
changeset
|
147 |
222
bd8b1301b27e
Added infrastructure for adding catalog checkers, and implement a checker that validations Python format parameters in translations, closing #19.
cmlenz
parents:
212
diff
changeset
|
148 class TranslationError(Exception): |
bd8b1301b27e
Added infrastructure for adding catalog checkers, and implement a checker that validations Python format parameters in translations, closing #19.
cmlenz
parents:
212
diff
changeset
|
149 """Exception thrown by translation checkers when invalid message |
bd8b1301b27e
Added infrastructure for adding catalog checkers, and implement a checker that validations Python format parameters in translations, closing #19.
cmlenz
parents:
212
diff
changeset
|
150 translations are encountered.""" |
bd8b1301b27e
Added infrastructure for adding catalog checkers, and implement a checker that validations Python format parameters in translations, closing #19.
cmlenz
parents:
212
diff
changeset
|
151 |
bd8b1301b27e
Added infrastructure for adding catalog checkers, and implement a checker that validations Python format parameters in translations, closing #19.
cmlenz
parents:
212
diff
changeset
|
152 |
106
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
153 DEFAULT_HEADER = u"""\ |
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
154 # Translations template for PROJECT. |
122 | 155 # Copyright (C) YEAR ORGANIZATION |
106
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
156 # This file is distributed under the same license as the PROJECT project. |
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
157 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. |
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
158 #""" |
58
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
159 |
198
982d7e704fdc
Fix for #35, and a minor improvement to how we parse the catalog fuzzy bit.
cmlenz
parents:
190
diff
changeset
|
160 |
58
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
161 class Catalog(object): |
80
8e2e9d549693
Fixed the plurals header on `Catalog` which should only be written if it's not a catalog template.
palgarvio
parents:
72
diff
changeset
|
162 """Representation of a message catalog.""" |
58
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
163 |
106
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
164 def __init__(self, locale=None, domain=None, header_comment=DEFAULT_HEADER, |
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
165 project=None, version=None, copyright_holder=None, |
80
8e2e9d549693
Fixed the plurals header on `Catalog` which should only be written if it's not a catalog template.
palgarvio
parents:
72
diff
changeset
|
166 msgid_bugs_address=None, creation_date=None, |
208
6cd31048eb5c
Preserve language-team header in catalogs on update. Closes #35 again.
cmlenz
parents:
205
diff
changeset
|
167 revision_date=None, last_translator=None, language_team=None, |
6cd31048eb5c
Preserve language-team header in catalogs on update. Closes #35 again.
cmlenz
parents:
205
diff
changeset
|
168 charset='utf-8', fuzzy=True): |
66 | 169 """Initialize the catalog object. |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
170 |
66 | 171 :param locale: the locale identifier or `Locale` object, or `None` |
172 if the catalog is not bound to a locale (which basically | |
173 means it's a template) | |
80
8e2e9d549693
Fixed the plurals header on `Catalog` which should only be written if it's not a catalog template.
palgarvio
parents:
72
diff
changeset
|
174 :param domain: the message domain |
106
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
175 :param header_comment: the header comment as string, or `None` for the |
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
176 default header |
80
8e2e9d549693
Fixed the plurals header on `Catalog` which should only be written if it's not a catalog template.
palgarvio
parents:
72
diff
changeset
|
177 :param project: the project's name |
8e2e9d549693
Fixed the plurals header on `Catalog` which should only be written if it's not a catalog template.
palgarvio
parents:
72
diff
changeset
|
178 :param version: the project's version |
106
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
179 :param copyright_holder: the copyright holder of the catalog |
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
180 :param msgid_bugs_address: the email address or URL to submit bug |
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
181 reports to |
80
8e2e9d549693
Fixed the plurals header on `Catalog` which should only be written if it's not a catalog template.
palgarvio
parents:
72
diff
changeset
|
182 :param creation_date: the date the catalog was created |
8e2e9d549693
Fixed the plurals header on `Catalog` which should only be written if it's not a catalog template.
palgarvio
parents:
72
diff
changeset
|
183 :param revision_date: the date the catalog was revised |
8e2e9d549693
Fixed the plurals header on `Catalog` which should only be written if it's not a catalog template.
palgarvio
parents:
72
diff
changeset
|
184 :param last_translator: the name and email of the last translator |
208
6cd31048eb5c
Preserve language-team header in catalogs on update. Closes #35 again.
cmlenz
parents:
205
diff
changeset
|
185 :param language_team: the name and email of the language team |
106
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
186 :param charset: the encoding to use in the output |
177
47f6c31e9a24
Changed the `__repr__` output to include the flags(it can be changed back, but it was usefull to implement the fuzzy header parsing).
palgarvio
parents:
167
diff
changeset
|
187 :param fuzzy: the fuzzy bit on the catalog header |
66 | 188 """ |
109 | 189 self.domain = domain #: The message domain |
66 | 190 if locale: |
191 locale = Locale.parse(locale) | |
109 | 192 self.locale = locale #: The locale or `None` |
106
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
193 self._header_comment = header_comment |
69 | 194 self._messages = odict() |
195 | |
109 | 196 self.project = project or 'PROJECT' #: The project name |
197 self.version = version or 'VERSION' #: The project version | |
106
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
198 self.copyright_holder = copyright_holder or 'ORGANIZATION' |
80
8e2e9d549693
Fixed the plurals header on `Catalog` which should only be written if it's not a catalog template.
palgarvio
parents:
72
diff
changeset
|
199 self.msgid_bugs_address = msgid_bugs_address or 'EMAIL@ADDRESS' |
108
8ea225f33f28
Fix for #16: the header message (`msgid = ""`) is now treated specially by `read_po` and `Catalog`.
cmlenz
parents:
107
diff
changeset
|
200 |
8ea225f33f28
Fix for #16: the header message (`msgid = ""`) is now treated specially by `read_po` and `Catalog`.
cmlenz
parents:
107
diff
changeset
|
201 self.last_translator = last_translator or 'FULL NAME <EMAIL@ADDRESS>' |
8ea225f33f28
Fix for #16: the header message (`msgid = ""`) is now treated specially by `read_po` and `Catalog`.
cmlenz
parents:
107
diff
changeset
|
202 """Name and email address of the last translator.""" |
208
6cd31048eb5c
Preserve language-team header in catalogs on update. Closes #35 again.
cmlenz
parents:
205
diff
changeset
|
203 self.language_team = language_team or 'LANGUAGE <LL@li.org>' |
6cd31048eb5c
Preserve language-team header in catalogs on update. Closes #35 again.
cmlenz
parents:
205
diff
changeset
|
204 """Name and email address of the language team.""" |
108
8ea225f33f28
Fix for #16: the header message (`msgid = ""`) is now treated specially by `read_po` and `Catalog`.
cmlenz
parents:
107
diff
changeset
|
205 |
97
debd9ac3bb4d
Fix for #11 (use local timezone in timestamps of generated POT).
cmlenz
parents:
89
diff
changeset
|
206 self.charset = charset or 'utf-8' |
86
8a703ecdba91
Some cosmetic changes for the new translator comments support.
cmlenz
parents:
82
diff
changeset
|
207 |
69 | 208 if creation_date is None: |
99 | 209 creation_date = datetime.now(LOCALTZ) |
97
debd9ac3bb4d
Fix for #11 (use local timezone in timestamps of generated POT).
cmlenz
parents:
89
diff
changeset
|
210 elif isinstance(creation_date, datetime) and not creation_date.tzinfo: |
99 | 211 creation_date = creation_date.replace(tzinfo=LOCALTZ) |
109 | 212 self.creation_date = creation_date #: Creation date of the template |
69 | 213 if revision_date is None: |
99 | 214 revision_date = datetime.now(LOCALTZ) |
97
debd9ac3bb4d
Fix for #11 (use local timezone in timestamps of generated POT).
cmlenz
parents:
89
diff
changeset
|
215 elif isinstance(revision_date, datetime) and not revision_date.tzinfo: |
99 | 216 revision_date = revision_date.replace(tzinfo=LOCALTZ) |
109 | 217 self.revision_date = revision_date #: Last revision date of the catalog |
183
e927dffc9ab4
The frontends now provide ways to update existing translations catalogs from a template. Closes #22.
cmlenz
parents:
177
diff
changeset
|
218 self.fuzzy = fuzzy #: Catalog header fuzzy bit (`True` or `False`) |
e927dffc9ab4
The frontends now provide ways to update existing translations catalogs from a template. Closes #22.
cmlenz
parents:
177
diff
changeset
|
219 |
e927dffc9ab4
The frontends now provide ways to update existing translations catalogs from a template. Closes #22.
cmlenz
parents:
177
diff
changeset
|
220 self.obsolete = odict() #: Dictionary of obsolete messages |
335
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
221 self._num_plurals = None |
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
222 self._plural_expr = None |
69 | 223 |
109 | 224 def _get_header_comment(self): |
106
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
225 comment = self._header_comment |
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
226 comment = comment.replace('PROJECT', self.project) \ |
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
227 .replace('VERSION', self.version) \ |
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
228 .replace('YEAR', self.revision_date.strftime('%Y')) \ |
122 | 229 .replace('ORGANIZATION', self.copyright_holder) |
106
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
230 if self.locale: |
109 | 231 comment = comment.replace('Translations template', '%s translations' |
232 % self.locale.english_name) | |
106
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
233 return comment |
122 | 234 |
109 | 235 def _set_header_comment(self, string): |
106
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
236 self._header_comment = string |
109 | 237 |
238 header_comment = property(_get_header_comment, _set_header_comment, doc="""\ | |
106
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
239 The header comment for the catalog. |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
240 |
106
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
241 >>> catalog = Catalog(project='Foobar', version='1.0', |
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
242 ... copyright_holder='Foo Company') |
314
5c0bda4f20b1
Fix catalog updating with fuzzy matches. Closes #82.
cmlenz
parents:
293
diff
changeset
|
243 >>> print catalog.header_comment #doctest: +ELLIPSIS |
106
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
244 # Translations template for Foobar. |
314
5c0bda4f20b1
Fix catalog updating with fuzzy matches. Closes #82.
cmlenz
parents:
293
diff
changeset
|
245 # Copyright (C) ... Foo Company |
106
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
246 # This file is distributed under the same license as the Foobar project. |
314
5c0bda4f20b1
Fix catalog updating with fuzzy matches. Closes #82.
cmlenz
parents:
293
diff
changeset
|
247 # FIRST AUTHOR <EMAIL@ADDRESS>, .... |
106
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
248 # |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
249 |
122 | 250 The header can also be set from a string. Any known upper-case variables |
251 will be replaced when the header is retrieved again: | |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
252 |
122 | 253 >>> catalog = Catalog(project='Foobar', version='1.0', |
254 ... copyright_holder='Foo Company') | |
255 >>> catalog.header_comment = '''\\ | |
256 ... # The POT for my really cool PROJECT project. | |
257 ... # Copyright (C) 1990-2003 ORGANIZATION | |
258 ... # This file is distributed under the same license as the PROJECT | |
259 ... # project. | |
260 ... #''' | |
261 >>> print catalog.header_comment | |
262 # The POT for my really cool Foobar project. | |
263 # Copyright (C) 1990-2003 Foo Company | |
264 # This file is distributed under the same license as the Foobar | |
265 # project. | |
266 # | |
267 | |
106
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
268 :type: `unicode` |
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
269 """) |
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
270 |
108
8ea225f33f28
Fix for #16: the header message (`msgid = ""`) is now treated specially by `read_po` and `Catalog`.
cmlenz
parents:
107
diff
changeset
|
271 def _get_mime_headers(self): |
69 | 272 headers = [] |
273 headers.append(('Project-Id-Version', | |
274 '%s %s' % (self.project, self.version))) | |
80
8e2e9d549693
Fixed the plurals header on `Catalog` which should only be written if it's not a catalog template.
palgarvio
parents:
72
diff
changeset
|
275 headers.append(('Report-Msgid-Bugs-To', self.msgid_bugs_address)) |
69 | 276 headers.append(('POT-Creation-Date', |
133
9d58665d134c
Use `dates.format_datetime` for dates in PO(T) header, as `datetime.strftime` produces wrong results on windows.
cmlenz
parents:
123
diff
changeset
|
277 format_datetime(self.creation_date, 'yyyy-MM-dd HH:mmZ', |
9d58665d134c
Use `dates.format_datetime` for dates in PO(T) header, as `datetime.strftime` produces wrong results on windows.
cmlenz
parents:
123
diff
changeset
|
278 locale='en'))) |
69 | 279 if self.locale is None: |
280 headers.append(('PO-Revision-Date', 'YEAR-MO-DA HO:MI+ZONE')) | |
281 headers.append(('Last-Translator', 'FULL NAME <EMAIL@ADDRESS>')) | |
282 headers.append(('Language-Team', 'LANGUAGE <LL@li.org>')) | |
283 else: | |
284 headers.append(('PO-Revision-Date', | |
133
9d58665d134c
Use `dates.format_datetime` for dates in PO(T) header, as `datetime.strftime` produces wrong results on windows.
cmlenz
parents:
123
diff
changeset
|
285 format_datetime(self.revision_date, |
9d58665d134c
Use `dates.format_datetime` for dates in PO(T) header, as `datetime.strftime` produces wrong results on windows.
cmlenz
parents:
123
diff
changeset
|
286 'yyyy-MM-dd HH:mmZ', locale='en'))) |
69 | 287 headers.append(('Last-Translator', self.last_translator)) |
208
6cd31048eb5c
Preserve language-team header in catalogs on update. Closes #35 again.
cmlenz
parents:
205
diff
changeset
|
288 headers.append(('Language-Team', |
6cd31048eb5c
Preserve language-team header in catalogs on update. Closes #35 again.
cmlenz
parents:
205
diff
changeset
|
289 self.language_team.replace('LANGUAGE', |
6cd31048eb5c
Preserve language-team header in catalogs on update. Closes #35 again.
cmlenz
parents:
205
diff
changeset
|
290 str(self.locale)))) |
86
8a703ecdba91
Some cosmetic changes for the new translator comments support.
cmlenz
parents:
82
diff
changeset
|
291 headers.append(('Plural-Forms', self.plural_forms)) |
69 | 292 headers.append(('MIME-Version', '1.0')) |
70 | 293 headers.append(('Content-Type', |
294 'text/plain; charset=%s' % self.charset)) | |
69 | 295 headers.append(('Content-Transfer-Encoding', '8bit')) |
107
4b42e23644e5
`Message`, `read_po` and `write_po` now all handle user/auto comments correctly.
palgarvio
parents:
106
diff
changeset
|
296 headers.append(('Generated-By', 'Babel %s\n' % VERSION)) |
69 | 297 return headers |
108
8ea225f33f28
Fix for #16: the header message (`msgid = ""`) is now treated specially by `read_po` and `Catalog`.
cmlenz
parents:
107
diff
changeset
|
298 |
8ea225f33f28
Fix for #16: the header message (`msgid = ""`) is now treated specially by `read_po` and `Catalog`.
cmlenz
parents:
107
diff
changeset
|
299 def _set_mime_headers(self, headers): |
8ea225f33f28
Fix for #16: the header message (`msgid = ""`) is now treated specially by `read_po` and `Catalog`.
cmlenz
parents:
107
diff
changeset
|
300 for name, value in headers: |
293 | 301 if name.lower() == 'content-type': |
212
2c00a52bc073
When parsing catalog headers, look for the content-type first, to be able to use a specified encoding on all other headers.
cmlenz
parents:
208
diff
changeset
|
302 mimetype, params = parse_header(value) |
2c00a52bc073
When parsing catalog headers, look for the content-type first, to be able to use a specified encoding on all other headers.
cmlenz
parents:
208
diff
changeset
|
303 if 'charset' in params: |
2c00a52bc073
When parsing catalog headers, look for the content-type first, to be able to use a specified encoding on all other headers.
cmlenz
parents:
208
diff
changeset
|
304 self.charset = params['charset'].lower() |
2c00a52bc073
When parsing catalog headers, look for the content-type first, to be able to use a specified encoding on all other headers.
cmlenz
parents:
208
diff
changeset
|
305 break |
2c00a52bc073
When parsing catalog headers, look for the content-type first, to be able to use a specified encoding on all other headers.
cmlenz
parents:
208
diff
changeset
|
306 for name, value in headers: |
2c00a52bc073
When parsing catalog headers, look for the content-type first, to be able to use a specified encoding on all other headers.
cmlenz
parents:
208
diff
changeset
|
307 name = name.lower().decode(self.charset) |
2c00a52bc073
When parsing catalog headers, look for the content-type first, to be able to use a specified encoding on all other headers.
cmlenz
parents:
208
diff
changeset
|
308 value = value.decode(self.charset) |
108
8ea225f33f28
Fix for #16: the header message (`msgid = ""`) is now treated specially by `read_po` and `Catalog`.
cmlenz
parents:
107
diff
changeset
|
309 if name == 'project-id-version': |
8ea225f33f28
Fix for #16: the header message (`msgid = ""`) is now treated specially by `read_po` and `Catalog`.
cmlenz
parents:
107
diff
changeset
|
310 parts = value.split(' ') |
212
2c00a52bc073
When parsing catalog headers, look for the content-type first, to be able to use a specified encoding on all other headers.
cmlenz
parents:
208
diff
changeset
|
311 self.project = u' '.join(parts[:-1]) |
108
8ea225f33f28
Fix for #16: the header message (`msgid = ""`) is now treated specially by `read_po` and `Catalog`.
cmlenz
parents:
107
diff
changeset
|
312 self.version = parts[-1] |
8ea225f33f28
Fix for #16: the header message (`msgid = ""`) is now treated specially by `read_po` and `Catalog`.
cmlenz
parents:
107
diff
changeset
|
313 elif name == 'report-msgid-bugs-to': |
8ea225f33f28
Fix for #16: the header message (`msgid = ""`) is now treated specially by `read_po` and `Catalog`.
cmlenz
parents:
107
diff
changeset
|
314 self.msgid_bugs_address = value |
8ea225f33f28
Fix for #16: the header message (`msgid = ""`) is now treated specially by `read_po` and `Catalog`.
cmlenz
parents:
107
diff
changeset
|
315 elif name == 'last-translator': |
8ea225f33f28
Fix for #16: the header message (`msgid = ""`) is now treated specially by `read_po` and `Catalog`.
cmlenz
parents:
107
diff
changeset
|
316 self.last_translator = value |
208
6cd31048eb5c
Preserve language-team header in catalogs on update. Closes #35 again.
cmlenz
parents:
205
diff
changeset
|
317 elif name == 'language-team': |
6cd31048eb5c
Preserve language-team header in catalogs on update. Closes #35 again.
cmlenz
parents:
205
diff
changeset
|
318 self.language_team = value |
335
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
319 elif name == 'plural-forms': |
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
320 _, params = parse_header(' ;' + value) |
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
321 self._num_plurals = int(params.get('nplurals', 2)) |
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
322 self._plural_expr = params.get('plural', '(n != 1)') |
108
8ea225f33f28
Fix for #16: the header message (`msgid = ""`) is now treated specially by `read_po` and `Catalog`.
cmlenz
parents:
107
diff
changeset
|
323 elif name == 'pot-creation-date': |
8ea225f33f28
Fix for #16: the header message (`msgid = ""`) is now treated specially by `read_po` and `Catalog`.
cmlenz
parents:
107
diff
changeset
|
324 # FIXME: this should use dates.parse_datetime as soon as that |
8ea225f33f28
Fix for #16: the header message (`msgid = ""`) is now treated specially by `read_po` and `Catalog`.
cmlenz
parents:
107
diff
changeset
|
325 # is ready |
8ea225f33f28
Fix for #16: the header message (`msgid = ""`) is now treated specially by `read_po` and `Catalog`.
cmlenz
parents:
107
diff
changeset
|
326 value, tzoffset, _ = re.split('[+-](\d{4})$', value, 1) |
8ea225f33f28
Fix for #16: the header message (`msgid = ""`) is now treated specially by `read_po` and `Catalog`.
cmlenz
parents:
107
diff
changeset
|
327 tt = time.strptime(value, '%Y-%m-%d %H:%M') |
8ea225f33f28
Fix for #16: the header message (`msgid = ""`) is now treated specially by `read_po` and `Catalog`.
cmlenz
parents:
107
diff
changeset
|
328 ts = time.mktime(tt) |
122 | 329 tzoffset = FixedOffsetTimezone(int(tzoffset[:2]) * 60 + |
330 int(tzoffset[2:])) | |
123 | 331 dt = datetime.fromtimestamp(ts) |
332 self.creation_date = dt.replace(tzinfo=tzoffset) | |
108
8ea225f33f28
Fix for #16: the header message (`msgid = ""`) is now treated specially by `read_po` and `Catalog`.
cmlenz
parents:
107
diff
changeset
|
333 |
8ea225f33f28
Fix for #16: the header message (`msgid = ""`) is now treated specially by `read_po` and `Catalog`.
cmlenz
parents:
107
diff
changeset
|
334 mime_headers = property(_get_mime_headers, _set_mime_headers, doc="""\ |
69 | 335 The MIME headers of the catalog, used for the special ``msgid ""`` entry. |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
336 |
69 | 337 The behavior of this property changes slightly depending on whether a locale |
338 is set or not, the latter indicating that the catalog is actually a template | |
339 for actual translations. | |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
340 |
69 | 341 Here's an example of the output for such a catalog template: |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
342 |
97
debd9ac3bb4d
Fix for #11 (use local timezone in timestamps of generated POT).
cmlenz
parents:
89
diff
changeset
|
343 >>> created = datetime(1990, 4, 1, 15, 30, tzinfo=UTC) |
69 | 344 >>> catalog = Catalog(project='Foobar', version='1.0', |
97
debd9ac3bb4d
Fix for #11 (use local timezone in timestamps of generated POT).
cmlenz
parents:
89
diff
changeset
|
345 ... creation_date=created) |
106
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
346 >>> for name, value in catalog.mime_headers: |
69 | 347 ... print '%s: %s' % (name, value) |
348 Project-Id-Version: Foobar 1.0 | |
80
8e2e9d549693
Fixed the plurals header on `Catalog` which should only be written if it's not a catalog template.
palgarvio
parents:
72
diff
changeset
|
349 Report-Msgid-Bugs-To: EMAIL@ADDRESS |
69 | 350 POT-Creation-Date: 1990-04-01 15:30+0000 |
351 PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE | |
352 Last-Translator: FULL NAME <EMAIL@ADDRESS> | |
353 Language-Team: LANGUAGE <LL@li.org> | |
354 MIME-Version: 1.0 | |
355 Content-Type: text/plain; charset=utf-8 | |
356 Content-Transfer-Encoding: 8bit | |
357 Generated-By: Babel ... | |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
358 |
69 | 359 And here's an example of the output when the locale is set: |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
360 |
97
debd9ac3bb4d
Fix for #11 (use local timezone in timestamps of generated POT).
cmlenz
parents:
89
diff
changeset
|
361 >>> revised = datetime(1990, 8, 3, 12, 0, tzinfo=UTC) |
69 | 362 >>> catalog = Catalog(locale='de_DE', project='Foobar', version='1.0', |
97
debd9ac3bb4d
Fix for #11 (use local timezone in timestamps of generated POT).
cmlenz
parents:
89
diff
changeset
|
363 ... creation_date=created, revision_date=revised, |
208
6cd31048eb5c
Preserve language-team header in catalogs on update. Closes #35 again.
cmlenz
parents:
205
diff
changeset
|
364 ... last_translator='John Doe <jd@example.com>', |
6cd31048eb5c
Preserve language-team header in catalogs on update. Closes #35 again.
cmlenz
parents:
205
diff
changeset
|
365 ... language_team='de_DE <de@example.com>') |
106
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
366 >>> for name, value in catalog.mime_headers: |
69 | 367 ... print '%s: %s' % (name, value) |
368 Project-Id-Version: Foobar 1.0 | |
80
8e2e9d549693
Fixed the plurals header on `Catalog` which should only be written if it's not a catalog template.
palgarvio
parents:
72
diff
changeset
|
369 Report-Msgid-Bugs-To: EMAIL@ADDRESS |
69 | 370 POT-Creation-Date: 1990-04-01 15:30+0000 |
371 PO-Revision-Date: 1990-08-03 12:00+0000 | |
372 Last-Translator: John Doe <jd@example.com> | |
208
6cd31048eb5c
Preserve language-team header in catalogs on update. Closes #35 again.
cmlenz
parents:
205
diff
changeset
|
373 Language-Team: de_DE <de@example.com> |
86
8a703ecdba91
Some cosmetic changes for the new translator comments support.
cmlenz
parents:
82
diff
changeset
|
374 Plural-Forms: nplurals=2; plural=(n != 1) |
69 | 375 MIME-Version: 1.0 |
376 Content-Type: text/plain; charset=utf-8 | |
377 Content-Transfer-Encoding: 8bit | |
378 Generated-By: Babel ... | |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
379 |
69 | 380 :type: `list` |
381 """) | |
382 | |
70 | 383 def num_plurals(self): |
335
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
384 if not self._num_plurals: |
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
385 num = 2 |
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
386 if self.locale: |
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
387 if str(self.locale) in PLURALS: |
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
388 num = PLURALS[str(self.locale)][0] |
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
389 elif self.locale.language in PLURALS: |
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
390 num = PLURALS[self.locale.language][0] |
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
391 self._num_plurals = num |
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
392 return self._num_plurals |
86
8a703ecdba91
Some cosmetic changes for the new translator comments support.
cmlenz
parents:
82
diff
changeset
|
393 num_plurals = property(num_plurals, doc="""\ |
335
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
394 The number of plurals used by the catalog or locale. |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
395 |
105
abd3a594dab4
Implement wrapping of header comments in PO(T) output. Related to #14.
cmlenz
parents:
99
diff
changeset
|
396 >>> Catalog(locale='en').num_plurals |
abd3a594dab4
Implement wrapping of header comments in PO(T) output. Related to #14.
cmlenz
parents:
99
diff
changeset
|
397 2 |
335
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
398 >>> Catalog(locale='ga').num_plurals |
105
abd3a594dab4
Implement wrapping of header comments in PO(T) output. Related to #14.
cmlenz
parents:
99
diff
changeset
|
399 3 |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
400 |
105
abd3a594dab4
Implement wrapping of header comments in PO(T) output. Related to #14.
cmlenz
parents:
99
diff
changeset
|
401 :type: `int` |
86
8a703ecdba91
Some cosmetic changes for the new translator comments support.
cmlenz
parents:
82
diff
changeset
|
402 """) |
70 | 403 |
335
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
404 def plural_expr(self): |
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
405 if not self._plural_expr: |
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
406 expr = '(n != 1)' |
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
407 if self.locale: |
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
408 if str(self.locale) in PLURALS: |
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
409 expr = PLURALS[str(self.locale)][1] |
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
410 elif self.locale.language in PLURALS: |
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
411 expr = PLURALS[self.locale.language][1] |
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
412 self._plural_expr = expr |
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
413 return self._plural_expr |
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
414 plural_expr = property(plural_expr, doc="""\ |
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
415 The plural expression used by the catalog or locale. |
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
416 |
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
417 >>> Catalog(locale='en').plural_expr |
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
418 '(n != 1)' |
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
419 >>> Catalog(locale='ga').plural_expr |
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
420 '(n==1 ? 0 : n==2 ? 1 : 2)' |
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
421 |
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
422 :type: `basestring` |
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
423 """) |
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
424 |
69 | 425 def plural_forms(self): |
335
355a977c92aa
Change Catalog class to retain the plural forms set in the MIME headers.
cmlenz
parents:
315
diff
changeset
|
426 return 'nplurals=%s; plural=%s' % (self.num_plurals, self.plural_expr) |
69 | 427 plural_forms = property(plural_forms, doc="""\ |
428 Return the plural forms declaration for the locale. | |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
429 |
105
abd3a594dab4
Implement wrapping of header comments in PO(T) output. Related to #14.
cmlenz
parents:
99
diff
changeset
|
430 >>> Catalog(locale='en').plural_forms |
69 | 431 'nplurals=2; plural=(n != 1)' |
432 >>> Catalog(locale='pt_BR').plural_forms | |
433 'nplurals=2; plural=(n > 1)' | |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
434 |
69 | 435 :type: `str` |
436 """) | |
437 | |
438 def __contains__(self, id): | |
439 """Return whether the catalog has a message with the specified ID.""" | |
71
b260ffa01a2d
Message catalogs can have multiple messages with the same ID, where some of them have plural strings, and others don't. Still the same message.
cmlenz
parents:
70
diff
changeset
|
440 return self._key_for(id) in self._messages |
b260ffa01a2d
Message catalogs can have multiple messages with the same ID, where some of them have plural strings, and others don't. Still the same message.
cmlenz
parents:
70
diff
changeset
|
441 |
b260ffa01a2d
Message catalogs can have multiple messages with the same ID, where some of them have plural strings, and others don't. Still the same message.
cmlenz
parents:
70
diff
changeset
|
442 def __len__(self): |
86
8a703ecdba91
Some cosmetic changes for the new translator comments support.
cmlenz
parents:
82
diff
changeset
|
443 """The number of messages in the catalog. |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
444 |
86
8a703ecdba91
Some cosmetic changes for the new translator comments support.
cmlenz
parents:
82
diff
changeset
|
445 This does not include the special ``msgid ""`` entry. |
8a703ecdba91
Some cosmetic changes for the new translator comments support.
cmlenz
parents:
82
diff
changeset
|
446 """ |
71
b260ffa01a2d
Message catalogs can have multiple messages with the same ID, where some of them have plural strings, and others don't. Still the same message.
cmlenz
parents:
70
diff
changeset
|
447 return len(self._messages) |
58
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
448 |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
449 def __iter__(self): |
66 | 450 """Iterates through all the entries in the catalog, in the order they |
451 were added, yielding a `Message` object for every entry. | |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
452 |
66 | 453 :rtype: ``iterator`` |
454 """ | |
69 | 455 buf = [] |
106
2a00e352c986
Merged `write_pot` and `write_po` functions by moving more functionality to the `Catalog` class. This is certainly not perfect yet, but moves us in the right direction.
cmlenz
parents:
105
diff
changeset
|
456 for name, value in self.mime_headers: |
69 | 457 buf.append('%s: %s' % (name, value)) |
200
2f0161df6a38
Correctly handle non-ASCII chars in the catalog MIME headers.
cmlenz
parents:
198
diff
changeset
|
458 flags = set() |
177
47f6c31e9a24
Changed the `__repr__` output to include the flags(it can be changed back, but it was usefull to implement the fuzzy header parsing).
palgarvio
parents:
167
diff
changeset
|
459 if self.fuzzy: |
200
2f0161df6a38
Correctly handle non-ASCII chars in the catalog MIME headers.
cmlenz
parents:
198
diff
changeset
|
460 flags |= set(['fuzzy']) |
212
2c00a52bc073
When parsing catalog headers, look for the content-type first, to be able to use a specified encoding on all other headers.
cmlenz
parents:
208
diff
changeset
|
461 yield Message(u'', '\n'.join(buf), flags=flags) |
71
b260ffa01a2d
Message catalogs can have multiple messages with the same ID, where some of them have plural strings, and others don't. Still the same message.
cmlenz
parents:
70
diff
changeset
|
462 for key in self._messages: |
b260ffa01a2d
Message catalogs can have multiple messages with the same ID, where some of them have plural strings, and others don't. Still the same message.
cmlenz
parents:
70
diff
changeset
|
463 yield self._messages[key] |
58
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
464 |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
465 def __repr__(self): |
66 | 466 locale = '' |
467 if self.locale: | |
468 locale = ' %s' % self.locale | |
469 return '<%s %r%s>' % (type(self).__name__, self.domain, locale) | |
58
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
470 |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
471 def __delitem__(self, id): |
66 | 472 """Delete the message with the specified ID.""" |
71
b260ffa01a2d
Message catalogs can have multiple messages with the same ID, where some of them have plural strings, and others don't. Still the same message.
cmlenz
parents:
70
diff
changeset
|
473 key = self._key_for(id) |
b260ffa01a2d
Message catalogs can have multiple messages with the same ID, where some of them have plural strings, and others don't. Still the same message.
cmlenz
parents:
70
diff
changeset
|
474 if key in self._messages: |
b260ffa01a2d
Message catalogs can have multiple messages with the same ID, where some of them have plural strings, and others don't. Still the same message.
cmlenz
parents:
70
diff
changeset
|
475 del self._messages[key] |
58
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
476 |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
477 def __getitem__(self, id): |
66 | 478 """Return the message with the specified ID. |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
479 |
66 | 480 :param id: the message ID |
481 :return: the message with the specified ID, or `None` if no such message | |
482 is in the catalog | |
69 | 483 :rtype: `Message` |
66 | 484 """ |
71
b260ffa01a2d
Message catalogs can have multiple messages with the same ID, where some of them have plural strings, and others don't. Still the same message.
cmlenz
parents:
70
diff
changeset
|
485 return self._messages.get(self._key_for(id)) |
58
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
486 |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
487 def __setitem__(self, id, message): |
66 | 488 """Add or update the message with the specified ID. |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
489 |
66 | 490 >>> catalog = Catalog() |
491 >>> catalog[u'foo'] = Message(u'foo') | |
492 >>> catalog[u'foo'] | |
198
982d7e704fdc
Fix for #35, and a minor improvement to how we parse the catalog fuzzy bit.
cmlenz
parents:
190
diff
changeset
|
493 <Message u'foo' (flags: [])> |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
494 |
66 | 495 If a message with that ID is already in the catalog, it is updated |
496 to include the locations and flags of the new message. | |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
497 |
66 | 498 >>> catalog = Catalog() |
499 >>> catalog[u'foo'] = Message(u'foo', locations=[('main.py', 1)]) | |
500 >>> catalog[u'foo'].locations | |
501 [('main.py', 1)] | |
502 >>> catalog[u'foo'] = Message(u'foo', locations=[('utils.py', 5)]) | |
503 >>> catalog[u'foo'].locations | |
504 [('main.py', 1), ('utils.py', 5)] | |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
505 |
66 | 506 :param id: the message ID |
507 :param message: the `Message` object | |
508 """ | |
58
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
509 assert isinstance(message, Message), 'expected a Message object' |
71
b260ffa01a2d
Message catalogs can have multiple messages with the same ID, where some of them have plural strings, and others don't. Still the same message.
cmlenz
parents:
70
diff
changeset
|
510 key = self._key_for(id) |
b260ffa01a2d
Message catalogs can have multiple messages with the same ID, where some of them have plural strings, and others don't. Still the same message.
cmlenz
parents:
70
diff
changeset
|
511 current = self._messages.get(key) |
58
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
512 if current: |
71
b260ffa01a2d
Message catalogs can have multiple messages with the same ID, where some of them have plural strings, and others don't. Still the same message.
cmlenz
parents:
70
diff
changeset
|
513 if message.pluralizable and not current.pluralizable: |
b260ffa01a2d
Message catalogs can have multiple messages with the same ID, where some of them have plural strings, and others don't. Still the same message.
cmlenz
parents:
70
diff
changeset
|
514 # The new message adds pluralization |
b260ffa01a2d
Message catalogs can have multiple messages with the same ID, where some of them have plural strings, and others don't. Still the same message.
cmlenz
parents:
70
diff
changeset
|
515 current.id = message.id |
72
f5a6bf38df89
Fix for mixed singular/plural messages, follow-up to [70].
cmlenz
parents:
71
diff
changeset
|
516 current.string = message.string |
231 | 517 current.locations = list(distinct(current.locations + |
518 message.locations)) | |
230
aaf36f409166
Follow-up to [239]: also combine duplicate comments when writing PO files.
cmlenz
parents:
229
diff
changeset
|
519 current.auto_comments = list(distinct(current.auto_comments + |
aaf36f409166
Follow-up to [239]: also combine duplicate comments when writing PO files.
cmlenz
parents:
229
diff
changeset
|
520 message.auto_comments)) |
aaf36f409166
Follow-up to [239]: also combine duplicate comments when writing PO files.
cmlenz
parents:
229
diff
changeset
|
521 current.user_comments = list(distinct(current.user_comments + |
aaf36f409166
Follow-up to [239]: also combine duplicate comments when writing PO files.
cmlenz
parents:
229
diff
changeset
|
522 message.user_comments)) |
58
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
523 current.flags |= message.flags |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
524 message = current |
108
8ea225f33f28
Fix for #16: the header message (`msgid = ""`) is now treated specially by `read_po` and `Catalog`.
cmlenz
parents:
107
diff
changeset
|
525 elif id == '': |
8ea225f33f28
Fix for #16: the header message (`msgid = ""`) is now treated specially by `read_po` and `Catalog`.
cmlenz
parents:
107
diff
changeset
|
526 # special treatment for the header message |
8ea225f33f28
Fix for #16: the header message (`msgid = ""`) is now treated specially by `read_po` and `Catalog`.
cmlenz
parents:
107
diff
changeset
|
527 headers = message_from_string(message.string.encode(self.charset)) |
8ea225f33f28
Fix for #16: the header message (`msgid = ""`) is now treated specially by `read_po` and `Catalog`.
cmlenz
parents:
107
diff
changeset
|
528 self.mime_headers = headers.items() |
122 | 529 self.header_comment = '\n'.join(['# %s' % comment for comment |
530 in message.user_comments]) | |
198
982d7e704fdc
Fix for #35, and a minor improvement to how we parse the catalog fuzzy bit.
cmlenz
parents:
190
diff
changeset
|
531 self.fuzzy = message.fuzzy |
58
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
532 else: |
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
533 if isinstance(id, (list, tuple)): |
279
3308e9971fab
Fix for updating catalog messages that changed from gettext to ngettext or vice versa.
cmlenz
parents:
252
diff
changeset
|
534 assert isinstance(message.string, (list, tuple)), \ |
3308e9971fab
Fix for updating catalog messages that changed from gettext to ngettext or vice versa.
cmlenz
parents:
252
diff
changeset
|
535 'Expected sequence but got %s' % type(message.string) |
71
b260ffa01a2d
Message catalogs can have multiple messages with the same ID, where some of them have plural strings, and others don't. Still the same message.
cmlenz
parents:
70
diff
changeset
|
536 self._messages[key] = message |
58
068952b4d4c0
Add actual data structures for handling message catalogs, so that more code can be reused here between the frontends.
cmlenz
parents:
diff
changeset
|
537 |
107
4b42e23644e5
`Message`, `read_po` and `write_po` now all handle user/auto comments correctly.
palgarvio
parents:
106
diff
changeset
|
538 def add(self, id, string=None, locations=(), flags=(), auto_comments=(), |
337 | 539 user_comments=(), previous_id=(), lineno=None, context=None): |
66 | 540 """Add or update the message with the specified ID. |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
541 |
66 | 542 >>> catalog = Catalog() |
543 >>> catalog.add(u'foo') | |
544 >>> catalog[u'foo'] | |
198
982d7e704fdc
Fix for #35, and a minor improvement to how we parse the catalog fuzzy bit.
cmlenz
parents:
190
diff
changeset
|
545 <Message u'foo' (flags: [])> |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
546 |
66 | 547 This method simply constructs a `Message` object with the given |
548 arguments and invokes `__setitem__` with that object. | |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
549 |
66 | 550 :param id: the message ID, or a ``(singular, plural)`` tuple for |
551 pluralizable messages | |
552 :param string: the translated message string, or a | |
553 ``(singular, plural)`` tuple for pluralizable messages | |
554 :param locations: a sequence of ``(filenname, lineno)`` tuples | |
555 :param flags: a set or sequence of flags | |
108
8ea225f33f28
Fix for #16: the header message (`msgid = ""`) is now treated specially by `read_po` and `Catalog`.
cmlenz
parents:
107
diff
changeset
|
556 :param auto_comments: a sequence of automatic comments |
8ea225f33f28
Fix for #16: the header message (`msgid = ""`) is now treated specially by `read_po` and `Catalog`.
cmlenz
parents:
107
diff
changeset
|
557 :param user_comments: a sequence of user comments |
205 | 558 :param previous_id: the previous message ID, or a ``(singular, plural)`` |
559 tuple for pluralizable messages | |
222
bd8b1301b27e
Added infrastructure for adding catalog checkers, and implement a checker that validations Python format parameters in translations, closing #19.
cmlenz
parents:
212
diff
changeset
|
560 :param lineno: the line number on which the msgid line was found in the |
bd8b1301b27e
Added infrastructure for adding catalog checkers, and implement a checker that validations Python format parameters in translations, closing #19.
cmlenz
parents:
212
diff
changeset
|
561 PO file, if any |
337 | 562 :param context: the message context |
66 | 563 """ |
107
4b42e23644e5
`Message`, `read_po` and `write_po` now all handle user/auto comments correctly.
palgarvio
parents:
106
diff
changeset
|
564 self[id] = Message(id, string, list(locations), flags, auto_comments, |
337 | 565 user_comments, previous_id, lineno=lineno, |
566 context=context) | |
222
bd8b1301b27e
Added infrastructure for adding catalog checkers, and implement a checker that validations Python format parameters in translations, closing #19.
cmlenz
parents:
212
diff
changeset
|
567 |
bd8b1301b27e
Added infrastructure for adding catalog checkers, and implement a checker that validations Python format parameters in translations, closing #19.
cmlenz
parents:
212
diff
changeset
|
568 def check(self): |
bd8b1301b27e
Added infrastructure for adding catalog checkers, and implement a checker that validations Python format parameters in translations, closing #19.
cmlenz
parents:
212
diff
changeset
|
569 """Run various validation checks on the translations in the catalog. |
228 | 570 |
222
bd8b1301b27e
Added infrastructure for adding catalog checkers, and implement a checker that validations Python format parameters in translations, closing #19.
cmlenz
parents:
212
diff
changeset
|
571 For every message which fails validation, this method yield a |
bd8b1301b27e
Added infrastructure for adding catalog checkers, and implement a checker that validations Python format parameters in translations, closing #19.
cmlenz
parents:
212
diff
changeset
|
572 ``(message, errors)`` tuple, where ``message`` is the `Message` object |
bd8b1301b27e
Added infrastructure for adding catalog checkers, and implement a checker that validations Python format parameters in translations, closing #19.
cmlenz
parents:
212
diff
changeset
|
573 and ``errors`` is a sequence of `TranslationError` objects. |
228 | 574 |
252
2398fc97675b
Soften dependency on setuptools. Extraction methods can now be referenced using a special section in the mapping configuration, mapping short names to fully-qualified function references.
cmlenz
parents:
250
diff
changeset
|
575 :note: this feature requires ``setuptools``/``pkg_resources`` to be |
2398fc97675b
Soften dependency on setuptools. Extraction methods can now be referenced using a special section in the mapping configuration, mapping short names to fully-qualified function references.
cmlenz
parents:
250
diff
changeset
|
576 installed; if it is not, this method will simply return an empty |
2398fc97675b
Soften dependency on setuptools. Extraction methods can now be referenced using a special section in the mapping configuration, mapping short names to fully-qualified function references.
cmlenz
parents:
250
diff
changeset
|
577 iterator |
222
bd8b1301b27e
Added infrastructure for adding catalog checkers, and implement a checker that validations Python format parameters in translations, closing #19.
cmlenz
parents:
212
diff
changeset
|
578 :rtype: ``iterator`` |
bd8b1301b27e
Added infrastructure for adding catalog checkers, and implement a checker that validations Python format parameters in translations, closing #19.
cmlenz
parents:
212
diff
changeset
|
579 """ |
bd8b1301b27e
Added infrastructure for adding catalog checkers, and implement a checker that validations Python format parameters in translations, closing #19.
cmlenz
parents:
212
diff
changeset
|
580 checkers = [] |
252
2398fc97675b
Soften dependency on setuptools. Extraction methods can now be referenced using a special section in the mapping configuration, mapping short names to fully-qualified function references.
cmlenz
parents:
250
diff
changeset
|
581 try: |
2398fc97675b
Soften dependency on setuptools. Extraction methods can now be referenced using a special section in the mapping configuration, mapping short names to fully-qualified function references.
cmlenz
parents:
250
diff
changeset
|
582 from pkg_resources import working_set |
2398fc97675b
Soften dependency on setuptools. Extraction methods can now be referenced using a special section in the mapping configuration, mapping short names to fully-qualified function references.
cmlenz
parents:
250
diff
changeset
|
583 except ImportError: |
2398fc97675b
Soften dependency on setuptools. Extraction methods can now be referenced using a special section in the mapping configuration, mapping short names to fully-qualified function references.
cmlenz
parents:
250
diff
changeset
|
584 return |
2398fc97675b
Soften dependency on setuptools. Extraction methods can now be referenced using a special section in the mapping configuration, mapping short names to fully-qualified function references.
cmlenz
parents:
250
diff
changeset
|
585 else: |
2398fc97675b
Soften dependency on setuptools. Extraction methods can now be referenced using a special section in the mapping configuration, mapping short names to fully-qualified function references.
cmlenz
parents:
250
diff
changeset
|
586 for entry_point in working_set.iter_entry_points('babel.checkers'): |
2398fc97675b
Soften dependency on setuptools. Extraction methods can now be referenced using a special section in the mapping configuration, mapping short names to fully-qualified function references.
cmlenz
parents:
250
diff
changeset
|
587 checkers.append(entry_point.load()) |
2398fc97675b
Soften dependency on setuptools. Extraction methods can now be referenced using a special section in the mapping configuration, mapping short names to fully-qualified function references.
cmlenz
parents:
250
diff
changeset
|
588 for message in self._messages.values(): |
2398fc97675b
Soften dependency on setuptools. Extraction methods can now be referenced using a special section in the mapping configuration, mapping short names to fully-qualified function references.
cmlenz
parents:
250
diff
changeset
|
589 errors = [] |
2398fc97675b
Soften dependency on setuptools. Extraction methods can now be referenced using a special section in the mapping configuration, mapping short names to fully-qualified function references.
cmlenz
parents:
250
diff
changeset
|
590 for checker in checkers: |
2398fc97675b
Soften dependency on setuptools. Extraction methods can now be referenced using a special section in the mapping configuration, mapping short names to fully-qualified function references.
cmlenz
parents:
250
diff
changeset
|
591 try: |
2398fc97675b
Soften dependency on setuptools. Extraction methods can now be referenced using a special section in the mapping configuration, mapping short names to fully-qualified function references.
cmlenz
parents:
250
diff
changeset
|
592 checker(self, message) |
2398fc97675b
Soften dependency on setuptools. Extraction methods can now be referenced using a special section in the mapping configuration, mapping short names to fully-qualified function references.
cmlenz
parents:
250
diff
changeset
|
593 except TranslationError, e: |
2398fc97675b
Soften dependency on setuptools. Extraction methods can now be referenced using a special section in the mapping configuration, mapping short names to fully-qualified function references.
cmlenz
parents:
250
diff
changeset
|
594 errors.append(e) |
2398fc97675b
Soften dependency on setuptools. Extraction methods can now be referenced using a special section in the mapping configuration, mapping short names to fully-qualified function references.
cmlenz
parents:
250
diff
changeset
|
595 if errors: |
2398fc97675b
Soften dependency on setuptools. Extraction methods can now be referenced using a special section in the mapping configuration, mapping short names to fully-qualified function references.
cmlenz
parents:
250
diff
changeset
|
596 yield message, errors |
71
b260ffa01a2d
Message catalogs can have multiple messages with the same ID, where some of them have plural strings, and others don't. Still the same message.
cmlenz
parents:
70
diff
changeset
|
597 |
205 | 598 def update(self, template, no_fuzzy_matching=False): |
165
eafaa302dde1
Added preliminary catalog updating/merging functionality.
cmlenz
parents:
151
diff
changeset
|
599 """Update the catalog based on the given template catalog. |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
600 |
165
eafaa302dde1
Added preliminary catalog updating/merging functionality.
cmlenz
parents:
151
diff
changeset
|
601 >>> from babel.messages import Catalog |
eafaa302dde1
Added preliminary catalog updating/merging functionality.
cmlenz
parents:
151
diff
changeset
|
602 >>> template = Catalog() |
190 | 603 >>> template.add('green', locations=[('main.py', 99)]) |
165
eafaa302dde1
Added preliminary catalog updating/merging functionality.
cmlenz
parents:
151
diff
changeset
|
604 >>> template.add('blue', locations=[('main.py', 100)]) |
eafaa302dde1
Added preliminary catalog updating/merging functionality.
cmlenz
parents:
151
diff
changeset
|
605 >>> template.add(('salad', 'salads'), locations=[('util.py', 42)]) |
eafaa302dde1
Added preliminary catalog updating/merging functionality.
cmlenz
parents:
151
diff
changeset
|
606 >>> catalog = Catalog(locale='de_DE') |
eafaa302dde1
Added preliminary catalog updating/merging functionality.
cmlenz
parents:
151
diff
changeset
|
607 >>> catalog.add('blue', u'blau', locations=[('main.py', 98)]) |
eafaa302dde1
Added preliminary catalog updating/merging functionality.
cmlenz
parents:
151
diff
changeset
|
608 >>> catalog.add('head', u'Kopf', locations=[('util.py', 33)]) |
eafaa302dde1
Added preliminary catalog updating/merging functionality.
cmlenz
parents:
151
diff
changeset
|
609 >>> catalog.add(('salad', 'salads'), (u'Salat', u'Salate'), |
eafaa302dde1
Added preliminary catalog updating/merging functionality.
cmlenz
parents:
151
diff
changeset
|
610 ... locations=[('util.py', 38)]) |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
611 |
183
e927dffc9ab4
The frontends now provide ways to update existing translations catalogs from a template. Closes #22.
cmlenz
parents:
177
diff
changeset
|
612 >>> catalog.update(template) |
165
eafaa302dde1
Added preliminary catalog updating/merging functionality.
cmlenz
parents:
151
diff
changeset
|
613 >>> len(catalog) |
190 | 614 3 |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
615 |
190 | 616 >>> msg1 = catalog['green'] |
165
eafaa302dde1
Added preliminary catalog updating/merging functionality.
cmlenz
parents:
151
diff
changeset
|
617 >>> msg1.string |
190 | 618 >>> msg1.locations |
619 [('main.py', 99)] | |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
620 |
190 | 621 >>> msg2 = catalog['blue'] |
622 >>> msg2.string | |
165
eafaa302dde1
Added preliminary catalog updating/merging functionality.
cmlenz
parents:
151
diff
changeset
|
623 u'blau' |
190 | 624 >>> msg2.locations |
165
eafaa302dde1
Added preliminary catalog updating/merging functionality.
cmlenz
parents:
151
diff
changeset
|
625 [('main.py', 100)] |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
626 |
190 | 627 >>> msg3 = catalog['salad'] |
628 >>> msg3.string | |
165
eafaa302dde1
Added preliminary catalog updating/merging functionality.
cmlenz
parents:
151
diff
changeset
|
629 (u'Salat', u'Salate') |
190 | 630 >>> msg3.locations |
165
eafaa302dde1
Added preliminary catalog updating/merging functionality.
cmlenz
parents:
151
diff
changeset
|
631 [('util.py', 42)] |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
632 |
183
e927dffc9ab4
The frontends now provide ways to update existing translations catalogs from a template. Closes #22.
cmlenz
parents:
177
diff
changeset
|
633 Messages that are in the catalog but not in the template are removed |
e927dffc9ab4
The frontends now provide ways to update existing translations catalogs from a template. Closes #22.
cmlenz
parents:
177
diff
changeset
|
634 from the main collection, but can still be accessed via the `obsolete` |
e927dffc9ab4
The frontends now provide ways to update existing translations catalogs from a template. Closes #22.
cmlenz
parents:
177
diff
changeset
|
635 member: |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
636 |
165
eafaa302dde1
Added preliminary catalog updating/merging functionality.
cmlenz
parents:
151
diff
changeset
|
637 >>> 'head' in catalog |
eafaa302dde1
Added preliminary catalog updating/merging functionality.
cmlenz
parents:
151
diff
changeset
|
638 False |
183
e927dffc9ab4
The frontends now provide ways to update existing translations catalogs from a template. Closes #22.
cmlenz
parents:
177
diff
changeset
|
639 >>> catalog.obsolete.values() |
198
982d7e704fdc
Fix for #35, and a minor improvement to how we parse the catalog fuzzy bit.
cmlenz
parents:
190
diff
changeset
|
640 [<Message 'head' (flags: [])>] |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
641 |
165
eafaa302dde1
Added preliminary catalog updating/merging functionality.
cmlenz
parents:
151
diff
changeset
|
642 :param template: the reference catalog, usually read from a POT file |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
643 :param no_fuzzy_matching: whether to use fuzzy matching of message IDs |
165
eafaa302dde1
Added preliminary catalog updating/merging functionality.
cmlenz
parents:
151
diff
changeset
|
644 """ |
eafaa302dde1
Added preliminary catalog updating/merging functionality.
cmlenz
parents:
151
diff
changeset
|
645 messages = self._messages |
314
5c0bda4f20b1
Fix catalog updating with fuzzy matches. Closes #82.
cmlenz
parents:
293
diff
changeset
|
646 remaining = messages.copy() |
165
eafaa302dde1
Added preliminary catalog updating/merging functionality.
cmlenz
parents:
151
diff
changeset
|
647 self._messages = odict() |
eafaa302dde1
Added preliminary catalog updating/merging functionality.
cmlenz
parents:
151
diff
changeset
|
648 |
314
5c0bda4f20b1
Fix catalog updating with fuzzy matches. Closes #82.
cmlenz
parents:
293
diff
changeset
|
649 # Prepare for fuzzy matching |
5c0bda4f20b1
Fix catalog updating with fuzzy matches. Closes #82.
cmlenz
parents:
293
diff
changeset
|
650 fuzzy_candidates = [] |
5c0bda4f20b1
Fix catalog updating with fuzzy matches. Closes #82.
cmlenz
parents:
293
diff
changeset
|
651 if not no_fuzzy_matching: |
5c0bda4f20b1
Fix catalog updating with fuzzy matches. Closes #82.
cmlenz
parents:
293
diff
changeset
|
652 fuzzy_candidates = [ |
5c0bda4f20b1
Fix catalog updating with fuzzy matches. Closes #82.
cmlenz
parents:
293
diff
changeset
|
653 self._key_for(msgid) for msgid in messages |
5c0bda4f20b1
Fix catalog updating with fuzzy matches. Closes #82.
cmlenz
parents:
293
diff
changeset
|
654 if msgid and messages[msgid].string |
5c0bda4f20b1
Fix catalog updating with fuzzy matches. Closes #82.
cmlenz
parents:
293
diff
changeset
|
655 ] |
5c0bda4f20b1
Fix catalog updating with fuzzy matches. Closes #82.
cmlenz
parents:
293
diff
changeset
|
656 fuzzy_matches = set() |
5c0bda4f20b1
Fix catalog updating with fuzzy matches. Closes #82.
cmlenz
parents:
293
diff
changeset
|
657 |
279
3308e9971fab
Fix for updating catalog messages that changed from gettext to ngettext or vice versa.
cmlenz
parents:
252
diff
changeset
|
658 def _merge(message, oldkey, newkey): |
315
654b632e5482
Merging catalogs would sometimes mix translations from different runs.
cmlenz
parents:
314
diff
changeset
|
659 message = message.clone() |
279
3308e9971fab
Fix for updating catalog messages that changed from gettext to ngettext or vice versa.
cmlenz
parents:
252
diff
changeset
|
660 fuzzy = False |
3308e9971fab
Fix for updating catalog messages that changed from gettext to ngettext or vice versa.
cmlenz
parents:
252
diff
changeset
|
661 if oldkey != newkey: |
3308e9971fab
Fix for updating catalog messages that changed from gettext to ngettext or vice versa.
cmlenz
parents:
252
diff
changeset
|
662 fuzzy = True |
314
5c0bda4f20b1
Fix catalog updating with fuzzy matches. Closes #82.
cmlenz
parents:
293
diff
changeset
|
663 fuzzy_matches.add(oldkey) |
5c0bda4f20b1
Fix catalog updating with fuzzy matches. Closes #82.
cmlenz
parents:
293
diff
changeset
|
664 oldmsg = messages.get(oldkey) |
279
3308e9971fab
Fix for updating catalog messages that changed from gettext to ngettext or vice versa.
cmlenz
parents:
252
diff
changeset
|
665 if isinstance(oldmsg.id, basestring): |
3308e9971fab
Fix for updating catalog messages that changed from gettext to ngettext or vice versa.
cmlenz
parents:
252
diff
changeset
|
666 message.previous_id = [oldmsg.id] |
3308e9971fab
Fix for updating catalog messages that changed from gettext to ngettext or vice versa.
cmlenz
parents:
252
diff
changeset
|
667 else: |
3308e9971fab
Fix for updating catalog messages that changed from gettext to ngettext or vice versa.
cmlenz
parents:
252
diff
changeset
|
668 message.previous_id = list(oldmsg.id) |
314
5c0bda4f20b1
Fix catalog updating with fuzzy matches. Closes #82.
cmlenz
parents:
293
diff
changeset
|
669 else: |
5c0bda4f20b1
Fix catalog updating with fuzzy matches. Closes #82.
cmlenz
parents:
293
diff
changeset
|
670 oldmsg = remaining.pop(oldkey) |
279
3308e9971fab
Fix for updating catalog messages that changed from gettext to ngettext or vice versa.
cmlenz
parents:
252
diff
changeset
|
671 message.string = oldmsg.string |
3308e9971fab
Fix for updating catalog messages that changed from gettext to ngettext or vice versa.
cmlenz
parents:
252
diff
changeset
|
672 if isinstance(message.id, (list, tuple)): |
3308e9971fab
Fix for updating catalog messages that changed from gettext to ngettext or vice versa.
cmlenz
parents:
252
diff
changeset
|
673 if not isinstance(message.string, (list, tuple)): |
3308e9971fab
Fix for updating catalog messages that changed from gettext to ngettext or vice versa.
cmlenz
parents:
252
diff
changeset
|
674 fuzzy = True |
3308e9971fab
Fix for updating catalog messages that changed from gettext to ngettext or vice versa.
cmlenz
parents:
252
diff
changeset
|
675 message.string = tuple( |
3308e9971fab
Fix for updating catalog messages that changed from gettext to ngettext or vice versa.
cmlenz
parents:
252
diff
changeset
|
676 [message.string] + ([u''] * (len(message.id) - 1)) |
3308e9971fab
Fix for updating catalog messages that changed from gettext to ngettext or vice versa.
cmlenz
parents:
252
diff
changeset
|
677 ) |
3308e9971fab
Fix for updating catalog messages that changed from gettext to ngettext or vice versa.
cmlenz
parents:
252
diff
changeset
|
678 elif len(message.string) != len(message.id): |
3308e9971fab
Fix for updating catalog messages that changed from gettext to ngettext or vice versa.
cmlenz
parents:
252
diff
changeset
|
679 fuzzy = True |
3308e9971fab
Fix for updating catalog messages that changed from gettext to ngettext or vice versa.
cmlenz
parents:
252
diff
changeset
|
680 message.string = tuple(message.string[:len(oldmsg.string)]) |
3308e9971fab
Fix for updating catalog messages that changed from gettext to ngettext or vice versa.
cmlenz
parents:
252
diff
changeset
|
681 elif isinstance(message.string, (list, tuple)): |
3308e9971fab
Fix for updating catalog messages that changed from gettext to ngettext or vice versa.
cmlenz
parents:
252
diff
changeset
|
682 fuzzy = True |
3308e9971fab
Fix for updating catalog messages that changed from gettext to ngettext or vice versa.
cmlenz
parents:
252
diff
changeset
|
683 message.string = message.string[0] |
3308e9971fab
Fix for updating catalog messages that changed from gettext to ngettext or vice versa.
cmlenz
parents:
252
diff
changeset
|
684 message.flags |= oldmsg.flags |
3308e9971fab
Fix for updating catalog messages that changed from gettext to ngettext or vice versa.
cmlenz
parents:
252
diff
changeset
|
685 if fuzzy: |
3308e9971fab
Fix for updating catalog messages that changed from gettext to ngettext or vice versa.
cmlenz
parents:
252
diff
changeset
|
686 message.flags |= set([u'fuzzy']) |
3308e9971fab
Fix for updating catalog messages that changed from gettext to ngettext or vice versa.
cmlenz
parents:
252
diff
changeset
|
687 self[message.id] = message |
3308e9971fab
Fix for updating catalog messages that changed from gettext to ngettext or vice versa.
cmlenz
parents:
252
diff
changeset
|
688 |
165
eafaa302dde1
Added preliminary catalog updating/merging functionality.
cmlenz
parents:
151
diff
changeset
|
689 for message in template: |
eafaa302dde1
Added preliminary catalog updating/merging functionality.
cmlenz
parents:
151
diff
changeset
|
690 if message.id: |
eafaa302dde1
Added preliminary catalog updating/merging functionality.
cmlenz
parents:
151
diff
changeset
|
691 key = self._key_for(message.id) |
eafaa302dde1
Added preliminary catalog updating/merging functionality.
cmlenz
parents:
151
diff
changeset
|
692 if key in messages: |
279
3308e9971fab
Fix for updating catalog messages that changed from gettext to ngettext or vice versa.
cmlenz
parents:
252
diff
changeset
|
693 _merge(message, key, key) |
165
eafaa302dde1
Added preliminary catalog updating/merging functionality.
cmlenz
parents:
151
diff
changeset
|
694 else: |
202
d3c272492053
Added `--no-fuzzy-matching` to the frontends and also `--previous` which adds the old msgid's as comments. The latest closes #31.
palgarvio
parents:
200
diff
changeset
|
695 if no_fuzzy_matching is False: |
167
533baef258bb
Implement fuzzy matching to catalog updates. No frontend yet.
cmlenz
parents:
165
diff
changeset
|
696 # do some fuzzy matching with difflib |
533baef258bb
Implement fuzzy matching to catalog updates. No frontend yet.
cmlenz
parents:
165
diff
changeset
|
697 matches = get_close_matches(key.lower().strip(), |
314
5c0bda4f20b1
Fix catalog updating with fuzzy matches. Closes #82.
cmlenz
parents:
293
diff
changeset
|
698 fuzzy_candidates, 1) |
167
533baef258bb
Implement fuzzy matching to catalog updates. No frontend yet.
cmlenz
parents:
165
diff
changeset
|
699 if matches: |
279
3308e9971fab
Fix for updating catalog messages that changed from gettext to ngettext or vice versa.
cmlenz
parents:
252
diff
changeset
|
700 _merge(message, matches[0], key) |
190 | 701 continue |
165
eafaa302dde1
Added preliminary catalog updating/merging functionality.
cmlenz
parents:
151
diff
changeset
|
702 |
167
533baef258bb
Implement fuzzy matching to catalog updates. No frontend yet.
cmlenz
parents:
165
diff
changeset
|
703 self[message.id] = message |
533baef258bb
Implement fuzzy matching to catalog updates. No frontend yet.
cmlenz
parents:
165
diff
changeset
|
704 |
314
5c0bda4f20b1
Fix catalog updating with fuzzy matches. Closes #82.
cmlenz
parents:
293
diff
changeset
|
705 self.obsolete = odict() |
5c0bda4f20b1
Fix catalog updating with fuzzy matches. Closes #82.
cmlenz
parents:
293
diff
changeset
|
706 for msgid in remaining: |
5c0bda4f20b1
Fix catalog updating with fuzzy matches. Closes #82.
cmlenz
parents:
293
diff
changeset
|
707 if no_fuzzy_matching or msgid not in fuzzy_matches: |
5c0bda4f20b1
Fix catalog updating with fuzzy matches. Closes #82.
cmlenz
parents:
293
diff
changeset
|
708 self.obsolete[msgid] = remaining[msgid] |
165
eafaa302dde1
Added preliminary catalog updating/merging functionality.
cmlenz
parents:
151
diff
changeset
|
709 |
71
b260ffa01a2d
Message catalogs can have multiple messages with the same ID, where some of them have plural strings, and others don't. Still the same message.
cmlenz
parents:
70
diff
changeset
|
710 def _key_for(self, id): |
b260ffa01a2d
Message catalogs can have multiple messages with the same ID, where some of them have plural strings, and others don't. Still the same message.
cmlenz
parents:
70
diff
changeset
|
711 """The key for a message is just the singular ID even for pluralizable |
b260ffa01a2d
Message catalogs can have multiple messages with the same ID, where some of them have plural strings, and others don't. Still the same message.
cmlenz
parents:
70
diff
changeset
|
712 messages. |
b260ffa01a2d
Message catalogs can have multiple messages with the same ID, where some of them have plural strings, and others don't. Still the same message.
cmlenz
parents:
70
diff
changeset
|
713 """ |
b260ffa01a2d
Message catalogs can have multiple messages with the same ID, where some of them have plural strings, and others don't. Still the same message.
cmlenz
parents:
70
diff
changeset
|
714 key = id |
b260ffa01a2d
Message catalogs can have multiple messages with the same ID, where some of them have plural strings, and others don't. Still the same message.
cmlenz
parents:
70
diff
changeset
|
715 if isinstance(key, (list, tuple)): |
b260ffa01a2d
Message catalogs can have multiple messages with the same ID, where some of them have plural strings, and others don't. Still the same message.
cmlenz
parents:
70
diff
changeset
|
716 key = id[0] |
b260ffa01a2d
Message catalogs can have multiple messages with the same ID, where some of them have plural strings, and others don't. Still the same message.
cmlenz
parents:
70
diff
changeset
|
717 return key |