From 90b72f26aa787fda897dcbfa1ac9f91c564e1379 Mon Sep 17 00:00:00 2001
From: Andrey Rusakov <andrey.rusakov@camptocamp.com>
Date: Wed, 4 Dec 2024 17:03:04 +0100
Subject: [PATCH 1/3] Added missing translation labels

---
 .../profile/modify-profile.component.html     |   2 +-
 .../manualentry/manualentry.component.html    |  20 +--
 .../welcome/validate/validate.component.html  |  14 +-
 src/locale/messages.de.xlf                    | 162 ++++++++++++++++++
 src/locale/messages.xlf                       | 127 ++++++++++++++
 5 files changed, 307 insertions(+), 18 deletions(-)

diff --git a/src/app/account/profile/modify-profile.component.html b/src/app/account/profile/modify-profile.component.html
index 82250b0b..bb1984d7 100644
--- a/src/app/account/profile/modify-profile.component.html
+++ b/src/app/account/profile/modify-profile.component.html
@@ -1,5 +1,5 @@
 <mat-card *ngIf="user">
-  <mat-card-title>GeoShop - Modification du profil</mat-card-title>
+  <mat-card-title i18n>GeoShop - Modification du profil</mat-card-title>
   <mat-card-content>
     <form [formGroup]="formModifyUser" class="flex-column" (ngSubmit)="onModifyUserSubmit()">
       <mat-form-field color="primary">
diff --git a/src/app/welcome/map/manualentry/manualentry.component.html b/src/app/welcome/map/manualentry/manualentry.component.html
index 33cbdef8..4c5d67f2 100644
--- a/src/app/welcome/map/manualentry/manualentry.component.html
+++ b/src/app/welcome/map/manualentry/manualentry.component.html
@@ -1,10 +1,10 @@
 <div cdkDrag cdkDragRootElement=".cdk-overlay-pane">
   <h1 mat-dialog-title cdkDragHandle>Saisie manuelle</h1>
   <mat-tab-group #tabGroup (selectedTabChange)="tabChanged($event)" dynamicHeight>
-    <mat-tab label="Format pré-configuré">
+    <mat-tab i18n-label label="Format pré-configuré">
       <div mat-dialog-content>
         <mat-form-field>
-          <mat-label>Format de la page</mat-label>
+          <mat-label i18n>Format de la page</mat-label>
           <mat-select [formControl]="data.selectedPageFormat">
             <mat-option *ngFor="let pageFormat of data.pageFormats" [value]="pageFormat">
               {{pageFormat.name}}
@@ -12,7 +12,7 @@ <h1 mat-dialog-title cdkDragHandle>Saisie manuelle</h1>
           </mat-select>
         </mat-form-field>
         <mat-form-field>
-          <mat-label>Echelles</mat-label>
+          <mat-label i18n>Echelles</mat-label>
           <mat-select [formControl]="data.selectedPageFormatScale">
             <mat-option *ngFor="let pageFormatScale of data.pageFormatScales" [value]="pageFormatScale">
               {{pageFormatScale}}
@@ -20,34 +20,34 @@ <h1 mat-dialog-title cdkDragHandle>Saisie manuelle</h1>
           </mat-select>
         </mat-form-field>
         <mat-form-field>
-          <mat-label>Rotation</mat-label>
+          <mat-label i18n>Rotation</mat-label>
           <input matInput type="number" min=0 max=360 [formControl]="data.rotationPageFormat" value=0>
         </mat-form-field>
       </div>
     </mat-tab>
-    <mat-tab label="Rectangle englobant">
+    <mat-tab i18n-label label="Rectangle englobant">
       <div mat-dialog-content>
         <mat-form-field>
-          <mat-label>Ouest (X min)</mat-label>
+          <mat-label i18n>Ouest (X min)</mat-label>
           <input matInput type="number" min=2500000 max=2580000 [formControl]="data.xMin">
         </mat-form-field>
         <mat-form-field>
