i18n: Fix French translations of impact weights

Probesys · Feb 3, 2023 · 3e83422 · 3e83422
1 parent 8e65400
commit 3e83422
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 39 deletions.
diff --git a/src/Controller/Tickets/PriorityController.php b/src/Controller/Tickets/PriorityController.php
@@ -27,7 +27,6 @@ public function edit(Ticket $ticket): Response
             'urgency' => $ticket->getUrgency(),
             'impact' => $ticket->getImpact(),
             'priority' => $ticket->getPriority(),
-            'weights' => Ticket::getWeightsWithLabels(),
         ]);
     }
 
@@ -59,7 +58,6 @@ public function update(
                 'urgency' => $urgency,
                 'impact' => $impact,
                 'priority' => $priority,
-                'weights' => Ticket::getWeightsWithLabels(),
                 'error' => $this->csrfError(),
             ]);
         }
@@ -75,7 +73,6 @@ public function update(
                 'urgency' => $urgency,
                 'impact' => $impact,
                 'priority' => $priority,
-                'weights' => Ticket::getWeightsWithLabels(),
                 'errors' => $this->formatErrors($errors),
             ]);
         }

diff --git a/src/Entity/Ticket.php b/src/Entity/Ticket.php
@@ -239,7 +239,11 @@ public function getUrgency(): ?string
 
     public function getUrgencyLabel(): ?string
     {
-        $weightsWithLabels = self::getWeightsWithLabels();
+        $weightsWithLabels = [
+            'low' => new TranslatableMessage('tickets.urgency.low'),
+            'medium' => new TranslatableMessage('tickets.urgency.medium'),
+            'high' => new TranslatableMessage('tickets.urgency.high'),
+        ];
         return $weightsWithLabels[$this->urgency];
     }
 
@@ -257,7 +261,11 @@ public function getImpact(): ?string
 
     public function getImpactLabel(): ?string
     {
-        $weightsWithLabels = self::getWeightsWithLabels();
+        $weightsWithLabels = [
+            'low' => new TranslatableMessage('tickets.impact.low'),
+            'medium' => new TranslatableMessage('tickets.impact.medium'),
+            'high' => new TranslatableMessage('tickets.impact.high'),
+        ];
         return $weightsWithLabels[$this->impact];
     }
 
@@ -275,7 +283,11 @@ public function getPriority(): ?string
 
     public function getPriorityLabel(): ?string
     {
-        $weightsWithLabels = self::getWeightsWithLabels();
+        $weightsWithLabels = [
+            'low' => new TranslatableMessage('tickets.priority.low'),
+            'medium' => new TranslatableMessage('tickets.priority.medium'),
+            'high' => new TranslatableMessage('tickets.priority.high'),
+        ];
         return $weightsWithLabels[$this->priority];
     }
 
@@ -371,18 +383,6 @@ public static function getTypesWithLabels(): array
         ];
     }
 
-    /**
-     * @return array<string, string>
-     */
-    public static function getWeightsWithLabels(): array
-    {
-        return [
-            'low' => new TranslatableMessage('tickets.weight.low'),
-            'medium' => new TranslatableMessage('tickets.weight.medium'),
-            'high' => new TranslatableMessage('tickets.weight.high'),
-        ];
-    }
-
     /**
      * @return Collection<int, Message>
      */

diff --git a/templates/tickets/priority/edit.html.twig b/templates/tickets/priority/edit.html.twig
@@ -47,11 +47,15 @@
                     data-form-priority-target="urgency"
                     data-action="form-priority#updatePriority"
                 >
-                    {% for value, label in weights %}
-                        <option value="{{ value }}" {{ value == urgency ? 'selected' }}>
-                            {{ label | trans }}
-                        </option>
-                    {% endfor %}
+                    <option value="low" {{ "low" == urgency ? 'selected' }}>
+                        {{ 'tickets.urgency.low' | trans }}
+                    </option>
+                    <option value="medium" {{ "medium" == urgency ? 'selected' }}>
+                        {{ 'tickets.urgency.medium' | trans }}
+                    </option>
+                    <option value="high" {{ "high" == urgency ? 'selected' }}>
+                        {{ 'tickets.urgency.high' | trans }}
+                    </option>
                 </select>
             </div>
 
@@ -79,11 +83,15 @@
                     data-form-priority-target="impact"
                     data-action="form-priority#updatePriority"
                 >
