From 4d471cd94b610bd93b516dba9b206396d67e40fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Menou?=
 <frederic.menou@transport.data.gouv.fr>
Date: Mon, 3 Feb 2025 18:36:17 +0100
Subject: [PATCH] =?UTF-8?q?GTFS=20diff:=20changement=20dans=20la=20section?=
 =?UTF-8?q?=20"R=C3=A9sum=C3=A9"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- traduction (i18n) de l'objet concerné par un changement (fichier, ligne ou
  colonne)
- ordre des résumés : ajoutés, modifications puis suppressions
---
 .../live/gtfs_diff_select_live.ex             |  9 +++++
 .../live/gtfs_diff_select_live.html.heex      | 38 ++++++-------------
 .../gettext/en/LC_MESSAGES/validations.po     | 18 +++++++++
 .../gettext/fr/LC_MESSAGES/validations.po     | 18 +++++++++
 apps/transport/priv/gettext/validations.pot   | 18 +++++++++
 5 files changed, 74 insertions(+), 27 deletions(-)

diff --git a/apps/transport/lib/transport_web/live/gtfs_diff_select_live.ex b/apps/transport/lib/transport_web/live/gtfs_diff_select_live.ex
index bc99c1bd08..a5fd4cef01 100644
--- a/apps/transport/lib/transport_web/live/gtfs_diff_select_live.ex
+++ b/apps/transport/lib/transport_web/live/gtfs_diff_select_live.ex
@@ -161,4 +161,13 @@ defmodule TransportWeb.Live.GTFSDiffSelectLive do
   defp error_to_string(:too_large), do: "File is too large, must be <#{@max_file_size_mb}MB"
   defp error_to_string(:too_many_files), do: "You must select 2 files"
   defp error_to_string(:not_accepted), do: "You have selected an unacceptable file type"
+
+  def translate_target(target, n) do
+    case target do
+      "file" -> dngettext("validations", "file", "files", n)
+      "row" -> dngettext("validations", "row", "rows", n)
+      "column" -> dngettext("validations", "column", "columns", n)
+      _ -> "#{n} #{target}#{if n > 1, do: "s"}"
+    end
+  end
 end
diff --git a/apps/transport/lib/transport_web/live/gtfs_diff_select_live.html.heex b/apps/transport/lib/transport_web/live/gtfs_diff_select_live.html.heex
index 4a4a0bb623..0d4695ff39 100644
--- a/apps/transport/lib/transport_web/live/gtfs_diff_select_live.html.heex
+++ b/apps/transport/lib/transport_web/live/gtfs_diff_select_live.html.heex
@@ -90,33 +90,17 @@
             gtfs_original_file_name_2: @gtfs_original_file_name_2
           ) %>
           <div class="summary">
-            <div :if={@diff_summary["add"]}>
-              <ul>
-                <%= for {{file, "add", target}, n} <- @diff_summary["add"] do %>
-                  <li>
-                    <span class="green"><%= dgettext("validations", "added") %> &nbsp;</span><%= "#{n} #{target}#{if n > 1, do: "s"} - #{file}" %>
-                  </li>
-                <% end %>
-              </ul>
-            </div>
-            <div :if={@diff_summary["delete"]}>
-              <ul>
-                <%= for {{file, "delete", target}, n} <- @diff_summary["delete"] do %>
-                  <li>
-                    <span class="red"><%= dgettext("validations", "deleted") %> &nbsp;</span><%= "#{n} #{target}#{if n > 1, do: "s"} - #{file}" %>
-                  </li>
-                <% end %>
-              </ul>
-            </div>
-            <div :if={@diff_summary["update"]}>
-              <ul>
-                <%= for {{file, "update", target}, n} <- @diff_summary["update"] do %>
-                  <li>
-                    <span class="orange"><%= dgettext("validations", "updated") %> &nbsp;</span><%= "#{n} #{target}#{if n > 1, do: "s"} - #{file}" %>
-                  </li>
-                <% end %>
-              </ul>
-            </div>
+            <%= for {diff_nature, translation, css_class} <- [{"add", dgettext("validations", "added"), "green"}, {"update", dgettext("validations", "updated"), "orange"}, {"delete", dgettext("validations", "deleted"), "red"}] do %>
+              <div :if={@diff_summary[diff_nature]}>
+                <ul>
+                  <%= for {{file, ^diff_nature, target}, n} <- @diff_summary[diff_nature] do %>
+                    <li>
+                      <span class={css_class}><%= translation %> &nbsp;</span><%= "#{translate_target(target, n)} - #{file}" %>
+                    </li>
+                  <% end %>
+                </ul>
+              </div>
+            <% end %>
           </div>
         </div>
       <% else %>
diff --git a/apps/transport/priv/gettext/en/LC_MESSAGES/validations.po b/apps/transport/priv/gettext/en/LC_MESSAGES/validations.po
index 43c859423b..5d7223264d 100644
--- a/apps/transport/priv/gettext/en/LC_MESSAGES/validations.po
+++ b/apps/transport/priv/gettext/en/LC_MESSAGES/validations.po
@@ -437,3 +437,21 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "enRoute Chouette Valid"
 msgstr "enRoute Chouette Valid validator"
+
+#, elixir-autogen, elixir-format
+msgid "column"
+msgid_plural "columns"
+msgstr[0] ""
+msgstr[1] ""
+
+#, elixir-autogen, elixir-format
+msgid "file"
+msgid_plural "files"
+msgstr[0] ""
+msgstr[1] ""
+
+#, elixir-autogen, elixir-format
+msgid "row"
+msgid_plural "rows"
+msgstr[0] ""
+msgstr[1] ""
diff --git a/apps/transport/priv/gettext/fr/LC_MESSAGES/validations.po b/apps/transport/priv/gettext/fr/LC_MESSAGES/validations.po
index a90616fcfc..4a97c81a3e 100644
--- a/apps/transport/priv/gettext/fr/LC_MESSAGES/validations.po
+++ b/apps/transport/priv/gettext/fr/LC_MESSAGES/validations.po
@@ -437,3 +437,21 @@ msgstr "le validateur GTFS du <abbr title=\"Point d’Accès National\">PAN</abb
 #, elixir-autogen, elixir-format
 msgid "enRoute Chouette Valid"
 msgstr "le validateur NeTEx d’enRoute"
+
+#, elixir-autogen, elixir-format
+msgid "column"
+msgid_plural "columns"
+msgstr[0] "colonne"
+msgstr[1] "colonnes"
+
+#, elixir-autogen, elixir-format
+msgid "file"
+msgid_plural "files"
+msgstr[0] "fichier"
+msgstr[1] "fichiers"
+
+#, elixir-autogen, elixir-format
+msgid "row"
+msgid_plural "rows"
+msgstr[0] "ligne"
+msgstr[1] "lignes"
diff --git a/apps/transport/priv/gettext/validations.pot b/apps/transport/priv/gettext/validations.pot
index 3b373bd3d1..1c9ec266b4 100644
--- a/apps/transport/priv/gettext/validations.pot
+++ b/apps/transport/priv/gettext/validations.pot
@@ -435,3 +435,21 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "enRoute Chouette Valid"
 msgstr ""
+
+#, elixir-autogen, elixir-format
+msgid "column"
+msgid_plural "columns"
+msgstr[0] ""
+msgstr[1] ""
+
+#, elixir-autogen, elixir-format
+msgid "file"
+msgid_plural "files"
+msgstr[0] ""
+msgstr[1] ""
+
+#, elixir-autogen, elixir-format
+msgid "row"
+msgid_plural "rows"
+msgstr[0] ""
+msgstr[1] ""