From 2148a9361c3b48c296746d61124e019e8fa69d28 Mon Sep 17 00:00:00 2001
From: Maximilien Bausson <m.bausson@pantographe.studio>
Date: Thu, 5 Oct 2023 12:30:24 +0200
Subject: [PATCH 01/12] Added translations for bays and its partials

---
 app/views/bays/_export_button.html.erb   | 18 +++++-----
 app/views/bays/_form.html.erb            |  8 ++---
 app/views/bays/edit.html.erb             | 12 +++----
 app/views/bays/index.html.erb            | 43 +++++++++++++++++-------
 app/views/bays/new.html.erb              | 12 ++++---
 app/views/bays/show.html.erb             | 16 ++++-----
 app/views/bays/show.js.erb               |  2 +-
 app/views/rooms/_action_buttons.html.erb | 32 +++++++++---------
 app/views/servers/_room.html.erb         |  2 +-
 config/locales/activerecord.fr.yml       | 13 +++++++
 config/locales/fr.yml                    | 28 +++++++++++++++
 11 files changed, 122 insertions(+), 64 deletions(-)

diff --git a/app/views/bays/_export_button.html.erb b/app/views/bays/_export_button.html.erb
index b15fc52c4..56f2f46bd 100644
--- a/app/views/bays/_export_button.html.erb
+++ b/app/views/bays/_export_button.html.erb
@@ -1,37 +1,37 @@
 <div class="btn-group">
   <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-    Exports <span class="caret"></span>
+    <%= t("export_button.label") %> <span class="caret"></span>
   </button>
   <ul class="dropdown-menu dropdown-menu-right">
 
     <li class="dropdown-submenu pull-left">
       <%= link_to bay_path(bay, format: 'pdf', view: 'front', bg: ''), target: :_blank do %>
         <span class="glyphicon glyphicon-file" aria-hidden="true"></span>
-        Export PDF
+        <%= t("export_button.exports.pdf") %>
       <% end %>
       <ul class="dropdown-menu dropdown-menu-left">
         <li>
           <%= link_to bay_path(bay, format: 'pdf', view: 'front', bg: ''), target: :_blank do %>
             <span class="glyphicon glyphicon-file" aria-hidden="true"></span>
-            Face avant
+            <%= t("export_button.faces.front") %>
           <% end %>
         </li>
         <li>
           <%= link_to bay_path(bay, format: 'pdf', view: 'back', bg: ''), target: :_blank do %>
             <span class="glyphicon glyphicon-file" aria-hidden="true"></span>
-            Face arrière
+            <%= t("export_button.faces.back") %>
           <% end %>
         </li>
         <li>
           <%= link_to bay_path(bay, format: 'pdf', view: 'front', bg: 'cablage'), target: :_blank do %>
             <span class="glyphicon glyphicon-file" aria-hidden="true"></span>
-            Cablage - Face avant
+            <%= t("export_button.faces.front_wiring") %>
           <% end %>
         </li>
         <li>
           <%= link_to bay_path(bay, format: 'pdf', view: 'back', bg: 'cablage'), target: :_blank do %>
             <span class="glyphicon glyphicon-file" aria-hidden="true"></span>
-            Cablage - Face arrière
+            <%= t("export_button.faces.back_wiring") %>
           <% end %>
         </li>
       </ul>
@@ -39,13 +39,13 @@
 
     <li><%= link_to bay_path(bay, format: 'txt', view: '', bg: '') do %>
         <span class="glyphicon glyphicon-text-background" aria-hidden="true"></span>
-        Export Txt
+        <%= t("export_button.exports.txt") %>
       <% end %>
     </li>
 
     <li><%= link_to bay_path(bay, format: 'pdf', view: 'front', bg: '', debug: '1'), target: :_blank do %>
         <span class="glyphicon glyphicon-print" aria-hidden="true"></span>
-        Impression
+        <%= t("export_button.exports.print") %>
       <% end %>
     </li>
 
@@ -53,7 +53,7 @@
 
     <li><%= link_to ports_path(room_id: bay.islet.room_id, bay_id: bay.id) do %>
       <span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span>
-        Liste des ports
+        <%= t("export_button.port_list") %>
       <% end %>
     </li>
 
diff --git a/app/views/bays/_form.html.erb b/app/views/bays/_form.html.erb
index 98ff8aef9..89ee833d1 100644
--- a/app/views/bays/_form.html.erb
+++ b/app/views/bays/_form.html.erb
@@ -2,7 +2,7 @@
   <% if @bay.errors.any? %>
     <div class="alert alert-danger alert-dismissable" role="alert">
       <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-      <h4><%= pluralize(@bay.errors.count, "erreur", "erreurs") %> lors de la sauvegarde :</h4>
+      <h4><%= t("form.errors.title", count: @bay.errors.count) %></h4>
 
       <ul>
       <% @bay.errors.full_messages.each do |msg| %>
@@ -13,14 +13,14 @@
   <% end %>
 
   <div class="form-group">
-    <%= f.label 'Salle et Ilot', class: "col-sm-2 control-label" %>
+    <%= f.label :islet_id, class: "col-sm-2 control-label" %>
     <div class="col-sm-10">
       <%= f.select :islet_id, options_from_collection_for_select(Islet.includes(:room).all, :id, :name_with_room, @bay.islet_id), class: "form-control" %>
     </div>
   </div>
 
   <div class="form-group">
-    <%= f.label 'Ligne', class: "col-sm-2 control-label" %>
+    <%= f.label :lane, class: "col-sm-2 control-label" %>
     <div class="col-sm-10">
       <%= f.text_field :lane, class: "form-control" %>
     </div>
@@ -34,7 +34,7 @@
   </div>
 
   <div class="form-group">
