aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/fixtures
diff options
context:
space:
mode:
authorCraig Davey <me@craigdavey.ca>2010-04-09 21:01:32 -0400
committerDavid Heinemeier Hansson <david@loudthinking.com>2010-04-13 17:35:10 -0700
commit5208cc3cf5d54720512ff50c2b97e9f4369aaa27 (patch)
treef10f4ddc330fbc71fc3b3fa7a6201026b4920f59 /actionpack/test/fixtures
parent0ab2ba336f2b094a4235b54a1b17f8bef3fe3b2b (diff)
downloadrails-5208cc3cf5d54720512ff50c2b97e9f4369aaa27.tar.gz
rails-5208cc3cf5d54720512ff50c2b97e9f4369aaa27.tar.bz2
rails-5208cc3cf5d54720512ff50c2b97e9f4369aaa27.zip
Changed translate helper so that it doesn’t mark every translation as safe HTML. Only keys with a "_html" suffix and keys named "html" are considered to be safe HTML. All other translations are left untouched.
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
Diffstat (limited to 'actionpack/test/fixtures')
-rw-r--r--actionpack/test/fixtures/test/array_translation.erb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/fixtures/test/array_translation.erb b/actionpack/test/fixtures/test/array_translation.erb
index 12c0763313..def3a1a0c1 100644
--- a/actionpack/test/fixtures/test/array_translation.erb
+++ b/actionpack/test/fixtures/test/array_translation.erb
@@ -1 +1 @@
-<%= t(['foo', 'bar']) %> \ No newline at end of file
+<%= t(['foo', 'bar', 'html']) %> \ No newline at end of file