cubicweb: comparison devtools/devctl.py

equal deleted inserted replaced

-:d0f31e119936
+:4d114865098f
 from logilab.common import STD_BLACKLIST
 from logilab.common.modutils import get_module_files
 from logilab.common.textutils import get_csv
 from logilab.common.clcommands import register_commands
-from cubicweb import CW_SOFTWARE_ROOT as BASEDIR, BadCommandUsage
+from cubicweb import CW_SOFTWARE_ROOT as BASEDIR, BadCommandUsage, underline_title
 from cubicweb.__pkginfo__ import version as cubicwebversion
 from cubicweb.toolsutils import Command, confirm, copy_skeleton
 from cubicweb.web.webconfig import WebConfiguration
 from cubicweb.server.serverconfig import ServerConfiguration
 from logilab.common.fileutils import ensure_fs_mode
 from logilab.common.shellutils import globfind, find, rm
 from cubicweb.common.i18n import extract_from_tal, execute
 tempdir = tempdir.mkdtemp()
 potfiles = [join(I18NDIR, 'entities.pot')]
-print '******** extract schema messages'
+print '-> extract schema messages.'
 schemapot = join(tempdir, 'schema.pot')
 potfiles.append(schemapot)
 # explicit close necessary else the file may not be yet flushed when
 # we'll using it below
 schemapotstream = file(schemapot, 'w')
 generate_schema_pot(schemapotstream.write, cubedir=None)
 schemapotstream.close()
-print '******** extract TAL messages'
+print '-> extract TAL messages.'
 tali18nfile = join(tempdir, 'tali18n.py')
 extract_from_tal(find(join(BASEDIR, 'web'), ('.py', '.pt')), tali18nfile)
-print '******** .pot files generation'
+print '-> generate .pot files.'
 for id, files, lang in [('pycubicweb', get_module_files(BASEDIR) + list(globfind(join(BASEDIR, 'misc', 'migration'), '*.py')), None),
 ('schemadescr', globfind(join(BASEDIR, 'schemas'), '*.py'), None),
 ('yams', get_module_files(yams.__path__[0]), None),
 ('tal', [tali18nfile], None),
 ('js', globfind(join(BASEDIR, 'web'), 'cub*.js'), 'java'),
 potfile = join(tempdir, '%s.pot' % id)
 execute(cmd % (potfile, ' '.join(files)))
 if exists(potfile):
 potfiles.append(potfile)
 else:
-print 'WARNING: %s file not generated' % potfile
+print '-> WARNING: %s file was not generated' % potfile
-print '******** merging .pot files'
+print '-> merging %i .pot files' % len(potfiles)
 cubicwebpot = join(tempdir, 'cubicweb.pot')
 execute('msgcat %s > %s' % (' '.join(potfiles), cubicwebpot))
-print '******** merging main pot file with existing translations'
+print '-> merging main pot file with existing translations.'
 chdir(I18NDIR)
 toedit = []
 for lang in LANGS:
 target = '%s.po' % lang
 execute('msgmerge -N --sort-output  %s %s > %snew' % (target, cubicwebpot, target))
 shutil.move('%snew' % target, target)
 toedit.append(abspath(target))
 # cleanup
 rm(tempdir)
 # instructions pour la suite
-print '*' * 72
+print '-> regenerated CubicWeb\'s .po catalogs.'
-print 'you can now edit the following files:'
+print '\nYou can now edit the following files:'
 print '* ' + '\n* '.join(toedit)
-print
+print 'when you are done, run "cubicweb-ctl i18ncube yourcube".'
-print "then you'll have to update cubes catalogs using the i18ncube command"
 class UpdateTemplateCatalogCommand(Command):
 """Update i18n catalogs for cubes. If no cube is specified, update
 catalogs of all registered cubes.
 def update_cubes_catalogs(cubes):
 toedit = []
 for cubedir in cubes:
 if not isdir(cubedir):
-print 'not a directory', cubedir
+print '-> ignoring %s that is not a directory.' % cubedir
 continue
 try:
 toedit += update_cube_catalogs(cubedir)
 except Exception:
 import traceback
 traceback.print_exc()
-print 'error while updating catalogs for', cubedir
+print '-> Error while updating catalogs for cube', cubedir
 # instructions pour la suite
-print '*' * 72
+print '-> regenerated this cube\'s .po catalogs.'
-print 'you can now edit the following files:'
+print '\nYou can now edit the following files:'
 print '* ' + '\n* '.join(toedit)
+print 'when you are done, run "cubicweb-ctl i18ninstance yourinstance".'
 def update_cube_catalogs(cubedir):
 import shutil
 import tempfile
 from logilab.common.fileutils import ensure_fs_mode
 from logilab.common.shellutils import find, rm
 from cubicweb.common.i18n import extract_from_tal, execute
 toedit = []
 cube = basename(normpath(cubedir))
 tempdir = tempfile.mkdtemp()
-print '*' * 72
+print underline_title('Updating i18n catalogs for cube %s' % cube)
-print 'updating %s cube...' % cube
 chdir(cubedir)
 potfiles = [join('i18n', scfile) for scfile in ('entities.pot',)
 if exists(join('i18n', scfile))]
-print '******** extract schema messages'
+print '-> extract schema messages'
 schemapot = join(tempdir, 'schema.pot')
 potfiles.append(schemapot)
 # explicit close necessary else the file may not be yet flushed when
 # we'll using it below
 schemapotstream = file(schemapot, 'w')
 generate_schema_pot(schemapotstream.write, cubedir)
 schemapotstream.close()
-print '******** extract TAL messages'
+print '-> extract TAL messages'
 tali18nfile = join(tempdir, 'tali18n.py')
 extract_from_tal(find('.', ('.py', '.pt'), blacklist=STD_BLACKLIST+('test',)), tali18nfile)
-print '******** extract Javascript messages'
+print '-> extract Javascript messages'
 jsfiles =  [jsfile for jsfile in find('.', '.js') if basename(jsfile).startswith('cub')]
 if jsfiles:
 tmppotfile = join(tempdir, 'js.pot')
 execute('xgettext --no-location --omit-header -k_ -L java --from-code=utf-8 -o %s %s'
 % (tmppotfile, ' '.join(jsfiles)))
 # no pot file created if there are no string to translate
 if exists(tmppotfile):
 potfiles.append(tmppotfile)
-print '******** create cube specific catalog'
+print '-> create cube-specific catalog'
 tmppotfile = join(tempdir, 'generated.pot')
 cubefiles = find('.', '.py', blacklist=STD_BLACKLIST+('test',))
 cubefiles.append(tali18nfile)
 execute('xgettext --no-location --omit-header -k_ -o %s %s'
 % (tmppotfile, ' '.join(cubefiles)))
 if exists(tmppotfile): # doesn't exists of no translation string found
 potfiles.append(tmppotfile)
 potfile = join(tempdir, 'cube.pot')
-print '******** merging .pot files'
+print '-> merging %i .pot files:' % len(potfiles)
 execute('msgcat %s > %s' % (' '.join(potfiles), potfile))
-print '******** merging main pot file with existing translations'
+print '-> merging main pot file with existing translations:'
 chdir('i18n')
 for lang in LANGS:
-print '****', lang
+print '-> language', lang
 cubepo = '%s.po' % lang
 if not exists(cubepo):
 shutil.copy(potfile, cubepo)
 else:
 execute('msgmerge -N -s %s %s > %snew' % (cubepo, potfile, cubepo))

changeset 2458	4d114865098f
parent 2446	440cb4ea7e5c
parent 2396	8bfb99d7bbcc
child 2527	e60db6312aa0