-    <%= f.label 'Type de baie', class: "col-sm-2 control-label" %>
+    <%= f.label :bay_type_id, class: "col-sm-2 control-label" %>
     <div class="col-sm-10">
       <%= f.select :bay_type_id, options_from_collection_for_select(BayType.all, :id, :to_s, @bay.bay_type_id), class: "form-control" %>
     </div>
diff --git a/app/views/bays/edit.html.erb b/app/views/bays/edit.html.erb
index 575bb3218..72d028997 100644
--- a/app/views/bays/edit.html.erb
+++ b/app/views/bays/edit.html.erb
@@ -1,6 +1,6 @@
 <%= render 'layouts/breadcrumb', breadcrumb_variables: {
   t("inventories") => modeles_url,
-  'Baies et doubles-baies' => bays_path,
+  Bay.model_name.human.pluralize => bays_path,
   @bay.frames.map(&:name).join(' - ') => ''}
 %>
 
@@ -8,13 +8,11 @@
   <div class="page-header">
     <%= link_to bays_path, class: 'btn btn-default' do %>
       <span class="glyphicon glyphicon-list-alt"></span>
-      Retour
+      <%= t("action.back") %>
     <% end %>
-    <%= link_to @bay, class: 'btn btn-primary' do %>
-      <span class="glyphicon glyphicon-info-sign"></span>
-      Voir
-    <% end %>
-    <h1>Modifier la baie <%= @bay.bay_type_id == 2 ? 'double' : 'simple' %> <%= @bay.frames.map(&:name).join(' / ') %> </h1>
+    <h1>
+      <%= t(".title", type: @bay.bay_type_id == 2 ? 'double' : 'simple', frames: @bay.frames.map(&:name).join(' / ')) %>
+    </h1>
   </div>
 
   <%= render 'form' %>
diff --git a/app/views/bays/index.html.erb b/app/views/bays/index.html.erb
index 181ff8fb8..e1dcea5b1 100644
--- a/app/views/bays/index.html.erb
+++ b/app/views/bays/index.html.erb
@@ -1,4 +1,7 @@
-<%= render 'layouts/breadcrumb', breadcrumb_variables: {t("inventories") => modeles_url, 'Baies et doubles-baies' => ''} %>
+<%= render 'layouts/breadcrumb', breadcrumb_variables: {
+  t("inventories") => modeles_url,
+  Bay.model_name.human.pluralize => "" }
+%>
 
 <div class="container-fluid">
 
@@ -13,21 +16,35 @@
       <div class="page-header">
         <%= link_to new_bay_path, class: 'btn btn-primary btn-disabled' do %>
           <span class="glyphicon glyphicon-plus"></span>
-          Ajouter une baie ou un couple de baies
+          <%= t('.new') %>
         <% end %>
-        <h1>Baies et doubles-baies</h1>
+        <h1>
+          <%= t('.title') %>
+        </h1>
       </div>
 
       <div class="table-responsive">
         <table class="table table-striped table-bordered table-hover">
           <thead>
             <tr>
-              <th>Salle</th>
-              <th>Ilot</th>
-              <th>Baies</th>
-              <th>Ligne</th>
-              <th>Position</th>
-              <th>Nombre de serveurs</th>
+              <th>
+                <%= Room.model_name.human %>
+              </th>
+              <th>
+                <%= Islet.model_name.human %>
+              </th>
+              <th>
+                <%= Bay.model_name.human.pluralize %>
+              </th>
+              <th>
+                <%= Bay.human_attribute_name(:lane) %>
+              </th>
+              <th>
+                <%= Bay.human_attribute_name(:position) %>
+              </th>
+              <th>
+                <%= t(".server_count") %>
+              </th>
               <th></th>
             </tr>
           </thead>
@@ -53,15 +70,15 @@
                 <td><%= bay.lane %> </td>
                 <td><%= bay.position %> </td>
 
-                <td><%= pluralize(bay.materials.count, 'serveur', 'serveurs') %> </td>
+                <td><%= Bay.human_attribute_name(:materials_count, count: bay.materials.count) %> </td>
 
                 <td class="text-right">
                   <%= render partial: "bays/export_button", locals: { bay: bay } %>
-                  <%= link_to 'Modifier', edit_bay_path(bay), class: 'btn btn-primary' %>
-                  <%= link_to 'Supprimer',
+                  <%= link_to t("action.edit"), edit_bay_path(bay), class: 'btn btn-primary' %>
+                  <%= link_to t("action.delete"),
                               bay,
                               method: :delete,
-                              data: { confirm: 'Cette baie ne pourra pas être supprimée tant qu\'elle est associée à au moins un chassis. Voulez-vous continuer ?' },
+                              data: { confirm: t(".delete_confirmation") },
                               class: 'btn btn-danger' %>
                 </td>
               </tr>
diff --git a/app/views/bays/new.html.erb b/app/views/bays/new.html.erb
index 0a76ca226..ecfbdef3f 100644
--- a/app/views/bays/new.html.erb
+++ b/app/views/bays/new.html.erb
@@ -1,16 +1,18 @@
 <%= render 'layouts/breadcrumb', breadcrumb_variables: {
   t("inventories") => modeles_url,
-  'Baies et doubles-baies' => bays_path,
-  'Nouvelle baie' => ''}
-%>
+  Bay.model_name.human.pluralize => bays_path,
+  t(".title") => ''
+}%>
 
 <div class="container">
   <div class="page-header">
     <%= link_to bays_path, class: 'btn btn-default' do %>
       <span class="glyphicon glyphicon-list-alt"></span>
-      Retour
+      <%= t("action.back") %>
     <% end %>
-    <h1>Ajouter une baie</h1>
+    <h1>
+      <%= t(".title") %>
+    </h1>
   </div>
 
   <%= render 'form' %>
