Skip to content

Commit

Permalink
refactor(translate): Fix incorrect french keys (#1844)
Browse files Browse the repository at this point in the history
* Fix - French translation to "edit from"

* fix - forget "Modifier"

* add more translations

* fix edit.subscription french translation

---------

Co-authored-by: matheus-relief <matheus.reliefapps@gmail.com>
  • Loading branch information
GuilhermeGabriel and matheus-relief committed Sep 20, 2023
1 parent ea24fbd commit eac3e43
Show file tree
Hide file tree
Showing 10 changed files with 38 additions and 31 deletions.
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
<ui-dialog size="small">
<ng-container ngProjectAs="header">
<h1>
{{
'common.editObject'
| translate : { name: 'common.channel.one' | translate }
}}
{{ 'models.channel.edit' | translate }}
</h1>
</ng-container>
<ng-container ngProjectAs="content">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,7 @@ <h1 class="!m-0 overflow-hidden text-ellipsis">
(click)="editForm()"
*ngIf="form.canUpdate"
>
{{
'common.editObject'
| translate : { name: 'common.form.one' | translate }
}}
{{ 'models.form.edit' | translate }}
</ui-button>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ <h1>
{{
data.add
? ('models.positionAttribute.new' | translate)
: ('common.editObject'
| translate : { name: 'common.positionAttribute.one' | translate })
: ('models.positionAttribute.edit' | translate)
}}
</h1>
</ng-container>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
<h1>
{{
data.subscription
? ('common.editObject'
| translate : { name: 'common.subscription.one' | translate })
? ('models.subscription.edit' | translate)
: ('models.subscription.new' | translate)
}}
</h1>
Expand Down Expand Up @@ -90,9 +89,7 @@ <h1>
<label>{{ 'components.channel.dropdown.select' | translate }}</label>
<ui-select-menu
formControlName="channel"
[placeholder]="
'components.channel.selectChannel' | translate
"
[placeholder]="'components.channel.selectChannel' | translate"
>
<ui-select-option
*ngFor="let channel of data.channels"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
<h1>
{{
data.pullJob
? ('common.editObject'
| translate : { name: 'common.pullJob.one' | translate })
? ('models.pullJob.edit' | translate)
: ('models.pullJob.new' | translate)
}}
</h1>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,7 @@
[uiMenuTriggerFor]="templates"
>
<ui-icon icon="edit_note" variant="grey"></ui-icon>
{{
'common.editObject'
| translate : { name: 'common.child' | translate }
}}
{{ 'common.child.edit' | translate }}
</button>
<ui-divider class="py-1"></ui-divider>
<button
Expand Down
12 changes: 10 additions & 2 deletions libs/safe/src/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@
"none": "No channel",
"one": "Channel"
},
"child": "Child",
"child": {
"edit": "Edit child",
"one": "Child"
},
"clear": "Clear",
"close": "Close",
"column": {
Expand Down Expand Up @@ -75,7 +78,6 @@
"downloadTemplate": "Get template",
"duplicate": "Duplicate",
"edit": "Edit",
"editObject": "Edit {{name}}",
"email": {
"few": "Emails",
"none": "No email",
Expand Down Expand Up @@ -1642,6 +1644,7 @@
},
"channel": {
"create": "Create a channel",
"edit": "Edit channel",
"new": "New channel"
},
"customNotification": {
Expand Down Expand Up @@ -1677,6 +1680,7 @@
"form": {
"core": "Core",
"create": "Create a Form",
"edit": "Edit form",
"field": {
"label": "Label",
"name": "Field name",
Expand Down Expand Up @@ -1706,9 +1710,11 @@
}
},
"positionAttribute": {
"edit": "Edit position attribute",
"new": "New position attribute"
},
"pullJob": {
"edit": "Edit pull job",
"new": "New pull job",
"nextIteration": "Next iteration",
"path": "Path",
Expand All @@ -1717,6 +1723,7 @@
},
"record": {
"convert": "Convert",
"edit": "Edit record",
"new": "New record",
"notifications": {
"conversionIncomplete": "Selected record(s) do not match with some fields from this form.",
Expand All @@ -1743,6 +1750,7 @@
"new": "New step"
},
"subscription": {
"edit": "Edit subscription",
"new": "New subscription"
},
"user": {
Expand Down
12 changes: 10 additions & 2 deletions libs/safe/src/i18n/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@
"none": "Aucun canal de diffusion",
"one": "Canal de diffusion"
},
"child": "Enfant",
"child": {
"edit": "Modifier l'enfant",
"one": "Enfant"
},
"clear": "Annuler",
"close": "Fermer",
"column": {
Expand Down Expand Up @@ -75,7 +78,6 @@
"downloadTemplate": "Télécharger le modèle",
"duplicate": "Dupliquer",
"edit": "Modifier",
"editObject": "Modifier {{name}}",
"email": {
"few": "Emails",
"none": "Pas d'email",
Expand Down Expand Up @@ -1649,6 +1651,7 @@
},
"channel": {
"create": "Créer un canal de diffusion",
"edit": "Modifier le canal",
"new": "Nouveau canal de diffusion"
},
"customNotification": {
Expand Down Expand Up @@ -1684,6 +1687,7 @@
"form": {
"core": "Source",
"create": "Créer un formulaire",
"edit": "Modifier le formulaire",
"field": {
"label": "Étiquette",
"name": "Nom du champ",
Expand Down Expand Up @@ -1713,9 +1717,11 @@
}
},
"positionAttribute": {
"edit": "Modifier l'attribut de position",
"new": "Nouvel attribut de position"
},
"pullJob": {
"edit": "Modifier une tâche planifiée",
"new": "Nouvelle tâche planifiée",
"nextIteration": "Prochaine exécution",
"path": "Chemin",
Expand All @@ -1724,6 +1730,7 @@
},
"record": {
"convert": "Convertir",
"edit": "Modifier l'enregistrement",
"new": "Nouvel enregistrement",
"notifications": {
"conversionIncomplete": "Il n'y a pas de correspondance entre le(s) enregistrement(s) sélectionné(s) et certains champs de ce formulaire.",
Expand All @@ -1750,6 +1757,7 @@
"new": "Nouvelle étape"
},
"subscription": {
"edit": "Modifier l'abonnement",
"new": "Nouvel abonnement"
},
"user": {
Expand Down
12 changes: 10 additions & 2 deletions libs/safe/src/i18n/test.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@
"none": "******",
"one": "******"
},
"child": "******",
"child": {
"edit": "******",
"one": "******"
},
"clear": "******",
"close": "******",
"column": {
Expand Down Expand Up @@ -75,7 +78,6 @@
"downloadTemplate": "******",
"duplicate": "******",
"edit": "******",
"editObject": "****** {{name}}",
"email": {
"few": "******",
"none": "******",
Expand Down Expand Up @@ -1642,6 +1644,7 @@
},
"channel": {
"create": "******",
"edit": "******",
"new": "******"
},
"customNotification": {
Expand Down Expand Up @@ -1677,6 +1680,7 @@
"form": {
"core": "******",
"create": "******",
"edit": "******",
"field": {
"label": "******",
"name": "******",
Expand Down Expand Up @@ -1706,9 +1710,11 @@
}
},
"positionAttribute": {
"edit": "******",
"new": "******"
},
"pullJob": {
"edit": "******",
"new": "******",
"nextIteration": "******",
"path": "******",
Expand All @@ -1717,6 +1723,7 @@
},
"record": {
"convert": "******",
"edit": "******",
"new": "******",
"notifications": {
"conversionIncomplete": "******",
Expand All @@ -1743,6 +1750,7 @@
"new": "******"
},
"subscription": {
"edit": "******",
"new": "******"
},
"user": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,7 @@
*ngIf="canEdit"
(click)="onEdit()"
>
{{
'common.editObject'
| translate : { name: 'common.record.one' | translate }
}}
{{ 'models.record.edit' | translate }}
</ui-button>
</ng-container>
</ng-container>
Expand Down

0 comments on commit eac3e43

Please sign in to comment.