Be consistent between locales

svenfuchs · Aug 6, 2018 · ae1b620 · ae1b620
1 parent ff216f0
commit ae1b620
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 14 deletions.
diff --git a/rails/locale/fr-CA.yml b/rails/locale/fr-CA.yml
@@ -95,6 +95,9 @@ fr-CA:
       x_months:
         one: 1 mois
         other: "%{count} mois"
+      x_years:
+        one: 1 an
+        other: "%{count} ans"
       x_seconds:
         one: 1 seconde
         other: "%{count} secondes"
@@ -170,11 +173,11 @@ fr-CA:
       decimal_units:
         format: "%n %u"
         units:
-          billion: Milliard
-          million: Million
-          quadrillion: Million de milliards
-          thousand: Millier
-          trillion: Mille milliard
+          billion: milliard
+          million: million
+          quadrillion: million de milliards
+          thousand: millier
+          trillion: billion
           unit: ''
       format:
         delimiter: ''
@@ -185,12 +188,14 @@ fr-CA:
         format: "%n %u"
         units:
           byte:
-            one: Octet
-            other: Octets
+            one: octet
+            other: octets
           gb: Go
           kb: ko
           mb: Mo
           tb: To
+          pb: Po
+          eb: Eo
     percentage:
       format:
         delimiter: ''

diff --git a/rails/locale/fr-CH.yml b/rails/locale/fr-CH.yml
@@ -95,6 +95,9 @@ fr-CH:
       x_months:
         one: 1 mois
         other: "%{count} mois"
+      x_years:
+        one: 1 an
+        other: "%{count} ans"
       x_seconds:
         one: 1 seconde
         other: "%{count} secondes"
@@ -191,6 +194,8 @@ fr-CH:
           kb: ko
           mb: Mo
           tb: To
+          pb: Po
+          eb: Eo
     percentage:
       format:
         delimiter: ''

diff --git a/rails/locale/fr-FR.yml b/rails/locale/fr-FR.yml
@@ -95,6 +95,9 @@ fr-FR:
       x_months:
         one: 1 mois
         other: "%{count} mois"
+      x_years:
+        one: 1 an
+        other: "%{count} ans"
       x_seconds:
         one: 1 seconde
         other: "%{count} secondes"
@@ -171,9 +174,7 @@ fr-FR:
         format: "%n %u"
         units:
           billion: milliard
-          million:
-            one: million
-            other: millions
+          million: million
           quadrillion: million de milliards
           thousand: millier
           trillion: billion
@@ -193,6 +194,8 @@ fr-FR:
           kb: ko
           mb: Mo
           tb: To
+          pb: Po
+          eb: Eo
     percentage:
       format:
         delimiter: ''

diff --git a/rails/locale/fr.yml b/rails/locale/fr.yml
@@ -96,7 +96,7 @@ fr:
         one: 1 mois
         other: "%{count} mois"
       x_years:
-        one: un an
+        one: 1 an
         other: "%{count} ans"
       x_seconds:
         one: 1 seconde
@@ -174,9 +174,7 @@ fr:
         format: "%n %u"
         units:
           billion: milliard
-          million:
-            one: million
-            other: millions
+          million: million
           quadrillion: million de milliards
           thousand: millier
           trillion: billion