aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2017-01-31 00:04:17 -0500
committerGitHub <noreply@github.com>2017-01-31 00:04:17 -0500
commit1c79936023cfffdd21f2b5ef4321111ad97ef651 (patch)
tree50823c688b63900bf77a7f317edbc684865c6d12 /railties/lib/rails
parentce97c79445f9ac4b056e34deaaaaf25cadc08b72 (diff)
parentd4ddf7b72f52597d0c0f90794cf52f6d0d687d4e (diff)
downloadrails-1c79936023cfffdd21f2b5ef4321111ad97ef651.tar.gz
rails-1c79936023cfffdd21f2b5ef4321111ad97ef651.tar.bz2
rails-1c79936023cfffdd21f2b5ef4321111ad97ef651.zip
Merge pull request #27842 from richseviora/master
Added warning for reserved YAML keywords.
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/locales/en.yml10
1 files changed, 10 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/locales/en.yml b/railties/lib/rails/generators/rails/app/templates/config/locales/en.yml
index 0653957166..decc5a8573 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/locales/en.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/locales/en.yml
@@ -16,6 +16,16 @@
#
# This would use the information in config/locales/es.yml.
#
+# The following keys must be escaped otherwise they will not be retrieved by
+# the default I18n backend:
+#
+# true, false, on, off, yes, no
+#
+# Instead, surround them with single quotes.
+#
+# en:
+# 'true': 'foo'
+#
# To learn more, please read the Rails Internationalization guide
# available at http://guides.rubyonrails.org/i18n.html.