Merge remote branch 'upstream/master'

teixas · Mar 2, 2012 · 02ea338 · 02ea338
2 parents a758af7 + 131a9f2
commit 02ea338
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/kotti/__init__.py b/kotti/__init__.py
@@ -109,6 +109,10 @@ def base_configure(global_config, **settings):
     for key, value in conf_defaults.items():
         settings.setdefault(key, value)
 
+    for key, value in settings.items():
+        if isinstance(settings[key], basestring):
+            settings[key] = unicode(value, 'utf8')
+
     # Allow extending packages to change 'settings' w/ Python:
     _resolve_dotted(settings, keys=('kotti.configurators',))
     for func in settings['kotti.configurators']:

diff --git a/kotti/templates/add-dropdown.pt b/kotti/templates/add-dropdown.pt
@@ -10,7 +10,7 @@
     </a>
     <ul class="dropdown-menu">
       <li tal:repeat="factory factories">
-        <a href="${api.url(context, factory.type_info.add_view)}">${factory.type_info.name}</a>
+        <a href="${api.url(context, factory.type_info.add_view)}">${factory.type_info.title}</a>
       </li>
     </ul>
   </li>