-          <mat-label>Sud (Y min)</mat-label>
+          <mat-label i18n>Sud (Y min)</mat-label>
           <input matInput type="number" min=1180000 max=1240000 [formControl]="data.yMin">
         </mat-form-field>
         <mat-form-field>
-          <mat-label>Est (X max)</mat-label>
+          <mat-label i18n>Est (X max)</mat-label>
           <input matInput type="number" min=2500000 max=2580000 [formControl]="data.xMax">
         </mat-form-field>
         <mat-form-field>
-          <mat-label>Nord (Y max)</mat-label>
+          <mat-label i18n>Nord (Y max)</mat-label>
           <input matInput type="number" min=1180000 max=1240000 [formControl]="data.yMax">
         </mat-form-field>
       </div>
     </mat-tab>
   </mat-tab-group>
   <div mat-dialog-actions>
-    <button mat-button (click)="onNoClick()">Annuler</button>
+    <button mat-button (click)="onNoClick()" i18n>Annuler</button>
     <button mat-button [mat-dialog-close]="data">Ok</button>
   </div>
 </div>
diff --git a/src/app/welcome/validate/validate.component.html b/src/app/welcome/validate/validate.component.html
index 94429fd8..3cbacce0 100644
--- a/src/app/welcome/validate/validate.component.html
+++ b/src/app/welcome/validate/validate.component.html
@@ -3,7 +3,7 @@
   <mat-card>
     <div *ngIf="!order">
       <mat-card-header>
-        <mat-card-title>GeoShop - Validation</mat-card-title>
+        <mat-card-title i18n>GeoShop - Validation</mat-card-title>
       </mat-card-header>
       <mat-card-content>
         <mat-spinner class="flex" diameter="48" color="accent" style="margin-right: 10px"></mat-spinner>
@@ -12,17 +12,17 @@
 
     <div *ngIf="order">
       <mat-card-header>
-        <mat-card-title>{{orderitem.product}} - à valider</mat-card-title>
+        <mat-card-title i18n>{{orderitem.product}} - à valider</mat-card-title>
         <mat-card-subtitle>
           Cette page permet d'autoriser ou d'annuler l'utilisation d'un produit commandé sur le geoshop.
         </mat-card-subtitle>
       </mat-card-header>
       <mat-card-content>
-        <h4>Titre du mandat {{order.order_type | lowercase}}:</h4>
+        <h4 i18n>Titre du mandat {{order.order_type | lowercase}}:</h4>
         <p>{{order.title}}</p>
-        <h4>Description fournie par le client:</h4>
+        <h4 i18n>Description fournie par le client:</h4>
         <p>{{order.description}}</p>
-        <h4>Détails du client:</h4>
+        <h4 i18n>Détails du client:</h4>
         <p>
           <span *ngIf="order.client.company_name">
             {{order.client.company_name}}<br>
@@ -39,8 +39,8 @@ <h4>Détails du client:</h4>
         <div class="mini-map" [id]="'mini-map-' + order.id"></div>
       </mat-card-content>
       <mat-card-actions>
-        <button mat-button color="primary" (click)="proceedOrder(true)">ACCEPTER</button>
-        <button mat-button color="warn" (click)="proceedOrder(false)">REFUSER</button>
+        <button mat-button color="primary" (click)="proceedOrder(true)" i18n>ACCEPTER</button>
+        <button mat-button color="warn" (click)="proceedOrder(false)" i18n>REFUSER</button>
       </mat-card-actions>
     </div>
   </mat-card>
diff --git a/src/locale/messages.de.xlf b/src/locale/messages.de.xlf
index 7b081377..4a6a9c95 100644
--- a/src/locale/messages.de.xlf
+++ b/src/locale/messages.de.xlf
@@ -294,6 +294,14 @@
           <context context-type="linenumber">28</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="fa00e1421e6d6789af990afebe0cbd76ae21db3e" datatype="html">
