_Bastler/we_bstly-web
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

update borrow + fix invite

Browse Source
This commit is contained in:
_Bastler
2021-10-27 17:07:44 +02:00
parent 59ac345933
commit 925a03fd46
45 changed files with 2792 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/services/i18n.service.ts
+32 -28
View File
@@ -1,6 +1,6 @@
import {Injectable} from '@angular/core';
import {HttpClient} from '@angular/common/http';
import {environment} from '../../environments/environment';
import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { environment } from '../../environments/environment';
@Injectable({
providedIn: 'root',
@@ -8,7 +8,7 @@ import {environment} from '../../environments/environment';
export class I18nService {
locale: string = "de-informal";
locales: any[] = ["de-informal"];
locales: any[] = [ "de-informal" ];
i18n: any;
constructor(private http: HttpClient) {
@@ -31,13 +31,13 @@ export class I18nService {
let browserLocale = navigator.language;
if(browserLocale.indexOf("-") != -1) {
browserLocale = browserLocale.split("-")[0];
if (browserLocale.indexOf("-") != -1) {
browserLocale = browserLocale.split("-")[ 0 ];
}
let locale = localStorage.getItem("bstly.locale") || browserLocale || this.locales[0];
let locale = localStorage.getItem("bstly.locale") || browserLocale || this.locales[ 0 ];
if(locale == 'de') {
if (locale == 'de') {
locale = 'de-informal';
}
@@ -45,54 +45,58 @@ export class I18nService {
await this.http.get(environment.apiUrl + "/i18n").toPromise().then((response: any) => {
this.locales = response;
});
} catch(e) {
} catch (e) {
console.debug("fallback to default locales");
}
if(this.locales.indexOf(locale) == -1) {
locale = this.locales[0];
if (this.locales.indexOf(locale) == -1) {
locale = this.locales[ 0 ];
}
this.setLocale(locale);
try {
this.i18n = await this.http.get(environment.apiUrl + "/i18n/" + locale).toPromise();
} catch(e) {
} catch (e) {
this.i18n = await this.http.get("/assets/i18n/" + locale + ".json").toPromise();
console.debug("fallback to default locale");
}
}
get(key, args: string[]): string {
return this.getInternal(key, args, this.i18n);
return this.getInternal(key, args, this.i18n, "");
}
getInternal(key, args: string[], from): string {
getInternal(key, args: string[], from, path): string {
key += '';
if(!from) {
return key;
} else if(from[key]) {
if(typeof from[key] === 'object') {
if(from[key]["."]) {
return this.insertArguments(from[key]["."], args);
if (!from) {
return this.empty(key, args, path);
} else if (from[ key ]) {
if (typeof from[ key ] === 'object') {
if (from[ key ][ "." ]) {
return this.insertArguments(from[ key ][ "." ], args);
}
return key;
return this.empty(key, args, path);
}
return this.insertArguments(from[key], args);
return this.insertArguments(from[ key ], args);
} else {
let keys = key.split(".");
if(from[keys[0]]) {
if (from[ keys[ 0 ] ]) {
key = keys.slice(1, keys.length).join(".");
return this.getInternal(key, args, from[keys[0]])
return this.getInternal(key, args, from[ keys[ 0 ] ], path + keys[ 0 ] + ".")
}
}
return key;
return this.empty(key, args, path);
}
empty(key, args: string[], path: string): string {
return (path ? path + (path.endsWith(".") ? "" : ".") : "") + key + (args && args.length > 0 ? (" [" + args + "]") : "");
}
insertArguments(label: string, args: string[]) {
if(args) {
for(let index in args) {
label = label.replace(`{${index}}`, this.get(args[index], []));
if (args) {
for (let index in args) {
label = label.replace(`{${index}}`, this.get(args[ index ], []));
}
}
return label;