diff --git a/app/views/bays/show.html.erb b/app/views/bays/show.html.erb
index c310c69c9..2a3312996 100644
--- a/app/views/bays/show.html.erb
+++ b/app/views/bays/show.html.erb
@@ -1,21 +1,21 @@
-<% provide :title, "Double baie #{@bay}" %>
+<% provide :title, t(".title", bay: @bay) %>
 <%
   breadcrumb_variables = { t("visualization") => overview_rooms_path, @bay.room.name => room_path(@bay.room, view: params[:view]) }
   if @bay.islet.name.present?
-    breadcrumb_variables["Ilot #{@bay.islet.name}"] = room_path(@bay.room, islet: @bay.islet.name, view: params[:view])
+    breadcrumb_variables[t("breadcrumb.islet", islet: @bay.islet.name)] = room_path(@bay.room, islet: @bay.islet.name, view: params[:view])
   elsif params[:islet].present?
-    breadcrumb_variables["Ilot #{params[:islet]}"] = ''
+    breadcrumb_variables[t("breadcrumb.islet", islet: params[:islet])] = ''
   end
-  breadcrumb_variables["Double baie #{@bay}"] = ''
+  breadcrumb_variables[t(".title", bay: @bay)] = ''
 %>
 <%= render 'layouts/breadcrumb', breadcrumb_variables: breadcrumb_variables %>
 
 <div class="container-fluid" id="bay-container">
   <%= render partial: 'servers/room', locals: {
-    room: @bay.room,
-    islets: @servers_per_frames[@bay.islet.room_id],
-    title: @bay.frames.size > 1 ? "Double baie #{@bay}" : @bay,
-    view_side: params[:view],
+              room: @bay.room,
+              islets: @servers_per_frames[@bay.islet.room_id],
+              title: Bay.human_attribute_name(:bay_frames, count: @bay.frames.size, bay: @bay),
+              view_side: params[:view],
   } %>
 </div>
 
diff --git a/app/views/bays/show.js.erb b/app/views/bays/show.js.erb
index dcb24a2b5..b1cb739d9 100644
--- a/app/views/bays/show.js.erb
+++ b/app/views/bays/show.js.erb
@@ -8,7 +8,7 @@ $('.couple .overviewed_frame[data-bay-id=<%= @bay.id %>]').addClass('selected')
 $('#bay-container').html("<%= escape_javascript(render partial: 'servers/room', locals: {
               room: @bay.room,
               islets: @servers_per_frames[@bay.islet.room_id],
-              title: @bay.frames.size > 1 ? "Double baie #{@bay}" : @bay,
+              title: Bay.human_attribute_name(:bay_frames, count: @bay.frames.count, bay: @bay),
               view_side: params[:view]}) %>")
 
 var searchParams = new URLSearchParams(window.location.search)
diff --git a/app/views/rooms/_action_buttons.html.erb b/app/views/rooms/_action_buttons.html.erb
index ca19da6e7..c717c5c70 100644
--- a/app/views/rooms/_action_buttons.html.erb
+++ b/app/views/rooms/_action_buttons.html.erb
@@ -6,12 +6,12 @@
     <!-- Choice of server background color -->
     <div class="btn-group">
       <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-        Couleur de fond : <%= params[:bg] || 'modèle' %> <span class="caret"></span>
+        <%= t(".background_color", bg: params[:bg] || 'modèle') %> <span class="caret"></span>
       </button>
       <ul class="dropdown-menu">
-        <li><%= link_to 'Modèle', url_for( params.except(:controller, :action).permit(:view, :islet, :id, :bg, :format).merge({:view => 'front', bg: 'modele', islet: params[:islet], id: params[:id]})), remote: true  %></li>
-        <li><%= link_to 'Gestionnaire', url_for( params.except(:controller, :action).permit(:view, :islet, :id, :bg, :format).merge({:view => 'front', bg: 'gestionnaire', islet: params[:islet], id: params[:id]})), remote: true  %></li>
-        <li><%= link_to 'Cluster', url_for( params.except(:controller, :action).permit(:view, :islet, :id, :bg, :format).merge({:view => 'front', bg: 'cluster', islet: params[:islet], id: params[:id]})), remote: true  %></li>
+        <li><%= link_to t(".background_choices.modele"), url_for( params.except(:controller, :action).permit(:view, :islet, :id, :bg, :format).merge({:view => 'front', bg: 'modele', islet: params[:islet], id: params[:id]})), remote: true  %></li>
+        <li><%= link_to t(".background_choices.manager"), url_for( params.except(:controller, :action).permit(:view, :islet, :id, :bg, :format).merge({:view => 'front', bg: 'gestionnaire', islet: params[:islet], id: params[:id]})), remote: true  %></li>
+        <li><%= link_to t(".background_choices.cluster"), url_for( params.except(:controller, :action).permit(:view, :islet, :id, :bg, :format).merge({:view => 'front', bg: 'cluster', islet: params[:islet], id: params[:id]})), remote: true  %></li>
       </ul>
     </div>
   <% end %>
@@ -19,54 +19,54 @@
   <!-- Views FRONT / BACK -->
   <% if view_side==Frame.view_sides[:both] %>
      <%= content_tag :div, class: 'btn btn-default disabled' do %>
-      Vue avant & arrière
+      <%= t(".views.back_front") %>
     <% end %>
   <% else %>
     <%= link_to url_for(params.except(:controller, :action).permit(:view, :islet, :id, :bg, :format).merge({:view => (view_side == Frame.view_sides[:back] ? Frame.view_sides[:front] : Frame.view_sides[:back]), islet: params['islet'], id: params['id']})), class: 'btn btn-success', remote: true do %>
       <span class="glyphicon glyphicon-refresh" aria-hidden="true"></span>