+        <source>Renseigner une courte description du mandat...</source>
+        <target>DE::</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/new-order/new-order.component.html</context>
+          <context context-type="linenumber">32</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="a6979d1d2366eff97c4ed5ac1b4b7966ba2620b9" datatype="html">
         <source>Votre référence reportée sur la facture</source>
         <target>Ihre Rechnungsreferenz</target>
@@ -358,6 +366,14 @@
           <context context-type="linenumber">71</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="5c839344200383e0ae0d32a81e464c338d292d45" datatype="html">
+        <source>Vous devez spécifier les informations de contact du tiers pour un mandat de type <x id="INTERPOLATION" equiv-text="{{ orderFormGroup.get(&apos;orderType&apos;)?.value?.name | lowercase }}"/>.</source>
+        <target>DE::</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/new-order/new-order.component.html</context>
+          <context context-type="linenumber">77,78</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="4f2d7b652f61d816a265e2de92d27c2c28913291" datatype="html">
         <source>Rechercher dans mes contacts</source>
         <target>Suche in den Kontakten</target>
@@ -616,6 +632,14 @@
           <context context-type="linenumber">19,21</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="a3585c98825466e76166413256b1de0f43c469a2" datatype="html">
+        <source>GeoShop - Modification du profil</source>
+        <target>DE::</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/profile/modify-profile.component.html</context>
+          <context context-type="linenumber">2</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="profile.username_unchangabel" datatype="html">
         <source>Nom d&apos;utilisateur (ne peut être modifié)</source>
         <target>Benutzername (kann nicht verändert werden)</target>
@@ -1285,6 +1309,86 @@
           <context context-type="linenumber">27,28</context>
         </context-group>
       </trans-unit>
+<trans-unit id="1abf463668afa2062ca698cabb5a103217406af8" datatype="html">
+        <source>Format pré-configuré</source>
+        <target>DE::</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/map/manualentry/manualentry.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ed4621596bf8a1ac831857652d9af867b0593691" datatype="html">
+        <source>Format de la page</source>
+        <target>DE::</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/map/manualentry/manualentry.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="95bf15a2734646bea8c71e60fdd071ebbe3e864c" datatype="html">
+        <source>Echelles</source>
+        <target>DE::</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/map/manualentry/manualentry.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="877b172d1c398beab3648952aab19eb52fe66ebd" datatype="html">
+        <source>Rotation</source>
+        <target>DE::</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/map/manualentry/manualentry.component.html</context>
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6c772d531ec433b9f6d7a82a4dbc28b18d2264e2" datatype="html">
+        <source>Rectangle englobant</source>
+        <target>DE::</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/map/manualentry/manualentry.component.html</context>
+          <context context-type="linenumber">28</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="597bb8c1f6a67879128f1e28f4a2b4895e906f29" datatype="html">
+        <source>Ouest (X min)</source>
+        <target>DE::</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/map/manualentry/manualentry.component.html</context>
+          <context context-type="linenumber">31</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="64611d4b2b8e4f4436249d38d7a28767826b70e3" datatype="html">
+        <source>Sud (Y min)</source>
+        <target>DE::</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/map/manualentry/manualentry.component.html</context>
+          <context context-type="linenumber">35</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7770827ed4617f1dfe1d3174ad320b9cd4f7e719" datatype="html">
+        <source>Est (X max)</source>
+        <target>DE::</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/map/manualentry/manualentry.component.html</context>
+          <context context-type="linenumber">39</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="b45e74376e66843302e126145838a6e603bb8ffb" datatype="html">
+        <source>Nord (Y max)</source>
+        <target>DE::</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/map/manualentry/manualentry.component.html</context>
+          <context context-type="linenumber">43</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="12380235948088ddf227ad226ce8a2ae63878fe5" datatype="html">
+        <source>Annuler</source>
+        <target>DE::</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/map/manualentry/manualentry.component.html</context>
+          <context context-type="linenumber">50</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="a5dd139cda95e1f79ce82badbaa71b9cbe738c8e" datatype="html">
         <source>Rechercher un lieu ou une paire de coordonnées...</source>
         <target>Suche nach Ort oder Koordinaten...</target>
