Drop i18n pseudo-namespace #8020

Because it add maintenance complexity and I don't think
we ever needed it. And if it actually becomes an issue we can always
specify a proper meaning to disambiguate (and not a generic "natural")

Author: PowerKiKi

README.md

@@ -27,21 +27,6 @@ The most useful commands for development are:
 This library is ready to be translated, but it does not ship translations. It is up to the consuming
 application to extract and translate strings.
 
-#### Marking text for translation
-
-All text marked for translation must use the "namespace" natural. This is done via the _meaning_
-of the translation. So something like:
-
-```html
-<p i18n="natural|">My text to translate</p>
-```
-
-```ts
-const message = $localize`:natural|:My text to translate`;
-```
-
-This is to avoid collision between the translation of natural and the consuming application.
-
 ## Components
 
 ### Natural Search

projects/natural/src/lib/classes/abstract-detail.ts

@@ -98,7 +98,7 @@ export class NaturalAbstractDetail<
         ifValid(this.form).subscribe(() => {
             this.formToData();
             const postUpdate = (model: ExtractTupdate<TService>) => {
-                this.alertService.info($localize`:natural|:Mis à jour`);
+                this.alertService.info($localize`Mis à jour`);
                 this.form.patchValue(model);
                 this.postUpdate(model);
             };
@@ -127,7 +127,7 @@ export class NaturalAbstractDetail<
         );
 
         obs.subscribe(model => {
-            this.alertService.info($localize`:natural|:Créé`);
+            this.alertService.info($localize`Créé`);
             this.form.patchValue(model);
             this.postCreate(model);
 
@@ -149,9 +149,9 @@ export class NaturalAbstractDetail<
     public delete(redirectionRoute?: unknown[]): void {
         this.alertService
             .confirm(
-                $localize`:natural|:Suppression`,
-                $localize`:natural|:Voulez-vous supprimer définitivement cet élément ?`,
-                $localize`:natural|:Supprimer définitivement`,
+                $localize`Suppression`,
+                $localize`Voulez-vous supprimer définitivement cet élément ?`,
+                $localize`Supprimer définitivement`,
             )
             .subscribe(confirmed => {
                 if (confirmed) {
@@ -162,7 +162,7 @@ export class NaturalAbstractDetail<
                         .delete([this.data.model])
                         .pipe(finalize(() => this.form.enable()))
                         .subscribe(() => {
-                            this.alertService.info($localize`:natural|:Supprimé`);
+                            this.alertService.info($localize`Supprimé`);
 
                             if (!this.isPanel) {
                                 const defaultRoute = ['../../' + kebabCase(this.key)];

projects/natural/src/lib/classes/abstract-list.ts

@@ -482,9 +482,9 @@ export class NaturalAbstractList<
 
     protected bulkdDeleteConfirmation(): Observable<boolean | undefined> {
         return this.alertService.confirm(
-            $localize`:natural|:Suppression`,
-            $localize`:natural|:Voulez-vous supprimer définitivement les éléments sélectionnés ?`,
-            $localize`:natural|:Supprimer définitivement`,
+            $localize`Suppression`,
+            $localize`Voulez-vous supprimer définitivement les éléments sélectionnés ?`,
+            $localize`Supprimer définitivement`,
         );
     }
 
@@ -503,7 +503,7 @@ export class NaturalAbstractList<
 
                 this.service.delete(selection).subscribe(() => {
                     this.selection.clear();
-                    this.alertService.info($localize`:natural|:Supprimé`);
+                    this.alertService.info($localize`Supprimé`);
                     subject.next();
                     subject.complete();
                 });

projects/natural/src/lib/modules/alert/alert.service.ts

@@ -40,7 +40,7 @@ export class NaturalAlertService {
         title: string,
         message: string,
         confirmText: string,
-        cancelText: string = $localize`:natural|:Annuler`,
+        cancelText: string = $localize`Annuler`,
     ): Observable<boolean | undefined> {
         const dialog = this.dialog.open<NaturalConfirmComponent, NaturalConfirmData, boolean>(NaturalConfirmComponent, {
             data: {

projects/natural/src/lib/modules/columns-picker/columns-picker.component.html

@@ -10,12 +10,7 @@
             }}</mat-checkbox>
         </div>
     </mat-menu>
-    <button
-        [matMenuTriggerFor]="naturalMenu"
-        mat-icon-button
-        i18n-matTooltip="natural|"
-        matTooltip="Sélectionner les colonnes"
-    >
+    <button [matMenuTriggerFor]="naturalMenu" mat-icon-button i18n-matTooltip matTooltip="Sélectionner les colonnes">
         <natural-icon name="view_column"></natural-icon>
     </button>
 </div>

projects/natural/src/lib/modules/dropdown-components/type-date/type-date.component.html

@@ -1,6 +1,6 @@
 <form [formGroup]="form">
     <mat-form-field style="max-width: 4em; margin-right: 1em">
-        <mat-label i18n="natural|Mathematical operator < > =">Opérateur</mat-label>
+        <mat-label i18n="Mathematical operator < > =">Opérateur</mat-label>
         <mat-select [formControl]="operatorCtrl" [required]="true">
             <mat-option *ngFor="let item of operators" [value]="item.key">
                 {{ item.label }}
@@ -9,7 +9,7 @@
     </mat-form-field>
 
     <mat-form-field>
-        <mat-label i18n="natural|">Date</mat-label>
+        <mat-label i18n>Date</mat-label>
         <input
             [formControl]="valueCtrl"
             [matDatepicker]="value"

projects/natural/src/lib/modules/dropdown-components/type-hierarchic-selector/type-hierarchic-selector.component.html

@@ -1,6 +1,6 @@
 <form [formGroup]="form">
     <mat-form-field style="max-width: 7em; margin-right: 1em">
-        <mat-label i18n="natural|Mathematical operator < > =">Opérateur</mat-label>
+        <mat-label i18n="Mathematical operator < > =">Opérateur</mat-label>
         <mat-select [formControl]="operatorCtrl" [required]="true">
             <mat-option *ngFor="let item of operators" [value]="item.key">
                 {{ item.label }}

projects/natural/src/lib/modules/dropdown-components/type-natural-select/type-natural-select.component.html

@@ -1,6 +1,6 @@
 <form [formGroup]="form">
     <mat-form-field style="max-width: 7em; margin-right: 1em">
-        <mat-label i18n="natural|Mathematical operator < > =">Opérateur</mat-label>
+        <mat-label i18n="Mathematical operator < > =">Opérateur</mat-label>
         <mat-select [formControl]="operatorCtrl" [required]="true">
             <mat-option *ngFor="let item of operators" [value]="item.key">
                 {{ item.label }}

projects/natural/src/lib/modules/dropdown-components/type-number/type-number.component.html

@@ -1,6 +1,6 @@
 <form [formGroup]="form">
     <mat-form-field style="max-width: 4em; margin-right: 1em">
-        <mat-label i18n="natural|Mathematical operator < > =">Opérateur</mat-label>
+        <mat-label i18n="Mathematical operator < > =">Opérateur</mat-label>
         <mat-select [formControl]="operatorCtrl" [required]="true">
             <mat-option *ngFor="let item of operators" [value]="item.key">
                 {{ item.label }}
@@ -9,7 +9,7 @@
     </mat-form-field>
 
     <mat-form-field>
-        <mat-label i18n="natural|">Valeur</mat-label>
+        <mat-label i18n>Valeur</mat-label>
         <input
             (keydown.enter)="close()"
             [errorStateMatcher]="matcher"

projects/natural/src/lib/modules/dropdown-components/type-select/type-select.component.html

@@ -1,6 +1,6 @@
 <form [formGroup]="form">
     <mat-form-field style="max-width: 7em; margin-right: 1em">
-        <mat-label i18n="natural|Mathematical operator < > =">Opérateur</mat-label>
+        <mat-label i18n="Mathematical operator < > =">Opérateur</mat-label>
         <mat-select [formControl]="operatorCtrl" [required]="true">
             <mat-option *ngFor="let item of operators" [value]="item.key">
                 {{ item.label }}

projects/natural/src/lib/modules/dropdown-components/type-text/type-text.component.html

@@ -1,5 +1,5 @@
 <mat-form-field>
-    <mat-label i18n="natural|">Valeur</mat-label>
+    <mat-label i18n>Valeur</mat-label>
     <input
         (keydown.enter)="close()"
         [errorStateMatcher]="matcher"

projects/natural/src/lib/modules/dropdown-components/types.ts

@@ -36,18 +36,18 @@ export interface PossibleDiscreteOperator {
 export const possibleDiscreteOperators: PossibleDiscreteOperator[] = [
     {
         key: 'is',
-        label: $localize`:natural|:est`,
+        label: $localize`est`,
     },
     {
         key: 'isnot',
-        label: $localize`:natural|:n'est pas`,
+        label: $localize`n'est pas`,
     },
     {
         key: 'any',
-        label: $localize`:natural|:tous`,
+        label: $localize`tous`,
     },
     {
         key: 'none',
-        label: $localize`:natural|:aucun`,
+        label: $localize`aucun`,
     },
 ];

projects/natural/src/lib/modules/fixed-button-detail/fixed-button-detail.component.html

@@ -14,7 +14,7 @@
     class="detail-speed-dial"
     color="warn"
     icon="delete_forever"
-    i18n-matTooltip="natural|"
+    i18n-matTooltip
     matTooltip="Supprimer définitivement"
     matTooltipPosition="left"
 ></natural-fixed-button>

projects/natural/src/lib/modules/hierarchic-selector/hierarchic-selector-dialog/hierarchic-selector-dialog.component.html

@@ -1,4 +1,4 @@
-<h2 i18n="natural|" mat-dialog-title>Sélection</h2>
+<h2 i18n mat-dialog-title>Sélection</h2>
 
 <mat-dialog-content>
     <natural-hierarchic-selector
@@ -15,8 +15,8 @@ <h2 i18n="natural|" mat-dialog-title>Sélection</h2>
 </mat-dialog-content>
 
 <mat-dialog-actions>
-    <button [mat-dialog-close] i18n="natural|" mat-button>Annuler</button>
+    <button [mat-dialog-close] i18n mat-button>Annuler</button>
     <button (click)="close(config.hierarchicSelection)" color="primary" mat-raised-button
-        ><span i18n="natural|">Valider</span>
+        ><span i18n>Valider</span>
     </button>
 </mat-dialog-actions>

projects/natural/src/lib/modules/hierarchic-selector/hierarchic-selector/hierarchic-selector.component.html

@@ -66,4 +66,4 @@
     </mat-chip-list>
 </div>
 
-<div *ngIf="!loading && !dataSource.data.length" class="margin-v" i18n="natural|">Aucun résultat</div>
+<div *ngIf="!loading && !dataSource.data.length" class="margin-v" i18n>Aucun résultat</div>

projects/natural/src/lib/modules/relations/relations.component.html

@@ -8,7 +8,7 @@
         <tr *matRowDef="let row; columns: displayedColumns" mat-row></tr>
 
         <ng-container matColumnDef="name">
-            <th *matHeaderCellDef i18n="natural|" mat-header-cell>Titre</th>
+            <th *matHeaderCellDef i18n mat-header-cell>Titre</th>
             <td *matCellDef="let item" mat-cell>
                 <ng-template
                     [ngTemplateOutletContext]="{item: item}"
@@ -24,7 +24,7 @@
                     (click)="removeRelation(element)"
                     color="warn"
                     mat-icon-button
-                    i18n-matTooltip="natural|"
+                    i18n-matTooltip
                     matTooltip="Dissocier"
                 >
                     <natural-icon name="link_off"></natural-icon>
@@ -43,7 +43,7 @@
     ></mat-paginator>
 
     <div *ngIf="!loading && dataSource?.data?.length === 0" class="margin-v mat-body">
-        <span i18n="natural|">Aucun résultat</span>
+        <span i18n>Aucun résultat</span>
     </div>
 
     <mat-progress-spinner *ngIf="loading" [diameter]="40" class="loading" mode="indeterminate"></mat-progress-spinner>

projects/natural/src/lib/modules/search/search/search.component.ts

@@ -12,7 +12,7 @@ export class NaturalSearchComponent implements OnChanges {
     /**
      * Placeholder for last input (the free search input)
      */
-    @Input() public placeholder = $localize`:natural|:Rechercher`;
+    @Input() public placeholder = $localize`Rechercher`;
 
     /**
      * Exhaustive list of facets to be used in this <natural-search>

projects/natural/src/lib/modules/select/select-enum/select-enum.component.html

@@ -16,5 +16,5 @@
         </mat-option>
     </mat-select>
 
-    <mat-error *ngIf="hasRequiredError()" i18n="natural|">Ce champ est requis</mat-error></mat-form-field
+    <mat-error *ngIf="hasRequiredError()" i18n>Ce champ est requis</mat-error></mat-form-field
 >

projects/natural/src/lib/modules/select/select-hierarchic/select-hierarchic.component.html

@@ -9,7 +9,7 @@
         [formControl]="internalCtrl"
         [errorStateMatcher]="matcher"
         aria-label="Recherche et sélection"
-        i18n-aria-label="natural|"
+        i18n-aria-label
         matInput
     />
 
@@ -22,7 +22,7 @@
             (click)="clear(); $event.stopPropagation()"
             *ngIf="internalCtrl.value && internalCtrl.enabled && !clearLabel"
             mat-icon-button
-            i18n-matTooltip="natural|"
+            i18n-matTooltip
             matTooltip="Désélectionner"
         >
             <natural-icon name="close"></natural-icon>
@@ -32,14 +32,14 @@
             [routerLink]="navigateTo"
             mat-button
             mat-icon-button
-            i18n-matTooltip="natural|"
+            i18n-matTooltip
             matTooltip="Naviguer vers"
         >
             <natural-icon name="open_in_browser"></natural-icon>
         </button>
     </div>
 
-    <mat-error *ngIf="hasRequiredError()" i18n="natural|">Ce champ est requis</mat-error>
+    <mat-error *ngIf="hasRequiredError()" i18n>Ce champ est requis</mat-error>
 </mat-form-field>
 
 <!--    Additional (un)select/(un)link buttons for more visual cohesion with natural-relations --><!-- [clearLabel] and/or [selectLabel] has to be given as attribute input -->

projects/natural/src/lib/modules/select/select/select.component.html

@@ -11,7 +11,7 @@
             [ngTemplateOutlet]="itemTemplate ? itemTemplate : defaultACItem"
         ></ng-template>
     </mat-option>
-    <div *ngIf="moreNbItems > 0" class="mat-caption" i18n="natural|" style="padding: 5px 10px"
+    <div *ngIf="moreNbItems > 0" class="mat-caption" i18n style="padding: 5px 10px"
         >{{ moreNbItems }} élément(s) supplémentaire(s)</div
     >
 </mat-autocomplete>
@@ -33,7 +33,7 @@
         [formControl]="internalCtrl"
         [matAutocomplete]="ac"
         aria-label="Recherche et sélection"
-        i18n-aria-label="natural|"
+        i18n-aria-label
         matInput
         [errorStateMatcher]="matcher"
     />
@@ -54,7 +54,7 @@
             (click)="clear(); $event.stopPropagation()"
             *ngIf="internalCtrl.value && internalCtrl.enabled && !clearLabel"
             mat-icon-button
-            i18n-matTooltip="natural|"
+            i18n-matTooltip
             matTooltip="Désélectionner"
         >
             <natural-icon name="close"></natural-icon>
@@ -64,14 +64,14 @@
             [routerLink]="navigateTo"
             mat-button
             mat-icon-button
-            i18n-matTooltip="natural|"
+            i18n-matTooltip
             matTooltip="Naviguer vers"
         >
             <natural-icon name="open_in_browser"></natural-icon>
         </button>
     </div>
 
-    <mat-error *ngIf="hasRequiredError()" i18n="natural|">Ce champ est requis</mat-error>
+    <mat-error *ngIf="hasRequiredError()" i18n>Ce champ est requis</mat-error>
 </mat-form-field>
 
 <!-- Additional (un)select/(un)link buttons for more visual cohesion with natural-relations --><!-- [clearLabel] and/or [selectLabel] has to be given as attribute input -->

projects/natural/src/lib/modules/stamp/stamp.component.html

@@ -1,6 +1,6 @@
 <ng-container *ngIf="item">
     <div *ngIf="item.creationDate || item.creator">
-        <span class="mat-body-2" i18n="natural|">Création</span>
+        <span class="mat-body-2" i18n>Création</span>
         :
         <span *ngIf="item.creator">{{ item.creator?.fullName || item.creator?.name }}</span>
         <span *ngIf="item.creator && item.creationDate">,&nbsp;</span>
@@ -10,7 +10,7 @@
     </div>
 
     <div *ngIf="item.updateDate || item.updater">
-        <span class="mat-body-2" i18n="natural|">Modification</span>
+        <span class="mat-body-2" i18n>Modification</span>
         :
         <span *ngIf="item.updater">{{ item.updater?.fullName || item.updater?.name }}</span>
         <span *ngIf="item.updater && item.updateDate">,&nbsp;</span>