-      <%= (view_side==Frame.view_sides[:back] ? 'Vue avant' : 'Vue arrière') %>
+      <%= (view_side==Frame.view_sides[:back] ? t(".views.front") : t(".views.back")) %>
     <% end %>
   <% end %>
 
   <%= link_to "#", class: 'btn btn-danger', id: 'drag-n-drop-switcher' do %>
     <span class="glyphicon glyphicon-move" aria-hidden="true"></span>
-    Activer le drag'n drop
+    <%= t(".dragn_drop.enable") %>
   <% end %>
 
   <% if formats!=[:pdf] && @room.present? && !@room.kind_of?(String) %>
     <div class="btn-group">
       <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-        Exports <span class="caret"></span>
+        <%= t("export_button.label") %> <span class="caret"></span>
       </button>
       <ul class="dropdown-menu dropdown-menu-right">
         <li class="dropdown-submenu pull-left">
           <%= link_to url_for(params.except(:controller, :action).permit(:view, :islet, :id, :bg, :format).merge({'format' => 'pdf'})), target: :_blank do %>
             <span class="glyphicon glyphicon-file" aria-hidden="true"></span>
-            Export PDF
+            <%= t("export_button.exports.pdf") %>
           <% end %>
           <ul class="dropdown-menu dropdown-menu-left">
             <li>
               <%= link_to url_for(params.except(:controller, :action).permit(:view, :islet, :id, :bg, :format).merge({'format' => 'pdf', 'view' => 'front'})), target: :_blank do %>
                 <span class="glyphicon glyphicon-file" aria-hidden="true"></span>
-                Face avant
+                <%= t("export_button.faces.front") %>
               <% end %>
             </li>
             <li>
               <%= link_to url_for(params.except(:controller, :action).permit(:view, :islet, :id, :bg, :format).merge({'format' => 'pdf', 'view' => 'back'})), target: :_blank do %>
                 <span class="glyphicon glyphicon-file" aria-hidden="true"></span>
-                Face arrière
+                <%= t("export_button.faces.back") %>
               <% end %>
             </li>
             <li>
               <%= link_to url_for(params.except(:controller, :action).permit(:view, :islet, :id, :bg, :format).merge({'format' => 'pdf', 'view' => 'front', 'bg' => 'cablage'})), target: :_blank do %>
                 <span class="glyphicon glyphicon-file" aria-hidden="true"></span>
-                Cablage - Face avant
+                <%= t("export_button.faces.front_wiring") %>
               <% end %>
             </li>
             <li>
               <%= link_to url_for(params.except(:controller, :action).permit(:view, :islet, :id, :bg, :format).merge({'format' => 'pdf', 'view' => 'back', 'bg' => 'cablage'})), target: :_blank do %>
                 <span class="glyphicon glyphicon-file" aria-hidden="true"></span>
-                Cablage - Face arrière
+                <%= t("export_button.faces.back_wiring") %>
               <% end %>
             </li>
           </ul>
@@ -74,20 +74,20 @@
         <li>
           <%= link_to url_for(params.except(:controller, :action).permit(:view, :islet, :id, :bg, :format).merge({'format' => 'txt'})) do %>
           <span class="glyphicon glyphicon-text-background" aria-hidden="true"></span>
-            Export Txt
+            <%= t("export_button.exports.txt") %>
           <% end %>
         </li>
         <li>
           <%= link_to url_for(params.except(:controller, :action).permit(:view, :islet, :id, :bg, :format).merge({'format' => 'pdf', 'debug' => '1'})), target: :_blank do %>
           <span class="glyphicon glyphicon-print" aria-hidden="true"></span>
-            Impression
+            <%= t("export_button.exports.print") %>
           <% end %>
         </li>
         <li role="separator" class="divider"></li>
         <li>
           <%= link_to ports_path(room_id: @room.id, frame_id: @frame.try(:id)) do %>
           <span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span>
-            Liste des ports
+            <%= t("export_button.port_list") %>
           <% end %>
         </li>
       </ul>
diff --git a/app/views/servers/_room.html.erb b/app/views/servers/_room.html.erb
index 84e4ec9c9..b5cf4b1c0 100644
--- a/app/views/servers/_room.html.erb
+++ b/app/views/servers/_room.html.erb
@@ -11,7 +11,7 @@
           <% if local_assigns[:title].present? %>
             <div><h3><%= title %></h3></div>
           <% elsif room.present? %>
-            <div><h3>Salle <%= room %> - Ilot <%= islet %></h3></div>
+            <div><h3><%= t(".title_room", room:, islet:) %></h3></div>
           <% end %>
           <div class="row">
             <ul class="frames <%= view_side %>"
diff --git a/config/locales/activerecord.fr.yml b/config/locales/activerecord.fr.yml
index 45d303489..53d790773 100644
--- a/config/locales/activerecord.fr.yml
+++ b/config/locales/activerecord.fr.yml
@@ -145,6 +145,19 @@ fr:
         name: Nom
         description: Description
         modeles_count: Usage
+      bay:
+        lane: Ligne
+        position: Position
+        materials_count:
+          one: 1 serveur
+          other: "%{count} serveurs"
+          zero: 0 serveurs
+        bay_frames:
+          one: "%{bay}"
+          other: Double baie %{bay}
+        islet_id: Salle et Ilot
+        bay_type_id: Type de baie
+
     errors:
       models:
         user:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 2532948b7..335610d14 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -44,6 +44,34 @@ fr:
     destroy:
       flashes:
         destroyed: L'ilôt a bien été supprimé.