@@ -1385,6 +1489,64 @@
           <context context-type="linenumber">85</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="2ca1910b4a34f125cf1ada39e13b0b94b221805b" datatype="html">
+        <source>GeoShop - Validation</source>
+        <target>DE::</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/validate/validate.component.html</context>
+          <context context-type="linenumber">6</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="e35122bf515768e7d60a89575daabff6afa2010c" datatype="html">
+        <source><x id="INTERPOLATION" equiv-text="- à valider&lt;/mat-card-title&gt;
+        &lt;mat-ca"/> - à valider</source>
+        <target>DE::<x id="INTERPOLATION" equiv-text="- à valider&lt;/mat-card-title&gt;
+        &lt;mat-ca"/> - à valider</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/validate/validate.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d5b4f067d3af1bcd3e4bdec579470e39ec0c311f" datatype="html">
+        <source>Titre du mandat <x id="INTERPOLATION" equiv-text="{{order.order_type | lowercase}}"/>:</source>
+        <target>DE:: Titre du mandat <x id="INTERPOLATION" equiv-text="{{order.order_type | lowercase}}"/>:</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/validate/validate.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="cd3ffbd49e1e02cd93392409c5b1bbd1f893ed27" datatype="html">
+        <source>Description fournie par le client:</source>
+        <target>DE::</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/validate/validate.component.html</context>
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="0a2c76650f701d340b63dcb4adc44eb7937db9c7" datatype="html">
+        <source>Détails du client:</source>
+        <target>DE::</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/validate/validate.component.html</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="f9f4aebb800bb2e3d1a719002e413ff430814ebf" datatype="html">
+        <source>ACCEPTER</source>
+        <target>DE::</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/validate/validate.component.html</context>
+          <context context-type="linenumber">42</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="cf6e4386d7852f55976ec923447b71c88544fe4b" datatype="html">
+        <source>REFUSER</source>
+        <target>DE::</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/validate/validate.component.html</context>
+          <context context-type="linenumber">43</context>
+        </context-group>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/src/locale/messages.xlf b/src/locale/messages.xlf
index 20b11e8d..d8d4a01c 100644
--- a/src/locale/messages.xlf
+++ b/src/locale/messages.xlf
@@ -611,6 +611,13 @@
           <context context-type="linenumber">19,21</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="a3585c98825466e76166413256b1de0f43c469a2" datatype="html">
+        <source>GeoShop - Modification du profil</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/account/profile/modify-profile.component.html</context>
+          <context context-type="linenumber">2</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="profile.username_unchangabel" datatype="html">
         <source>Nom d&apos;utilisateur (ne peut être modifié)</source>
         <context-group purpose="location">
@@ -1180,6 +1187,76 @@
           <context context-type="linenumber">29,30</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="1abf463668afa2062ca698cabb5a103217406af8" datatype="html">
+        <source>Format pré-configuré</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/map/manualentry/manualentry.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ed4621596bf8a1ac831857652d9af867b0593691" datatype="html">
+        <source>Format de la page</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/map/manualentry/manualentry.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="95bf15a2734646bea8c71e60fdd071ebbe3e864c" datatype="html">
+        <source>Echelles</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/map/manualentry/manualentry.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="877b172d1c398beab3648952aab19eb52fe66ebd" datatype="html">
+        <source>Rotation</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/map/manualentry/manualentry.component.html</context>
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6c772d531ec433b9f6d7a82a4dbc28b18d2264e2" datatype="html">
+        <source>Rectangle englobant</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/map/manualentry/manualentry.component.html</context>
+          <context context-type="linenumber">28</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="597bb8c1f6a67879128f1e28f4a2b4895e906f29" datatype="html">
+        <source>Ouest (X min)</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/map/manualentry/manualentry.component.html</context>
+          <context context-type="linenumber">31</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="64611d4b2b8e4f4436249d38d7a28767826b70e3" datatype="html">
+        <source>Sud (Y min)</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/map/manualentry/manualentry.component.html</context>
+          <context context-type="linenumber">35</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7770827ed4617f1dfe1d3174ad320b9cd4f7e719" datatype="html">
+        <source>Est (X max)</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/map/manualentry/manualentry.component.html</context>
+          <context context-type="linenumber">39</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="b45e74376e66843302e126145838a6e603bb8ffb" datatype="html">
+        <source>Nord (Y max)</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/map/manualentry/manualentry.component.html</context>
+          <context context-type="linenumber">43</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="12380235948088ddf227ad226ce8a2ae63878fe5" datatype="html">
+        <source>Annuler</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/map/manualentry/manualentry.component.html</context>
+          <context context-type="linenumber">50</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="a5dd139cda95e1f79ce82badbaa71b9cbe738c8e" datatype="html">
         <source>Rechercher un lieu ou une paire de coordonnées...</source>
         <context-group purpose="location">
