aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2018-07-04 09:42:53 +0900
committerRyuta Kamizono <kamipo@gmail.com>2018-07-04 09:43:56 +0900
commit90e2739d8680878b40224d68b366917b9c582ba5 (patch)
tree5d984feac02b5a2f7ada62184634212ce9619173 /actionview
parentd6703f7e390f920a9209f66c1c970c4ee1e57f09 (diff)
parent54c2c6de1769570ecc13ddfb733e80e1086a21ef (diff)
downloadrails-90e2739d8680878b40224d68b366917b9c582ba5.tar.gz
rails-90e2739d8680878b40224d68b366917b9c582ba5.tar.bz2
rails-90e2739d8680878b40224d68b366917b9c582ba5.zip
Merge pull request #33286 from ph3t/add-changelog-entry-for-42c3537
Add changelog entry for 42c3537 [ci skip]
Diffstat (limited to 'actionview')
-rw-r--r--actionview/CHANGELOG.md14
1 files changed, 13 insertions, 1 deletions
diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md
index 26170dfa77..7d3ca7735e 100644
--- a/actionview/CHANGELOG.md
+++ b/actionview/CHANGELOG.md
@@ -1,3 +1,15 @@
+* 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 +17,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>