[reclaim-ui] 330/459: replace service

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository reclaim-ui.

commit a83e5f6cce366f21a27213607ff091d6bca26911
Merge: f4f0ec8 38699ed
Author: Martin Schanzenbach <mschanzenbach@posteo.de>
AuthorDate: Wed Oct 7 14:57:12 2020 +0200

    replace service

 src/app/app.component.ts                           |  6 ----
 .../edit-authorizations.component.ts               | 14 +++-------
 .../edit-credentials.component.html                |  2 +-
 .../edit-credentials/edit-credentials.component.ts | 14 +++-------
 src/app/edit-identity/edit-identity.component.html | 30 ++++++++++----------
 src/app/edit-identity/edit-identity.component.ts   | 12 ++------
 src/app/identity-list/identity-list.component.html |  2 +-
 src/app/identity-list/identity-list.component.ts   |  2 +-
 src/app/language.service.spec.ts                   | 16 +++++++++++
 src/app/language.service.ts                        | 32 ++++++++++++++++++++++
 src/app/new-identity/new-identity.component.html   |  2 +-
 src/app/new-identity/new-identity.component.ts     | 12 ++------
 12 files changed, 81 insertions(+), 63 deletions(-)

diff --cc src/app/app.component.ts
index b2b4c95,8cdb324..b93cafd
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@@ -11,19 -9,12 +11,13 @@@ declare var chrome: any
  })
  export class AppComponent {
    title = 'app';
 +  defaultLanguage = 'en';
    configService: any;
 +  public myTranslation: any;
  
-   translateTest(locale:string) {
-     return require(`../locales/${locale}/messages.json`);
-   }
- 
    constructor(private _configService: ConfigService,
 -              private localesService: LocalesService) 
 -              {
 +              private languageService: LanguageService) {
      this.configService = _configService;
-     const lang = navigator.language || "en";
-     this.myTranslation = this.translateTest(lang.substr(0,2));
    }
  
    isExperimental() {
diff --cc src/app/identity-list/identity-list.component.ts
index e032cd8,273afba..e4ae31f
--- a/src/app/identity-list/identity-list.component.ts
+++ b/src/app/identity-list/identity-list.component.ts
@@@ -10,11 -10,10 +10,11 @@@ import { NamestoreService } from '../na
  import { OpenIdService } from '../open-id.service';
  import { ReclaimService } from '../reclaim.service';
  import { ModalService } from '../modal.service';
+ import { LocalesService } from '../locales.service';
  import { finalize } from 'rxjs/operators';
  import { from, forkJoin, EMPTY } from 'rxjs';
 +import { LanguageService } from '../language.service';
  
- declare var chrome: any;
  
  @Component({
    selector: 'app-identity-list',
diff --cc src/app/language.service.spec.ts
index 0000000,304e4e8..299455e
mode 000000,100644..100644
--- a/src/app/language.service.spec.ts
+++ b/src/app/language.service.spec.ts
@@@ -1,0 -1,16 +1,16 @@@
+ import { TestBed } from '@angular/core/testing';
+ 
 -import { LocalesService } from './locales.service';
++import { LanguageService } from './language.service';
+ 
 -describe('LocalesService', () => {
 -  let service: LocalesService;
++describe('LanguageService', () => {
++  let service: LanguageService;
+ 
+   beforeEach(() => {
+     TestBed.configureTestingModule({});
 -    service = TestBed.inject(LocalesService);
++    service = TestBed.inject(LanguageService);
+   });
+ 
+   it('should be created', () => {
+     expect(service).toBeTruthy();
+   });
+ });
diff --cc src/app/language.service.ts
index 0000000,0000000..193e8f9
new file mode 100644
--- /dev/null
+++ b/src/app/language.service.ts
@@@ -1,0 -1,0 +1,32 @@@
++import { Injectable } from '@angular/core';
++import i18next from 'i18next';
++
++@Injectable({
++  providedIn: 'root'
++})
++export class LanguageService {
++  locale: string;
++
++  constructor() {
++    this.locale = navigator.language || "en";
++    i18next.init({
++      lng: this.locale,
++      debug: true,
++      resources: this.getTranslationData()
++    }).then(function(t) {
++      // initialized and ready to go!
++      console.log("Successfully initialized i18next");
++    });
++  }
++
++  public getMessage(key, data): string {
++    return i18next.t(key, data);
++  }
++
++  getTranslationData() {
++    var resource = {};
++    resource[this.locale.substr(0,2)] = {}
++    resource[this.locale.substr(0,2)]["translation"] = 
require(`../locales/${this.locale.substr(0,2)}/messages.json`);
++    return resource;
++  }
++}

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.