-
Connexion
+
{{'COMMONS.LOGIN' | translate}}
diff --git a/admin/src/app/login-page/login-page.component.ts b/admin/src/app/login-page/login-page.component.ts
index 3d0a0815..35e8d14e 100644
--- a/admin/src/app/login-page/login-page.component.ts
+++ b/admin/src/app/login-page/login-page.component.ts
@@ -5,6 +5,7 @@ import { User } from '../shared/user';
import { Router } from '@angular/router';
import { AuthService } from '../services/auth.service';
import { Conf } from '../config';
+import { LanguageService } from '../services/language.service';
@Component({
selector: 'app-login-page',
@@ -16,15 +17,18 @@ export class LoginPageComponent implements OnInit {
userForm: any;
currentUser: User;
logoUrl: string;
+ currentLang: string;
constructor(
private loginService: LoginService,
private authService: AuthService,
private formBuilder: FormBuilder,
- private route: Router
+ private route: Router,
+ private languageService: LanguageService
) {}
ngOnInit() {
+ this.currentLang = this.languageService.getCurrentLang();
this.logoUrl = `${Conf.customFiles}images/logo_txt_blanc.png`;
this.loginForm = this.formBuilder.group({
login: ['', Validators.required],
diff --git a/admin/src/app/manage-sites/manage-sites.component.ts b/admin/src/app/manage-sites/manage-sites.component.ts
index 57e0596a..7c284905 100644
--- a/admin/src/app/manage-sites/manage-sites.component.ts
+++ b/admin/src/app/manage-sites/manage-sites.component.ts
@@ -11,6 +11,7 @@ import { Conf } from './../config';
import { Router } from '@angular/router';
import { NgxSpinnerService } from 'ngx-spinner';
import { ToastrService } from 'ngx-toastr';
+import { TranslateService } from '@ngx-translate/core';
@Component({
selector: 'app-manage-sites',
@@ -27,6 +28,7 @@ export class ManageSitesComponent implements OnInit, OnDestroy {
private changeDetector: ChangeDetectorRef,
private spinner: NgxSpinnerService,
private toastr: ToastrService,
+ private translate: TranslateService
) {}
ngOnInit() {
@@ -59,9 +61,11 @@ export class ManageSitesComponent implements OnInit, OnDestroy {
},
(err) => {
this.spinner.hide();
- this.toastr.error('Une erreur est survenue sur le serveur.', '', {
- positionClass: 'toast-bottom-right',
- });
+ this.translate.get('ERRORS.SERVER_ERROR').subscribe((message: string) => {
+ this.toastr.error(message, '', {
+ positionClass: 'toast-bottom-right',
+ });
+ })
console.log('get site error: ', err);
}
);
diff --git a/admin/src/app/observatories/observatories.component.ts b/admin/src/app/observatories/observatories.component.ts
index 4cb6508a..ebada24f 100644
--- a/admin/src/app/observatories/observatories.component.ts
+++ b/admin/src/app/observatories/observatories.component.ts
@@ -12,6 +12,7 @@ import { NgxSpinnerService } from 'ngx-spinner';
import { ToastrService } from 'ngx-toastr';
import { ObservatoriesService } from '../services/observatories.service';
import { ObservatoryType } from '../types';
+import { TranslateService } from '@ngx-translate/core';
type ObservatoryRowType = {
observatory: ObservatoryType;
@@ -33,6 +34,7 @@ export class ObservatoriesComponent implements OnInit, OnDestroy {
private changeDetector: ChangeDetectorRef,
private spinner: NgxSpinnerService,
private toastr: ToastrService,
+ private translate: TranslateService
) {}
ngOnInit() {
@@ -52,9 +54,11 @@ export class ObservatoriesComponent implements OnInit, OnDestroy {
},
(err) => {
this.spinner.hide();
- this.toastr.error('Une erreur est survenue sur le serveur.', '', {
- positionClass: 'toast-bottom-right',
- });
+ this.translate.get('ERRORS.SERVER_ERROR').subscribe((message: string) => {
+ this.toastr.error(message, '', {
+ positionClass: 'toast-bottom-right',
+ });
+ })
console.log('get items error: ', err);
}
);
diff --git a/admin/src/app/observatory/observatory.component.ts b/admin/src/app/observatory/observatory.component.ts
index c1f1d8a7..fd9a8a42 100644
--- a/admin/src/app/observatory/observatory.component.ts
+++ b/admin/src/app/observatory/observatory.component.ts
@@ -11,6 +11,8 @@ import { AuthService } from '../services/auth.service';
import { NgxSpinnerService } from 'ngx-spinner';
import { ObservatoryPatchType, ObservatoryType } from '../types';
import * as io from 'jsts/org/locationtech/jts/io';
+import { TranslateService } from '@ngx-translate/core';
+import { combineLatest, Observable } from 'rxjs';
@Component({
selector: 'app-observatory',
@@ -58,7 +60,8 @@ export class ObservatoryComponent implements OnInit {
private toastr: ToastrService,
private modalService: NgbModal,
private authService: AuthService,
- private spinner: NgxSpinnerService
+ private spinner: NgxSpinnerService,
+ private translate: TranslateService
) {}
ngOnInit() {
@@ -120,19 +123,25 @@ export class ObservatoryComponent implements OnInit {
try {
const geom = reader.read(observatoryForm.value.geom);
if (geom.getGeometryType() !== 'MultiPolygon') {
- this.toastr.error(
- 'Le geom doit être un MultiPolygon.',
- 'Geom invalide',
- {
+ this.getTranslatedMessages([
+ 'INFO_MESSAGE.GEOM_SHOULD_BE_MULTIPOLYGON',
+ 'ERRORS.INVALID_GEOM',
+ ]).subscribe(([errorMessage, title]) => {
+ this.toastr.error(errorMessage, title, {
positionClass: 'toast-bottom-right',
- }
- );
+ });
+ });
return;
}
} catch (error) {
- this.toastr.error(error, 'Geom invalide', {
- positionClass: 'toast-bottom-right',
- });
+ this.translate
+ .get('ERRORS.INVALID_GEOM')
+ .subscribe((message: string) => {
+ this.toastr.error(error, message, {
+ positionClass: 'toast-bottom-right',
+ });
+ })
+
return;
}
}
@@ -152,27 +161,32 @@ export class ObservatoryComponent implements OnInit {
}
} catch (err) {
if (err.status === 403) {
- this.router.navigate(['']);
- this.toastr.error('votre session est expirée', '', {
- positionClass: 'toast-bottom-right',
+ this.translate.get('ERRORS.SESSION_EXPIRED').subscribe((message: string) => {
+ this.router.navigate(['']);
+ this.toastr.error(message, '', {
+ positionClass: 'toast-bottom-right',
+ });
});
} else {
- this.toastr.error('Une erreur est survenue sur le serveur.', '', {
- positionClass: 'toast-bottom-right',
+ this.translate.get('ERRORS.SERVER_ERROR').subscribe((message: string) => {
+ this.toastr.error(message, '', {
+ positionClass: 'toast-bottom-right',
+ });
});
}
}
- this.edit_btn_text = 'Éditer';
+ this.edit_btn_text = 'BUTTONS.EDIT';
this.spinner.hide();
}
- setAlert(message) {
- this.alert = {
- type: 'danger',
- message: 'La ' + message + ' existe déjà',
- };
+ setAlert(message: string) {
+ this.translate.get('ALERTS.ITEM_EXISTS').subscribe((translatedMessage: string) => {
+ this.alert = {
+ type: 'danger',
+ message: `${translatedMessage.replace('{{ item }}', message)}`,
+ };
+ });
}
-
getObservatory(id_observatory) {
this.observatoryService.getById(id_observatory).subscribe(
(observatory) => {
@@ -180,9 +194,11 @@ export class ObservatoryComponent implements OnInit {
},
(err) => {
console.log('err', err);
- this.toastr.error('Une erreur est survenue sur le serveur.', '', {
- positionClass: 'toast-bottom-right',
- });
+ this.translate.get('ERRORS.SERVER_ERROR').subscribe((message: string) => {
+ this.toastr.error(message, '', {
+ positionClass: 'toast-bottom-right',
+ });
+ })
},
() => {
this.patchForm();
@@ -196,10 +212,12 @@ export class ObservatoryComponent implements OnInit {
return new Promise((resolve, reject) => {
this.observatoryService.post(this.observatoryForm.value).subscribe(
(res) => {
- this.toastr.success('Observatoire ajouté', '', {
- positionClass: 'toast-bottom-right',
- });
+ this.translate.get("INFO_MESSAGE.SUCCESS_ADDED_OBSERVATORY").subscribe((message: string) => {
+ this.toastr.success(message, '', {
+ positionClass: 'toast-bottom-right',
+ })
resolve(res);
+ });
},
(err) => {
reject(err);
@@ -254,7 +272,7 @@ export class ObservatoryComponent implements OnInit {
editForm() {
this.isEditing = !this.isEditing;
if (!this.isEditing) {
- this.edit_btn_text = 'Éditer';
+ this.edit_btn_text = 'BUTTONS.EDIT';
this.patchForm();
this.alert = null;
this.observatoryForm.disable();
@@ -325,4 +343,8 @@ export class ObservatoryComponent implements OnInit {
this.mySubscription.unsubscribe();
}
}
+
+ getTranslatedMessages(keys: string[]): Observable
{
+ return combineLatest(keys.map(key => this.translate.get(key)));
+ }
}
diff --git a/admin/src/app/services/auth.guard.ts b/admin/src/app/services/auth.guard.ts
index c3f68352..8eacd178 100644
--- a/admin/src/app/services/auth.guard.ts
+++ b/admin/src/app/services/auth.guard.ts
@@ -3,6 +3,7 @@ import { CanActivate, Router } from '@angular/router';
import { AuthService } from './auth.service';
import { LoginService } from './lgoin.service';
import { DbConfService } from './dbconf.service';
+import { LanguageService } from './language.service';
@Injectable()
@@ -11,7 +12,8 @@ export class AuthGuard implements CanActivate {
protected router: Router,
private authService: AuthService,
private loginService: LoginService,
- private dbConfService: DbConfService
+ private dbConfService: DbConfService,
+ private languageService: LanguageService
) {}
getCurUser(): Promise {
@@ -25,6 +27,8 @@ export class AuthGuard implements CanActivate {
resolve(true);
},
(err) => {
+ const currentLang = this.languageService.getCurrentLang();
+ this.languageService.changeLanguage(currentLang);
this.router.navigate(['']);
resolve(false);
}
@@ -35,6 +39,8 @@ export class AuthGuard implements CanActivate {
async canActivate(): Promise {
const hasUser = await this.getCurUser();
if (!hasUser) {
+ const currentLang = this.languageService.getCurrentLang();
+ this.languageService.changeLanguage(currentLang);
this.router.navigate(['']);
return false;
}
diff --git a/admin/src/app/services/language.service.ts b/admin/src/app/services/language.service.ts
index 9b529347..b54bce96 100644
--- a/admin/src/app/services/language.service.ts
+++ b/admin/src/app/services/language.service.ts
@@ -53,7 +53,7 @@ export class LanguageService {
}
// Récupère la langue préférée de l'utilisateur depuis le localStorage
private getPreferredLanguage(): string {
- return localStorage.getItem('preferredLanguage') || this.defaultLanguage; // 'fr' par défaut
+ return localStorage.getItem('preferredLanguage');
}
private setDefaultLanguage(): void {
@@ -63,20 +63,16 @@ private setDefaultLanguage(): void {
// Obtenir la langue du navigateur
const browserLang = navigator.language.split('-')[0]; // Extrait 'fr' de 'fr-FR'
- console.log(`Browser language: ${browserLang}`);
// Récupérer la langue préférée de l'utilisateur
const preferredLang = this.getPreferredLanguage();
// Vérifier si la langue du navigateur ou la langue préférée est supportée
if (this.languages.includes(preferredLang)) {
this.translate.use(preferredLang); // Utiliser la langue préférée
- console.log(`Using preferred language: ${preferredLang}`);
} else if (this.languages.includes(browserLang)) {
this.translate.use(browserLang); // Utiliser la langue du navigateur
- console.log(`Using browser language: ${browserLang}`);
} else {
this.translate.use(this.defaultLanguage); // Utiliser la langue par défaut si pas supportée
- console.log(`Using default language: ${this.defaultLanguage}`)
}
}
diff --git a/admin/src/assets/i18n/en.json b/admin/src/assets/i18n/en.json
index fe6e5301..2d9f3966 100644
--- a/admin/src/assets/i18n/en.json
+++ b/admin/src/assets/i18n/en.json
@@ -75,7 +75,13 @@
"REFERENCE":"Reference",
"LOGO":"Logo",
"PICTURE":"Picture",
- "THUMBNAIL":"Thumbnail"
+ "THUMBNAIL":"Thumbnail",
+ "CONNECTION": "Sign in",
+ "CONNECT": "Connect",
+ "LOGIN": "Login",
+ "PASSWORD": "Password",
+ "YES": "Yes",
+ "NO": "No"
},
"FIELDS":{
"NAME": "{{ varname }} name"
@@ -99,8 +105,26 @@
"EDIT": "Edit {{ article }} {{ varname }}",
"DELETE": "Delete {{ article }} {{ varname }}",
"MODIFY": "Change {{ article }} {{ varname }}",
+ "MODIFY_DEFAULT":"Edit",
"PUBLISH": "Publish {{ article }} {{ varname }}",
"PUBLISH_DEFAULT":"Publish"
+ },
+ "ERRORS": {
+ "EXPIRED_SESSION": "Your session has expired, please log in again.",
+ "SERVER_ERROR": "An error occurred on the server, please refresh the page.",
+ "INVALID_GEOM": "The geometry is invalid."
+ },
+ "INFO_MESSAGE": {
+ "NO_PICTURE": "Please import a picture.",
+ "RECENTER_MAP": "Recenter the map.",
+ "SUCESS_ADDED_SITE": "Observatory point added successfully.",
+ "SUCCESS_UPDATED_SITE": "Observatory point updated successfully.",
+ "SUCCESS_ADDED_OBSERVATORY": "Observatory added successfully.",
+ "SUCCESS_UPDATED_OBSERVATORY": "Observatory updated successfully.",
+ "GEOM_SHOULD_BE_MULTIPOLYGON": "The geometry must be a MultiPolygon."
+ },
+ "ALERTS": {
+ "ITEM_EXISTS": "« {{ item }} » already exists."
}
}
diff --git a/admin/src/assets/i18n/fr.json b/admin/src/assets/i18n/fr.json
index 944bca95..4a9a5e9f 100644
--- a/admin/src/assets/i18n/fr.json
+++ b/admin/src/assets/i18n/fr.json
@@ -54,8 +54,7 @@
"OBSERVATORIES": "Gestion des observatoires",
"SITES": "Gestion des sites d'observation",
"GALLERY": "Gestion de la galerie photos",
- "LANGUAGE": "Langue",
- "LOGOUT": "Déconnexion"
+ "LANGUAGE": "Langue"
},
"LANGUAGES": {
"en": "Anglais",
@@ -75,7 +74,13 @@
"REFERENCE":"Référence",
"LOGO":"Logo",
"PICTURE":"Photo",
- "THUMBNAIL":"Vignette"
+ "THUMBNAIL":"Vignette",
+ "CONNECTION": "Connexion",
+ "CONNECT": "Se connecter",
+ "LOGIN": "Identifiant",
+ "PASSWORD": "Mot de passe",
+ "YES": "Oui",
+ "NO": "Non"
},
"FIELDS":{
"NAME": "Nom {{article}} {{ varname }}"
@@ -99,9 +104,27 @@
"EDIT": "Editer {{ article }} {{ varname }}",
"DELETE": "Supprimer {{ article }} {{ varname }}",
"MODIFY": "Modifier {{ article }} {{ varname }}",
+ "MODIFY_DEFAULT":"Modifier",
"PUBLISH": "Publier {{ article }} {{ varname }}",
"PUBLISH_DEFAULT":"Publier"
- }
+ },
+ "ERRORS": {
+ "EXPIRED_SESSION": "Votre session a expirée, veuillez vous reconnecter.",
+ "SERVER_ERROR": "Erreur survenue sur le serveur, veuillez rafraîchir la page.",
+ "INVALID_GEOM": "La geometrie est invalide"
+ },
+ "INFO_MESSAGE":{
+ "NO_PICTURE": "Veuillez importer une photo",
+ "RECENTER_MAP": "Recentrer la map",
+ "SUCESS_ADDED_SITE": "Point d'observation ajouté avec succès",
+ "SUCCESS_UPDATED_SITE":"Point d'observation mis à jour avec succès",
+ "SUCCESS_ADDED_OBSERVATORY": "Observatoire ajouté avec succès",
+ "SUCCESS_UPDATED_OBSERVATORY": "Observatoire mis à jour avec succès",
+ "GEOM_SHOULD_BE_MULTIPOLYGON": "La geometrie doit être un Multipolygon"
+ },
+ "ALERTS":{
+ "ITEM_EXISTS":"« {{ item }} » existe déjà"
+ }
}
\ No newline at end of file