aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMatthew Landauer <matthew@openaustralia.org>2013-01-14 17:54:25 +1100
committerMatthew Landauer <matthew@openaustralia.org>2013-01-14 17:54:25 +1100
commit7ca718bb01c52d36e125afa5870afbd565fb9696 (patch)
treeaea572d78338355c6da9dc091052fca2e1aad557 /lib
parentb661acbf4e15f94c7886970ded41bd8c1d6adb97 (diff)
Revert "Assume the result of doing any translation is html_safe"
This reverts commit 493e8e7ec43351952e2d7876afaede0cdb5d3644.
Diffstat (limited to 'lib')
-rw-r--r--lib/i18n_fixes.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/i18n_fixes.rb b/lib/i18n_fixes.rb
index f75b969c4..6e684d44a 100644
--- a/lib/i18n_fixes.rb
+++ b/lib/i18n_fixes.rb
@@ -6,9 +6,7 @@
# so that we can interpolate our translation strings nicely
def _(key, options = {})
- # Assume the result of doing any translation is html_safe.
- # In other words, we trust the translators.
- translation = FastGettext._(key).html_safe || key
+ translation = FastGettext._(key) || key
gettext_interpolate(translation, options)
end