Merge 99e4644 into e54a401

makinacorpus · Jan 8, 2015 · 733683e · 733683e
2 parents e54a401 + 99e4644
commit 733683e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/CHANGES b/CHANGES
@@ -5,7 +5,7 @@ CHANGELOG
 0.15.3dev (unreleased)
 -------------------
 
-*
+* Map attribution can be translated using ugettext_lazy
 
 
 0.15.2 (2014-12-22)

diff --git a/leaflet/templatetags/leaflet_tags.py b/leaflet/templatetags/leaflet_tags.py
@@ -6,6 +6,7 @@
 from django import template
 from django.conf import settings
 from django.utils import six
+from django.utils.encoding import force_text
 
 from leaflet import (app_settings, SPATIAL_EXTENT, SRID, PLUGINS, PLUGINS_DEFAULT,
                      PLUGIN_ALL, PLUGIN_FORMS)
@@ -68,9 +69,9 @@ def leaflet_map(name, callback=None, fitextent=True, creatediv=True, loadevent='
         fitextent=fitextent,
         center=app_settings['DEFAULT_CENTER'],
         zoom=app_settings['DEFAULT_ZOOM'],
-        layers=[(six.text_type(label), url, attrs) for (label, url, attrs) in app_settings.get('TILES')],
-        overlays=[(six.text_type(label), url, attrs) for (label, url, attrs) in app_settings.get('OVERLAYS')],
-        attributionprefix=app_settings.get('ATTRIBUTION_PREFIX'),
+        layers=[(force_text(label), url, attrs) for (label, url, attrs) in app_settings.get('TILES')],
+        overlays=[(force_text(label), url, attrs) for (label, url, attrs) in app_settings.get('OVERLAYS')],
+        attributionprefix=force_text(app_settings.get('ATTRIBUTION_PREFIX'), strings_only=True),
         scale=app_settings.get('SCALE'),
         minimap=app_settings.get('MINIMAP'),
         resetview=app_settings.get('RESET_VIEW'),