Issue 2133 - Allow to specify default translation inline in pages rather than in a separate file

cms/utils.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2015 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
@@ skipping 30 matching lines @@
   try:
     converter = converters[format](params)
   except KeyError:
     raise Exception("Page %s uses unknown format %s" % (page, format))
 
   # Note: The converter might change some parameters so we can only read in
   # template data here.
   params["templatedata"] = source.read_template(params["template"])
   template_converter = TemplateConverter(params, key="templatedata")
 
-  params["defaultlocale"] = params["config"].get("general", "defaultlocale")
+  defaultlocale = params["config"].get("general", "defaultlocale")
+  params["defaultlocale"] = defaultlocale
 
-  params["available_locales"] = [
+  locales = [
     locale
     for locale in source.list_locales()
     if source.has_locale(locale, localefile)
   ]
-  if params["defaultlocale"] not in params["available_locales"]:
-    params["available_locales"].append(params["defaultlocale"])
-  params["available_locales"].sort()

[Sebastian Noack, 2015/03/12 20:33:46]

Four inline lookups for "available_locales" and three for "defaultloacle", that
calls for local variables.

[Wladimir Palant, 2015/03/12 20:57:02]

Not sure it really makes the code better here but done.

[Sebastian Noack, 2015/03/12 21:08:19]

Much better. Thanks.

+  if defaultlocale not in locales:
+    locales.append(defaultlocale)
+  locales.sort()
+  params["available_locales"] = locales
 
   params["head"], params["body"] = converter()
   return template_converter()