switch to using I18n.load_translations instead of requiring plain ruby files

1 files changed, 78 insertions, 77 deletions

diff --git a/actionpack/lib/action_view/locale/en-US.rb b/actionpack/lib/action_view/locale/en-US.rb
index 0119b3d9c1..8cce874700 100644
--- a/actionpack/lib/action_view/locale/en-US.rb
+++ b/actionpack/lib/action_view/locale/en-US.rb
@@ -1,86 +1,87 @@
-I18n.backend.store_translations :'en-US', {
-  :datetime => {
-    :distance_in_words => {
-      :half_a_minute => 'half a minute',
-      :less_than_x_seconds => {
-        :one => 'less than 1 second', 
-        :many => 'less than {{count}} seconds'
-      },
-      :x_seconds => {
-        :one => '1 second', 
-        :many => '{{count}} seconds'
-      },
-      :less_than_x_minutes => {
-        :one => 'less than a minute', 
-        :many => 'less than {{count}} minutes'
-      },
-      :x_minutes => {
-        :one => '1 minute', 
-        :many => '{{count}} minutes'
-      },
-      :about_x_hours => {
-        :one => 'about 1 hour', 
-        :many => 'about {{count}} hours'
-      },
-      :x_days => {
-        :one => '1 day',
-        :many => '{{count}} days' 
+{ :'en-US' => {
+    :datetime => {
+      :distance_in_words => {
+        :half_a_minute => 'half a minute',
+        :less_than_x_seconds => {
+          :one => 'less than 1 second', 
+          :many => 'less than {{count}} seconds'
+        },
+        :x_seconds => {
+          :one => '1 second', 
+          :many => '{{count}} seconds'
+        },
+        :less_than_x_minutes => {
+          :one => 'less than a minute', 
+          :many => 'less than {{count}} minutes'
+        },
+        :x_minutes => {
+          :one => '1 minute', 
+          :many => '{{count}} minutes'
+        },
+        :about_x_hours => {
+          :one => 'about 1 hour', 
+          :many => 'about {{count}} hours'
+        },
+        :x_days => {
+          :one => '1 day',
+          :many => '{{count}} days' 
+        },
+        :about_x_months => { 
+          :one => 'about 1 month', 
+          :many => 'about {{count}} months'
+        },
+        :x_months => {
+          :one => '1 month', 
+          :many => '{{count}} months'
+        },
+        :about_x_years => {
+          :one => 'about 1 year', 
+          :many => 'about {{count}} years'
+        },
+        :over_x_years => {
+          :one => 'over 1 year', 
+          :many => 'over {{count}} years'
+        }
+      }
+    },
+    :number => {
+      :format => {
+        :precision => 3,
+        :separator => '.',
+        :delimiter => ','
       },
-      :about_x_months => { 
-        :one => 'about 1 month', 
-        :many => 'about {{count}} months'
+      :currency => {
+        :format => {
+          :unit => '$',
+          :precision => 2,
+          :format => '%u%n'
+        }
       },
-      :x_months => {
-        :one => '1 month', 
-        :many => '{{count}} months'
+      :human => {
+        :format => {
+          :precision => 1,
+          :delimiter => ''
+        }
       },
-      :about_x_years => {
-        :one => 'about 1 year', 
-        :many => 'about {{count}} years'
+      :percentage => {
+        :format => {
+          :delimiter => ''
+        }
       },
-      :over_x_years => {
-        :one => 'over 1 year', 
-        :many => 'over {{count}} years'
+      :precision => {
+        :format => {
+          :delimiter => ''
+        }
       }
-    }
-  },
-  :number => {
-    :format => {
-      :precision => 3,
-      :separator => '.',
-      :delimiter => ','
     },
-    :currency => {
-      :format => {
-        :unit => '$',
-        :precision => 2,
-        :format => '%u%n'
+    :active_record => {
+      :error => {
+        :header_message => {
+          :one => "1 error prohibited this {{object_name}} from being saved", 
+          :many => "{{count}} errors prohibited this {{object_name}} from being saved"
+        },
+        :message => "There were problems with the following fields:"
       }
-    },
-    :human => {
-      :format => {
-        :precision => 1,
-        :delimiter => ''
-      }
-    },
-    :percentage => {
-      :format => {
-        :delimiter => ''
-      }
-    },
-    :precision => {
-      :format => {
-        :delimiter => ''
-      }
-    }
-  },
-  :active_record => {
-    :error => {
-      :header_message => {
-        :one => "1 error prohibited this {{object_name}} from being saved", 
-        :many => "{{count}} errors prohibited this {{object_name}} from being saved"
-      },
-      :message => "There were problems with the following fields:"
     }
   }
-}
+}
\ No newline at end of file