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

change rule label #669

Merged
merged 6 commits into from
Jan 30, 2025
Merged

change rule label #669

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e8ee992
change rule label
EtienneLt Jan 16, 2025
069fb42
Merge branch 'main' into change-rule-abel
EtienneLt Jan 16, 2025
a83c685
Merge branch 'main' into change-rule-abel
EtienneLt Jan 29, 2025
98dc891
add missing translations
EtienneLt Jan 29, 2025
9ea5719
typo
EtienneLt Jan 29, 2025
1cd8568
fix typo
EtienneLt Jan 30, 2025
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
6 changes: 3 additions & 3 deletions src/translations/en/filterEn.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
export const filterEn = {
OR: 'OR',
AND: 'AND',
rule: 'rule',
rule: 'criterion',
subGroup: 'subgroup',
is: 'is',
contains: 'contains',
Expand All @@ -23,8 +23,8 @@ export const filterEn = {
emptyRule: 'Filter contains an empty field',
incorrectRule: 'Filter contains an incorrect field',
obsoleteFilter: 'This filter is no longer supported. Please remove it or change its equipment type.',
betweenRule: "Left value of 'between' rule have to be lower than the right value",
emptyGroup: 'Filter contains an empty group. Consider removing it or adding rules to this group',
betweenRule: "Left value of 'between' criterion have to be lower than the right value",
emptyGroup: 'Filter contains an empty group. Consider removing it or adding criteria to this group',
Hvdc: 'HVDC',
'filter.expert': 'Criteria based',
'filter.explicitNaming': 'Explicit naming',
Expand Down
2 changes: 1 addition & 1 deletion src/translations/en/filterExpertEn.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ export const filterExpertEn = {
YupNotTypeNumber: 'This field only accepts numeric values',
YupNotTypeDefault: 'Field value format is incorrect',
changeOperatorMessage:
'The operator will be changed and will be applied to all the rules already created in the group.',
'The operator will be changed and will be applied to all the criteria already created in the group.',
lowShortCircuitCurrentLimit: 'Low short-circuit current limit',
highShortCircuitCurrentLimit: 'High short-circuit current limit',
};
2 changes: 1 addition & 1 deletion src/translations/fr/filterExpertFr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ export const filterExpertFr = {
lessOrEqual: '<=',
YupNotTypeNumber: "Ce champ n'accepte que des valeurs numériques",
YupNotTypeDefault: "La valeur du champ n'est pas au bon format",
changeOperatorMessage: "L'opérateur sera modifié et s'appliquera sur toutes les règles déjà créées dans le groupe.",
changeOperatorMessage: "L'opérateur sera modifié et s'appliquera sur tous les critères déjà créées dans le groupe.",
lowShortCircuitCurrentLimit: 'Limite ICC min',
highShortCircuitCurrentLimit: 'Limite ICC max',
};
6 changes: 3 additions & 3 deletions src/translations/fr/filterFr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
export const filterFr = {
OR: 'OU',
AND: 'ET',
rule: 'règle',
rule: 'critère',
subGroup: 'sous-groupe',
is: 'est',
contains: 'contient',
Expand All @@ -23,8 +23,8 @@ export const filterFr = {
emptyRule: 'Le filtre contient un champ vide',
incorrectRule: 'Le filtre contient un champ incorrect',
obsoleteFilter: "Ce filtre n'est plus supporté. Veuillez le supprimer ou changer son type d'équipement.",
betweenRule: "La valeur de gauche d'une règle 'entre' doit être inférieure à la valeur de droite",
emptyGroup: 'Le filtre contient un groupe vide. Supprimez le ou ajoutez des règles à ce groupe',
betweenRule: "La valeur de gauche d'un critère 'entre' doit être inférieure à la valeur de droite",
emptyGroup: 'Le filtre contient un groupe vide. Supprimez le ou ajoutez des critères à ce groupe',
Hvdc: 'HVDC',
'filter.expert': 'Par critères',
'filter.explicitNaming': 'Par nommage',
Expand Down
Loading