Merge branch '1436-fix-encoding-in-user-form'

ckan · Jul 29, 2014 · 4d31a45 · 4d31a45
2 parents 4c90eb2 + a2c979b
commit 4d31a45
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/ckan/templates/user/edit_user_form.html b/ckan/templates/user/edit_user_form.html
@@ -16,7 +16,8 @@
 
     {% if c.show_email_notifications %}
       {% call form.checkbox('activity_streams_email_notifications', label=_('Subscribe to notification emails'), id='field-activity-streams-email-notifications', value=True, checked=c.userobj.activity_streams_email_notifications) %}
-      {{ form.info(_("You will receive notification emails from {site_title}, e.g. when you have new activities on your dashboard.".format(site_title=g.site_title)), classes=['info-help-tight']) }}
+      {% set helper_text = _("You will receive notification emails from {site_title}, e.g. when you have new activities on your dashboard."|string) %}
+      {{ form.info(helper_text.format(site_title=g.site_title), classes=['info-help-tight']) }}
       {% endcall %}
     {% endif %}