aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2012-08-16 00:07:17 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2012-08-16 00:07:17 +0530
commit176f0888d85da38e3ae95f74b419d22e347d7a81 (patch)
tree0a46e2a790cf34785b7e8048e21fb598010e23e8 /railties/lib/rails/generators
parentebb4a3d5becd535074502a4bf1b61a5b18e30917 (diff)
parent62499bcb9d8aa65636f5cd3ace2a818ffd4e2f8a (diff)
downloadrails-176f0888d85da38e3ae95f74b419d22e347d7a81.tar.gz
rails-176f0888d85da38e3ae95f74b419d22e347d7a81.tar.bz2
rails-176f0888d85da38e3ae95f74b419d22e347d7a81.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'railties/lib/rails/generators')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/locales/en.yml22
1 files changed, 20 insertions, 2 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 179c14ca52..0653957166 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
@@ -1,5 +1,23 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+# Files in the config/locales directory are used for internationalization
+# and are automatically loaded by Rails. If you want to use locales other
+# than English, add the necessary files in this directory.
+#
+# To use the locales, use `I18n.t`:
+#
+# I18n.t 'hello'
+#
+# In views, this is aliased to just `t`:
+#
+# <%= t('hello') %>
+#
+# To use a different locale, set it with `I18n.locale`:
+#
+# I18n.locale = :es
+#
+# This would use the information in config/locales/es.yml.
+#
+# To learn more, please read the Rails Internationalization guide
+# available at http://guides.rubyonrails.org/i18n.html.
en:
hello: "Hello world"