+  bays:
+    index:
+      new: Ajouter une baie ou un couple de baies
+      server_count: Nombre de serveurs
+      title: Baies et doubles-baies
+      delete_confirmation: Cette baie ne pourra pas être supprimée tant qu'elle est associée à au moins un chassis. Voulez-vous continuer ?
+    show:
+      title: Double baie %{bay}
+    new:
+      title: Ajouter une baie
+    edit:
+      title: Modifier la baie %{type} %{frames}
+  rooms:
+    action_buttons:
+      background_color: 'Couleur de fond : %{bg}'
+      background_choices:
+        modele: Modèle
+        manager: Gestionnaire
+        cluster: Cluster
+      views:
+        back_front: Vue avant & arrière
+        front: Vue avant
+        back: Vue arrière
+      dragn_drop:
+        enable: Activer le drag'n drop
+  servers:
+    room:
+      title_room: Salle %{room} - Ilot %{islet}
   pages:
     params_menu:
       location:

From 5e32c0d3e3340ed5263c732e6f0a2ca2a0772509 Mon Sep 17 00:00:00 2001
From: Maximilien Bausson <m.bausson@pantographe.studio>
Date: Thu, 5 Oct 2023 14:40:27 +0200
Subject: [PATCH 02/12] Added controller translations

---
 app/controllers/bays_controller.rb | 6 +++---
 config/locales/fr.yml              | 9 +++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/controllers/bays_controller.rb b/app/controllers/bays_controller.rb
index 1d0f77d2a..e64b87fc5 100644
--- a/app/controllers/bays_controller.rb
+++ b/app/controllers/bays_controller.rb
@@ -52,7 +52,7 @@ def create
 
     respond_to do |format|
       if @bay.save
-        format.html { redirect_to bays_path, notice: 'la baie a été ajoutée.' }
+        format.html { redirect_to bays_path, notice: t(".flashes.created") }
         format.json { render :show, status: :created, location: @bay }
       else
         format.html { render :new }
@@ -64,7 +64,7 @@ def create
   def update
     respond_to do |format|
       if @bay.update(bay_params)
-        format.html { redirect_to bays_path, notice: 'La baie a été mise à jour.' }
+        format.html { redirect_to bays_path, notice: t(".flashes.updated") }
         format.json { render :show, status: :ok, location: @bay }
       else
         format.html { render :edit }
@@ -76,7 +76,7 @@ def update
   def destroy
     if @bay.destroy
       respond_to do |format|
-        format.html { redirect_to bays_url, notice: 'Bay a bien été supprimé.' }
+        format.html { redirect_to bays_url, notice: t(".flashes.destroyed") }
         format.json { head :no_content }
       end
     else
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 335610d14..d01071666 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -54,8 +54,17 @@ fr:
       title: Double baie %{bay}
     new:
       title: Ajouter une baie
+    create:
+      flashes:
+        created: La baie a été ajoutée.
     edit:
       title: Modifier la baie %{type} %{frames}
+    update:
+      flashes:
+        updated: La baie a bien été mise à jour.
+    destroy:
+      flashes:
+        destroyed: Bay a bien été supprimé.
   rooms:
     action_buttons:
       background_color: 'Couleur de fond : %{bg}'

From b81f39fca86d56254a1b5cfbed5a969ac7ca59cc Mon Sep 17 00:00:00 2001
From: Maximilien Bausson <m.bausson@pantographe.studio>
Date: Wed, 11 Oct 2023 11:56:43 +0200
Subject: [PATCH 03/12] Added Frame.view_sides translations

---
 app/views/rooms/_action_buttons.html.erb | 4 ++--
 config/locales/activerecord.fr.yml       | 4 ++++
 config/locales/fr.yml                    | 4 ----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/rooms/_action_buttons.html.erb b/app/views/rooms/_action_buttons.html.erb
index c717c5c70..40d6adade 100644
--- a/app/views/rooms/_action_buttons.html.erb
+++ b/app/views/rooms/_action_buttons.html.erb
@@ -19,12 +19,12 @@
   <!-- Views FRONT / BACK -->
   <% if view_side==Frame.view_sides[:both] %>
      <%= content_tag :div, class: 'btn btn-default disabled' do %>
-      <%= t(".views.back_front") %>
+      <%= Frame.human_attribute_name("view_sides.both") %>
     <% end %>
   <% else %>
     <%= link_to url_for(params.except(:controller, :action).permit(:view, :islet, :id, :bg, :format).merge({:view => (view_side == Frame.view_sides[:back] ? Frame.view_sides[:front] : Frame.view_sides[:back]), islet: params['islet'], id: params['id']})), class: 'btn btn-success', remote: true do %>
       <span class="glyphicon glyphicon-refresh" aria-hidden="true"></span>
-      <%= (view_side==Frame.view_sides[:back] ? t(".views.front") : t(".views.back")) %>
+      <%= Frame.human_attribute_name("view_sides.#{view_side}") %>
     <% end %>
   <% end %>
 
diff --git a/config/locales/activerecord.fr.yml b/config/locales/activerecord.fr.yml
index 53d790773..9f6b67bfb 100644
--- a/config/locales/activerecord.fr.yml
+++ b/config/locales/activerecord.fr.yml
@@ -43,6 +43,10 @@ fr:
         frames_count:
           one: 1 châssis
           other: '%{count} châssis'
+      frame/view_sides:
+        front: Vue avant
+        back: Vue arrière
+        both: Vue avant & arrière
       maintenance_contract:
         server_id: Serveur
         start_date: Date de début
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index d01071666..3a87880ba 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -72,10 +72,6 @@ fr:
         modele: Modèle
         manager: Gestionnaire
         cluster: Cluster
-      views:
-        back_front: Vue avant & arrière
-        front: Vue avant
-        back: Vue arrière
       dragn_drop:
         enable: Activer le drag'n drop
   servers:

