diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-02-22 19:06:29 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-02-22 19:06:29 +0100 |
| commit | f8cfa454e540def354c7ad3db62e7995165ea08b (patch) | |
| tree | 7fd2cbabcfa2881df76f0fd9abaec0a9404bbfb0 | |
| parent | b3fcabb3a529e8ea3d2d6326b2d99aac4222cf06 (diff) | |
| parent | 20f2785849bc17b2512465e8bfdb5560803cc9f8 (diff) | |
| download | rails-f8cfa454e540def354c7ad3db62e7995165ea08b.tar.gz rails-f8cfa454e540def354c7ad3db62e7995165ea08b.tar.bz2 rails-f8cfa454e540def354c7ad3db62e7995165ea08b.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
| -rw-r--r-- | railties/guides/source/i18n.textile | 2 | ||||
| -rw-r--r-- | railties/guides/source/layouts_and_rendering.textile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/guides/source/i18n.textile b/railties/guides/source/i18n.textile index 8b37543342..ac05e1c6c7 100644 --- a/railties/guides/source/i18n.textile +++ b/railties/guides/source/i18n.textile @@ -780,7 +780,7 @@ h5. Action View Helper Methods * +distance_of_time_in_words+ translates and pluralizes its result and interpolates the number of seconds, minutes, hours, and so on. See "datetime.distance_in_words":http://github.com/rails/rails/blob/master/actionpack/lib/action_view/locale/en.yml#L51 translations. -* +datetime_select+ and +select_month+ use translated month names for populating the resulting select tag. See "date.month_names":http://github.com/rails/rails/blob/master/activesupport/lib/active_support/locale/en.yml#L15 for translations. +datetime_select+ also looks up the order option from "date.order":http://github.com/rails/rails/blob/master/activesupport/lib/active_support/locale/en.yml#L18 (unless you pass the option explicitely). All date selection helpers translate the prompt using the translations in the "datetime.prompts":http://github.com/rails/rails/blob/master/actionpack/lib/action_view/locale/en.yml#L83 scope if applicable. +* +datetime_select+ and +select_month+ use translated month names for populating the resulting select tag. See "date.month_names":http://github.com/rails/rails/blob/master/activesupport/lib/active_support/locale/en.yml#L15 for translations. +datetime_select+ also looks up the order option from "date.order":http://github.com/rails/rails/blob/master/activesupport/lib/active_support/locale/en.yml#L18 (unless you pass the option explicitly). All date selection helpers translate the prompt using the translations in the "datetime.prompts":http://github.com/rails/rails/blob/master/actionpack/lib/action_view/locale/en.yml#L83 scope if applicable. * The +number_to_currency+, +number_with_precision+, +number_to_percentage+, +number_with_delimiter+, and +number_to_human_size+ helpers use the number format settings located in the "number":http://github.com/rails/rails/blob/master/actionpack/lib/action_view/locale/en.yml#L2 scope. diff --git a/railties/guides/source/layouts_and_rendering.textile b/railties/guides/source/layouts_and_rendering.textile index 8442a6e257..5bfbf97ea7 100644 --- a/railties/guides/source/layouts_and_rendering.textile +++ b/railties/guides/source/layouts_and_rendering.textile @@ -339,7 +339,7 @@ render :layout => false h6. The +:status+ Option -Rails will automatically generate a response with the correct HTML status code (in most cases, this is +200 OK+). You can use the +:status+ option to change this: +Rails will automatically generate a response with the correct HTTP status code (in most cases, this is +200 OK+). You can use the +:status+ option to change this: <ruby> render :status => 500 |