Remove code duplication

gisaia · Jan 22, 2025 · 33527e7 · 33527e7
1 parent 4ac4666
commit 33527e7
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 74 deletions.
diff --git a/projects/arlas-toolkit/src/lib/login.module.ts b/projects/arlas-toolkit/src/lib/login.module.ts
@@ -24,55 +24,20 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatInputModule } from '@angular/material/input';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import en from 'arlas-web-components/assets/i18n/en.json';
-import fr from 'arlas-web-components/assets/i18n/fr.json';
-import es from 'arlas-web-components/assets/i18n/es.json';
-import enMap from 'arlas-map/assets/i18n/en.json';
-import esMap from 'arlas-map/assets/i18n/es.json';
-import frMap from 'arlas-map/assets/i18n/fr.json';
-import { Observable } from 'rxjs/internal/Observable';
-import { LoginComponent } from './components/login/login.component';
-import { MatIconModule } from '@angular/material/icon';
 import { MatButtonModule } from '@angular/material/button';
-import { RegisterComponent } from './components/register/register.component';
-import { RouterModule } from '@angular/router';
-import { VerifyComponent } from './components/verify/verify.component';
-import { ResetComponent } from './components/reset/reset.component';
-import { ForgotComponent } from './components/forgot/forgot.component';
 import { MatCheckboxModule } from '@angular/material/checkbox';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatIconModule } from '@angular/material/icon';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
+import { RouterModule } from '@angular/router';
 import { ChangePasswordComponent } from './components/change-password/change-password.component';
-import { MatDialogModule } from '@angular/material/dialog';
-
-export class CustomTranslateLoader implements TranslateLoader {
-
-  public constructor(private http: HttpClient) { }
+import { ForgotComponent } from './components/forgot/forgot.component';
+import { LoginComponent } from './components/login/login.component';
+import { RegisterComponent } from './components/register/register.component';
+import { ResetComponent } from './components/reset/reset.component';
+import { VerifyComponent } from './components/verify/verify.component';
+import { CustomTranslateLoader } from './tools/Translation/custom-translate-loader';
 
-  public getTranslation(lang: string): Observable<any> {
-    const apiAddress = 'assets/i18n/' + lang + '.json?' + Date.now();
-    return Observable.create(observer => {
-      this.http.get(apiAddress).subscribe(
-        res => {
-          let merged = res;
-          // Properties in res will overwrite those in fr.
-          if (lang === 'fr') {
-            merged = { ...fr, ...frMap, ...res };
-          } else if (lang === 'en') {
-            merged = { ...en, ...enMap, ...res };
-          } else if (lang === 'es') {
-            merged = { ...es, ...esMap, ...res };
-          }
-          observer.next(merged);
-          observer.complete();
-        },
-        error => {
-          // failed to retrieve requested language file, use default
-          observer.complete(); // => Default language is already loaded
-        }
-      );
-    });
-  }
-}
 
 @NgModule({
   declarations: [

diff --git a/projects/arlas-toolkit/src/lib/shared.module.ts b/projects/arlas-toolkit/src/lib/shared.module.ts
@@ -141,36 +141,6 @@ import { ArlasColorGeneratorLoader } from './tools/color-generator-loader';
 import { ArlasMapModule, } from 'arlas-map';
 
 
-export class CustomTranslateLoader implements TranslateLoader {
-
-  public constructor(private readonly http: HttpClient) { }
-
-  public getTranslation(lang: string): Observable<any> {
-    const apiAddress = 'assets/i18n/' + lang + '.json?' + Date.now();
-    return new Observable(observer => {
-      this.http.get(apiAddress).subscribe(
-        res => {
-          let merged = res;
-          // Properties in res will overwrite those in fr.
-          if (lang === 'fr') {
-            merged = { ...fr, ...frMap, ...res };
-          } else if (lang === 'en') {
-            merged = { ...en, ...enMap, ...res };
-          } else if (lang === 'es') {
-            merged = { ...es, ...esMap, ...res };
-          }
-          observer.next(merged);
-          observer.complete();
-        },
-        error => {
-          // failed to retrieve requested language file, use default
-          observer.complete(); // => Default language is already loaded
-        }
-      );
-    });
-  }
-}
-
 @NgModule({
   exports: [
     AnalyticsBoardComponent,

diff --git a/projects/arlas-toolkit/src/lib/tools/Translation/custom-translate-loader.ts b/projects/arlas-toolkit/src/lib/tools/Translation/custom-translate-loader.ts
@@ -0,0 +1,49 @@
+/*
+ * Licensed to Gisaïa under one or more contributor
+ * license agreements. See the NOTICE.txt file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Gisaïa licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+export class CustomTranslateLoader implements TranslateLoader {
+
+  public constructor(private readonly http: HttpClient) { }
+
+  public getTranslation(lang: string): Observable<any> {
+    const apiAddress = 'assets/i18n/' + lang + '.json?' + Date.now();
+    return new Observable(observer => {
+      this.http.get(apiAddress).subscribe(
+        res => {
+          let merged = res;
+          // Properties in res will overwrite those in fr.
+          if (lang === 'fr') {
+            merged = { ...fr, ...frMap, ...res };
+          } else if (lang === 'en') {
+            merged = { ...en, ...enMap, ...res };
+          } else if (lang === 'es') {
+            merged = { ...es, ...esMap, ...res };
+          }
+          observer.next(merged);
+          observer.complete();
+        },
+        error => {
+          // failed to retrieve requested language file, use default
+          observer.complete(); // => Default language is already loaded
+        }
+      );
+    });
+  }
+}