aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/fixtures
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2010-05-24 17:21:18 -0300
committerJosé Valim <jose.valim@gmail.com>2010-05-24 23:41:55 +0200
commit2b8eb5404e5545fb80eb6edf09c61bd5030034e8 (patch)
treea33dddd35eacd7791766e252aa7de3d487ed2ed8 /actionpack/test/fixtures
parent8e583b69e8b3017e85440c97b325ca7ae0c32dfb (diff)
downloadrails-2b8eb5404e5545fb80eb6edf09c61bd5030034e8.tar.gz
rails-2b8eb5404e5545fb80eb6edf09c61bd5030034e8.tar.bz2
rails-2b8eb5404e5545fb80eb6edf09c61bd5030034e8.zip
Revert "translation method for arrays on TranslationHelper module returns an array where values for keys of the form (.|_)html keys are html_safe"
This reverts commit 05c95b5c5815c0b3ae55fda7a897922b7f3ec2c7. Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'actionpack/test/fixtures')
-rw-r--r--actionpack/test/fixtures/test/array_translation.erb2
-rw-r--r--actionpack/test/fixtures/test/scoped_array_translation.erb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/fixtures/test/array_translation.erb b/actionpack/test/fixtures/test/array_translation.erb
index bcdeea4c0d..def3a1a0c1 100644
--- a/actionpack/test/fixtures/test/array_translation.erb
+++ b/actionpack/test/fixtures/test/array_translation.erb
@@ -1 +1 @@
-<% translation = t(['foo', 'bar', 'baz_html']) %><%= translation.first %>, <%= translation.second %>, <%= translation.third %> \ No newline at end of file
+<%= t(['foo', 'bar', 'html']) %> \ No newline at end of file
diff --git a/actionpack/test/fixtures/test/scoped_array_translation.erb b/actionpack/test/fixtures/test/scoped_array_translation.erb
index cb07fca838..0a0c79f717 100644
--- a/actionpack/test/fixtures/test/scoped_array_translation.erb
+++ b/actionpack/test/fixtures/test/scoped_array_translation.erb
@@ -1 +1 @@
-<%= t(['.foo', '.bar']).join(", ") %> \ No newline at end of file
+<%= t(['.foo', '.bar']) %> \ No newline at end of file