mozilla/zamboni — pull request #1834 by magopian (2014-03-05 11:10:51+00:00)
Title: overload jingo.helpers.f to fix UnicodeEncodeError (bug 976727)

This PR is only adding one commit to the PR #1740 (fixing bug 963513).

The issue is explained here: https://github.com/jbalogh/jingo/pull/54#issuecomment-36728948

We thus first check if the input of the ```|f``` helper is an instance of
```six.text_type```, and if not, we convert before doing the string
interpolation.