Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: GSGGR-166 add more translations and fix second page for the order dialog #78

Merged
merged 3 commits into from
Dec 6, 2024
Merged

feat: GSGGR-166 add more translations and fix second page for the order dialog #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
90b72f2
Added missing translation labels
Dec 4, 2024
62c9562
Add german translations
jwkaltz Dec 5, 2024
835173d
Use ID to select format for the order address
Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions src/app/account/new-order/new-order.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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
};
Expand All @@ -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(
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/app/account/profile/modify-profile.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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">
Expand Down
20 changes: 10 additions & 10 deletions src/app/welcome/map/manualentry/manualentry.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,53 +1,53 @@
<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}}
</mat-option>
</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}}
</mat-option>
</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>
14 changes: 7 additions & 7 deletions src/app/welcome/validate/validate.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
166 changes: 164 additions & 2 deletions src/locale/messages.de.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>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>
</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>
Expand Down Expand Up @@ -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>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>
</context-group>
</trans-unit>
<trans-unit id="4f2d7b652f61d816a265e2de92d27c2c28913291" datatype="html">
<source>Rechercher dans mes contacts</source>
<target>Suche in den Kontakten</target>
Expand Down Expand Up @@ -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>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>
</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>
Expand Down Expand Up @@ -1151,15 +1175,15 @@
</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>
</context-group>
</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>
Expand Down Expand Up @@ -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>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>
</context-group>
</trans-unit>
<trans-unit id="ed4621596bf8a1ac831857652d9af867b0593691" datatype="html">
<source>Format de la page</source>
<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>
</context-group>
</trans-unit>
<trans-unit id="95bf15a2734646bea8c71e60fdd071ebbe3e864c" datatype="html">
<source>Echelles</source>
<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>
</context-group>
</trans-unit>
<trans-unit id="877b172d1c398beab3648952aab19eb52fe66ebd" datatype="html">
<source>Rotation</source>
<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>
</context-group>
</trans-unit>
<trans-unit id="6c772d531ec433b9f6d7a82a4dbc28b18d2264e2" datatype="html">
<source>Rectangle englobant</source>
<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>
</context-group>
</trans-unit>
<trans-unit id="597bb8c1f6a67879128f1e28f4a2b4895e906f29" datatype="html">
<source>Ouest (X min)</source>
<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>
</context-group>
</trans-unit>
<trans-unit id="64611d4b2b8e4f4436249d38d7a28767826b70e3" datatype="html">
<source>Sud (Y min)</source>
<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>
</context-group>
</trans-unit>
<trans-unit id="7770827ed4617f1dfe1d3174ad320b9cd4f7e719" datatype="html">
<source>Est (X max)</source>
<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>
</context-group>
</trans-unit>
<trans-unit id="b45e74376e66843302e126145838a6e603bb8ffb" datatype="html">
<source>Nord (Y max)</source>
<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>
</context-group>
</trans-unit>
<trans-unit id="12380235948088ddf227ad226ce8a2ae63878fe5" datatype="html">
<source>Annuler</source>
<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>
</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>
Expand Down Expand Up @@ -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>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>
</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><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>
</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>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>
</context-group>
</trans-unit>
<trans-unit id="cd3ffbd49e1e02cd93392409c5b1bbd1f893ed27" datatype="html">
<source>Description fournie par le client:</source>
<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>
</context-group>
</trans-unit>
<trans-unit id="0a2c76650f701d340b63dcb4adc44eb7937db9c7" datatype="html">
<source>Détails du client:</source>
<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>
</context-group>
</trans-unit>
<trans-unit id="f9f4aebb800bb2e3d1a719002e413ff430814ebf" datatype="html">
<source>ACCEPTER</source>
<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>
</context-group>
</trans-unit>
<trans-unit id="cf6e4386d7852f55976ec923447b71c88544fe4b" datatype="html">
<source>REFUSER</source>
<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>
</context-group>
</trans-unit>
</body>
</file>
</xliff>
Loading