From 92398c6d8d3c50bf2e3f5d1f010265e334a7a04a Mon Sep 17 00:00:00 2001
From: Sylvain <sylvain@sbx.pm>
Date: Wed, 8 Apr 2020 16:32:22 +0200
Subject: [PATCH] Allow removing contacts from the about page + defaut locales

---
 CHANGELOG.md                               | 1 +
 app/assets/templates/shared/about.html.erb | 5 +++--
 config/initializers/i18n.rb                | 5 -----
 config/initializers/locale.rb              | 7 +++++++
 4 files changed, 11 insertions(+), 7 deletions(-)
 delete mode 100644 config/initializers/i18n.rb
 create mode 100644 config/initializers/locale.rb

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df0b912e3..e3a468800 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - Compatible database with Fab-manager v1, to allow upgrades
 - Updated documentation
 - Changed In-Context pseudo-language to Zulu instead of Acholi
+- Allow removing contacts from the about page
 - Fix a bug: installation without nginx does not remove the service from the docker-compose file
 - Fix a bug: default twitter feed is invalid
 - Fix a bug: default nginx configuration does not allows secure cookies
diff --git a/app/assets/templates/shared/about.html.erb b/app/assets/templates/shared/about.html.erb
index 33cce5a6d..ef0fd8ab1 100644
--- a/app/assets/templates/shared/about.html.erb
+++ b/app/assets/templates/shared/about.html.erb
@@ -8,7 +8,8 @@
   </div>
 
   <div class="row padder">
-    <div class="col-sm-offset-1 col-md-offset-3 col-sm-7 col-md-5 col-lg-4 m-b-lg">
+    <div ng-class="{'col-sm-10 col-md-6 col-lg-6':!aboutContacts.value, 'col-sm-7 col-md-5 col-lg-4':aboutContacts.value}"
+         class="col-sm-offset-1 col-md-offset-3 col-sm-7 col-md-5 col-lg-4 m-b-lg">
       <span ng-bind-html="aboutBody.value"></span>
       <p ng-show="cgu">
         <a href="{{cgu.custom_asset_file_attributes.attachment_url}}" target="_blank" translate>{{ 'app.public.about.read_the_fablab_policy' }}</a>
@@ -21,7 +22,7 @@
       </p>
     </div>
 
-    <div class="col-sm-offset-0 col-md-offset-0 col-lg-offset-1 col-sm-4 col-md-4">
+    <div class="col-sm-offset-0 col-md-offset-0 col-lg-offset-1 col-sm-4 col-md-4" ng-show="aboutContacts.value">
       <h2 class="about-title-aside text-u-c" translate>{{ 'app.public.about.your_fablab_s_contacts' }}</h2>
       <span ng-bind-html="aboutContacts.value"></span>
     </div>
diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
deleted file mode 100644
index 73785fed9..000000000
--- a/config/initializers/i18n.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-# we allow the Zulu locale (zu) as it is used for In-Context translation
-# @see https://support.crowdin.com/in-context-localization/
-I18n.config.available_locales = :zu
\ No newline at end of file
diff --git a/config/initializers/locale.rb b/config/initializers/locale.rb
new file mode 100644
index 000000000..6cab93747
--- /dev/null
+++ b/config/initializers/locale.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# List of all allowed values for RAILS_LOCALE
+I18n.config.available_locales += %i[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-PA es-PE es-US es-VE pt pt-BR zu]
+# we allow the Zulu locale (zu) as it is used for In-Context translation
+# @see https://support.crowdin.com/in-context-localization/