@@ -1271,6 +1348,56 @@
           <context context-type="linenumber">85</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="2ca1910b4a34f125cf1ada39e13b0b94b221805b" datatype="html">
+        <source>GeoShop - Validation</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/validate/validate.component.html</context>
+          <context context-type="linenumber">6</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="e35122bf515768e7d60a89575daabff6afa2010c" datatype="html">
+        <source><x id="INTERPOLATION" equiv-text="- à valider&lt;/mat-card-title&gt;
+        &lt;mat-ca"/> - à valider</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/validate/validate.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d5b4f067d3af1bcd3e4bdec579470e39ec0c311f" datatype="html">
+        <source>Titre du mandat <x id="INTERPOLATION" equiv-text="{{order.order_type | lowercase}}"/>:</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/validate/validate.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="cd3ffbd49e1e02cd93392409c5b1bbd1f893ed27" datatype="html">
+        <source>Description fournie par le client:</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/validate/validate.component.html</context>
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="0a2c76650f701d340b63dcb4adc44eb7937db9c7" datatype="html">
+        <source>Détails du client:</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/validate/validate.component.html</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="f9f4aebb800bb2e3d1a719002e413ff430814ebf" datatype="html">
+        <source>ACCEPTER</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/validate/validate.component.html</context>
+          <context context-type="linenumber">42</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="cf6e4386d7852f55976ec923447b71c88544fe4b" datatype="html">
+        <source>REFUSER</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/welcome/validate/validate.component.html</context>
+          <context context-type="linenumber">43</context>
+        </context-group>
+      </trans-unit>
     </body>
   </file>
 </xliff>

From 62c9562a820c34a89e8dd9a8eb0c6e8233817642 Mon Sep 17 00:00:00 2001
From: Wolfgang Kaltz <wolfgang.kaltz@camptocamp.com>
Date: Thu, 5 Dec 2024 15:51:36 +0100
Subject: [PATCH 2/3] Add german translations

---
 src/locale/messages.de.xlf | 42 +++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/locale/messages.de.xlf b/src/locale/messages.de.xlf
index 4a6a9c95..5314ae4f 100644
--- a/src/locale/messages.de.xlf
+++ b/src/locale/messages.de.xlf
@@ -296,7 +296,7 @@
       </trans-unit>
       <trans-unit id="fa00e1421e6d6789af990afebe0cbd76ae21db3e" datatype="html">
         <source>Renseigner une courte description du mandat...</source>
-        <target>DE::</target>
+        <target>Kurze Beschreibung des Auftrags</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/new-order/new-order.component.html</context>
           <context context-type="linenumber">32</context>
@@ -368,7 +368,7 @@
       </trans-unit>
       <trans-unit id="5c839344200383e0ae0d32a81e464c338d292d45" datatype="html">
         <source>Vous devez spécifier les informations de contact du tiers pour un mandat de type <x id="INTERPOLATION" equiv-text="{{ orderFormGroup.get(&apos;orderType&apos;)?.value?.name | lowercase }}"/>.</source>
