aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/CHANGELOG.md
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-01-02 20:55:34 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-01-02 20:55:34 -0300
commit41740be7c43c3454278c9ecc65772922ec718926 (patch)
treeca91521dc5d7386148a61c61195b5d72cd67887b /actionview/CHANGELOG.md
parent2ade177b37c079666efa7705d57519072b8d8215 (diff)
parentfab50c130baf482288d510427a6632e6489a55d6 (diff)
downloadrails-41740be7c43c3454278c9ecc65772922ec718926.tar.gz
rails-41740be7c43c3454278c9ecc65772922ec718926.tar.bz2
rails-41740be7c43c3454278c9ecc65772922ec718926.zip
Merge pull request #18308 from jcoyne/i18n_translate_safety
Unsafe default translations should not be marked html_safe
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*