diff --git a/src/frontend/app/administration/contact/contact-duplicate/contact-duplicate.component.html b/src/frontend/app/administration/contact/contact-duplicate/contact-duplicate.component.html
index 2d4be3e1156842edddf5692e058541e6e40d698e..2fcaba87115cab178e036ce239407ce0454cce42 100644
--- a/src/frontend/app/administration/contact/contact-duplicate/contact-duplicate.component.html
+++ b/src/frontend/app/administration/contact/contact-duplicate/contact-duplicate.component.html
@@ -29,11 +29,11 @@
<mat-expansion-panel [expanded]="openedSearchTool">
<mat-expansion-panel-header>
<mat-panel-title>
- Critère de recherche
+ {{lang.criteriaSearch}}
</mat-panel-title>
</mat-expansion-panel-header>
- <plugin-select-search [label]="'Ajouter un critère'" [formControlSelect]="addCriteriaSelect"
- [placeholderLabel]="'Ajouter un critère'" [datas]="contactFields"
+ <plugin-select-search [label]="lang.addCriteria" [formControlSelect]="addCriteriaSelect"
+ [placeholderLabel]="lang.addCriteria" [datas]="contactFields"
(afterSelected)="addCriteria($event)">
</plugin-select-search>
<mat-divider style="margin-top:20px;margin-bottom:20px;"></mat-divider>
@@ -47,13 +47,13 @@
</mat-chip-list>
<div class="col-md-12 text-center">
<button mat-raised-button color="primary" type="button" (click)="searchDuplicates()"
- [disabled]="currentFieldsSearch.length === 0 ||Â isLoadingResults">Lancer la recherche</button>
+ [disabled]="currentFieldsSearch.length === 0 ||Â isLoadingResults">{{lang.launchSearch}}</button>
</div>
</mat-expansion-panel>
</mat-accordion>
</div>
<div *ngIf="duplicatesContacts.length > 0" style="padding: 10px;text-align: right;color: rgba(0,0,0,0.54);">
- {{this.duplicatesContactsRealCount}} doulons ({{this.duplicatesContactsCount}} affichés)
+ {{lang.duplicatesContactDisplayed | scan: [duplicatesContactsRealCount, duplicatesContactsCount]}}
</div>
<mat-list role="list" *ngIf="duplicatesContacts.length > 0">
<mat-list-item role="listitem">
@@ -85,23 +85,6 @@
</ng-container>
</mat-list>
</cdk-virtual-scroll-viewport>
- <!--<mat-table #table [dataSource]="dataSource" matSort matSortActive="duplicateId"
- matSortDirection="asc">
- <ng-container *ngFor="let item of displayedColumns">
- <ng-container [matColumnDef]="item">
- <mat-header-cell *matHeaderCellDef mat-sort-header>
- {{lang['contactsParameters_' + item] !== undefined ? lang['contactsParameters_' + item] : lang[item]}}
- </mat-header-cell>
- <mat-cell *matCellDef="let element">
- {{element[item]}} </mat-cell>
- </ng-container>
- </ng-container>
- <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
- <mat-row class="item" [class.hovered]="row.duplicateId === currentDuplicateId"
- *matRowDef="let row; columns: displayedColumns;" style="cursor:pointer;"
- (mouseover)="selectDuplicates(row.duplicateId)" (click)="manageDuplicate(row.duplicateId)">
- </mat-row>
- </mat-table>-->
<div *ngIf="isLoadingResults" class="example-loading-shade">
<mat-spinner></mat-spinner>
</div>
diff --git a/src/frontend/app/administration/contact/contact-duplicate/contact-duplicate.component.ts b/src/frontend/app/administration/contact/contact-duplicate/contact-duplicate.component.ts
index 2e57f032424c7fd078f4fe79846e5d703c1d2ce9..e7aacd24fc396e259cec580c7e8158e85f77c48a 100644
--- a/src/frontend/app/administration/contact/contact-duplicate/contact-duplicate.component.ts
+++ b/src/frontend/app/administration/contact/contact-duplicate/contact-duplicate.component.ts
@@ -10,8 +10,6 @@ import { of } from 'rxjs/internal/observable/of';
import { catchError, tap, map, exhaustMap, filter, finalize } from 'rxjs/operators';
import { SortPipe } from '../../../../plugins/sorting.pipe';
import { FormControl } from '@angular/forms';
-import { MatPaginator } from '@angular/material/paginator';
-import { MatSort } from '@angular/material/sort';
import { ManageDuplicateComponent } from './manage-duplicate/manage-duplicate.component';
@Component({
@@ -31,7 +29,7 @@ export class ContactDuplicateComponent implements OnInit {
{
icon: 'fas fa-magic',
route: '/administration/contacts/duplicates',
- label: 'Gerer les doublons de contact',
+ label: this.lang.duplicatesContactsAdmin,
current: true
},
{
@@ -218,7 +216,7 @@ export class ContactDuplicateComponent implements OnInit {
dialogRef.afterClosed().pipe(
filter((data: any) => data === 'success'),
tap(() => {
- this.notify.success('Contact fusionné');
+ this.notify.success(this.lang.contactsMerged);
this.duplicatesContactsCount--;
this.duplicatesContactsRealCount--;
this.duplicatesContacts = this.duplicatesContacts.filter((contact: any) => contact.duplicateId !== duplicateId);
diff --git a/src/frontend/app/administration/contact/group/contacts-group-administration.component.ts b/src/frontend/app/administration/contact/group/contacts-group-administration.component.ts
index c7ede9748ad1d15dc4338d26adcba9318b6553a0..b9f6391c54040adbe94a78248751104da884f0bc 100644
--- a/src/frontend/app/administration/contact/group/contacts-group-administration.component.ts
+++ b/src/frontend/app/administration/contact/group/contacts-group-administration.component.ts
@@ -33,7 +33,7 @@ export class ContactsGroupAdministrationComponent implements OnInit {
{
icon: 'fas fa-magic',
route: '/administration/contacts/duplicates',
- label: 'Gerer les doublons de contact',
+ label: this.lang.duplicatesContactsAdmin,
current: false
},
{
diff --git a/src/frontend/app/administration/contact/group/contacts-groups-administration.component.ts b/src/frontend/app/administration/contact/group/contacts-groups-administration.component.ts
index 4d483db79298838496f055f3afa4291b05cd18a3..f3432b527d507930b13ec09fde9d4323bfea0af9 100644
--- a/src/frontend/app/administration/contact/group/contacts-groups-administration.component.ts
+++ b/src/frontend/app/administration/contact/group/contacts-groups-administration.component.ts
@@ -35,7 +35,7 @@ export class ContactsGroupsAdministrationComponent implements OnInit {
{
icon: 'fas fa-magic',
route: '/administration/contacts/duplicates',
- label: 'Gerer les doublons de contact',
+ label: this.lang.duplicatesContactsAdmin,
current: false
},
{
diff --git a/src/frontend/app/administration/contact/list/contacts-list-administration.component.ts b/src/frontend/app/administration/contact/list/contacts-list-administration.component.ts
index fa89150cd0d3943d656896d412ccd6ddb4777668..4a433757e7e1df4bca2cac7a15378715e4441fae 100644
--- a/src/frontend/app/administration/contact/list/contacts-list-administration.component.ts
+++ b/src/frontend/app/administration/contact/list/contacts-list-administration.component.ts
@@ -52,7 +52,7 @@ export class ContactsListAdministrationComponent implements OnInit {
{
icon: 'fas fa-magic',
route: '/administration/contacts/duplicates',
- label: 'Gerer les doublons de contact',
+ label: this.lang.duplicatesContactsAdmin,
current: false
},
{
diff --git a/src/frontend/app/administration/contact/page/contacts-page-administration.component.ts b/src/frontend/app/administration/contact/page/contacts-page-administration.component.ts
index c6571d8763b095a06fa8843de6bc3046b058aabb..c3f815d98771861dd4c62a918f1aec81ee2d80bc 100644
--- a/src/frontend/app/administration/contact/page/contacts-page-administration.component.ts
+++ b/src/frontend/app/administration/contact/page/contacts-page-administration.component.ts
@@ -24,7 +24,7 @@ export class ContactsPageAdministrationComponent implements OnInit {
{
icon: 'fas fa-magic',
route: '/administration/contacts/duplicates',
- label: 'Gerer les doublons de contact',
+ label: this.lang.duplicatesContactsAdmin,
current: false
},
{
diff --git a/src/frontend/app/administration/customField/custom-fields-administration.component.ts b/src/frontend/app/administration/customField/custom-fields-administration.component.ts
index 80f09f31c40c6e60e7ffee2f5a745e1c8f38a57b..e1da01b8d4111a8e5c6537d6e2de97f60f3e4dec 100644
--- a/src/frontend/app/administration/customField/custom-fields-administration.component.ts
+++ b/src/frontend/app/administration/customField/custom-fields-administration.component.ts
@@ -32,7 +32,7 @@ export class CustomFieldsAdministrationComponent implements OnInit {
{
icon: 'fas fa-magic',
route: '/administration/contacts/duplicates',
- label: 'Gerer les doublons de contact',
+ label: this.lang.duplicatesContactsAdmin,
current: false
},
{
diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts
index a77871747255bfba7994aaf4dbc286cb587c8d5f..dc1d64b7eb2a3416a3497d697f8024acbaf50259 100755
--- a/src/frontend/lang/lang-en.ts
+++ b/src/frontend/lang/lang-en.ts
@@ -1694,4 +1694,9 @@ export const LANG_EN = {
"canUpdateIndexingModel": "Can change indexing model",
"options": "Options",
"contactsDuplicates": "Contacts duplicates",
+ "contactsMerged": "Contacts merged",
+ "addCriteria": "Add a criteria",
+ "launchSearch": "Launch search",
+ "duplicatesContactDisplayed": "{0} duplicates ({1} displayed)",
+ "duplicatesContactsAdmin": "Manage contacts duplicates",
};
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index 13cbad07c53eeb0c1e91a9d3dfff6172994ca953..aff4b4058c0b3f2d394ed47f99a95e2ed0749112 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -1696,4 +1696,9 @@ export const LANG_FR = {
"canUpdateIndexingModel": "Pouvoir changer le modèle d'indexation",
"options": "Options",
"contactsDuplicates": "Doublons de contacts",
+ "contactsMerged": "Contacts fusionnés",
+ "addCriteria": "Ajouter un critère",
+ "launchSearch": "Lancer la recherche",
+ "duplicatesContactDisplayed": "{0} doulons ({1} affichés)",
+ "duplicatesContactsAdmin": "Gérer les doublons de contacts",
};
diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts
index 2f180f689f4591764597d2bf666c0a0a4a12d42c..92b50f081d4e48e97e48434710c2ec3cc1a72729 100755
--- a/src/frontend/lang/lang-nl.ts
+++ b/src/frontend/lang/lang-nl.ts
@@ -1677,5 +1677,10 @@ export const LANG_NL = {
"test": "Test", //_TO_TRANSLATE
"canUpdateIndexingModel": "Can change indexing model", //_TO_TRANSLATE
"options": "Options", //_TO_TRANSLATE
- "contactsDuplicates": "Contacts duplicates", //_TO_TRANSLATE
+ "contactsDuplicates": "Contacts duplicates", //_TO_TRANSLATE
+ "contactsMerged": "Contacts merged", //_TO_TRANSLATE
+ "addCriteria": "Add a criteria", //_TO_TRANSLATE
+ "launchSearch": "Launch search", //_TO_TRANSLATE
+ "duplicatesContactDisplayed": "{0} duplicates ({1} displayed)", //_TO_TRANSLATE
+ "duplicatesContactsAdmin": "Manage contacts duplicates", //_TO_TRANSLATE
};