Merge branch 'master' into copyright

[rails.git] / vendor / plugins / rails-i18n / locale / es-MX.yml

diff --git a/vendor/plugins/rails-i18n/locale/es-MX.yml b/vendor/plugins/rails-i18n/locale/es-MX.yml
index 99728ba073697d346c9fb5b6f67aa1194a56534d..0306e870560cb73cfa66faec69e17d5272fc4cb2 100644 (file)
--- a/vendor/plugins/rails-i18n/locale/es-MX.yml
+++ b/vendor/plugins/rails-i18n/locale/es-MX.yml
@@ -1,29 +1,30 @@
 # Spanish as spoken in Mexico (es-MX) translations for Rails
 # by Edgar J. Suárez (edgar.js@gmail.com)
+# Fixed currency format (Can't convert string to symbol)
+# by Ivan Torres (mexpolk@gmail.com)
+# Added datetime / prompts for time_select helper
+# by Daniel Roux ( daniel.roux@gmail.com)
 
 es-MX:
   number:
     percentage:
       format:
-        delimiter: ""
+        delimiter: ","
     currency:
-      format: "%u%n"
-      delimiter: ","
-      unit: "$"
-      precision: 2
-      separator: "."
+      format:
+        format: "%u%n"
+        unit: "$"
     format:
       delimiter: ","
-      precision: 3
+      precision: 2
       separator: "."
     human:
       format:
-        delimiter: ""
-        precision: 1
+        delimiter: ","
       storage_units: [Bytes, KB, MB, GB, TB]
     precision:
       format:
-        delimiter: ""
+        delimiter: ","
 
   date:
     order: [:day, :month, :year]
@@ -76,6 +77,10 @@ es-MX:
       over_x_years:
         one: "más de 1 año"
         other: "más de {{count}} años"
+    prompts:
+      hour: 'Hora'
+      minute: 'Minuto'
+      second: 'Segundo'        
 
   activerecord:
     errors: