diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2010-05-24 13:38:23 -0300 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-05-24 20:12:43 +0200 |
| commit | 05c95b5c5815c0b3ae55fda7a897922b7f3ec2c7 (patch) | |
| tree | d1b1215dd7f32c50ba1245e20476613cf90f4b86 /actionpack/test/fixtures | |
| parent | 59d1c418be47694a5b79d860bced6f9b7f11f3a8 (diff) | |
| download | rails-05c95b5c5815c0b3ae55fda7a897922b7f3ec2c7.tar.gz rails-05c95b5c5815c0b3ae55fda7a897922b7f3ec2c7.tar.bz2 rails-05c95b5c5815c0b3ae55fda7a897922b7f3ec2c7.zip | |
translation method for arrays on TranslationHelper module returns an array where values for keys of the form (.|_)html keys are html_safe
[#4675]
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'actionpack/test/fixtures')
| -rw-r--r-- | actionpack/test/fixtures/test/array_translation.erb | 2 | ||||
| -rw-r--r-- | actionpack/test/fixtures/test/scoped_array_translation.erb | 2 |
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 def3a1a0c1..bcdeea4c0d 100644 --- a/actionpack/test/fixtures/test/array_translation.erb +++ b/actionpack/test/fixtures/test/array_translation.erb @@ -1 +1 @@ -<%= t(['foo', 'bar', 'html']) %>
\ No newline at end of file +<% translation = t(['foo', 'bar', 'baz_html']) %><%= translation.first %>, <%= translation.second %>, <%= translation.third %>
\ 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 0a0c79f717..cb07fca838 100644 --- a/actionpack/test/fixtures/test/scoped_array_translation.erb +++ b/actionpack/test/fixtures/test/scoped_array_translation.erb @@ -1 +1 @@ -<%= t(['.foo', '.bar']) %>
\ No newline at end of file +<%= t(['.foo', '.bar']).join(", ") %>
\ No newline at end of file |