From f33bd2ef233d48df5eaf18ae620f4ac79600b0b5 Mon Sep 17 00:00:00 2001
From: Sylvain <sylvain@sleede.com>
Date: Mon, 20 Feb 2023 10:18:19 +0100
Subject: [PATCH] (bug) unable to configure locale to fr-CA

---
 CHANGELOG.md                  | 2 ++
 config/initializers/locale.rb | 3 +--
 doc/environment.md            | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b29c27fb2..2e55c1a31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog Fab-manager
 
+- Fix a bug: unable to configure RAILS_LOCALE to fr-CA
+
 ## v5.7.0 2023 February 17
 
 - Report user's prepaid packs in the dashboard
diff --git a/config/initializers/locale.rb b/config/initializers/locale.rb
index ffaba7cf5..8a2818fd1 100644
--- a/config/initializers/locale.rb
+++ b/config/initializers/locale.rb
@@ -3,7 +3,7 @@
 # List of all allowed values for RAILS_LOCALE
 I18n.config.available_locales += %i[de de-AT de-CH de-DE
                                     en en-AU en-CA en-GB en-IE en-IN en-NZ en-US en-ZA
-                                    fr fa-CA fr-CH fr-CM fr-FR
+                                    fr fr-CA fr-CH fr-CM fr-FR
                                     es es-419 es-AR es-CL es-CO es-CR es-DO es-EC es-ES es-MX es-PA es-PE es-US es-VE
                                     no
                                     pt pt-BR
@@ -11,7 +11,6 @@ I18n.config.available_locales += %i[de de-AT de-CH de-DE
 # we allow the Zulu locale (zu) as it is used for In-Context translation
 # @see https://support.crowdin.com/in-context-localization/
 
-
 #
 # /!\ ALL locales SHOULD be configured accordingly with the default_locale. /!\
 #
diff --git a/doc/environment.md b/doc/environment.md
index 8e9bdccc6..d02241e21 100644
--- a/doc/environment.md
+++ b/doc/environment.md
@@ -196,8 +196,7 @@ Please, be aware that **the configured locale will imply the CURRENCY symbol use
 
 _Eg.: configuring **es-ES** will set the currency symbol to **€** but **es-MX** will set **$** as currency symbol, so setting the `RAILS_LOCALE` to simple **es** (without country indication) will probably not do what you expect._
 
-Available values: `en, en-AU-CA, en-GB, en-IE, en-IN, en-NZ, en-US, en-ZA, fr, fa-CA, fr-CH, fr-CM, fr-FR, es, es-419, es-AR, es-CL, es-CO, es-CR, es-DO,
-  es-EC, es-ES, es-MX, es-MX, es-PA, es-PE, es-US, es-VE, no, pt, pt-BR, zu`.
+Available values: `en, en-AU-CA, en-GB, en-IE, en-IN, en-NZ, en-US, en-ZA, fr, fr-CA, fr-CH, fr-CM, fr-FR, es, es-419, es-AR, es-CL, es-CO, es-CR, es-DO, es-EC, es-ES, es-MX, es-MX, es-PA, es-PE, es-US, es-VE, no, pt, pt-BR, zu`.
 When not defined, it defaults to **en**.
 
 If your locale is not present in that list or any locale doesn't have your exact expectations, please open a pull request to share your modifications with the community and obtain a rebuilt docker image.