Merge commit 'rails/master' into i18n

2 files changed, 12 insertions, 11 deletions

diff --git a/actionpack/lib/action_view/locale/en-US.yml b/actionpack/lib/action_view/locale/en-US.yml
index eabdbf33d6..57987f4e02 100644
--- a/actionpack/lib/action_view/locale/en-US.yml
+++ b/actionpack/lib/action_view/locale/en-US.yml
@@ -51,41 +51,41 @@
       half_a_minute: "half a minute"
       less_than_x_seconds:
         one:  "less than 1 second"
-        other: "less than {{count}} seconds"
+        many: "less than {{count}} seconds"
       x_seconds:
         one:  "1 second"
-        other: "{{count}} seconds"
+        many: "{{count}} seconds"
       less_than_x_minutes:
         one:  "less than a minute"
-        other: "less than {{count}} minutes"
+        many: "less than {{count}} minutes"
       x_minutes:
         one:  "1 minute"
-        other: "{{count}} minutes"
+        many: "{{count}} minutes"
       about_x_hours:
         one:  "about 1 hour"
-        other: "about {{count}} hours"
+        many: "about {{count}} hours"
       x_days:
         one:  "1 day"
-        other: "{{count}} days"
+        many: "{{count}} days"
       about_x_months:
         one:  "about 1 month"
-        other: "about {{count}} months"
+        many: "about {{count}} months"
       x_months:
         one:  "1 month"
-        other: "{{count}} months"
+        many: "{{count}} months"
       about_x_years:
         one:  "about 1 year"
-        other: "about {{count}} years"
+        many: "about {{count}} years"
       over_x_years:
         one:  "over 1 year"
-        other: "over {{count}} years"
+        many: "over {{count}} years"
 
   activerecord:
     errors:
       template:
         header:
           one:   "1 error prohibited this {{model}} from being saved"
-          other:  "{{count}} errors prohibited this {{model}} from being saved"
+          many:  "{{count}} errors prohibited this {{model}} from being saved"
         # The variable :count is also available
         body: "There were problems with the following fields:"
 
diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb
index 3065d33c1b..85e967ac1c 100644
--- a/actionpack/test/template/url_helper_test.rb
+++ b/actionpack/test/template/url_helper_test.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'abstract_unit'
 
 RequestMock = Struct.new("Request", :request_uri, :protocol, :host_with_port, :env)