aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
diff options
context:
space:
mode:
authorJuan Broullon <juan.broullon@shopify.com>2018-07-03 16:28:24 -0400
committerJuan Broullon <juan.broullon@shopify.com>2018-07-03 16:38:25 -0400
commit54c2c6de1769570ecc13ddfb733e80e1086a21ef (patch)
tree6a20b29eec8995ab3f9d4a3573bff9ed4d8a20ea /actionview
parentcfc48d0b5f363cc880237d2e25598c64c9eb8400 (diff)
downloadrails-54c2c6de1769570ecc13ddfb733e80e1086a21ef.tar.gz
rails-54c2c6de1769570ecc13ddfb733e80e1086a21ef.tar.bz2
rails-54c2c6de1769570ecc13ddfb733e80e1086a21ef.zip
Add changelog entry for 42c3537 [ci skip]
Diffstat (limited to 'actionview')
-rw-r--r--actionview/CHANGELOG.md12
1 files changed, 11 insertions, 1 deletions
diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md
index 26170dfa77..73ed11dc8f 100644
--- a/actionview/CHANGELOG.md
+++ b/actionview/CHANGELOG.md
@@ -1,3 +1,13 @@
+* Mark arrays of translations as trusted safe by using the `_html` suffix. Example:
+
+ en:
+ foo_html:
+ - "One"
+ - "<strong>Two</strong>"
+ - "Three &#128075; &#128578;"
+
+ *Juan Broullon*
+
* Add `year_format` option to date_select tag. This option makes it possible to customize year
names. Lambda should be passed to use this option.
@@ -5,7 +15,7 @@
date_select('user_birthday', '', start_year: 1998, end_year: 2000, year_format: ->year { "Heisei #{year - 1988}" })
- The HTML produced:
+ The HTML produced:
<select id="user_birthday__1i" name="user_birthday[(1i)]">
<option value="1998">Heisei 10</option>