-        <target>DE::</target>
+        <target>Für einen Autrag der Art <x id="INTERPOLATION" equiv-text="{{ orderFormGroup.get(&apos;orderType&apos;)?.value?.name | lowercase }}"/> müssen Sie die Kontaktdaten des Mandanten ausfüllen.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/new-order/new-order.component.html</context>
           <context context-type="linenumber">77,78</context>
@@ -634,7 +634,7 @@
       </trans-unit>
       <trans-unit id="a3585c98825466e76166413256b1de0f43c469a2" datatype="html">
         <source>GeoShop - Modification du profil</source>
-        <target>DE::</target>
+        <target>GeoShop Profiländerungen</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/account/profile/modify-profile.component.html</context>
           <context context-type="linenumber">2</context>
@@ -1311,7 +1311,7 @@
       </trans-unit>
 <trans-unit id="1abf463668afa2062ca698cabb5a103217406af8" datatype="html">
         <source>Format pré-configuré</source>
-        <target>DE::</target>
+        <target>Vordefiniertes Format</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/welcome/map/manualentry/manualentry.component.html</context>
           <context context-type="linenumber">4</context>
@@ -1319,7 +1319,7 @@
       </trans-unit>
       <trans-unit id="ed4621596bf8a1ac831857652d9af867b0593691" datatype="html">
         <source>Format de la page</source>
-        <target>DE::</target>
+        <target>Seitenformat</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/welcome/map/manualentry/manualentry.component.html</context>
           <context context-type="linenumber">7</context>
@@ -1327,7 +1327,7 @@
       </trans-unit>
       <trans-unit id="95bf15a2734646bea8c71e60fdd071ebbe3e864c" datatype="html">
         <source>Echelles</source>
-        <target>DE::</target>
+        <target>Massstab</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/welcome/map/manualentry/manualentry.component.html</context>
           <context context-type="linenumber">15</context>
@@ -1335,7 +1335,7 @@
       </trans-unit>
       <trans-unit id="877b172d1c398beab3648952aab19eb52fe66ebd" datatype="html">
         <source>Rotation</source>
-        <target>DE::</target>
+        <target>Winkel</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/welcome/map/manualentry/manualentry.component.html</context>
           <context context-type="linenumber">23</context>
@@ -1343,7 +1343,7 @@
       </trans-unit>
       <trans-unit id="6c772d531ec433b9f6d7a82a4dbc28b18d2264e2" datatype="html">
         <source>Rectangle englobant</source>
-        <target>DE::</target>
+        <target>Umfassendes Rechteck</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/welcome/map/manualentry/manualentry.component.html</context>
           <context context-type="linenumber">28</context>
@@ -1351,7 +1351,7 @@
       </trans-unit>
       <trans-unit id="597bb8c1f6a67879128f1e28f4a2b4895e906f29" datatype="html">
         <source>Ouest (X min)</source>
-        <target>DE::</target>
+        <target>Westen (X min)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/welcome/map/manualentry/manualentry.component.html</context>
           <context context-type="linenumber">31</context>
@@ -1359,7 +1359,7 @@
       </trans-unit>
       <trans-unit id="64611d4b2b8e4f4436249d38d7a28767826b70e3" datatype="html">
         <source>Sud (Y min)</source>
-        <target>DE::</target>
+        <target>Süd (Y min)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/welcome/map/manualentry/manualentry.component.html</context>
           <context context-type="linenumber">35</context>
@@ -1367,7 +1367,7 @@
       </trans-unit>
       <trans-unit id="7770827ed4617f1dfe1d3174ad320b9cd4f7e719" datatype="html">
         <source>Est (X max)</source>
-        <target>DE::</target>
+        <target>Ost (X max)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/welcome/map/manualentry/manualentry.component.html</context>
           <context context-type="linenumber">39</context>
