From ca012322fbddae34fe3d267c2033782b7101764f Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 27 Apr 2017 17:08:17 +0200 Subject: [PATCH 1/3] fixed rails locales files --- config/locales/rails.af.yml | 1 - config/locales/rails.ar.yml | 1 - config/locales/rails.az.yml | 1 - config/locales/rails.be.yml | 1 - config/locales/rails.bg.yml | 1 - config/locales/rails.bn.yml | 1 - config/locales/rails.bs.yml | 1 - config/locales/rails.ca.yml | 1 - config/locales/rails.cs.yml | 1 - config/locales/rails.csb.yml | 1 - config/locales/rails.cy.yml | 1 - config/locales/rails.da.yml | 1 - config/locales/rails.de-AT.yml | 1 - config/locales/rails.de-CH.yml | 1 - config/locales/rails.de-DE.yml | 1 - config/locales/rails.de.yml | 1 - config/locales/rails.dsb.yml | 1 - config/locales/rails.el.yml | 1 - config/locales/rails.en-AU.yml | 1 - config/locales/rails.en-CA.yml | 1 - config/locales/rails.en-GB.yml | 1 - config/locales/rails.en-IE.yml | 1 - config/locales/rails.en-IN.yml | 1 - config/locales/rails.en-NZ.yml | 1 - config/locales/rails.en-US.yml | 1 - config/locales/rails.en-ZA.yml | 1 - config/locales/rails.eo.yml | 1 - config/locales/rails.es-419.yml | 1 - config/locales/rails.es-AR.yml | 1 - config/locales/rails.es-CL.yml | 1 - config/locales/rails.es-CO.yml | 1 - config/locales/rails.es-CR.yml | 1 - config/locales/rails.es-DO.yml | 1 - config/locales/rails.es-EC.yml | 1 - config/locales/rails.es-ES.yml | 1 - config/locales/rails.es-MX.yml | 1 - config/locales/rails.es-PA.yml | 1 - config/locales/rails.es-PE.yml | 1 - config/locales/rails.es-US.yml | 1 - config/locales/rails.es-VE.yml | 1 - config/locales/rails.es.yml | 1 - config/locales/rails.et.yml | 1 - config/locales/rails.eu.yml | 1 - config/locales/rails.fa.yml | 1 - config/locales/rails.fi.yml | 1 - config/locales/rails.fr-CA.yml | 1 - config/locales/rails.fr-CH.yml | 6 +++--- config/locales/rails.fr-FR.yml | 1 - config/locales/rails.fur.yml | 1 - config/locales/rails.gl.yml | 1 - config/locales/rails.gsw-CH.yml | 1 - config/locales/rails.he.yml | 1 - config/locales/rails.hi-IN.yml | 1 - config/locales/rails.hi.yml | 1 - config/locales/rails.hr.yml | 1 - config/locales/rails.hsb.yml | 1 - config/locales/rails.hu.yml | 1 - config/locales/rails.id.yml | 1 - config/locales/rails.is.yml | 1 - config/locales/rails.it-CH.yml | 1 - config/locales/rails.it.yml | 1 - config/locales/rails.ja.yml | 1 - config/locales/rails.km.yml | 1 - config/locales/rails.kn.yml | 1 - config/locales/rails.ko.yml | 1 - config/locales/rails.lb.yml | 1 - config/locales/rails.lo.yml | 1 - config/locales/rails.lt.yml | 1 - config/locales/rails.lv.yml | 1 - config/locales/rails.mk.yml | 1 - config/locales/rails.mn.yml | 1 - config/locales/rails.mr-IN.yml | 1 - config/locales/rails.ms.yml | 1 - config/locales/rails.nb.yml | 1 - config/locales/rails.ne.yml | 1 - config/locales/rails.nl.yml | 1 - config/locales/rails.nn.yml | 1 - config/locales/rails.or.yml | 1 - config/locales/rails.pa.yml | 1 - config/locales/rails.pap-AW.yml | 1 - config/locales/rails.pap-CW.yml | 1 - config/locales/rails.pl.yml | 1 - config/locales/rails.pt-BR.yml | 1 - config/locales/rails.pt.yml | 1 - config/locales/rails.rm.yml | 1 - config/locales/rails.ro.yml | 1 - config/locales/rails.ru.yml | 1 - config/locales/rails.scr.yml | 1 - config/locales/rails.sk.yml | 1 - config/locales/rails.sl.yml | 1 - config/locales/rails.sq.yml | 1 - config/locales/rails.sr.yml | 1 - config/locales/rails.sv.yml | 1 - config/locales/rails.sw.yml | 1 - config/locales/rails.ta.yml | 1 - config/locales/rails.th.yml | 1 - config/locales/rails.tl.yml | 1 - config/locales/rails.tr.yml | 1 - config/locales/rails.tt.yml | 1 - config/locales/rails.ug.yml | 1 - config/locales/rails.uk.yml | 1 - config/locales/rails.ur.yml | 1 - config/locales/rails.uz.yml | 1 - config/locales/rails.vi.yml | 1 - config/locales/rails.wo.yml | 1 - config/locales/rails.zh-CN.yml | 1 - config/locales/rails.zh-HK.yml | 1 - config/locales/rails.zh-TW.yml | 1 - config/locales/rails.zh-YUE.yml | 1 - 109 files changed, 3 insertions(+), 111 deletions(-) diff --git a/config/locales/rails.af.yml b/config/locales/rails.af.yml index a336d026c..aa0ed73f9 100644 --- a/config/locales/rails.af.yml +++ b/config/locales/rails.af.yml @@ -1,4 +1,3 @@ ---- af: date: abbr_day_names: diff --git a/config/locales/rails.ar.yml b/config/locales/rails.ar.yml index 849e7cd55..82795196e 100644 --- a/config/locales/rails.ar.yml +++ b/config/locales/rails.ar.yml @@ -1,4 +1,3 @@ ---- ar: date: abbr_day_names: diff --git a/config/locales/rails.az.yml b/config/locales/rails.az.yml index 09ba23ed3..c028ac361 100644 --- a/config/locales/rails.az.yml +++ b/config/locales/rails.az.yml @@ -1,4 +1,3 @@ ---- az: date: abbr_day_names: diff --git a/config/locales/rails.be.yml b/config/locales/rails.be.yml index 7aa6909d1..af0723953 100644 --- a/config/locales/rails.be.yml +++ b/config/locales/rails.be.yml @@ -1,4 +1,3 @@ ---- be: date: abbr_day_names: diff --git a/config/locales/rails.bg.yml b/config/locales/rails.bg.yml index d14804a54..50ef1f41c 100644 --- a/config/locales/rails.bg.yml +++ b/config/locales/rails.bg.yml @@ -1,4 +1,3 @@ ---- bg: date: abbr_day_names: diff --git a/config/locales/rails.bn.yml b/config/locales/rails.bn.yml index 6fcc2aae4..ae4c8baf1 100644 --- a/config/locales/rails.bn.yml +++ b/config/locales/rails.bn.yml @@ -1,4 +1,3 @@ ---- bn: date: abbr_day_names: diff --git a/config/locales/rails.bs.yml b/config/locales/rails.bs.yml index 3371fcc94..c5af13d34 100644 --- a/config/locales/rails.bs.yml +++ b/config/locales/rails.bs.yml @@ -1,4 +1,3 @@ ---- bs: date: abbr_day_names: diff --git a/config/locales/rails.ca.yml b/config/locales/rails.ca.yml index 2dfc47b6f..69e28ece0 100644 --- a/config/locales/rails.ca.yml +++ b/config/locales/rails.ca.yml @@ -1,4 +1,3 @@ ---- ca: date: abbr_day_names: diff --git a/config/locales/rails.cs.yml b/config/locales/rails.cs.yml index 31629a838..cccb4db45 100644 --- a/config/locales/rails.cs.yml +++ b/config/locales/rails.cs.yml @@ -1,4 +1,3 @@ ---- cs: date: abbr_day_names: diff --git a/config/locales/rails.csb.yml b/config/locales/rails.csb.yml index 782419850..ee6ea08f9 100644 --- a/config/locales/rails.csb.yml +++ b/config/locales/rails.csb.yml @@ -1,4 +1,3 @@ -csb: date: abbr_day_names: - nie diff --git a/config/locales/rails.cy.yml b/config/locales/rails.cy.yml index b8d726148..9c959f832 100644 --- a/config/locales/rails.cy.yml +++ b/config/locales/rails.cy.yml @@ -1,4 +1,3 @@ ---- cy: date: abbr_day_names: diff --git a/config/locales/rails.da.yml b/config/locales/rails.da.yml index b228a7d31..ef7ab6d9a 100644 --- a/config/locales/rails.da.yml +++ b/config/locales/rails.da.yml @@ -1,4 +1,3 @@ ---- da: date: abbr_day_names: diff --git a/config/locales/rails.de-AT.yml b/config/locales/rails.de-AT.yml index ee8798f87..e87bb6f76 100644 --- a/config/locales/rails.de-AT.yml +++ b/config/locales/rails.de-AT.yml @@ -1,4 +1,3 @@ ---- de-AT: date: abbr_day_names: diff --git a/config/locales/rails.de-CH.yml b/config/locales/rails.de-CH.yml index 21c73689f..74eb15cec 100644 --- a/config/locales/rails.de-CH.yml +++ b/config/locales/rails.de-CH.yml @@ -1,4 +1,3 @@ ---- de-CH: date: abbr_day_names: diff --git a/config/locales/rails.de-DE.yml b/config/locales/rails.de-DE.yml index d6faad2ce..8dd43df7c 100644 --- a/config/locales/rails.de-DE.yml +++ b/config/locales/rails.de-DE.yml @@ -1,4 +1,3 @@ ---- de-DE: date: abbr_day_names: diff --git a/config/locales/rails.de.yml b/config/locales/rails.de.yml index 52730cbda..3b870b49c 100644 --- a/config/locales/rails.de.yml +++ b/config/locales/rails.de.yml @@ -1,4 +1,3 @@ ---- de: date: abbr_day_names: diff --git a/config/locales/rails.dsb.yml b/config/locales/rails.dsb.yml index c8afd099b..80fb98779 100644 --- a/config/locales/rails.dsb.yml +++ b/config/locales/rails.dsb.yml @@ -1,4 +1,3 @@ -dsb: date: abbr_day_names: - Nj diff --git a/config/locales/rails.el.yml b/config/locales/rails.el.yml index ec67f13a3..2e1c40efe 100644 --- a/config/locales/rails.el.yml +++ b/config/locales/rails.el.yml @@ -1,4 +1,3 @@ ---- el: date: abbr_day_names: diff --git a/config/locales/rails.en-AU.yml b/config/locales/rails.en-AU.yml index cecede89f..87b499fbb 100644 --- a/config/locales/rails.en-AU.yml +++ b/config/locales/rails.en-AU.yml @@ -1,4 +1,3 @@ ---- en-AU: date: abbr_day_names: diff --git a/config/locales/rails.en-CA.yml b/config/locales/rails.en-CA.yml index 38117295e..94ea41022 100644 --- a/config/locales/rails.en-CA.yml +++ b/config/locales/rails.en-CA.yml @@ -1,4 +1,3 @@ ---- en-CA: date: abbr_day_names: diff --git a/config/locales/rails.en-GB.yml b/config/locales/rails.en-GB.yml index 7ce71e96b..37544fd78 100644 --- a/config/locales/rails.en-GB.yml +++ b/config/locales/rails.en-GB.yml @@ -1,4 +1,3 @@ ---- en-GB: date: abbr_day_names: diff --git a/config/locales/rails.en-IE.yml b/config/locales/rails.en-IE.yml index 567ae00cc..367a029d4 100644 --- a/config/locales/rails.en-IE.yml +++ b/config/locales/rails.en-IE.yml @@ -1,4 +1,3 @@ ---- en-IE: date: abbr_day_names: diff --git a/config/locales/rails.en-IN.yml b/config/locales/rails.en-IN.yml index 1d0159e29..b88c424f8 100644 --- a/config/locales/rails.en-IN.yml +++ b/config/locales/rails.en-IN.yml @@ -1,4 +1,3 @@ ---- en-IN: date: abbr_day_names: diff --git a/config/locales/rails.en-NZ.yml b/config/locales/rails.en-NZ.yml index 5fe5d7c94..21f7902c9 100644 --- a/config/locales/rails.en-NZ.yml +++ b/config/locales/rails.en-NZ.yml @@ -1,4 +1,3 @@ ---- en-NZ: date: abbr_day_names: diff --git a/config/locales/rails.en-US.yml b/config/locales/rails.en-US.yml index 60c95aa78..3157d9eb0 100644 --- a/config/locales/rails.en-US.yml +++ b/config/locales/rails.en-US.yml @@ -1,4 +1,3 @@ ---- en-US: date: abbr_day_names: diff --git a/config/locales/rails.en-ZA.yml b/config/locales/rails.en-ZA.yml index 63f08ab1c..d927e5a9a 100644 --- a/config/locales/rails.en-ZA.yml +++ b/config/locales/rails.en-ZA.yml @@ -1,4 +1,3 @@ ---- en-ZA: date: abbr_day_names: diff --git a/config/locales/rails.eo.yml b/config/locales/rails.eo.yml index de3837b05..2ff565f8a 100644 --- a/config/locales/rails.eo.yml +++ b/config/locales/rails.eo.yml @@ -1,4 +1,3 @@ ---- eo: date: abbr_day_names: diff --git a/config/locales/rails.es-419.yml b/config/locales/rails.es-419.yml index 4fdb0c4cb..ea0cd5427 100644 --- a/config/locales/rails.es-419.yml +++ b/config/locales/rails.es-419.yml @@ -1,4 +1,3 @@ ---- es-419: date: abbr_day_names: diff --git a/config/locales/rails.es-AR.yml b/config/locales/rails.es-AR.yml index 857a02a40..08bb935cb 100644 --- a/config/locales/rails.es-AR.yml +++ b/config/locales/rails.es-AR.yml @@ -1,4 +1,3 @@ ---- es-AR: date: abbr_day_names: diff --git a/config/locales/rails.es-CL.yml b/config/locales/rails.es-CL.yml index 7852a6428..43e439ab7 100644 --- a/config/locales/rails.es-CL.yml +++ b/config/locales/rails.es-CL.yml @@ -1,4 +1,3 @@ ---- es-CL: date: abbr_day_names: diff --git a/config/locales/rails.es-CO.yml b/config/locales/rails.es-CO.yml index 41cac639e..e5a56a75c 100644 --- a/config/locales/rails.es-CO.yml +++ b/config/locales/rails.es-CO.yml @@ -1,4 +1,3 @@ ---- es-CO: date: abbr_day_names: diff --git a/config/locales/rails.es-CR.yml b/config/locales/rails.es-CR.yml index 3dbd390fb..a988a6f1a 100644 --- a/config/locales/rails.es-CR.yml +++ b/config/locales/rails.es-CR.yml @@ -1,4 +1,3 @@ ---- es-CR: date: abbr_day_names: diff --git a/config/locales/rails.es-DO.yml b/config/locales/rails.es-DO.yml index fdba089d8..f2ab40e16 100644 --- a/config/locales/rails.es-DO.yml +++ b/config/locales/rails.es-DO.yml @@ -1,4 +1,3 @@ ---- es-DO: date: abbr_day_names: diff --git a/config/locales/rails.es-EC.yml b/config/locales/rails.es-EC.yml index 01727a753..584d778ba 100644 --- a/config/locales/rails.es-EC.yml +++ b/config/locales/rails.es-EC.yml @@ -1,4 +1,3 @@ ---- es-EC: date: abbr_day_names: diff --git a/config/locales/rails.es-ES.yml b/config/locales/rails.es-ES.yml index ed1cc4e4a..61a2c43a5 100644 --- a/config/locales/rails.es-ES.yml +++ b/config/locales/rails.es-ES.yml @@ -1,4 +1,3 @@ ---- es-ES: date: abbr_day_names: diff --git a/config/locales/rails.es-MX.yml b/config/locales/rails.es-MX.yml index 3987c01c0..b82b4b566 100644 --- a/config/locales/rails.es-MX.yml +++ b/config/locales/rails.es-MX.yml @@ -1,4 +1,3 @@ ---- es-MX: date: abbr_day_names: diff --git a/config/locales/rails.es-PA.yml b/config/locales/rails.es-PA.yml index a107acded..e4769347e 100644 --- a/config/locales/rails.es-PA.yml +++ b/config/locales/rails.es-PA.yml @@ -1,4 +1,3 @@ ---- es-PA: date: abbr_day_names: diff --git a/config/locales/rails.es-PE.yml b/config/locales/rails.es-PE.yml index 071b1b889..ebf01e0e6 100644 --- a/config/locales/rails.es-PE.yml +++ b/config/locales/rails.es-PE.yml @@ -1,4 +1,3 @@ ---- es-PE: date: abbr_day_names: diff --git a/config/locales/rails.es-US.yml b/config/locales/rails.es-US.yml index 814d45b53..3d6cdb681 100644 --- a/config/locales/rails.es-US.yml +++ b/config/locales/rails.es-US.yml @@ -1,4 +1,3 @@ ---- es-US: date: abbr_day_names: diff --git a/config/locales/rails.es-VE.yml b/config/locales/rails.es-VE.yml index 21f15b275..f35abc3ad 100644 --- a/config/locales/rails.es-VE.yml +++ b/config/locales/rails.es-VE.yml @@ -1,4 +1,3 @@ ---- es-VE: date: abbr_day_names: diff --git a/config/locales/rails.es.yml b/config/locales/rails.es.yml index 35f3083d2..d88a38231 100644 --- a/config/locales/rails.es.yml +++ b/config/locales/rails.es.yml @@ -1,4 +1,3 @@ ---- es: date: abbr_day_names: diff --git a/config/locales/rails.et.yml b/config/locales/rails.et.yml index c92b7d6d0..92033728f 100644 --- a/config/locales/rails.et.yml +++ b/config/locales/rails.et.yml @@ -1,4 +1,3 @@ ---- et: date: abbr_day_names: diff --git a/config/locales/rails.eu.yml b/config/locales/rails.eu.yml index 5be132476..d8e7c9c6e 100644 --- a/config/locales/rails.eu.yml +++ b/config/locales/rails.eu.yml @@ -1,4 +1,3 @@ ---- eu: date: abbr_day_names: diff --git a/config/locales/rails.fa.yml b/config/locales/rails.fa.yml index 3187060c3..bdf1fdea9 100644 --- a/config/locales/rails.fa.yml +++ b/config/locales/rails.fa.yml @@ -1,4 +1,3 @@ ---- fa: date: abbr_day_names: diff --git a/config/locales/rails.fi.yml b/config/locales/rails.fi.yml index de76b4b0f..73a145a55 100644 --- a/config/locales/rails.fi.yml +++ b/config/locales/rails.fi.yml @@ -1,4 +1,3 @@ ---- fi: date: abbr_day_names: diff --git a/config/locales/rails.fr-CA.yml b/config/locales/rails.fr-CA.yml index 357fd8eed..b7bb0c2ee 100644 --- a/config/locales/rails.fr-CA.yml +++ b/config/locales/rails.fr-CA.yml @@ -1,4 +1,3 @@ ---- fr-CA: date: abbr_day_names: diff --git a/config/locales/rails.fr-CH.yml b/config/locales/rails.fr-CH.yml index f8cbda189..6e44d5808 100644 --- a/config/locales/rails.fr-CH.yml +++ b/config/locales/rails.fr-CH.yml @@ -1,4 +1,3 @@ ---- fr-CH: date: abbr_day_names: @@ -10,7 +9,7 @@ fr-CH: - ven - sam abbr_month_names: - - + - - jan. - fév. - mar. @@ -36,7 +35,7 @@ fr-CH: long: "%e %B %Y" short: "%e %b" month_names: - - + - - janvier - février - mars @@ -133,6 +132,7 @@ fr-CH: one: ne fait pas la bonne longueur (doit comporter un seul caractère) other: ne fait pas la bonne longueur (doit comporter %{count} caractères) other_than: doit être différent de %{count} + wrong_content_type: "ce type de contenu n'est pas autorisé" template: body: 'Veuillez vérifier les champs suivants : ' header: diff --git a/config/locales/rails.fr-FR.yml b/config/locales/rails.fr-FR.yml index 1d32eec14..11c2eef79 100644 --- a/config/locales/rails.fr-FR.yml +++ b/config/locales/rails.fr-FR.yml @@ -1,4 +1,3 @@ ---- fr-FR: date: abbr_day_names: diff --git a/config/locales/rails.fur.yml b/config/locales/rails.fur.yml index 721aaf8e3..e0fe64f7a 100644 --- a/config/locales/rails.fur.yml +++ b/config/locales/rails.fur.yml @@ -1,4 +1,3 @@ -fur: date: abbr_day_names: - dom diff --git a/config/locales/rails.gl.yml b/config/locales/rails.gl.yml index c6a4b8342..409252cda 100644 --- a/config/locales/rails.gl.yml +++ b/config/locales/rails.gl.yml @@ -1,4 +1,3 @@ ---- gl: date: abbr_day_names: diff --git a/config/locales/rails.gsw-CH.yml b/config/locales/rails.gsw-CH.yml index 4d7d63129..ce98c0d82 100644 --- a/config/locales/rails.gsw-CH.yml +++ b/config/locales/rails.gsw-CH.yml @@ -1,4 +1,3 @@ -"gsw-CH": date: abbr_day_names: - Su diff --git a/config/locales/rails.he.yml b/config/locales/rails.he.yml index 59b60c13a..daae5dbef 100644 --- a/config/locales/rails.he.yml +++ b/config/locales/rails.he.yml @@ -1,4 +1,3 @@ ---- he: date: abbr_day_names: diff --git a/config/locales/rails.hi-IN.yml b/config/locales/rails.hi-IN.yml index 9331735aa..5c015dc7e 100644 --- a/config/locales/rails.hi-IN.yml +++ b/config/locales/rails.hi-IN.yml @@ -1,4 +1,3 @@ ---- hi-IN: date: abbr_day_names: diff --git a/config/locales/rails.hi.yml b/config/locales/rails.hi.yml index 47d1ad66e..2bbf0c7d7 100644 --- a/config/locales/rails.hi.yml +++ b/config/locales/rails.hi.yml @@ -1,4 +1,3 @@ ---- hi: date: abbr_day_names: diff --git a/config/locales/rails.hr.yml b/config/locales/rails.hr.yml index c8710e675..87b6db1c2 100644 --- a/config/locales/rails.hr.yml +++ b/config/locales/rails.hr.yml @@ -1,4 +1,3 @@ ---- hr: date: abbr_day_names: diff --git a/config/locales/rails.hsb.yml b/config/locales/rails.hsb.yml index cd94b7b91..8306d6440 100644 --- a/config/locales/rails.hsb.yml +++ b/config/locales/rails.hsb.yml @@ -1,4 +1,3 @@ -hsb: date: abbr_day_names: - Nj diff --git a/config/locales/rails.hu.yml b/config/locales/rails.hu.yml index a9565da02..fe7cc52ef 100644 --- a/config/locales/rails.hu.yml +++ b/config/locales/rails.hu.yml @@ -1,4 +1,3 @@ ---- hu: date: abbr_day_names: diff --git a/config/locales/rails.id.yml b/config/locales/rails.id.yml index f4fbf4f9f..116a5cc23 100644 --- a/config/locales/rails.id.yml +++ b/config/locales/rails.id.yml @@ -1,4 +1,3 @@ ---- id: date: abbr_day_names: diff --git a/config/locales/rails.is.yml b/config/locales/rails.is.yml index eec02d0eb..e5809f371 100644 --- a/config/locales/rails.is.yml +++ b/config/locales/rails.is.yml @@ -1,4 +1,3 @@ ---- is: date: abbr_day_names: diff --git a/config/locales/rails.it-CH.yml b/config/locales/rails.it-CH.yml index 9c98b9cb6..59c1d0b1e 100644 --- a/config/locales/rails.it-CH.yml +++ b/config/locales/rails.it-CH.yml @@ -1,4 +1,3 @@ ---- it-CH: date: abbr_day_names: diff --git a/config/locales/rails.it.yml b/config/locales/rails.it.yml index 799ad9c46..eedb61139 100644 --- a/config/locales/rails.it.yml +++ b/config/locales/rails.it.yml @@ -1,4 +1,3 @@ ---- it: date: abbr_day_names: diff --git a/config/locales/rails.ja.yml b/config/locales/rails.ja.yml index fdb427ca9..5e2875ad9 100644 --- a/config/locales/rails.ja.yml +++ b/config/locales/rails.ja.yml @@ -1,4 +1,3 @@ ---- ja: date: abbr_day_names: diff --git a/config/locales/rails.km.yml b/config/locales/rails.km.yml index f0b787fc1..a07b04fd4 100644 --- a/config/locales/rails.km.yml +++ b/config/locales/rails.km.yml @@ -1,4 +1,3 @@ ---- km: date: abbr_day_names: diff --git a/config/locales/rails.kn.yml b/config/locales/rails.kn.yml index 2df3f0ed2..7a494afd3 100644 --- a/config/locales/rails.kn.yml +++ b/config/locales/rails.kn.yml @@ -1,4 +1,3 @@ ---- kn: date: abbr_day_names: diff --git a/config/locales/rails.ko.yml b/config/locales/rails.ko.yml index e5324cc11..66389f62d 100644 --- a/config/locales/rails.ko.yml +++ b/config/locales/rails.ko.yml @@ -1,4 +1,3 @@ ---- ko: date: abbr_day_names: diff --git a/config/locales/rails.lb.yml b/config/locales/rails.lb.yml index 7c04d3c44..d8934190d 100644 --- a/config/locales/rails.lb.yml +++ b/config/locales/rails.lb.yml @@ -1,4 +1,3 @@ -lb: date: abbr_day_names: - Son diff --git a/config/locales/rails.lo.yml b/config/locales/rails.lo.yml index 0e2a100f4..718a9f889 100644 --- a/config/locales/rails.lo.yml +++ b/config/locales/rails.lo.yml @@ -1,4 +1,3 @@ ---- lo: date: abbr_day_names: diff --git a/config/locales/rails.lt.yml b/config/locales/rails.lt.yml index 8c1e8b8c9..6ea1567ea 100644 --- a/config/locales/rails.lt.yml +++ b/config/locales/rails.lt.yml @@ -1,4 +1,3 @@ ---- lt: date: abbr_day_names: diff --git a/config/locales/rails.lv.yml b/config/locales/rails.lv.yml index f679de5f0..78016d9d7 100644 --- a/config/locales/rails.lv.yml +++ b/config/locales/rails.lv.yml @@ -1,4 +1,3 @@ ---- lv: date: abbr_day_names: diff --git a/config/locales/rails.mk.yml b/config/locales/rails.mk.yml index 120335dd3..7d2edf2bd 100644 --- a/config/locales/rails.mk.yml +++ b/config/locales/rails.mk.yml @@ -1,4 +1,3 @@ ---- mk: date: abbr_day_names: diff --git a/config/locales/rails.mn.yml b/config/locales/rails.mn.yml index 816dbb636..75dfcdfb4 100644 --- a/config/locales/rails.mn.yml +++ b/config/locales/rails.mn.yml @@ -1,4 +1,3 @@ ---- mn: date: abbr_day_names: diff --git a/config/locales/rails.mr-IN.yml b/config/locales/rails.mr-IN.yml index 9a57dd655..85cfb8e4d 100644 --- a/config/locales/rails.mr-IN.yml +++ b/config/locales/rails.mr-IN.yml @@ -1,4 +1,3 @@ ---- mr-IN: date: abbr_day_names: diff --git a/config/locales/rails.ms.yml b/config/locales/rails.ms.yml index ae6c8ad71..965a00b60 100644 --- a/config/locales/rails.ms.yml +++ b/config/locales/rails.ms.yml @@ -1,4 +1,3 @@ ---- ms: date: abbr_day_names: diff --git a/config/locales/rails.nb.yml b/config/locales/rails.nb.yml index bc5385995..13f121bc9 100644 --- a/config/locales/rails.nb.yml +++ b/config/locales/rails.nb.yml @@ -1,4 +1,3 @@ ---- nb: date: abbr_day_names: diff --git a/config/locales/rails.ne.yml b/config/locales/rails.ne.yml index 7ed306e70..87b20c896 100644 --- a/config/locales/rails.ne.yml +++ b/config/locales/rails.ne.yml @@ -1,4 +1,3 @@ ---- ne: date: abbr_day_names: diff --git a/config/locales/rails.nl.yml b/config/locales/rails.nl.yml index e74ce94a6..e0b18dd63 100644 --- a/config/locales/rails.nl.yml +++ b/config/locales/rails.nl.yml @@ -1,4 +1,3 @@ ---- nl: date: abbr_day_names: diff --git a/config/locales/rails.nn.yml b/config/locales/rails.nn.yml index 44092fca6..2ba24351e 100644 --- a/config/locales/rails.nn.yml +++ b/config/locales/rails.nn.yml @@ -1,4 +1,3 @@ ---- nn: date: abbr_day_names: diff --git a/config/locales/rails.or.yml b/config/locales/rails.or.yml index 511f9d06e..fbe93b15a 100644 --- a/config/locales/rails.or.yml +++ b/config/locales/rails.or.yml @@ -1,4 +1,3 @@ ---- or: date: abbr_day_names: diff --git a/config/locales/rails.pa.yml b/config/locales/rails.pa.yml index f4ff4954f..9d6893e41 100644 --- a/config/locales/rails.pa.yml +++ b/config/locales/rails.pa.yml @@ -1,4 +1,3 @@ ---- pa: date: abbr_day_names: diff --git a/config/locales/rails.pap-AW.yml b/config/locales/rails.pap-AW.yml index e743025ae..eba60dd53 100644 --- a/config/locales/rails.pap-AW.yml +++ b/config/locales/rails.pap-AW.yml @@ -1,4 +1,3 @@ -# pap-AW copy of pap-CW and by no means correct. By M. Maduro for Suares & Co pap-AW: date: abbr_day_names: diff --git a/config/locales/rails.pap-CW.yml b/config/locales/rails.pap-CW.yml index a862fa3cf..f3324cd96 100644 --- a/config/locales/rails.pap-CW.yml +++ b/config/locales/rails.pap-CW.yml @@ -1,4 +1,3 @@ -# pap-CW by M. Madurao for Suares & Co pap-CW: date: abbr_day_names: diff --git a/config/locales/rails.pl.yml b/config/locales/rails.pl.yml index fb3f6bc7f..fc1f291be 100644 --- a/config/locales/rails.pl.yml +++ b/config/locales/rails.pl.yml @@ -1,4 +1,3 @@ ---- pl: date: abbr_day_names: diff --git a/config/locales/rails.pt-BR.yml b/config/locales/rails.pt-BR.yml index 2fcc19e17..0469dc1b9 100644 --- a/config/locales/rails.pt-BR.yml +++ b/config/locales/rails.pt-BR.yml @@ -1,4 +1,3 @@ ---- pt-BR: date: abbr_day_names: diff --git a/config/locales/rails.pt.yml b/config/locales/rails.pt.yml index 0d30d920f..eb91ad48c 100644 --- a/config/locales/rails.pt.yml +++ b/config/locales/rails.pt.yml @@ -1,4 +1,3 @@ ---- pt: date: abbr_day_names: diff --git a/config/locales/rails.rm.yml b/config/locales/rails.rm.yml index 958e23330..2f12ea8ce 100644 --- a/config/locales/rails.rm.yml +++ b/config/locales/rails.rm.yml @@ -1,4 +1,3 @@ ---- rm: date: abbr_day_names: diff --git a/config/locales/rails.ro.yml b/config/locales/rails.ro.yml index 0639ac730..b08f9c80d 100644 --- a/config/locales/rails.ro.yml +++ b/config/locales/rails.ro.yml @@ -1,4 +1,3 @@ ---- ro: date: abbr_day_names: diff --git a/config/locales/rails.ru.yml b/config/locales/rails.ru.yml index 58bf0fa40..d905a5de5 100644 --- a/config/locales/rails.ru.yml +++ b/config/locales/rails.ru.yml @@ -1,4 +1,3 @@ ---- ru: date: abbr_day_names: diff --git a/config/locales/rails.scr.yml b/config/locales/rails.scr.yml index 93be0dd2c..142d6d3f8 100644 --- a/config/locales/rails.scr.yml +++ b/config/locales/rails.scr.yml @@ -1,4 +1,3 @@ -scr: date: abbr_day_names: - Ned diff --git a/config/locales/rails.sk.yml b/config/locales/rails.sk.yml index 4e3b9382f..85d3f0c47 100644 --- a/config/locales/rails.sk.yml +++ b/config/locales/rails.sk.yml @@ -1,4 +1,3 @@ ---- sk: date: abbr_day_names: diff --git a/config/locales/rails.sl.yml b/config/locales/rails.sl.yml index 5744aaec8..8f4cb4985 100644 --- a/config/locales/rails.sl.yml +++ b/config/locales/rails.sl.yml @@ -1,4 +1,3 @@ ---- sl: date: abbr_day_names: diff --git a/config/locales/rails.sq.yml b/config/locales/rails.sq.yml index 21ffdca91..aba3896d4 100644 --- a/config/locales/rails.sq.yml +++ b/config/locales/rails.sq.yml @@ -1,4 +1,3 @@ ---- sq: date: abbr_day_names: diff --git a/config/locales/rails.sr.yml b/config/locales/rails.sr.yml index f352fc67a..f0edc971c 100644 --- a/config/locales/rails.sr.yml +++ b/config/locales/rails.sr.yml @@ -1,4 +1,3 @@ ---- sr: date: abbr_day_names: diff --git a/config/locales/rails.sv.yml b/config/locales/rails.sv.yml index 9267cebf4..c51b42635 100644 --- a/config/locales/rails.sv.yml +++ b/config/locales/rails.sv.yml @@ -1,4 +1,3 @@ ---- sv: date: abbr_day_names: diff --git a/config/locales/rails.sw.yml b/config/locales/rails.sw.yml index 5ef280c92..90aa753f1 100644 --- a/config/locales/rails.sw.yml +++ b/config/locales/rails.sw.yml @@ -1,4 +1,3 @@ ---- sw: date: abbr_day_names: diff --git a/config/locales/rails.ta.yml b/config/locales/rails.ta.yml index b5a1abc32..5ddca4154 100644 --- a/config/locales/rails.ta.yml +++ b/config/locales/rails.ta.yml @@ -1,4 +1,3 @@ ---- ta: date: abbr_day_names: diff --git a/config/locales/rails.th.yml b/config/locales/rails.th.yml index b73ba04ec..39649c007 100644 --- a/config/locales/rails.th.yml +++ b/config/locales/rails.th.yml @@ -1,4 +1,3 @@ ---- th: date: abbr_day_names: diff --git a/config/locales/rails.tl.yml b/config/locales/rails.tl.yml index ec9255541..7e1f88607 100644 --- a/config/locales/rails.tl.yml +++ b/config/locales/rails.tl.yml @@ -1,4 +1,3 @@ ---- tl: date: formats: diff --git a/config/locales/rails.tr.yml b/config/locales/rails.tr.yml index e1682b478..7ad22b758 100644 --- a/config/locales/rails.tr.yml +++ b/config/locales/rails.tr.yml @@ -1,4 +1,3 @@ ---- tr: date: abbr_day_names: diff --git a/config/locales/rails.tt.yml b/config/locales/rails.tt.yml index 6a12efda7..ce0043eb6 100644 --- a/config/locales/rails.tt.yml +++ b/config/locales/rails.tt.yml @@ -1,4 +1,3 @@ ---- tt: date: abbr_day_names: diff --git a/config/locales/rails.ug.yml b/config/locales/rails.ug.yml index 92ace4b4d..c751dac44 100644 --- a/config/locales/rails.ug.yml +++ b/config/locales/rails.ug.yml @@ -1,4 +1,3 @@ ---- ug: date: abbr_day_names: diff --git a/config/locales/rails.uk.yml b/config/locales/rails.uk.yml index c9a822be8..50cb35994 100644 --- a/config/locales/rails.uk.yml +++ b/config/locales/rails.uk.yml @@ -1,4 +1,3 @@ ---- uk: date: abbr_day_names: diff --git a/config/locales/rails.ur.yml b/config/locales/rails.ur.yml index 93888cc7b..8115bdb00 100644 --- a/config/locales/rails.ur.yml +++ b/config/locales/rails.ur.yml @@ -1,4 +1,3 @@ ---- ur: date: abbr_day_names: diff --git a/config/locales/rails.uz.yml b/config/locales/rails.uz.yml index 6c034ed0b..95286c73f 100644 --- a/config/locales/rails.uz.yml +++ b/config/locales/rails.uz.yml @@ -1,4 +1,3 @@ ---- uz: date: abbr_day_names: diff --git a/config/locales/rails.vi.yml b/config/locales/rails.vi.yml index 4bcca5069..036812697 100644 --- a/config/locales/rails.vi.yml +++ b/config/locales/rails.vi.yml @@ -1,4 +1,3 @@ ---- vi: date: abbr_day_names: diff --git a/config/locales/rails.wo.yml b/config/locales/rails.wo.yml index 564ebe205..b2e6deb37 100644 --- a/config/locales/rails.wo.yml +++ b/config/locales/rails.wo.yml @@ -1,4 +1,3 @@ ---- wo: date: abbr_day_names: diff --git a/config/locales/rails.zh-CN.yml b/config/locales/rails.zh-CN.yml index 4afe5d102..eb4d8d439 100644 --- a/config/locales/rails.zh-CN.yml +++ b/config/locales/rails.zh-CN.yml @@ -1,4 +1,3 @@ ---- zh-CN: date: abbr_day_names: diff --git a/config/locales/rails.zh-HK.yml b/config/locales/rails.zh-HK.yml index 79c7d5182..2bf1faa4d 100644 --- a/config/locales/rails.zh-HK.yml +++ b/config/locales/rails.zh-HK.yml @@ -1,4 +1,3 @@ ---- zh-HK: date: abbr_day_names: diff --git a/config/locales/rails.zh-TW.yml b/config/locales/rails.zh-TW.yml index 1cc8c29ff..b28218b26 100644 --- a/config/locales/rails.zh-TW.yml +++ b/config/locales/rails.zh-TW.yml @@ -1,4 +1,3 @@ ---- zh-TW: date: abbr_day_names: diff --git a/config/locales/rails.zh-YUE.yml b/config/locales/rails.zh-YUE.yml index 57fc77b63..b1c8cce27 100644 --- a/config/locales/rails.zh-YUE.yml +++ b/config/locales/rails.zh-YUE.yml @@ -1,4 +1,3 @@ ---- zh-YUE: date: abbr_day_names: From 89e30980e095eb358c6c60be43bb9b902cb31b31 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 27 Apr 2017 18:35:00 +0200 Subject: [PATCH 2/3] [bug] unable to set locale other than fr or en --- CHANGELOG.md | 6 +++++- README.md | 6 ++++++ app/views/application/index.html.erb | 2 +- config/application.rb | 1 + config/application.yml.default | 1 + config/secrets.yml | 4 ++++ docker/env.example | 1 + 7 files changed, 19 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 981500607..4d092d67b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog Fab Manager +## Next Release +- Fix a bug: Unable to define application locale other than `fr` or `en`. +- [TODO DEPLOY] add `APP_LOCALE` environment variable (see README.md for configuration details) + ## v2.5.3 2017 April 27 - Project view: added responsive support on external images @@ -13,7 +17,7 @@ ## v2.5.1 2017 March 28 - hide spaces in admin's credit management if spaces are disabled -- Fix a bug : Can not display training tracking (this bug was introduced in version 2.5.0) +- Fix a bug: Can not display training tracking (this bug was introduced in version 2.5.0) - [TODO DEPLOY] `rake assets:precompile` ## v2.5.0 2017 March 28 diff --git a/README.md b/README.md index 0dfc7f2b6..8bd19ad13 100644 --- a/README.md +++ b/README.md @@ -546,6 +546,12 @@ If you are in a development environment, your can keep the default values, other #### Settings + APP_LOCALE + +Configure application's main localization and translation settings. + +See `config/locales/app.*.yml` for a list of available locales. Default is **en**. + RAILS_LOCALE Configure Ruby on Rails localization settings (currency, dates, number formats ...). diff --git a/app/views/application/index.html.erb b/app/views/application/index.html.erb index 708f7be69..eb7111e73 100644 --- a/app/views/application/index.html.erb +++ b/app/views/application/index.html.erb @@ -30,7 +30,7 @@ Fablab.gaId = "<%= Rails.application.secrets.google_analytics_id %>"; // i18n stuff - Fablab.locale = "<%= I18n.locale %>"; + Fablab.locale = "<%= Rails.application.secrets.app_locale %>"; Fablab.moment_locale = "<%= Rails.application.secrets.moment_locale %>"; Fablab.summernote_locale = "<%= Rails.application.secrets.summernote_locale %>"; Fablab.fullcalendar_locale = "<%= Rails.application.secrets.fullcalendar_locale %>"; diff --git a/config/application.rb b/config/application.rb index c692e74af..c05bfb93e 100644 --- a/config/application.rb +++ b/config/application.rb @@ -35,6 +35,7 @@ module Fablab # /!\ ALL locales SHOULD be configured accordingly with this locale. /!\ # config.i18n.default_locale = Rails.application.secrets.rails_locale + config.i18n.fallbacks = [Rails.application.secrets.app_locale, :en] config.assets.paths << Rails.root.join('vendor', 'assets', 'components').to_s diff --git a/config/application.yml.default b/config/application.yml.default index b213c0a71..ab2e0b224 100644 --- a/config/application.yml.default +++ b/config/application.yml.default @@ -41,6 +41,7 @@ TWITTER_ACCESS_TOKEN_SECRET: '' FACEBOOK_APP_ID: '' RAILS_LOCALE: 'fr' +APP_LOCALE: 'fr' MOMENT_LOCALE: 'fr' SUMMERNOTE_LOCALE: 'fr-FR' ANGULAR_LOCALE: 'fr-fr' diff --git a/config/secrets.yml b/config/secrets.yml index 292503f91..d7cfafe37 100644 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -26,6 +26,7 @@ development: uib_date_format: <%= ENV["UIB_DATE_FORMAT"] %> excel_date_format: <%= ENV["EXCEL_DATE_FORMAT"]%> rails_locale: <%= ENV["RAILS_LOCALE"] %> + app_locale: <%= ENV["APP_LOCALE"] %> moment_locale: <%= ENV["MOMENT_LOCALE"] %> summernote_locale: <%= ENV["SUMMERNOTE_LOCALE"] %> angular_locale: <%= ENV["ANGULAR_LOCALE"] %> @@ -60,6 +61,7 @@ test: uib_date_format: dd/MM/yyyy excel_date_format: dd/mm/yyyy rails_locale: en + app_locale: en moment_locale: en summernote_locale: en-US angular_locale: en-us @@ -99,6 +101,7 @@ staging: uib_date_format: <%= ENV["UIB_DATE_FORMAT"] %> excel_date_format: <%= ENV["EXCEL_DATE_FORMAT"]%> rails_locale: <%= ENV["RAILS_LOCALE"] %> + app_locale: <%= ENV["APP_LOCALE"] %> moment_locale: <%= ENV["MOMENT_LOCALE"] %> summernote_locale: <%= ENV["SUMMERNOTE_LOCALE"] %> angular_locale: <%= ENV["ANGULAR_LOCALE"] %> @@ -140,6 +143,7 @@ production: uib_date_format: <%= ENV["UIB_DATE_FORMAT"] %> excel_date_format: <%= ENV["EXCEL_DATE_FORMAT"]%> rails_locale: <%= ENV["RAILS_LOCALE"] %> + app_locale: <%= ENV["APP_LOCALE"] %> moment_locale: <%= ENV["MOMENT_LOCALE"] %> summernote_locale: <%= ENV["SUMMERNOTE_LOCALE"] %> angular_locale: <%= ENV["ANGULAR_LOCALE"] %> diff --git a/docker/env.example b/docker/env.example index c2a422d06..f896f9262 100644 --- a/docker/env.example +++ b/docker/env.example @@ -38,6 +38,7 @@ TWITTER_ACCESS_TOKEN_SECRET= FACEBOOK_APP_ID= RAILS_LOCALE=fr +APP_LOCALE=fr MOMENT_LOCALE=fr SUMMERNOTE_LOCALE=fr-FR ANGULAR_LOCALE=fr-fr From 565aafb455af233be486635d952bf7fbab19197c Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 4 May 2017 12:59:04 +0200 Subject: [PATCH 3/3] Version 2.5.4 --- .fabmanager-version | 2 +- CHANGELOG.md | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.fabmanager-version b/.fabmanager-version index aedc15bb0..fe16b348d 100644 --- a/.fabmanager-version +++ b/.fabmanager-version @@ -1 +1 @@ -2.5.3 +2.5.4 diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d092d67b..a561254e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changelog Fab Manager -## Next Release +## v2.5.4 2017 May 4 + - Fix a bug: Unable to define application locale other than `fr` or `en`. - [TODO DEPLOY] add `APP_LOCALE` environment variable (see README.md for configuration details)