diff sat/tools/config.py @ 2671:0fa217fafabf

tools (common/template), jp: refactoring to handle multiple sites: - site can now be specified in template header before theme, for instance: (some_site/some_theme)path/to/template.ext - absolute template paths are now implemented, but Renderer must be instanciated with trusted to True for security reason (it's the case for jp) - a new "front_url_filter" callable can be given to Renderer, which will convert template path to URL seen by end-user (default to real path). - the "front_url_filter" can be used in templates with… "front_url" filter - template_data is a new named tuple available in templates, which give site, theme and template relative URL - search order is site/theme, site/default_theme, and default/default_theme where default link to sat_pubsub templates - when loading CSS files, files with _noscript suffixes are now loaded, and used when javascript is not available - "styles_extra.css" is also loaded before "styles.css", useful when a theme want to reuse default style, and just override some rules - new site can be specified in sat.conf [DEFAULT] section, using sites_path_public_dict or sites_path_private_dict (where sites_path_private_dict won't be used in public frontends, like Libervia) - "private" argument of Renderer tells the renderer to load private sites or not - templates are now loaded from "templates" subdirectory, to differenciate them from other data like i18n - jp template output has been updated to handle those changes, and to manage absolute templates
author Goffi <goffi@goffi.org>
date Mon, 10 Sep 2018 08:58:18 +0200
parents 56f94936df1e
children 003b8b4b56a7
line wrap: on
line diff
--- a/sat/tools/config.py	Fri Aug 31 17:18:51 2018 +0200
+++ b/sat/tools/config.py	Mon Sep 10 08:58:18 2018 +0200
@@ -47,7 +47,8 @@
     config = SafeConfigParser()
     target_file = None
     for file_ in C.CONFIG_FILES[::-1]:
-        # we will eventually update the existing file with the highest priority, if it's a user personal file...
+        # we will eventually update the existing file with the highest priority,
+        # if it's a user personal file...
         if not silent:
             log.debug(_(u"Testing file %s") % file_)
         if os.path.isfile(file_):
@@ -66,12 +67,9 @@
     if not silent:
         if option in ("passphrase",):  # list here the options storing a password
             value = "******"
-        log.warning(
-            _(
-                u"Config auto-update: %(option)s set to %(value)s in the file %(config_file)s"
-            )
-            % {"option": option, "value": value, "config_file": target_file}
-        )
+        log.warning(_(u"Config auto-update: {option} set to {value} in the file "
+                      u"{config_file}.").format(option=option, value=value,
+                                                config_file=target_file))
 
 
 def parseMainConf():