@@ -1375,7 +1375,7 @@
       </trans-unit>
       <trans-unit id="b45e74376e66843302e126145838a6e603bb8ffb" datatype="html">
         <source>Nord (Y max)</source>
-        <target>DE::</target>
+        <target>Nord (Y max)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/welcome/map/manualentry/manualentry.component.html</context>
           <context context-type="linenumber">43</context>
@@ -1383,7 +1383,7 @@
       </trans-unit>
       <trans-unit id="12380235948088ddf227ad226ce8a2ae63878fe5" datatype="html">
         <source>Annuler</source>
-        <target>DE::</target>
+        <target>Stornieren</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/welcome/map/manualentry/manualentry.component.html</context>
           <context context-type="linenumber">50</context>
@@ -1491,7 +1491,7 @@
       </trans-unit>
       <trans-unit id="2ca1910b4a34f125cf1ada39e13b0b94b221805b" datatype="html">
         <source>GeoShop - Validation</source>
-        <target>DE::</target>
+        <target>GeoShop - Validierung</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/welcome/validate/validate.component.html</context>
           <context context-type="linenumber">6</context>
@@ -1500,8 +1500,8 @@
       <trans-unit id="e35122bf515768e7d60a89575daabff6afa2010c" datatype="html">
         <source><x id="INTERPOLATION" equiv-text="- à valider&lt;/mat-card-title&gt;
         &lt;mat-ca"/> - à valider</source>
-        <target>DE::<x id="INTERPOLATION" equiv-text="- à valider&lt;/mat-card-title&gt;
-        &lt;mat-ca"/> - à valider</target>
+        <target><x id="INTERPOLATION" equiv-text="- à valider&lt;/mat-card-title&gt;
+        &lt;mat-ca"/> - zu validieren</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/welcome/validate/validate.component.html</context>
           <context context-type="linenumber">15</context>
@@ -1509,7 +1509,7 @@
       </trans-unit>
       <trans-unit id="d5b4f067d3af1bcd3e4bdec579470e39ec0c311f" datatype="html">
         <source>Titre du mandat <x id="INTERPOLATION" equiv-text="{{order.order_type | lowercase}}"/>:</source>
-        <target>DE:: Titre du mandat <x id="INTERPOLATION" equiv-text="{{order.order_type | lowercase}}"/>:</target>
+        <target>Bezeichung des Mandats <x id="INTERPOLATION" equiv-text="{{order.order_type | lowercase}}"/>:</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/welcome/validate/validate.component.html</context>
           <context context-type="linenumber">21</context>
@@ -1517,7 +1517,7 @@
       </trans-unit>
       <trans-unit id="cd3ffbd49e1e02cd93392409c5b1bbd1f893ed27" datatype="html">
         <source>Description fournie par le client:</source>
-        <target>DE::</target>
+        <target>Durch den Kunden übermittelte Beschreibung:</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/welcome/validate/validate.component.html</context>
           <context context-type="linenumber">23</context>
@@ -1525,7 +1525,7 @@
       </trans-unit>
       <trans-unit id="0a2c76650f701d340b63dcb4adc44eb7937db9c7" datatype="html">
         <source>Détails du client:</source>
-        <target>DE::</target>
+        <target>Kundenangaben:</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/welcome/validate/validate.component.html</context>
           <context context-type="linenumber">25</context>
@@ -1533,7 +1533,7 @@
       </trans-unit>
       <trans-unit id="f9f4aebb800bb2e3d1a719002e413ff430814ebf" datatype="html">
         <source>ACCEPTER</source>
-        <target>DE::</target>
+        <target>ANNEHMEN</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/welcome/validate/validate.component.html</context>
           <context context-type="linenumber">42</context>
@@ -1541,7 +1541,7 @@
       </trans-unit>
       <trans-unit id="cf6e4386d7852f55976ec923447b71c88544fe4b" datatype="html">
         <source>REFUSER</source>
-        <target>DE::</target>
+        <target>ABLEHNEN</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/welcome/validate/validate.component.html</context>
           <context context-type="linenumber">43</context>

