fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
opds fix
[wolnelektury.git]
/
apps
/
modeltranslation
/
management
/
commands
/
translation2po.py
diff --git
a/apps/modeltranslation/management/commands/translation2po.py
b/apps/modeltranslation/management/commands/translation2po.py
index
c38d82c
..
09eec1a
100644
(file)
--- a/
apps/modeltranslation/management/commands/translation2po.py
+++ b/
apps/modeltranslation/management/commands/translation2po.py
@@
-41,6
+41,13
@@
def make_po(language=''):
return po
return po
+def get_languages(langs):
+ if not langs: return settings.LANGUAGES
+ langs = langs.split(',')
+ lm = dict(settings.LANGUAGES)
+ return map(lambda l: (l, lm.get(l, l)), langs)
+
+
class Command(BaseCommand):
option_list = BaseCommand.option_list + (
make_option('-d', '--directory', help='Specify which directory should hold generated PO files', dest='directory'),
class Command(BaseCommand):
option_list = BaseCommand.option_list + (
make_option('-d', '--directory', help='Specify which directory should hold generated PO files', dest='directory'),
@@
-75,17
+82,11
@@
class Command(BaseCommand):
objects[md.__name__] = {}
modmod['model'] = md
objects[md.__name__] = {}
modmod['model'] = md
-<<<<<<< Updated upstream
- for lng in zip(*settings.LANGUAGES)[0]:
- pofile = os.path.join(options['directory'], lng, appname + '.po')
-=======
languages = get_languages(options['lang'])
for lng in zip(*languages)[0]:
pofile = os.path.join(options['directory'], lng, options['poname'] + '.po')
if not os.path.exists(pofile): raise OSError('%s po file: %s not found' % (appname, pofile))
languages = get_languages(options['lang'])
for lng in zip(*languages)[0]:
pofile = os.path.join(options['directory'], lng, options['poname'] + '.po')
if not os.path.exists(pofile): raise OSError('%s po file: %s not found' % (appname, pofile))
- print pofile
->>>>>>> Stashed changes
po = polib.pofile(pofile)
for entry in po:
loc, pk = entry.occurrences[0]
po = polib.pofile(pofile)
for entry in po:
loc, pk = entry.occurrences[0]
@@
-114,9
+115,13
@@
class Command(BaseCommand):
po = make_po(cur_lang)
pofiles[cur_lang] = po
po = make_po(cur_lang)
pofiles[cur_lang] = po
+ k = getattr(obj, '%s_%s' % (fld, settings.LANGUAGE_CODE))
+ if k is None: k = ''
+ v = getattr(obj, locfld)
+ if v is None: v = ''
entry = polib.POEntry(
entry = polib.POEntry(
- msgid=
getattr(obj, '%s_%s' % (fld, settings.LANGUAGE_CODE))
,
- msgstr=
getattr(obj, locfld)
,
+ msgid=
k
,
+ msgstr=
v
,
occurrences=[('%s/%s/%s' % (appname, md.__name__, locfld), obj.id)])
po.append(entry)
occurrences=[('%s/%s/%s' % (appname, md.__name__, locfld), obj.id)])
po.append(entry)
@@
-124,4
+129,5
@@
class Command(BaseCommand):
for lng, po in pofiles.items():
try: os.makedirs(os.path.join(directory, lng))
except OSError: pass
for lng, po in pofiles.items():
try: os.makedirs(os.path.join(directory, lng))
except OSError: pass
+ print lng, options
po.save(os.path.join(directory, lng, '%s.po' % options['poname']))
po.save(os.path.join(directory, lng, '%s.po' % options['poname']))