aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/locale
diff options
context:
space:
mode:
authorAkira Matsuda <ronnie@dio.jp>2008-11-18 02:16:08 +0900
committerJeremy Kemper <jeremy@bitsweat.net>2008-12-08 15:53:20 -0800
commit273c770011ab43d4b523caacb808bce070922d77 (patch)
treed10dd1a4af6127ad824eac36e5786cda32f4e431 /activesupport/lib/active_support/locale
parent091e6f791aa3324b2c7f8c8c4cd2fce12b689cc8 (diff)
downloadrails-273c770011ab43d4b523caacb808bce070922d77.tar.gz
rails-273c770011ab43d4b523caacb808bce070922d77.tar.bz2
rails-273c770011ab43d4b523caacb808bce070922d77.zip
Change Array#to_sentence I18n options to pass comma and space character from outside.
[#1397 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'activesupport/lib/active_support/locale')
-rw-r--r--activesupport/lib/active_support/locale/en.yml5
1 files changed, 3 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/locale/en.yml b/activesupport/lib/active_support/locale/en.yml
index 92132cacd5..e604c9ee8c 100644
--- a/activesupport/lib/active_support/locale/en.yml
+++ b/activesupport/lib/active_support/locale/en.yml
@@ -28,5 +28,6 @@ en:
# Used in array.to_sentence.
support:
array:
- sentence_connector: "and"
- skip_last_comma: false
+ words_connector: ", "
+ two_words_connector: " and "
+ last_word_connector: ", and "