From 835173db6cda78a5e809d144931beed92387fafa Mon Sep 17 00:00:00 2001
From: Andrey Rusakov <andrey.rusakov@camptocamp.com>
Date: Thu, 5 Dec 2024 16:33:41 +0100
Subject: [PATCH 3/3] Use ID to select format for the order address

---
 .../account/new-order/new-order.component.ts    | 17 ++++++-----------
 src/locale/messages.de.xlf                      |  4 ++--
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/app/account/new-order/new-order.component.ts b/src/app/account/new-order/new-order.component.ts
index c071107a..95c25510 100644
--- a/src/app/account/new-order/new-order.component.ts
+++ b/src/app/account/new-order/new-order.component.ts
@@ -73,7 +73,7 @@ export class NewOrderComponent implements OnInit, OnDestroy {
   }
 
   get IsOrderTypePrivate() {
-    return this.orderFormGroup?.get('orderType')?.value?.name.startsWith('Priv');
+    return this.orderFormGroup?.get('orderType')?.value?.id === 1;
   }
 
   get orderTypeCtrl() {
@@ -201,9 +201,8 @@ export class NewOrderComponent implements OnInit, OnDestroy {
     return returnValue;
   }
 
-  private getOrderType(id: string | number) {
-    return this.orderTypes.find(x => typeof id === 'number' ?
-      id === x.id : id === x.name) || {
+  private getOrderType(id: number) {
+    return this.orderTypes.find(x => id === x.id) || {
       id: 1,
       name: ConstantsService.ORDERTYPE_PRIVATE
     };
@@ -221,11 +220,7 @@ export class NewOrderComponent implements OnInit, OnDestroy {
     });
     this.orderTypeCtrl?.valueChanges.subscribe(
       (choice) => {
-        if (choice.name === ConstantsService.ORDER_NAME.PRIVATE) {
-          this.addressChoiceCtrl?.setValue('1');
-        } else {
-          this.addressChoiceCtrl?.setValue('2');
-        }
+        this.addressChoiceCtrl?.setValue(choice.id);
       }
     );
     this.emailDeliverChoiceCtrl?.valueChanges.subscribe(
@@ -270,7 +265,7 @@ export class NewOrderComponent implements OnInit, OnDestroy {
     this.isCustomerSelected = order.HasInvoiceContact;
 
     this.orderFormGroup?.setValue({
-      orderType: this.getOrderType(order.order_type),
+      orderType: this.getOrderType(parseInt(order.order_type)),
       title: order.title,
       invoice_reference: order.invoice_reference,
       emailDeliver: order.email_deliver,
@@ -428,7 +423,7 @@ export class NewOrderComponent implements OnInit, OnDestroy {
   resetForms() {
     this.isCustomerSelected = this.currentOrder.HasInvoiceContact;
     this.orderFormGroup.reset({
-      orderType: this.getOrderType(this.currentOrder.order_type),
+      orderType: this.getOrderType(parseInt(this.currentOrder.order_type)),
       title: this.currentOrder.title,
       invoice_reference: this.currentOrder.invoice_reference,
       emailDeliver: this.currentOrder.email_deliver,
diff --git a/src/locale/messages.de.xlf b/src/locale/messages.de.xlf
index 5314ae4f..d3dd1bb4 100644
--- a/src/locale/messages.de.xlf
+++ b/src/locale/messages.de.xlf
@@ -1175,7 +1175,7 @@
       </trans-unit>
       <trans-unit id="order.public" datatype="html">
         <source>Public</source>
-        <target>Öffentlich</target>
+        <target>Für einen Mandanten</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/constants.service.ts</context>
           <context context-type="linenumber">37</context>
@@ -1183,7 +1183,7 @@
       </trans-unit>
       <trans-unit id="order.private" datatype="html">
         <source>Privé</source>
-        <target>Privat</target>
+        <target>Für mich selbst</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/constants.service.ts</context>
           <context context-type="linenumber">38</context>