From 74913d338b273ef5a3099f32f6483dfc3378012f Mon Sep 17 00:00:00 2001
From: Maximilien Bausson <m.bausson@pantographe.studio>
Date: Thu, 2 Nov 2023 17:59:25 +0100
Subject: [PATCH 04/12] Fixed breadcrumb

---
 config/locales/fr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 3a87880ba..a6be43380 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -64,7 +64,7 @@ fr:
         updated: La baie a bien été mise à jour.
     destroy:
       flashes:
-        destroyed: Bay a bien été supprimé.
+        destroyed: La bay bien été supprimé.
   rooms:
     action_buttons:
       background_color: 'Couleur de fond : %{bg}'

From 04e2676bb82c5219bce59e513b00cf10269129a4 Mon Sep 17 00:00:00 2001
From: Maximilien Bausson <m.bausson@pantographe.studio>
Date: Fri, 3 Nov 2023 10:41:27 +0100
Subject: [PATCH 05/12] Fixed breadcrumb & duplicated key

---
 app/views/bays/show.html.erb | 4 ++--
 config/locales/fr.yml        | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/views/bays/show.html.erb b/app/views/bays/show.html.erb
index 2a3312996..faea6971d 100644
--- a/app/views/bays/show.html.erb
+++ b/app/views/bays/show.html.erb
@@ -2,9 +2,9 @@
 <%
   breadcrumb_variables = { t("visualization") => overview_rooms_path, @bay.room.name => room_path(@bay.room, view: params[:view]) }
   if @bay.islet.name.present?
-    breadcrumb_variables[t("breadcrumb.islet", islet: @bay.islet.name)] = room_path(@bay.room, islet: @bay.islet.name, view: params[:view])
+    breadcrumb_variables["#{Islet.model_name.human} #{@bay.islet.name}"] = room_path(@bay.room, islet: @bay.islet.name, view: params[:view])
   elsif params[:islet].present?
-    breadcrumb_variables[t("breadcrumb.islet", islet: params[:islet])] = ''
+    breadcrumb_variables["#{Islet.model_name.human} #{params[:islet]}"] = ''
   end
   breadcrumb_variables[t(".title", bay: @bay)] = ''
 %>
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index a6be43380..f01d2d001 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -67,6 +67,10 @@ fr:
         destroyed: La bay bien été supprimé.
   rooms:
     action_buttons:
+      caption:
+        ports: Ports
+        unreferenced_client: Le port correspondant de la carte jumelle est câblé
+        no_client: Le port correspondant de la carte jumelle n'est pas câblé
       background_color: 'Couleur de fond : %{bg}'
       background_choices:
         modele: Modèle

From c3e61b285c2a0166e64a684c983017b14d4e7d28 Mon Sep 17 00:00:00 2001
From: Maximilien Bausson <m.bausson@pantographe.studio>
Date: Wed, 6 Dec 2023 10:50:48 +0100
Subject: [PATCH 06/12] Improvements