-                    {% for value, label in weights %}
-                        <option value="{{ value }}" {{ value == impact ? 'selected' }}>
-                            {{ label | trans }}
-                        </option>
-                    {% endfor %}
+                    <option value="low" {{ "low" == impact ? 'selected' }}>
+                        {{ 'tickets.impact.low' | trans }}
+                    </option>
+                    <option value="medium" {{ "medium" == impact ? 'selected' }}>
+                        {{ 'tickets.impact.medium' | trans }}
+                    </option>
+                    <option value="high" {{ "high" == impact ? 'selected' }}>
+                        {{ 'tickets.impact.high' | trans }}
+                    </option>
                 </select>
             </div>
         </div>
@@ -111,11 +119,15 @@
                 {% endif %}
                 data-form-priority-target="priority"
             >
-                {% for value, label in weights %}
-                    <option value="{{ value }}" {{ value == priority ? 'selected' }}>
-                        {{ label | trans }}
-                    </option>
-                {% endfor %}
+                <option value="low" {{ "low" == priority ? 'selected' }}>
+                    {{ 'tickets.priority.low' | trans }}
+                </option>
+                <option value="medium" {{ "medium" == priority ? 'selected' }}>
+                    {{ 'tickets.priority.medium' | trans }}
+                </option>
+                <option value="high" {{ "high" == priority ? 'selected' }}>
+                    {{ 'tickets.priority.high' | trans }}
+                </option>
             </select>
         </div>
 

diff --git a/translations/messages+intl-icu.en_GB.yaml b/translations/messages+intl-icu.en_GB.yaml
@@ -72,6 +72,9 @@ tickets.actors: Actors
 tickets.actors.edit.title: 'Edit the actors'
 tickets.assignee: Assignee
 tickets.impact: Impact
+tickets.impact.high: High
+tickets.impact.low: Low
+tickets.impact.medium: Medium
 tickets.incident: Incident
 tickets.index.new_ticket: 'New ticket'
 tickets.index.no_tickets: 'No tickets'
@@ -83,6 +86,9 @@ tickets.new.submit: 'Create the ticket'
 tickets.opened_on: 'Opened on'
 tickets.priority: Priority
 tickets.priority.edit.title: 'Edit the priority'
+tickets.priority.high: High
+tickets.priority.low: Low
+tickets.priority.medium: Medium
 tickets.request: Request
 tickets.requester: Requester
 tickets.show.actions: Actions
@@ -116,9 +122,9 @@ tickets.title.edit.title: 'Rename the ticket'
 tickets.type: Type
 tickets.unassigned: Unassigned
 tickets.urgency: Urgency
-tickets.weight.high: High
-tickets.weight.low: Low
-tickets.weight.medium: Medium
+tickets.urgency.high: High
+tickets.urgency.low: Low
+tickets.urgency.medium: Medium
 users.color_scheme: 'Color scheme'
 users.color_scheme.auto: Auto
 users.color_scheme.light: Light

diff --git a/translations/messages+intl-icu.fr_FR.yaml b/translations/messages+intl-icu.fr_FR.yaml
@@ -72,6 +72,9 @@ tickets.actors: Acteurs
 tickets.actors.edit.title: 'Modifier les acteurs'
 tickets.assignee: 'Attribué à'
 tickets.impact: Impact
+tickets.impact.high: Haut
+tickets.impact.low: Bas
+tickets.impact.medium: Moyen
 tickets.incident: Incident
 tickets.index.new_ticket: 'Nouveau ticket'
 tickets.index.no_tickets: 'Aucun ticket'
@@ -83,6 +86,9 @@ tickets.new.submit: 'Créer le ticket'
 tickets.opened_on: 'Ouvert le'
 tickets.priority: Priorité
 tickets.priority.edit.title: 'Modifier la priorité'
+tickets.priority.high: Haute
+tickets.priority.low: Basse
+tickets.priority.medium: Moyenne
 tickets.request: Demande
 tickets.requester: Demandeur
 tickets.show.actions: Actions
@@ -116,9 +122,9 @@ tickets.title.edit.title: 'Renommer le ticket'
 tickets.type: Type
 tickets.unassigned: 'Non attribué'
 tickets.urgency: Urgence
-tickets.weight.high: Haute
-tickets.weight.low: Basse
-tickets.weight.medium: Moyenne
+tickets.urgency.high: Haute
+tickets.urgency.low: Basse
+tickets.urgency.medium: Moyenne
 users.color_scheme: 'Schéma de couleurs'
 users.color_scheme.auto: Auto
 users.color_scheme.light: Clair