From bd0b4f1117cfec841351f50fc6ccba5dda96036d Mon Sep 17 00:00:00 2001
From: Monica Mateiu <monica.mateiu@gmail.com>
Date: Wed, 6 Oct 2021 16:53:58 +0100
Subject: [PATCH] Tokenize settings menu and add French translations (#14905)

* tokenize settings menu and add French translations

* add quotes around tokens

* add tokens in alphabetical order

Co-authored-by: Ben Halpern <bendhalpern@gmail.com>
---
 app/controllers/users_controller.rb      |  2 +-
 app/lib/constants/settings.rb            | 13 -------------
 app/lib/settings.rb                      | 13 +++++++++++++
 app/views/users/edit.html.erb            |  4 ++--
 config/locales/en.yml                    |  8 ++++++++
 config/locales/fr.yml                    |  8 ++++++++
 spec/requests/user/user_settings_spec.rb |  2 +-
 7 files changed, 33 insertions(+), 17 deletions(-)
 delete mode 100644 app/lib/constants/settings.rb
 create mode 100644 app/lib/settings.rb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 0123c94dd..df47576e1 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -267,7 +267,7 @@ class UsersController < ApplicationController
       handle_integrations_tab
       handle_response_templates_tab
     else
-      not_found unless @tab.in?(Constants::Settings::TAB_LIST.map { |t| t.downcase.tr(" ", "-") })
+      not_found unless @tab.in?(Settings.tab_list.map { |t| t.downcase.tr(" ", "-") })
     end
   end
 
diff --git a/app/lib/constants/settings.rb b/app/lib/constants/settings.rb
deleted file mode 100644
index 3e8dda9bf..000000000
--- a/app/lib/constants/settings.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-module Constants
-  module Settings
-    TAB_LIST = %w[
-      Profile
-      Customization
-      Notifications
-      Account
-      Billing
-      Organization
-      Extensions
-    ].freeze
-  end
-end
diff --git a/app/lib/settings.rb b/app/lib/settings.rb
new file mode 100644
index 000000000..39b6e273b
--- /dev/null
+++ b/app/lib/settings.rb
@@ -0,0 +1,13 @@
+module Settings
+  def self.tab_list
+    [
+      I18n.t("settings_menu.profile"),
+      I18n.t("settings_menu.customization"),
+      I18n.t("settings_menu.notifications"),
+      I18n.t("settings_menu.account"),
+      I18n.t("settings_menu.billing"),
+      I18n.t("settings_menu.organization"),
+      I18n.t("settings_menu.extensions"),
+    ]
+  end
+end
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index b261e9181..17c67a4b2 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -44,7 +44,7 @@
   <div class="crayons-layout crayons-layout--2-cols crayons-layout--limited-l pt-0">
     <div class="crayons-layout__left-sidebar">
       <nav class="hidden m:block" aria-label="Settings">
-        <% Constants::Settings::TAB_LIST.each do |possible_tab| %>
+        <% Settings.tab_list.each do |possible_tab| %>
           <a class="crayons-link crayons-link--block <% if @tab == possible_tab.downcase.tr(' ', '-') %>crayons-link--current<% end %>" href="/settings/<%= possible_tab.downcase.tr(" ", "-") %>">
             <%= inline_svg_tag("twemoji/#{possible_tab.downcase.tr(' ', '-')}", aria: true, class: "crayons-icon crayons-icon--default", title: possible_tab) %>
             <%= possible_tab %>
@@ -53,7 +53,7 @@
       </nav>
       <div class="m:hidden p-2 pt-0">
         <select id="mobile-page-selector" class="crayons-select">
-          <% Constants::Settings::TAB_LIST.each do |possible_tab| %>
+          <% Settings.tab_list.each do |possible_tab| %>
             <option value="/settings/<%= possible_tab.downcase.tr(" ", "-") %>" <% if @tab == possible_tab.downcase.tr(' ', '-') %> selected <% end %>>
               <%= possible_tab %>
             </option>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e670b1dca..109bcacf6 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -79,3 +79,11 @@ en:
       unparsable: Podcast's rss couldn't be parsed
       unplayable: This podcast may not be playable in the browser
       unreachable: Podcast's feed_url is not reachable
+  settings_menu:
+    profile: "Profile"
+    customization: "Customization"
+    notifications: "Notifications"
+    account: "Account"
+    billing: "Billing"
+    organization: "Organization"
+    extensions: "Extensions"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index e32611f7d..39cd76bd9 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -102,3 +102,11 @@ fr:
       unparsable: Le rss du podcast n'a pas pu être analysé
       unplayable: Ce podcast peut ne pas être lisible dans le navigateur
       unreachable: Le feed_url du podcast n'est pas accessible
+  settings_menu:
+    profile: Profil
+    customization: Personnalisation
+    notifications: Notifications
+    account: Compte
+    billing: Facturation
+    organization: Organisation
+    extensions: Extensions
diff --git a/spec/requests/user/user_settings_spec.rb b/spec/requests/user/user_settings_spec.rb
index 99054f809..04b0b9db3 100644
--- a/spec/requests/user/user_settings_spec.rb
+++ b/spec/requests/user/user_settings_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe "UserSettings", type: :request do
       before { sign_in user }
 
       it "renders various settings tabs properly" do
-        Constants::Settings::TAB_LIST.each do |tab|
+        Settings.tab_list.each do |tab|
           get user_settings_path(tab.downcase.tr(" ", "-"))
 
           expect(response.body).to include("Settings for")