---
 app/views/bays/new.html.erb              |  4 ++--
 app/views/rooms/_action_buttons.html.erb |  8 ++++----
 config/locales/fr.yml                    | 23 ++++++++---------------
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/app/views/bays/new.html.erb b/app/views/bays/new.html.erb
index ecfbdef3f..2a56b7069 100644
--- a/app/views/bays/new.html.erb
+++ b/app/views/bays/new.html.erb
@@ -1,7 +1,7 @@
-<%= render 'layouts/breadcrumb', breadcrumb_variables: {
+<%= render "layouts/breadcrumb", breadcrumb_variables: {
   t("inventories") => modeles_url,
   Bay.model_name.human.pluralize => bays_path,
-  t(".title") => ''
+  t(".title") => ""
 }%>
 
 <div class="container">
diff --git a/app/views/rooms/_action_buttons.html.erb b/app/views/rooms/_action_buttons.html.erb
index 40d6adade..6e32e7369 100644
--- a/app/views/rooms/_action_buttons.html.erb
+++ b/app/views/rooms/_action_buttons.html.erb
@@ -6,12 +6,12 @@
     <!-- Choice of server background color -->
     <div class="btn-group">
       <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-        <%= t(".background_color", bg: params[:bg] || 'modèle') %> <span class="caret"></span>
+        <%= t(".background_color", bg: params[:bg] || Modele.model_name.human.downcase) %> <span class="caret"></span>
       </button>
       <ul class="dropdown-menu">
-        <li><%= link_to t(".background_choices.modele"), url_for( params.except(:controller, :action).permit(:view, :islet, :id, :bg, :format).merge({:view => 'front', bg: 'modele', islet: params[:islet], id: params[:id]})), remote: true  %></li>
-        <li><%= link_to t(".background_choices.manager"), url_for( params.except(:controller, :action).permit(:view, :islet, :id, :bg, :format).merge({:view => 'front', bg: 'gestionnaire', islet: params[:islet], id: params[:id]})), remote: true  %></li>
-        <li><%= link_to t(".background_choices.cluster"), url_for( params.except(:controller, :action).permit(:view, :islet, :id, :bg, :format).merge({:view => 'front', bg: 'cluster', islet: params[:islet], id: params[:id]})), remote: true  %></li>
+        <li><%= link_to Modele.model_name.human, url_for( params.except(:controller, :action).permit(:view, :islet, :id, :bg, :format).merge({:view => 'front', bg: Modele.model_name.human.downcase, islet: params[:islet], id: params[:id]})), remote: true  %></li>
+        <li><%= link_to Gestion.model_name.human, url_for( params.except(:controller, :action).permit(:view, :islet, :id, :bg, :format).merge({:view => 'front', bg: Gestion.model_name.human.downcase, islet: params[:islet], id: params[:id]})), remote: true  %></li>
+        <li><%= link_to Cluster.model_name.human, url_for( params.except(:controller, :action).permit(:view, :islet, :id, :bg, :format).merge({:view => 'front', bg: Cluster.model_name.human.downcase, islet: params[:islet], id: params[:id]})), remote: true  %></li>
       </ul>
     </div>
   <% end %>
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index f01d2d001..5f0305f1f 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -64,7 +64,7 @@ fr:
         updated: La baie a bien été mise à jour.
     destroy:
       flashes:
-        destroyed: La bay bien été supprimé.
+        destroyed: La baie bien été supprimé.
   rooms:
     action_buttons:
       caption:
@@ -78,6 +78,13 @@ fr:
         cluster: Cluster
       dragn_drop:
         enable: Activer le drag'n drop
+    title: Salles
+    capacity_view:
+      title: Vue capacité réseau
+      networks:
+        fiber: Fibre
+        giga: Réseau Gb
+        10giga: 10Gb
   servers:
     room:
       title_room: Salle %{room} - Ilot %{islet}
@@ -431,20 +438,6 @@ fr:
       destroy: a supprimé un serveur
   order-in-progress: 'Commande en cours'
 
-  rooms:
-    title: Salles
-    capacity_view:
-      title: Vue capacité réseau
-      networks:
-        fiber: Fibre
-        giga: Réseau Gb
-        10giga: 10Gb
-    action_buttons:
-      caption:
-        ports: Ports
-        unreferenced_client: Le port correspondant de la carte jumelle est câblé
-        no_client: Le port correspondant de la carte jumelle n'est pas câblé
-
   views:
     pagination:
       previous: "&lt; Précédent"

From 38c7262433adde348409e99172dbbaf785b816fd Mon Sep 17 00:00:00 2001
From: Nicolas Brousse <n.brousse@pantographe.studio>
Date: Wed, 13 Dec 2023 16:53:46 +0100
Subject: [PATCH 07/12] Cleanup

---
 config/locales/activerecord.fr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/activerecord.fr.yml b/config/locales/activerecord.fr.yml
index 9f6b67bfb..0ec8ec055 100644
--- a/config/locales/activerecord.fr.yml
+++ b/config/locales/activerecord.fr.yml
@@ -6,7 +6,7 @@ fr:
       maintainer: Mainteneur
       room: Salle
       islet: Ilot
-      bay: Baies
+      bay: Baie
       frame:
         one: Châssis
         other: Châssis

From 510d3a391108abb80efba6b81d7e6be36ab34c37 Mon Sep 17 00:00:00 2001
From: Nicolas Brousse <n.brousse@pantographe.studio>
Date: Wed, 24 Jan 2024 17:25:54 +0100
Subject: [PATCH 08/12] cleanups

---
 app/views/bays/edit.html.erb  | 2 +-
 app/views/bays/index.html.erb | 8 ++------
 app/views/bays/show.html.erb  | 4 ++--
 config/locales/fr.yml         | 3 +--
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/app/views/bays/edit.html.erb b/app/views/bays/edit.html.erb
index 72d028997..b30496612 100644
--- a/app/views/bays/edit.html.erb
+++ b/app/views/bays/edit.html.erb
@@ -11,7 +11,7 @@
       <%= t("action.back") %>
     <% end %>
     <h1>
-      <%= t(".title", type: @bay.bay_type_id == 2 ? 'double' : 'simple', frames: @bay.frames.map(&:name).join(' / ')) %>
+      <%= t(".title", type: @bay.bay_type&.name, frames: @bay.frames.map(&:name).join(' / ')) %>
     </h1>
   </div>
 
diff --git a/app/views/bays/index.html.erb b/app/views/bays/index.html.erb
index e1dcea5b1..75e4df8ea 100644
--- a/app/views/bays/index.html.erb
+++ b/app/views/bays/index.html.erb
@@ -34,7 +34,7 @@
                 <%= Islet.model_name.human %>
               </th>
               <th>
-                <%= Bay.model_name.human.pluralize %>
+                <%= Frame.model_name.human.pluralize %>
               </th>
               <th>
                 <%= Bay.human_attribute_name(:lane) %>
@@ -43,7 +43,7 @@
                 <%= Bay.human_attribute_name(:position) %>
               </th>
               <th>
-                <%= t(".server_count") %>
+                <%= Server.model_name.human.pluralize %>
               </th>
               <th></th>
             </tr>
@@ -58,7 +58,6 @@
                 <td>
                   <%= link_to bay.islet, islet_path(bay.islet) %>
                 </td>
-
                 <td>
                   <%=
                     bay.frames.map do |frame|
@@ -66,12 +65,9 @@
                     end.join(' / ').html_safe
                   %>
                 </td>
-
                 <td><%= bay.lane %> </td>
                 <td><%= bay.position %> </td>
-
                 <td><%= Bay.human_attribute_name(:materials_count, count: bay.materials.count) %> </td>
-
                 <td class="text-right">
                   <%= render partial: "bays/export_button", locals: { bay: bay } %>
                   <%= link_to t("action.edit"), edit_bay_path(bay), class: 'btn btn-primary' %>
diff --git a/app/views/bays/show.html.erb b/app/views/bays/show.html.erb
index faea6971d..bde8b7b93 100644
--- a/app/views/bays/show.html.erb
+++ b/app/views/bays/show.html.erb
@@ -1,4 +1,4 @@
-<% provide :title, t(".title", bay: @bay) %>
+<% provide :title, t(".title", bay: @bay, bay_type: @bay.bay_type&.name) %>
 <%
   breadcrumb_variables = { t("visualization") => overview_rooms_path, @bay.room.name => room_path(@bay.room, view: params[:view]) }
   if @bay.islet.name.present?
@@ -6,7 +6,7 @@
   elsif params[:islet].present?
     breadcrumb_variables["#{Islet.model_name.human} #{params[:islet]}"] = ''
   end
-  breadcrumb_variables[t(".title", bay: @bay)] = ''
+  breadcrumb_variables[t(".title", bay: @bay, bay_type: @bay.bay_type&.name)] = ''
 %>
 <%= render 'layouts/breadcrumb', breadcrumb_variables: breadcrumb_variables %>
 
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 9364b1187..eb2f3b09d 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -520,11 +520,10 @@ fr:
   bays:
     index:
       new: Ajouter une baie ou un couple de baies
-      server_count: Nombre de serveurs
       title: Baies et doubles-baies
       delete_confirmation: Cette baie ne pourra pas être supprimée tant qu'elle est associée à au moins un chassis. Voulez-vous continuer ?
     show:
-      title: Double baie %{bay}
+      title: Baie %{bay_type} %{bay}
     new:
       title: Ajouter une baie
     create:

From 91b230c234be241220b06c7b7fe86ec51d01a0af Mon Sep 17 00:00:00 2001
From: Nicolas Brousse <n.brousse@pantographe.studio>
Date: Wed, 24 Jan 2024 18:01:43 +0100
Subject: [PATCH 09/12] Cleanup

---
 app/views/bays/edit.html.erb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/views/bays/edit.html.erb b/app/views/bays/edit.html.erb
index b30496612..d79d43c9e 100644
--- a/app/views/bays/edit.html.erb
+++ b/app/views/bays/edit.html.erb
@@ -10,6 +10,10 @@
       <span class="glyphicon glyphicon-list-alt"></span>
       <%= t("action.back") %>
     <% end %>
+    <%= link_to @bay, class: 'btn btn-primary' do %>
+      <span class="glyphicon glyphicon-info-sign"></span>
+      <%= t("action.show") %>
+    <% end %>
     <h1>
       <%= t(".title", type: @bay.bay_type&.name, frames: @bay.frames.map(&:name).join(' / ')) %>
     </h1>

From ae1e3acc73c9fc4a5f9a599cacccb39325f1daeb Mon Sep 17 00:00:00 2001
From: Nicolas Brousse <n.brousse@pantographe.studio>
Date: Wed, 31 Jan 2024 14:44:24 +0100
Subject: [PATCH 10/12] cleanup

---
 config/locales/activerecord.fr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/activerecord.fr.yml b/config/locales/activerecord.fr.yml
index 655186fc5..f1276cbdc 100644
--- a/config/locales/activerecord.fr.yml
+++ b/config/locales/activerecord.fr.yml
@@ -237,9 +237,9 @@ fr:
         lane: Ligne
         position: Position
         materials_count:
+          zero: 0 serveur
           one: 1 serveur
           other: "%{count} serveurs"
-          zero: 0 serveurs
         bay_frames:
           one: "%{bay}"
           other: Double baie %{bay}

From e074875ced235ff1e3ca19c29d10470780269925 Mon Sep 17 00:00:00 2001
From: B_Rass <b.rasschaert@pantographe.studio>
Date: Wed, 31 Jan 2024 15:09:16 +0100
Subject: [PATCH 11/12] Clean buttons group HTML

---
 app/views/bays/index.html.erb | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/views/bays/index.html.erb b/app/views/bays/index.html.erb
index 75e4df8ea..ea59329bb 100644
--- a/app/views/bays/index.html.erb
+++ b/app/views/bays/index.html.erb
@@ -68,14 +68,16 @@
                 <td><%= bay.lane %> </td>
                 <td><%= bay.position %> </td>
                 <td><%= Bay.human_attribute_name(:materials_count, count: bay.materials.count) %> </td>
-                <td class="text-right">
-                  <%= render partial: "bays/export_button", locals: { bay: bay } %>
-                  <%= link_to t("action.edit"), edit_bay_path(bay), class: 'btn btn-primary' %>
-                  <%= link_to t("action.delete"),
-                              bay,
-                              method: :delete,
-                              data: { confirm: t(".delete_confirmation") },
-                              class: 'btn btn-danger' %>
+                <td>
+                  <div class="btn-group btn-group-sm btn-group-vertical" role="group" aria-label="...">
+                    <%= render partial: "bays/export_button", locals: { bay: bay } %>
+                    <%= link_to t("action.edit"), edit_bay_path(bay), class: 'btn btn-primary' %>
+                    <%= link_to t("action.delete"),
+                                bay,
+                                method: :delete,
+                                data: { confirm: t(".delete_confirmation") },
+                                class: 'btn btn-danger' %>
+                  </div>
                 </td>
               </tr>
             <% end %>

From 2669c153777cc2e2cb2e5e690914bd23ba680b78 Mon Sep 17 00:00:00 2001
From: Nicolas Brousse <n.brousse@pantographe.studio>
Date: Wed, 31 Jan 2024 16:43:16 +0100
Subject: [PATCH 12/12] Cleanup

---
 app/views/bays/index.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/bays/index.html.erb b/app/views/bays/index.html.erb
index ea59329bb..abc31861c 100644
--- a/app/views/bays/index.html.erb
+++ b/app/views/bays/index.html.erb
@@ -65,8 +65,8 @@
                     end.join(' / ').html_safe
                   %>
                 </td>
-                <td><%= bay.lane %> </td>
-                <td><%= bay.position %> </td>
+                <td><%= bay.lane %></td>
+                <td><%= bay.position %></td>
                 <td><%= Bay.human_attribute_name(:materials_count, count: bay.materials.count) %> </td>
                 <td>
                   <div class="btn-group btn-group-sm btn-group-vertical" role="group" aria-label="...">