aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/CHANGELOG.md
diff options
context:
space:
mode:
authorJustin Coyne <justin@curationexperts.com>2015-01-02 17:07:01 -0600
committerJustin Coyne <justin@curationexperts.com>2015-01-02 17:07:01 -0600
commitfab50c130baf482288d510427a6632e6489a55d6 (patch)
treead8adb4db3bd92ea4f181b82697c772d005c8d4f /actionview/CHANGELOG.md
parent4b04fc0528d7ffa3943a92a854d2b882419508a8 (diff)
downloadrails-fab50c130baf482288d510427a6632e6489a55d6.tar.gz
rails-fab50c130baf482288d510427a6632e6489a55d6.tar.bz2
rails-fab50c130baf482288d510427a6632e6489a55d6.zip
Unsafe default translations should not be marked html_safe
Previously default translation keys that didn't end in `_html`, but came after a missing key that ended in `_html` were being returned as html_safe. Now they are not. Fixes #18257
Diffstat (limited to 'actionview/CHANGELOG.md')
-rw-r--r--actionview/CHANGELOG.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md
index 321501a3bf..6357f8ac57 100644
--- a/actionview/CHANGELOG.md
+++ b/actionview/CHANGELOG.md
@@ -1,3 +1,8 @@
+* Default translations that have a lower precidence than an html safe default,
+ but are not themselves safe, should not be marked as html_safe.
+
+ *Justin Coyne*
+
* Make possible to use blocks with short version of `render "partial"` helper.
*Nikolay Shebanov*