[ckan-changes] [ckan/ckan] a2c979: [#1436] Fix encoding error on user form when using...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: a2c979b81d9bf19dc8f9e4446a82b84154a24b1b
      https://github.com/ckan/ckan/commit/a2c979b81d9bf19dc8f9e4446a82b84154a24b1b
  Author: amercader <amercadero at gmail.com>
  Date:   2014-07-22 (Tue, 22 Jul 2014)

  Changed paths:
    M ckan/templates/user/edit_user_form.html

  Log Message:
  -----------
  [#1436] Fix encoding error on user form when using email notifications

If the site title had special characters an encoding error was raised,
as the site title was an unicode string but the helper text wasn't. We
used the Jinja2 "string" filter to fix this. Translations should not be
affected so this can be backported.


  Commit: 4d31a453c659f73a75699fc74458d7e77b816a14
      https://github.com/ckan/ckan/commit/4d31a453c659f73a75699fc74458d7e77b816a14
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-07-29 (Tue, 29 Jul 2014)

  Changed paths:
    M ckan/templates/user/edit_user_form.html

  Log Message:
  -----------
  Merge branch '1436-fix-encoding-in-user-form'


Compare: https://github.com/ckan/ckan/compare/4c90eb2a9589...4d31a453c659