merge back stable to default
authorAlexandre Fayolle <alexandre.fayolle@logilab.fr>
Thu, 31 Mar 2011 17:24:38 +0200
changeset 7156 b1521f1546e0
parent 7154 5e2f93b88d86 (current diff)
parent 7155 4bab50b02927 (diff)
child 7161 e3f69df8dac7
merge back stable to default
web/views/reledit.py
--- a/cwctl.py	Thu Mar 31 15:23:52 2011 +0200
+++ b/cwctl.py	Thu Mar 31 17:24:38 2011 +0200
@@ -389,10 +389,9 @@
         # write down configuration
         config.save()
         self._handle_win32(config, appid)
-        print '-> generated %s' % config.main_config_file()
+        print '-> generated config %s' % config.main_config_file()
         # handle i18n files structure
         # in the first cube given
-        print '-> preparing i18n catalogs'
         from cubicweb import i18n
         langs = [lang for lang, _ in i18n.available_catalogs(join(templdirs[0], 'i18n'))]
         errors = config.i18ncompile(langs)
@@ -412,7 +411,7 @@
             # this directory should be owned by the uid of the server process
             print 'set %s as owner of the data directory' % config['uid']
             chown(config.appdatahome, config['uid'])
-        print '\n-> creation done for %r.\n' % config.apphome
+        print '\n-> creation done for %s\n' % repr(config.apphome)[1:-1]
         helper.postcreate(self.config.automatic)
 
     def _handle_win32(self, config, appid):
--- a/i18n.py	Thu Mar 31 15:23:52 2011 +0200
+++ b/i18n.py	Thu Mar 31 17:24:38 2011 +0200
@@ -80,7 +80,7 @@
     """generate .mo files for a set of languages into the `destdir` i18n directory
     """
     from logilab.common.fileutils import ensure_fs_mode
-    print '-> compiling %s catalogs...' % destdir
+    print '-> compiling message catalogs to %s' % destdir
     errors = []
     for lang in langs:
         langdir = join(destdir, lang, 'LC_MESSAGES')
--- a/server/serverctl.py	Thu Mar 31 15:23:52 2011 +0200
+++ b/server/serverctl.py	Thu Mar 31 17:24:38 2011 +0200
@@ -180,7 +180,7 @@
         if automatic:
             # XXX modify a copy
             password = generate_password()
-            print 'Administration account is admin / %s' % password
+            print '-> set administrator account to admin / %s' % password
             USER_OPTIONS[1][1]['default'] = password
             sconfig = Configuration(options=USER_OPTIONS)
         else:
--- a/toolsutils.py	Thu Mar 31 15:23:52 2011 +0200
+++ b/toolsutils.py	Thu Mar 31 17:24:38 2011 +0200
@@ -58,12 +58,12 @@
     """create a directory if it doesn't exist yet"""
     try:
         makedirs(directory)
-        print '-> created directory %s.' % directory
+        print '-> created directory %s' % directory
     except OSError, ex:
         import errno
         if ex.errno != errno.EEXIST:
             raise
-        print '-> directory %s already exists, no need to create it.' % directory
+        print '-> no need to create existing directory %s' % directory
 
 def create_symlink(source, target):
     """create a symbolic link"""
@@ -154,9 +154,9 @@
 def restrict_perms_to_user(filepath, log=None):
     """set -rw------- permission on the given file"""
     if log:
-        log('set %s permissions to 0600', filepath)
+        log('set permissions to 0600 for %s', filepath)
     else:
-        print '-> set %s permissions to 0600' % filepath
+        print '-> set permissions to 0600 for %s' % filepath
     chmod(filepath, 0600)
 
 def read_config(config_file):
--- a/web/views/reledit.py	Thu Mar 31 15:23:52 2011 +0200
+++ b/web/views/reledit.py	Thu Mar 31 17:24:38 2011 +0200
@@ -1,4 +1,4 @@
-# copyright 2003-2010 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 # contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
 #
 # This file is part of CubicWeb.
@@ -223,7 +223,7 @@
         return self._build_zone(self._deletezone, self._deletemsg, self._deletelogo)
 
     def _build_add_zone(self):
-        return self._build_zone(self._addzone, self._addzonemsg, self._addlogo)
+        return self._build_zone(self._addzone, self._addmsg, self._addlogo)
 
     def _build_divid(self, rtype, role, entity_eid):
         """ builds an id for the root div of a reledit widget """