dfx-translate - npm Package Compare versions

Comparing version 0.0.3 to 0.0.4

bundles/dfx-translate.umd.js

@@ -30,21 +30,20 @@ (function (global, factory) {
 
-    // noinspection JSUnusedLocalSymbols
     var Translator = /** @class */ (function () {
         function Translator(config, http) {
-            var _a, _b, _c, _d, _e, _f;
+            var _a, _b;
             this.config = config;
             this.http = http;
-            this.translation = {};
-            this.autoGeneratedTranslation = {};
+            this.translations = {};
+            this.autoGeneratedTranslations = {};
             this.defaultLanguage = 'de';
             this.autoGeneratedDefaultLanguage = 'en';
-            this.defaultLanguage = ((_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.defaultLanguage) === null || _b === void 0 ? void 0 : _b.length) > 2 ? (_c = this.config) === null || _c === void 0 ? void 0 : _c.defaultLanguage : this.defaultLanguage;
-            this.autoGeneratedDefaultLanguage = ((_e = (_d = this.config) === null || _d === void 0 ? void 0 : _d.autoGeneratedDefaultLanguage) === null || _e === void 0 ? void 0 : _e.length) > 2 ? (_f = this.config) === null || _f === void 0 ? void 0 : _f.autoGeneratedDefaultLanguage : this.autoGeneratedDefaultLanguage;
+            this.defaultLanguage = ((_a = config === null || config === void 0 ? void 0 : config.defaultLanguage) === null || _a === void 0 ? void 0 : _a.length) > 0 ? config.defaultLanguage : this.defaultLanguage;
+            this.autoGeneratedDefaultLanguage = ((_b = config === null || config === void 0 ? void 0 : config.autoGeneratedDefaultLanguage) === null || _b === void 0 ? void 0 : _b.length) > 0 ? config.autoGeneratedDefaultLanguage : this.autoGeneratedDefaultLanguage;
         }
         Translator.prototype.translate = function (key) {
-            if (this.translation[key]) {
-                return this.translation[key];
+            if (this.translations[key]) {
+                return this.translations[key];
             }
-            else if (this.autoGeneratedTranslation[key]) {
-                return this.autoGeneratedTranslation[key];
+            else if (this.autoGeneratedTranslations[key]) {
+                return this.autoGeneratedTranslations[key];
             }
@@ -58,11 +57,11 @@ else {
             if (lang === 'DEFAULT') {
-                var langCookie = localStorage.getItem('language');
-                if (langCookie == null) {
+                var language = localStorage.getItem('language');
+                if (language != null) {
+                    lang = language;
+                    console.log('Language cookie found! Using ' + lang);
+                }
+                else {
                     lang = this.defaultLanguage;
                     console.log('No language cookie found! Using de as default');
                 }
-                else {
-                    console.log('Language cookie found! Using ' + lang);
-                    lang = langCookie;
-                }
             }
@@ -75,16 +74,18 @@ else {
                 var langPath = "assets/i18n/" + (lang || _this.defaultLanguage) + ".json";
+                // noinspection JSUnusedLocalSymbols
                 _this.http.get(langPath).subscribe(function (translation) {
-                    _this.translation = Object.assign({}, translation || {});
-                    resolve(_this.translation);
+                    _this.translations = Object.assign({}, translation || {});
+                    resolve(_this.translations);
                 }, function (error) {
-                    _this.translation = {};
-                    resolve(_this.translation);
+                    _this.translations = {};
+                    resolve(_this.translations);
                 });
                 var autoLangPath = "assets/i18n/" + (lang || _this.autoGeneratedDefaultLanguage) + "_auto.json";
+                // noinspection JSUnusedLocalSymbols
                 _this.http.get(autoLangPath).subscribe(function (translation) {
-                    _this.autoGeneratedTranslation = Object.assign({}, translation || {});
-                    resolve(_this.autoGeneratedTranslation);
+                    _this.autoGeneratedTranslations = Object.assign({}, translation || {});
+                    resolve(_this.autoGeneratedTranslations);
                 }, function (error) {
-                    _this.autoGeneratedTranslation = {};
-                    resolve(_this.autoGeneratedTranslation);
+                    _this.autoGeneratedTranslations = {};
+                    resolve(_this.autoGeneratedTranslations);
                 });
@@ -110,11 +111,11 @@ });
     var TranslatePipe = /** @class */ (function () {
-        function TranslatePipe(translator) {
-            this.translator = translator;
+        function TranslatePipe(translate) {
+            this.translate = translate;
         }
         TranslatePipe.prototype.transform = function (key) {
-            if (this.translator.translation[key]) {
-                return this.translator.translation[key];
+            if (this.translate.translations[key]) {
+                return this.translate.translations[key];
             }
-            else if (this.translator.autoGeneratedTranslation[key]) {
-                return this.translator.autoGeneratedTranslation[key];
+            else if (this.translate.autoGeneratedTranslations[key]) {
+                return this.translate.autoGeneratedTranslations[key];
             }
@@ -129,10 +130,7 @@ else {
     TranslatePipe.ɵpipe = i0__namespace.ɵɵngDeclarePipe({ minVersion: "12.0.0", version: "12.1.0", ngImport: i0__namespace, type: TranslatePipe, name: "tr", pure: false });
-    TranslatePipe.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.1.0", ngImport: i0__namespace, type: TranslatePipe });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.1.0", ngImport: i0__namespace, type: TranslatePipe, decorators: [{
-                type: i0.Injectable
-            }, {
                 type: i0.Pipe,
                 args: [{
                         name: 'tr',
-                        pure: false
+                        pure: false,
                     }]
@@ -148,3 +146,3 @@ }], ctorParameters: function () { return [{ type: Translator }]; } });
                 ngModule: DfxTranslateModule,
-                providers: [{ provide: 'config', useValue: configuration },]
+                providers: [{ provide: 'config', useValue: configuration }]
             };
@@ -151,0 +149,0 @@ };

esm2015/lib/dfx-translate.module.js

 import { APP_INITIALIZER, NgModule } from '@angular/core';
-import { TranslatePipe } from "./translate.pipe";
+import { TranslatePipe } from './translate.pipe';
 import { Translator } from "./translator.service";
@@ -10,3 +10,3 @@ import * as i0 from "@angular/core";
             ngModule: DfxTranslateModule,
-            providers: [{ provide: 'config', useValue: configuration },]
+            providers: [{ provide: 'config', useValue: configuration }]
         };
@@ -43,2 +43,2 @@ }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGZ4LXRyYW5zbGF0ZS5tb2R1bGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9wcm9qZWN0cy9kZngtdHJhbnNsYXRlL3NyYy9saWIvZGZ4LXRyYW5zbGF0ZS5tb2R1bGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFDLGVBQWUsRUFBdUIsUUFBUSxFQUFDLE1BQU0sZUFBZSxDQUFDO0FBQzdFLE9BQU8sRUFBQyxhQUFhLEVBQUMsTUFBTSxrQkFBa0IsQ0FBQztBQUMvQyxPQUFPLEVBQUMsVUFBVSxFQUFDLE1BQU0sc0JBQXNCLENBQUM7O0FBY2hELE1BQU0sT0FBTyxrQkFBa0I7SUFDdEIsTUFBTSxDQUFDLE1BQU0sQ0FBQyxhQUFrQjtRQUNyQyxPQUFPLENBQUMsR0FBRyxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQzNCLE9BQU87WUFDTCxRQUFRLEVBQUUsa0JBQWtCO1lBQzVCLFNBQVMsRUFBRSxDQUFDLEVBQUMsT0FBTyxFQUFFLFFBQVEsRUFBRSxRQUFRLEVBQUUsYUFBYSxFQUFDLEVBQUU7U0FDM0QsQ0FBQztJQUNKLENBQUM7OytHQVBVLGtCQUFrQjtnSEFBbEIsa0JBQWtCLGlCQVhkLGFBQWEsYUFDbEIsYUFBYTtnSEFVWixrQkFBa0IsYUFUbEI7UUFDVDtZQUNFLE9BQU8sRUFBRSxlQUFlO1lBQ3hCLFVBQVUsRUFBRSxxQkFBcUI7WUFDakMsSUFBSSxFQUFFLENBQUMsVUFBVSxDQUFDO1lBQ2xCLEtBQUssRUFBRSxJQUFJO1NBQ1o7S0FDRjsyRkFFVSxrQkFBa0I7a0JBWjlCLFFBQVE7bUJBQUM7b0JBQ1IsWUFBWSxFQUFFLENBQUMsYUFBYSxDQUFDO29CQUM3QixPQUFPLEVBQUUsQ0FBQyxhQUFhLENBQUM7b0JBQ3hCLFNBQVMsRUFBRTt3QkFDVDs0QkFDRSxPQUFPLEVBQUUsZUFBZTs0QkFDeEIsVUFBVSxFQUFFLHFCQUFxQjs0QkFDakMsSUFBSSxFQUFFLENBQUMsVUFBVSxDQUFDOzRCQUNsQixLQUFLLEVBQUUsSUFBSTt5QkFDWjtxQkFDRjtpQkFDRjs7QUFXRCxNQUFNLFVBQVUscUJBQXFCLENBQUMsT0FBbUI7SUFDdkQsT0FBTyxHQUFHLEVBQUUsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0FBQ3RDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge0FQUF9JTklUSUFMSVpFUiwgTW9kdWxlV2l0aFByb3ZpZGVycywgTmdNb2R1bGV9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHtUcmFuc2xhdGVQaXBlfSBmcm9tIFwiLi90cmFuc2xhdGUucGlwZVwiO1xuaW1wb3J0IHtUcmFuc2xhdG9yfSBmcm9tIFwiLi90cmFuc2xhdG9yLnNlcnZpY2VcIjtcblxuQE5nTW9kdWxlKHtcbiAgZGVjbGFyYXRpb25zOiBbVHJhbnNsYXRlUGlwZV0sXG4gIGV4cG9ydHM6IFtUcmFuc2xhdGVQaXBlXSxcbiAgcHJvdmlkZXJzOiBbXG4gICAge1xuICAgICAgcHJvdmlkZTogQVBQX0lOSVRJQUxJWkVSLFxuICAgICAgdXNlRmFjdG9yeTogc2V0dXBUcmFuc2xhdGVGYWN0b3J5LFxuICAgICAgZGVwczogW1RyYW5zbGF0b3JdLFxuICAgICAgbXVsdGk6IHRydWVcbiAgICB9LFxuICBdXG59KVxuZXhwb3J0IGNsYXNzIERmeFRyYW5zbGF0ZU1vZHVsZSB7XG4gIHB1YmxpYyBzdGF0aWMgY29uZmlnKGNvbmZpZ3VyYXRpb246IGFueSk6IE1vZHVsZVdpdGhQcm92aWRlcnM8RGZ4VHJhbnNsYXRlTW9kdWxlPiB7XG4gICAgY29uc29sZS5sb2coY29uZmlndXJhdGlvbik7XG4gICAgcmV0dXJuIHtcbiAgICAgIG5nTW9kdWxlOiBEZnhUcmFuc2xhdGVNb2R1bGUsXG4gICAgICBwcm92aWRlcnM6IFt7cHJvdmlkZTogJ2NvbmZpZycsIHVzZVZhbHVlOiBjb25maWd1cmF0aW9ufSxdXG4gICAgfTtcbiAgfVxufVxuXG5leHBvcnQgZnVuY3Rpb24gc2V0dXBUcmFuc2xhdGVGYWN0b3J5KHNlcnZpY2U6IFRyYW5zbGF0b3IpOiBGdW5jdGlvbiB7XG4gIHJldHVybiAoKSA9PiBzZXJ2aWNlLnVzZSgnREVGQVVMVCcpO1xufVxuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGZ4LXRyYW5zbGF0ZS5tb2R1bGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9wcm9qZWN0cy9kZngtdHJhbnNsYXRlL3NyYy9saWIvZGZ4LXRyYW5zbGF0ZS5tb2R1bGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFDLGVBQWUsRUFBdUIsUUFBUSxFQUFDLE1BQU0sZUFBZSxDQUFDO0FBRTdFLE9BQU8sRUFBQyxhQUFhLEVBQUMsTUFBTSxrQkFBa0IsQ0FBQztBQUMvQyxPQUFPLEVBQUMsVUFBVSxFQUFDLE1BQU0sc0JBQXNCLENBQUM7O0FBY2hELE1BQU0sT0FBTyxrQkFBa0I7SUFDN0IsTUFBTSxDQUFDLE1BQU0sQ0FBQyxhQUFrQjtRQUM5QixPQUFPLENBQUMsR0FBRyxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQzNCLE9BQU87WUFDTCxRQUFRLEVBQUUsa0JBQWtCO1lBQzVCLFNBQVMsRUFBRSxDQUFDLEVBQUMsT0FBTyxFQUFFLFFBQVEsRUFBRSxRQUFRLEVBQUUsYUFBYSxFQUFDLENBQUM7U0FDMUQsQ0FBQztJQUNKLENBQUM7OytHQVBVLGtCQUFrQjtnSEFBbEIsa0JBQWtCLGlCQVhkLGFBQWEsYUFDbEIsYUFBYTtnSEFVWixrQkFBa0IsYUFUbEI7UUFDVDtZQUNFLE9BQU8sRUFBRSxlQUFlO1lBQ3hCLFVBQVUsRUFBRSxxQkFBcUI7WUFDakMsSUFBSSxFQUFFLENBQUMsVUFBVSxDQUFDO1lBQ2xCLEtBQUssRUFBRSxJQUFJO1NBQ1o7S0FDRjsyRkFFVSxrQkFBa0I7a0JBWjlCLFFBQVE7bUJBQUM7b0JBQ1IsWUFBWSxFQUFFLENBQUMsYUFBYSxDQUFDO29CQUM3QixPQUFPLEVBQUUsQ0FBQyxhQUFhLENBQUM7b0JBQ3hCLFNBQVMsRUFBRTt3QkFDVDs0QkFDRSxPQUFPLEVBQUUsZUFBZTs0QkFDeEIsVUFBVSxFQUFFLHFCQUFxQjs0QkFDakMsSUFBSSxFQUFFLENBQUMsVUFBVSxDQUFDOzRCQUNsQixLQUFLLEVBQUUsSUFBSTt5QkFDWjtxQkFDRjtpQkFDRjs7QUFXRCxNQUFNLFVBQVUscUJBQXFCLENBQUMsT0FBbUI7SUFDdkQsT0FBTyxHQUFHLEVBQUUsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0FBQ3RDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge0FQUF9JTklUSUFMSVpFUiwgTW9kdWxlV2l0aFByb3ZpZGVycywgTmdNb2R1bGV9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuXG5pbXBvcnQge1RyYW5zbGF0ZVBpcGV9IGZyb20gJy4vdHJhbnNsYXRlLnBpcGUnO1xuaW1wb3J0IHtUcmFuc2xhdG9yfSBmcm9tIFwiLi90cmFuc2xhdG9yLnNlcnZpY2VcIjtcblxuQE5nTW9kdWxlKHtcbiAgZGVjbGFyYXRpb25zOiBbVHJhbnNsYXRlUGlwZV0sXG4gIGV4cG9ydHM6IFtUcmFuc2xhdGVQaXBlXSxcbiAgcHJvdmlkZXJzOiBbXG4gICAge1xuICAgICAgcHJvdmlkZTogQVBQX0lOSVRJQUxJWkVSLFxuICAgICAgdXNlRmFjdG9yeTogc2V0dXBUcmFuc2xhdGVGYWN0b3J5LFxuICAgICAgZGVwczogW1RyYW5zbGF0b3JdLFxuICAgICAgbXVsdGk6IHRydWVcbiAgICB9LFxuICBdXG59KVxuZXhwb3J0IGNsYXNzIERmeFRyYW5zbGF0ZU1vZHVsZSB7XG4gIHN0YXRpYyBjb25maWcoY29uZmlndXJhdGlvbjogYW55KTogTW9kdWxlV2l0aFByb3ZpZGVyczxEZnhUcmFuc2xhdGVNb2R1bGU+IHtcbiAgICBjb25zb2xlLmxvZyhjb25maWd1cmF0aW9uKTtcbiAgICByZXR1cm4ge1xuICAgICAgbmdNb2R1bGU6IERmeFRyYW5zbGF0ZU1vZHVsZSxcbiAgICAgIHByb3ZpZGVyczogW3twcm92aWRlOiAnY29uZmlnJywgdXNlVmFsdWU6IGNvbmZpZ3VyYXRpb259XVxuICAgIH07XG4gIH1cbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHNldHVwVHJhbnNsYXRlRmFjdG9yeShzZXJ2aWNlOiBUcmFuc2xhdG9yKTogRnVuY3Rpb24ge1xuICByZXR1cm4gKCkgPT4gc2VydmljZS51c2UoJ0RFRkFVTFQnKTtcbn1cbiJdfQ==

esm2015/lib/translate.pipe.js

@@ -1,14 +0,14 @@
-import { Injectable, Pipe } from '@angular/core';
+import { Pipe } from '@angular/core';
 import * as i0 from "@angular/core";
 import * as i1 from "./translator.service";
 export class TranslatePipe {
-    constructor(translator) {
-        this.translator = translator;
+    constructor(translate) {
+        this.translate = translate;
     }
     transform(key) {
-        if (this.translator.translation[key]) {
-            return this.translator.translation[key];
+        if (this.translate.translations[key]) {
+            return this.translate.translations[key];
         }
-        else if (this.translator.autoGeneratedTranslation[key]) {
-            return this.translator.autoGeneratedTranslation[key];
+        else if (this.translate.autoGeneratedTranslations[key]) {
+            return this.translate.autoGeneratedTranslations[key];
         }
@@ -22,12 +22,9 @@ else {
 TranslatePipe.ɵpipe = i0.ɵɵngDeclarePipe({ minVersion: "12.0.0", version: "12.1.0", ngImport: i0, type: TranslatePipe, name: "tr", pure: false });
-TranslatePipe.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.1.0", ngImport: i0, type: TranslatePipe });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.1.0", ngImport: i0, type: TranslatePipe, decorators: [{
-            type: Injectable
-        }, {
             type: Pipe,
             args: [{
                     name: 'tr',
-                    pure: false
+                    pure: false,
                 }]
         }], ctorParameters: function () { return [{ type: i1.Translator }]; } });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNsYXRlLnBpcGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9wcm9qZWN0cy9kZngtdHJhbnNsYXRlL3NyYy9saWIvdHJhbnNsYXRlLnBpcGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFDLFVBQVUsRUFBRSxJQUFJLEVBQWdCLE1BQU0sZUFBZSxDQUFDOzs7QUFROUQsTUFBTSxPQUFPLGFBQWE7SUFDeEIsWUFBb0IsVUFBc0I7UUFBdEIsZUFBVSxHQUFWLFVBQVUsQ0FBWTtJQUFHLENBQUM7SUFFOUMsU0FBUyxDQUFDLEdBQVE7UUFDaEIsSUFBSSxJQUFJLENBQUMsVUFBVSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsRUFBRTtZQUNwQyxPQUFPLElBQUksQ0FBQyxVQUFVLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1NBQ3pDO2FBQU0sSUFBSSxJQUFJLENBQUMsVUFBVSxDQUFDLHdCQUF3QixDQUFDLEdBQUcsQ0FBQyxFQUFFO1lBQ3hELE9BQU8sSUFBSSxDQUFDLFVBQVUsQ0FBQyx3QkFBd0IsQ0FBQyxHQUFHLENBQUMsQ0FBQztTQUN0RDthQUFNO1lBQ0wsT0FBTyxHQUFHLENBQUM7U0FDWjtJQUNILENBQUM7OzBHQVhVLGFBQWE7d0dBQWIsYUFBYTs4R0FBYixhQUFhOzJGQUFiLGFBQWE7a0JBTHpCLFVBQVU7O2tCQUNWLElBQUk7bUJBQUM7b0JBQ0osSUFBSSxFQUFFLElBQUk7b0JBQ1YsSUFBSSxFQUFFLEtBQUs7aUJBQ1oiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge0luamVjdGFibGUsIFBpcGUsIFBpcGVUcmFuc2Zvcm19IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHtUcmFuc2xhdG9yfSBmcm9tIFwiLi90cmFuc2xhdG9yLnNlcnZpY2VcIjtcblxuQEluamVjdGFibGUoKVxuQFBpcGUoe1xuICBuYW1lOiAndHInLFxuICBwdXJlOiBmYWxzZVxufSlcbmV4cG9ydCBjbGFzcyBUcmFuc2xhdGVQaXBlIGltcGxlbWVudHMgUGlwZVRyYW5zZm9ybSB7XG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgdHJhbnNsYXRvcjogVHJhbnNsYXRvcikge31cblxuICB0cmFuc2Zvcm0oa2V5OiBhbnkpOiBhbnkge1xuICAgIGlmICh0aGlzLnRyYW5zbGF0b3IudHJhbnNsYXRpb25ba2V5XSkge1xuICAgICAgcmV0dXJuIHRoaXMudHJhbnNsYXRvci50cmFuc2xhdGlvbltrZXldO1xuICAgIH0gZWxzZSBpZiAodGhpcy50cmFuc2xhdG9yLmF1dG9HZW5lcmF0ZWRUcmFuc2xhdGlvbltrZXldKSB7XG4gICAgICByZXR1cm4gdGhpcy50cmFuc2xhdG9yLmF1dG9HZW5lcmF0ZWRUcmFuc2xhdGlvbltrZXldO1xuICAgIH0gZWxzZSB7XG4gICAgICByZXR1cm4ga2V5O1xuICAgIH1cbiAgfVxufVxuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNsYXRlLnBpcGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9wcm9qZWN0cy9kZngtdHJhbnNsYXRlL3NyYy9saWIvdHJhbnNsYXRlLnBpcGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFDLElBQUksRUFBZ0IsTUFBTSxlQUFlLENBQUM7OztBQU9sRCxNQUFNLE9BQU8sYUFBYTtJQUN4QixZQUFvQixTQUFxQjtRQUFyQixjQUFTLEdBQVQsU0FBUyxDQUFZO0lBQUcsQ0FBQztJQUU3QyxTQUFTLENBQUMsR0FBUTtRQUNoQixJQUFJLElBQUksQ0FBQyxTQUFTLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxFQUFFO1lBQ3BDLE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLENBQUM7U0FDekM7YUFBTSxJQUFJLElBQUksQ0FBQyxTQUFTLENBQUMseUJBQXlCLENBQUMsR0FBRyxDQUFDLEVBQUU7WUFDeEQsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDLHlCQUF5QixDQUFDLEdBQUcsQ0FBQyxDQUFDO1NBQ3REO2FBQU07WUFDTCxPQUFPLEdBQUcsQ0FBQztTQUNaO0lBQ0gsQ0FBQzs7MEdBWFUsYUFBYTt3R0FBYixhQUFhOzJGQUFiLGFBQWE7a0JBSnpCLElBQUk7bUJBQUM7b0JBQ0osSUFBSSxFQUFFLElBQUk7b0JBQ1YsSUFBSSxFQUFFLEtBQUs7aUJBQ1oiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1BpcGUsIFBpcGVUcmFuc2Zvcm19IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHtUcmFuc2xhdG9yfSBmcm9tICcuL3RyYW5zbGF0b3Iuc2VydmljZSc7XG5cbkBQaXBlKHtcbiAgbmFtZTogJ3RyJyxcbiAgcHVyZTogZmFsc2UsXG59KVxuZXhwb3J0IGNsYXNzIFRyYW5zbGF0ZVBpcGUgaW1wbGVtZW50cyBQaXBlVHJhbnNmb3JtIHtcbiAgY29uc3RydWN0b3IocHJpdmF0ZSB0cmFuc2xhdGU6IFRyYW5zbGF0b3IpIHt9XG5cbiAgdHJhbnNmb3JtKGtleTogYW55KTogYW55IHtcbiAgICBpZiAodGhpcy50cmFuc2xhdGUudHJhbnNsYXRpb25zW2tleV0pIHtcbiAgICAgIHJldHVybiB0aGlzLnRyYW5zbGF0ZS50cmFuc2xhdGlvbnNba2V5XTtcbiAgICB9IGVsc2UgaWYgKHRoaXMudHJhbnNsYXRlLmF1dG9HZW5lcmF0ZWRUcmFuc2xhdGlvbnNba2V5XSkge1xuICAgICAgcmV0dXJuIHRoaXMudHJhbnNsYXRlLmF1dG9HZW5lcmF0ZWRUcmFuc2xhdGlvbnNba2V5XTtcbiAgICB9IGVsc2Uge1xuICAgICAgcmV0dXJuIGtleTtcbiAgICB9XG4gIH1cbn1cbiJdfQ==

esm2015/lib/translator.service.js

 import { Inject, Injectable } from '@angular/core';
 import * as i0 from "@angular/core";
 import * as i1 from "@angular/common/http";
-// noinspection JSUnusedLocalSymbols
 export class Translator {
     constructor(config, http) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b;
         this.config = config;
         this.http = http;
-        this.translation = {};
-        this.autoGeneratedTranslation = {};
+        this.translations = {};
+        this.autoGeneratedTranslations = {};
         this.defaultLanguage = 'de';
         this.autoGeneratedDefaultLanguage = 'en';
-        this.defaultLanguage = ((_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.defaultLanguage) === null || _b === void 0 ? void 0 : _b.length) > 2 ? (_c = this.config) === null || _c === void 0 ? void 0 : _c.defaultLanguage : this.defaultLanguage;
-        this.autoGeneratedDefaultLanguage = ((_e = (_d = this.config) === null || _d === void 0 ? void 0 : _d.autoGeneratedDefaultLanguage) === null || _e === void 0 ? void 0 : _e.length) > 2 ? (_f = this.config) === null || _f === void 0 ? void 0 : _f.autoGeneratedDefaultLanguage : this.autoGeneratedDefaultLanguage;
+        this.defaultLanguage = ((_a = config === null || config === void 0 ? void 0 : config.defaultLanguage) === null || _a === void 0 ? void 0 : _a.length) > 0 ? config.defaultLanguage : this.defaultLanguage;
+        this.autoGeneratedDefaultLanguage = ((_b = config === null || config === void 0 ? void 0 : config.autoGeneratedDefaultLanguage) === null || _b === void 0 ? void 0 : _b.length) > 0 ? config.autoGeneratedDefaultLanguage : this.autoGeneratedDefaultLanguage;
     }
     translate(key) {
-        if (this.translation[key]) {
-            return this.translation[key];
+        if (this.translations[key]) {
+            return this.translations[key];
         }
-        else if (this.autoGeneratedTranslation[key]) {
-            return this.autoGeneratedTranslation[key];
+        else if (this.autoGeneratedTranslations[key]) {
+            return this.autoGeneratedTranslations[key];
         }
@@ -30,11 +29,11 @@ else {
         if (lang === 'DEFAULT') {
-            const langCookie = localStorage.getItem('language');
-            if (langCookie == null) {
+            const language = localStorage.getItem('language');
+            if (language != null) {
+                lang = language;
+                console.log('Language cookie found! Using ' + lang);
+            }
+            else {
                 lang = this.defaultLanguage;
                 console.log('No language cookie found! Using de as default');
             }
-            else {
-                console.log('Language cookie found! Using ' + lang);
-                lang = langCookie;
-            }
         }
@@ -47,16 +46,18 @@ else {
             const langPath = `assets/i18n/${lang || this.defaultLanguage}.json`;
+            // noinspection JSUnusedLocalSymbols
             this.http.get(langPath).subscribe((translation) => {
-                this.translation = Object.assign({}, translation || {});
-                resolve(this.translation);
+                this.translations = Object.assign({}, translation || {});
+                resolve(this.translations);
             }, (error) => {
-                this.translation = {};
-                resolve(this.translation);
+                this.translations = {};
+                resolve(this.translations);
             });
             const autoLangPath = `assets/i18n/${lang || this.autoGeneratedDefaultLanguage}_auto.json`;
+            // noinspection JSUnusedLocalSymbols
             this.http.get(autoLangPath).subscribe((translation) => {
-                this.autoGeneratedTranslation = Object.assign({}, translation || {});
-                resolve(this.autoGeneratedTranslation);
+                this.autoGeneratedTranslations = Object.assign({}, translation || {});
+                resolve(this.autoGeneratedTranslations);
             }, (error) => {
-                this.autoGeneratedTranslation = {};
-                resolve(this.autoGeneratedTranslation);
+                this.autoGeneratedTranslations = {};
+                resolve(this.autoGeneratedTranslations);
             });
@@ -77,2 +78,2 @@ });
                 }] }, { type: i1.HttpClient }]; } });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNsYXRvci5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vcHJvamVjdHMvZGZ4LXRyYW5zbGF0ZS9zcmMvbGliL3RyYW5zbGF0b3Iuc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUMsTUFBTSxFQUFFLFVBQVUsRUFBQyxNQUFNLGVBQWUsQ0FBQzs7O0FBRWpELG9DQUFvQztBQUlwQyxNQUFNLE9BQU8sVUFBVTtJQU9yQixZQUFzQyxNQUFXLEVBQVUsSUFBZ0I7O1FBQXJDLFdBQU0sR0FBTixNQUFNLENBQUs7UUFBVSxTQUFJLEdBQUosSUFBSSxDQUFZO1FBTjNFLGdCQUFXLEdBQVEsRUFBRSxDQUFDO1FBQ3RCLDZCQUF3QixHQUFRLEVBQUUsQ0FBQztRQUVuQyxvQkFBZSxHQUFHLElBQUksQ0FBQztRQUN2QixpQ0FBNEIsR0FBRyxJQUFJLENBQUM7UUFHbEMsSUFBSSxDQUFDLGVBQWUsR0FBRyxDQUFBLE1BQUEsTUFBQSxJQUFJLENBQUMsTUFBTSwwQ0FBRSxlQUFlLDBDQUFFLE1BQU0sSUFBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQUEsSUFBSSxDQUFDLE1BQU0sMENBQUUsZUFBZSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDO1FBQ3RILElBQUksQ0FBQyw0QkFBNEIsR0FBRyxDQUFBLE1BQUEsTUFBQSxJQUFJLENBQUMsTUFBTSwwQ0FBRSw0QkFBNEIsMENBQUUsTUFBTSxJQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBQSxJQUFJLENBQUMsTUFBTSwwQ0FBRSw0QkFBNEIsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLDRCQUE0QixDQUFDO0lBQzVLLENBQUM7SUFFRCxTQUFTLENBQUMsR0FBVztRQUNuQixJQUFJLElBQUksQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLEVBQUU7WUFDekIsT0FBTyxJQUFJLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1NBQzlCO2FBQU0sSUFBSSxJQUFJLENBQUMsd0JBQXdCLENBQUMsR0FBRyxDQUFDLEVBQUU7WUFDN0MsT0FBTyxJQUFJLENBQUMsd0JBQXdCLENBQUMsR0FBRyxDQUFDLENBQUM7U0FDM0M7YUFBTTtZQUNMLE9BQU8sR0FBRyxDQUFDO1NBQ1o7SUFDSCxDQUFDO0lBRUQsR0FBRyxDQUFDLElBQVk7UUFDZCxJQUFJLElBQUksS0FBSyxTQUFTLEVBQUU7WUFDdEIsTUFBTSxVQUFVLEdBQUcsWUFBWSxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FBQztZQUNwRCxJQUFJLFVBQVUsSUFBSSxJQUFJLEVBQUU7Z0JBQ3RCLElBQUksR0FBRyxJQUFJLENBQUMsZUFBZSxDQUFDO2dCQUM1QixPQUFPLENBQUMsR0FBRyxDQUFDLCtDQUErQyxDQUFDLENBQUM7YUFDOUQ7aUJBQU07Z0JBQ0wsT0FBTyxDQUFDLEdBQUcsQ0FBQywrQkFBK0IsR0FBRyxJQUFJLENBQUMsQ0FBQztnQkFDcEQsSUFBSSxHQUFHLFVBQVUsQ0FBQzthQUNuQjtTQUNGO2FBQU07WUFDTCxPQUFPLENBQUMsR0FBRyxDQUFDLHNCQUFzQixHQUFHLElBQUksQ0FBQyxDQUFDO1NBQzVDO1FBRUQsWUFBWSxDQUFDLE9BQU8sQ0FBQyxVQUFVLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFFdkMsT0FBTyxJQUFJLE9BQU8sQ0FBSyxDQUFDLE9BQU8sRUFBRSxFQUFFO1lBQ2pDLE1BQU0sUUFBUSxHQUFHLGVBQWUsSUFBSSxJQUFJLElBQUksQ0FBQyxlQUFlLE9BQU8sQ0FBQztZQUNwRSxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBSyxRQUFRLENBQUMsQ0FBQyxTQUFTLENBQ25DLENBQUMsV0FBVyxFQUFFLEVBQUU7Z0JBQ2QsSUFBSSxDQUFDLFdBQVcsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUUsRUFBRSxXQUFXLElBQUksRUFBRSxDQUFDLENBQUM7Z0JBQ3hELE9BQU8sQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7WUFDNUIsQ0FBQyxFQUNELENBQUMsS0FBSyxFQUFFLEVBQUU7Z0JBQ1IsSUFBSSxDQUFDLFdBQVcsR0FBRyxFQUFFLENBQUM7Z0JBQ3RCLE9BQU8sQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7WUFDNUIsQ0FBQyxDQUNGLENBQUM7WUFFRixNQUFNLFlBQVksR0FBRyxlQUFlLElBQUksSUFBSSxJQUFJLENBQUMsNEJBQTRCLFlBQVksQ0FBQztZQUMxRixJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBSyxZQUFZLENBQUMsQ0FBQyxTQUFTLENBQ3ZDLENBQUMsV0FBVyxFQUFFLEVBQUU7Z0JBQ2QsSUFBSSxDQUFDLHdCQUF3QixHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFBRSxFQUFFLFdBQVcsSUFBSSxFQUFFLENBQUMsQ0FBQztnQkFDckUsT0FBTyxDQUFDLElBQUksQ0FBQyx3QkFBd0IsQ0FBQyxDQUFDO1lBQ3pDLENBQUMsRUFDRCxDQUFDLEtBQUssRUFBRSxFQUFFO2dCQUNSLElBQUksQ0FBQyx3QkFBd0IsR0FBRyxFQUFFLENBQUM7Z0JBQ25DLE9BQU8sQ0FBQyxJQUFJLENBQUMsd0JBQXdCLENBQUMsQ0FBQztZQUN6QyxDQUFDLENBQ0YsQ0FBQztRQUNKLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQzs7dUdBL0RVLFVBQVUsa0JBT0QsUUFBUTsyR0FQakIsVUFBVSxjQUZULE1BQU07MkZBRVAsVUFBVTtrQkFIdEIsVUFBVTttQkFBQztvQkFDVixVQUFVLEVBQUUsTUFBTTtpQkFDbkI7OzBCQVFjLE1BQU07MkJBQUMsUUFBUSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7SHR0cENsaWVudH0gZnJvbSAnQGFuZ3VsYXIvY29tbW9uL2h0dHAnO1xuaW1wb3J0IHtJbmplY3QsIEluamVjdGFibGV9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuXG4vLyBub2luc3BlY3Rpb24gSlNVbnVzZWRMb2NhbFN5bWJvbHNcbkBJbmplY3RhYmxlKHtcbiAgcHJvdmlkZWRJbjogJ3Jvb3QnLFxufSlcbmV4cG9ydCBjbGFzcyBUcmFuc2xhdG9yIHtcbiAgdHJhbnNsYXRpb246IGFueSA9IHt9O1xuICBhdXRvR2VuZXJhdGVkVHJhbnNsYXRpb246IGFueSA9IHt9O1xuXG4gIGRlZmF1bHRMYW5ndWFnZSA9ICdkZSc7XG4gIGF1dG9HZW5lcmF0ZWREZWZhdWx0TGFuZ3VhZ2UgPSAnZW4nO1xuXG4gIGNvbnN0cnVjdG9yKEBJbmplY3QoJ2NvbmZpZycpIHByaXZhdGUgY29uZmlnOiBhbnksIHByaXZhdGUgaHR0cDogSHR0cENsaWVudCkge1xuICAgIHRoaXMuZGVmYXVsdExhbmd1YWdlID0gdGhpcy5jb25maWc/LmRlZmF1bHRMYW5ndWFnZT8ubGVuZ3RoID4gMiA/IHRoaXMuY29uZmlnPy5kZWZhdWx0TGFuZ3VhZ2UgOiB0aGlzLmRlZmF1bHRMYW5ndWFnZTtcbiAgICB0aGlzLmF1dG9HZW5lcmF0ZWREZWZhdWx0TGFuZ3VhZ2UgPSB0aGlzLmNvbmZpZz8uYXV0b0dlbmVyYXRlZERlZmF1bHRMYW5ndWFnZT8ubGVuZ3RoID4gMiA/IHRoaXMuY29uZmlnPy5hdXRvR2VuZXJhdGVkRGVmYXVsdExhbmd1YWdlIDogdGhpcy5hdXRvR2VuZXJhdGVkRGVmYXVsdExhbmd1YWdlO1xuICB9XG5cbiAgdHJhbnNsYXRlKGtleTogc3RyaW5nKTogc3RyaW5nIHtcbiAgICBpZiAodGhpcy50cmFuc2xhdGlvbltrZXldKSB7XG4gICAgICByZXR1cm4gdGhpcy50cmFuc2xhdGlvbltrZXldO1xuICAgIH0gZWxzZSBpZiAodGhpcy5hdXRvR2VuZXJhdGVkVHJhbnNsYXRpb25ba2V5XSkge1xuICAgICAgcmV0dXJuIHRoaXMuYXV0b0dlbmVyYXRlZFRyYW5zbGF0aW9uW2tleV07XG4gICAgfSBlbHNlIHtcbiAgICAgIHJldHVybiBrZXk7XG4gICAgfVxuICB9XG5cbiAgdXNlKGxhbmc6IHN0cmluZyk6IFByb21pc2U8e30+IHtcbiAgICBpZiAobGFuZyA9PT0gJ0RFRkFVTFQnKSB7XG4gICAgICBjb25zdCBsYW5nQ29va2llID0gbG9jYWxTdG9yYWdlLmdldEl0ZW0oJ2xhbmd1YWdlJyk7XG4gICAgICBpZiAobGFuZ0Nvb2tpZSA9PSBudWxsKSB7XG4gICAgICAgIGxhbmcgPSB0aGlzLmRlZmF1bHRMYW5ndWFnZTtcbiAgICAgICAgY29uc29sZS5sb2coJ05vIGxhbmd1YWdlIGNvb2tpZSBmb3VuZCEgVXNpbmcgZGUgYXMgZGVmYXVsdCcpO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgY29uc29sZS5sb2coJ0xhbmd1YWdlIGNvb2tpZSBmb3VuZCEgVXNpbmcgJyArIGxhbmcpO1xuICAgICAgICBsYW5nID0gbGFuZ0Nvb2tpZTtcbiAgICAgIH1cbiAgICB9IGVsc2Uge1xuICAgICAgY29uc29sZS5sb2coJ0xhbmd1YWdlIGNoYW5nZWQgdG8gJyArIGxhbmcpO1xuICAgIH1cblxuICAgIGxvY2FsU3RvcmFnZS5zZXRJdGVtKCdsYW5ndWFnZScsIGxhbmcpO1xuXG4gICAgcmV0dXJuIG5ldyBQcm9taXNlPHt9PigocmVzb2x2ZSkgPT4ge1xuICAgICAgY29uc3QgbGFuZ1BhdGggPSBgYXNzZXRzL2kxOG4vJHtsYW5nIHx8IHRoaXMuZGVmYXVsdExhbmd1YWdlfS5qc29uYDtcbiAgICAgIHRoaXMuaHR0cC5nZXQ8e30+KGxhbmdQYXRoKS5zdWJzY3JpYmUoXG4gICAgICAgICh0cmFuc2xhdGlvbikgPT4ge1xuICAgICAgICAgIHRoaXMudHJhbnNsYXRpb24gPSBPYmplY3QuYXNzaWduKHt9LCB0cmFuc2xhdGlvbiB8fCB7fSk7XG4gICAgICAgICAgcmVzb2x2ZSh0aGlzLnRyYW5zbGF0aW9uKTtcbiAgICAgICAgfSxcbiAgICAgICAgKGVycm9yKSA9PiB7XG4gICAgICAgICAgdGhpcy50cmFuc2xhdGlvbiA9IHt9O1xuICAgICAgICAgIHJlc29sdmUodGhpcy50cmFuc2xhdGlvbik7XG4gICAgICAgIH1cbiAgICAgICk7XG5cbiAgICAgIGNvbnN0IGF1dG9MYW5nUGF0aCA9IGBhc3NldHMvaTE4bi8ke2xhbmcgfHwgdGhpcy5hdXRvR2VuZXJhdGVkRGVmYXVsdExhbmd1YWdlfV9hdXRvLmpzb25gO1xuICAgICAgdGhpcy5odHRwLmdldDx7fT4oYXV0b0xhbmdQYXRoKS5zdWJzY3JpYmUoXG4gICAgICAgICh0cmFuc2xhdGlvbikgPT4ge1xuICAgICAgICAgIHRoaXMuYXV0b0dlbmVyYXRlZFRyYW5zbGF0aW9uID0gT2JqZWN0LmFzc2lnbih7fSwgdHJhbnNsYXRpb24gfHwge30pO1xuICAgICAgICAgIHJlc29sdmUodGhpcy5hdXRvR2VuZXJhdGVkVHJhbnNsYXRpb24pO1xuICAgICAgICB9LFxuICAgICAgICAoZXJyb3IpID0+IHtcbiAgICAgICAgICB0aGlzLmF1dG9HZW5lcmF0ZWRUcmFuc2xhdGlvbiA9IHt9O1xuICAgICAgICAgIHJlc29sdmUodGhpcy5hdXRvR2VuZXJhdGVkVHJhbnNsYXRpb24pO1xuICAgICAgICB9XG4gICAgICApO1xuICAgIH0pO1xuICB9XG59XG4iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNsYXRvci5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vcHJvamVjdHMvZGZ4LXRyYW5zbGF0ZS9zcmMvbGliL3RyYW5zbGF0b3Iuc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUMsTUFBTSxFQUFFLFVBQVUsRUFBQyxNQUFNLGVBQWUsQ0FBQzs7O0FBS2pELE1BQU0sT0FBTyxVQUFVO0lBT3JCLFlBQXNDLE1BQVcsRUFBVSxJQUFnQjs7UUFBckMsV0FBTSxHQUFOLE1BQU0sQ0FBSztRQUFVLFNBQUksR0FBSixJQUFJLENBQVk7UUFOM0UsaUJBQVksR0FBUSxFQUFFLENBQUM7UUFDdkIsOEJBQXlCLEdBQVEsRUFBRSxDQUFDO1FBRXBDLG9CQUFlLEdBQUcsSUFBSSxDQUFDO1FBQ3ZCLGlDQUE0QixHQUFHLElBQUksQ0FBQztRQUdsQyxJQUFJLENBQUMsZUFBZSxHQUFHLENBQUEsTUFBQSxNQUFNLGFBQU4sTUFBTSx1QkFBTixNQUFNLENBQUUsZUFBZSwwQ0FBRSxNQUFNLElBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsZUFBZSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDO1FBQzNHLElBQUksQ0FBQyw0QkFBNEIsR0FBRyxDQUFBLE1BQUEsTUFBTSxhQUFOLE1BQU0sdUJBQU4sTUFBTSxDQUFFLDRCQUE0QiwwQ0FBRSxNQUFNLElBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsNEJBQTRCLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyw0QkFBNEIsQ0FBQztJQUNqSyxDQUFDO0lBRU0sU0FBUyxDQUFDLEdBQVc7UUFDMUIsSUFBSSxJQUFJLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxFQUFFO1lBQzFCLE9BQU8sSUFBSSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsQ0FBQztTQUMvQjthQUFNLElBQUksSUFBSSxDQUFDLHlCQUF5QixDQUFDLEdBQUcsQ0FBQyxFQUFFO1lBQzlDLE9BQU8sSUFBSSxDQUFDLHlCQUF5QixDQUFDLEdBQUcsQ0FBQyxDQUFDO1NBQzVDO2FBQU07WUFDTCxPQUFPLEdBQUcsQ0FBQztTQUNaO0lBQ0gsQ0FBQztJQUVELEdBQUcsQ0FBQyxJQUFZO1FBQ2QsSUFBSSxJQUFJLEtBQUssU0FBUyxFQUFFO1lBQ3RCLE1BQU0sUUFBUSxHQUFHLFlBQVksQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDLENBQUE7WUFDakQsSUFBSSxRQUFRLElBQUksSUFBSSxFQUFFO2dCQUNwQixJQUFJLEdBQUcsUUFBUSxDQUFDO2dCQUNoQixPQUFPLENBQUMsR0FBRyxDQUFDLCtCQUErQixHQUFHLElBQUksQ0FBQyxDQUFDO2FBQ3JEO2lCQUFNO2dCQUNMLElBQUksR0FBRyxJQUFJLENBQUMsZUFBZSxDQUFDO2dCQUM1QixPQUFPLENBQUMsR0FBRyxDQUFDLCtDQUErQyxDQUFDLENBQUM7YUFDOUQ7U0FDRjthQUFNO1lBQ0wsT0FBTyxDQUFDLEdBQUcsQ0FBQyxzQkFBc0IsR0FBRyxJQUFJLENBQUMsQ0FBQztTQUM1QztRQUVELFlBQVksQ0FBQyxPQUFPLENBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBRXZDLE9BQU8sSUFBSSxPQUFPLENBQUssQ0FBQyxPQUFPLEVBQUUsRUFBRTtZQUNqQyxNQUFNLFFBQVEsR0FBRyxlQUFlLElBQUksSUFBSSxJQUFJLENBQUMsZUFBZSxPQUFPLENBQUM7WUFFcEUsb0NBQW9DO1lBQ3BDLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFLLFFBQVEsQ0FBQyxDQUFDLFNBQVMsQ0FDbkMsQ0FBQyxXQUFXLEVBQUUsRUFBRTtnQkFDZCxJQUFJLENBQUMsWUFBWSxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFBRSxFQUFFLFdBQVcsSUFBSSxFQUFFLENBQUMsQ0FBQztnQkFDekQsT0FBTyxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsQ0FBQztZQUM3QixDQUFDLEVBQ0QsQ0FBQyxLQUFLLEVBQUUsRUFBRTtnQkFDUixJQUFJLENBQUMsWUFBWSxHQUFHLEVBQUUsQ0FBQztnQkFDdkIsT0FBTyxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsQ0FBQztZQUM3QixDQUFDLENBQ0YsQ0FBQztZQUVGLE1BQU0sWUFBWSxHQUFHLGVBQWUsSUFBSSxJQUFJLElBQUksQ0FBQyw0QkFBNEIsWUFBWSxDQUFDO1lBQzFGLG9DQUFvQztZQUNwQyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBSyxZQUFZLENBQUMsQ0FBQyxTQUFTLENBQ3ZDLENBQUMsV0FBVyxFQUFFLEVBQUU7Z0JBQ2QsSUFBSSxDQUFDLHlCQUF5QixHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFBRSxFQUFFLFdBQVcsSUFBSSxFQUFFLENBQUMsQ0FBQztnQkFDdEUsT0FBTyxDQUFDLElBQUksQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDO1lBQzFDLENBQUMsRUFDRCxDQUFDLEtBQUssRUFBRSxFQUFFO2dCQUNSLElBQUksQ0FBQyx5QkFBeUIsR0FBRyxFQUFFLENBQUM7Z0JBQ3BDLE9BQU8sQ0FBQyxJQUFJLENBQUMseUJBQXlCLENBQUMsQ0FBQztZQUMxQyxDQUFDLENBQ0YsQ0FBQztRQUNKLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQzs7dUdBbEVVLFVBQVUsa0JBT0QsUUFBUTsyR0FQakIsVUFBVSxjQUZULE1BQU07MkZBRVAsVUFBVTtrQkFIdEIsVUFBVTttQkFBQztvQkFDVixVQUFVLEVBQUUsTUFBTTtpQkFDbkI7OzBCQVFjLE1BQU07MkJBQUMsUUFBUSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7SHR0cENsaWVudH0gZnJvbSAnQGFuZ3VsYXIvY29tbW9uL2h0dHAnO1xuaW1wb3J0IHtJbmplY3QsIEluamVjdGFibGV9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuXG5ASW5qZWN0YWJsZSh7XG4gIHByb3ZpZGVkSW46ICdyb290Jyxcbn0pXG5leHBvcnQgY2xhc3MgVHJhbnNsYXRvciB7XG4gIHRyYW5zbGF0aW9uczogYW55ID0ge307XG4gIGF1dG9HZW5lcmF0ZWRUcmFuc2xhdGlvbnM6IGFueSA9IHt9O1xuXG4gIGRlZmF1bHRMYW5ndWFnZSA9ICdkZSc7XG4gIGF1dG9HZW5lcmF0ZWREZWZhdWx0TGFuZ3VhZ2UgPSAnZW4nO1xuXG4gIGNvbnN0cnVjdG9yKEBJbmplY3QoJ2NvbmZpZycpIHByaXZhdGUgY29uZmlnOiBhbnksIHByaXZhdGUgaHR0cDogSHR0cENsaWVudCkge1xuICAgIHRoaXMuZGVmYXVsdExhbmd1YWdlID0gY29uZmlnPy5kZWZhdWx0TGFuZ3VhZ2U/Lmxlbmd0aCA+IDAgPyBjb25maWcuZGVmYXVsdExhbmd1YWdlIDogdGhpcy5kZWZhdWx0TGFuZ3VhZ2U7XG4gICAgdGhpcy5hdXRvR2VuZXJhdGVkRGVmYXVsdExhbmd1YWdlID0gY29uZmlnPy5hdXRvR2VuZXJhdGVkRGVmYXVsdExhbmd1YWdlPy5sZW5ndGggPiAwID8gY29uZmlnLmF1dG9HZW5lcmF0ZWREZWZhdWx0TGFuZ3VhZ2UgOiB0aGlzLmF1dG9HZW5lcmF0ZWREZWZhdWx0TGFuZ3VhZ2U7XG4gIH1cblxuICBwdWJsaWMgdHJhbnNsYXRlKGtleTogc3RyaW5nKSB7XG4gICAgaWYgKHRoaXMudHJhbnNsYXRpb25zW2tleV0pIHtcbiAgICAgIHJldHVybiB0aGlzLnRyYW5zbGF0aW9uc1trZXldO1xuICAgIH0gZWxzZSBpZiAodGhpcy5hdXRvR2VuZXJhdGVkVHJhbnNsYXRpb25zW2tleV0pIHtcbiAgICAgIHJldHVybiB0aGlzLmF1dG9HZW5lcmF0ZWRUcmFuc2xhdGlvbnNba2V5XTtcbiAgICB9IGVsc2Uge1xuICAgICAgcmV0dXJuIGtleTtcbiAgICB9XG4gIH1cblxuICB1c2UobGFuZzogc3RyaW5nKTogUHJvbWlzZTx7fT4ge1xuICAgIGlmIChsYW5nID09PSAnREVGQVVMVCcpIHtcbiAgICAgIGNvbnN0IGxhbmd1YWdlID0gbG9jYWxTdG9yYWdlLmdldEl0ZW0oJ2xhbmd1YWdlJylcbiAgICAgIGlmIChsYW5ndWFnZSAhPSBudWxsKSB7XG4gICAgICAgIGxhbmcgPSBsYW5ndWFnZTtcbiAgICAgICAgY29uc29sZS5sb2coJ0xhbmd1YWdlIGNvb2tpZSBmb3VuZCEgVXNpbmcgJyArIGxhbmcpO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgbGFuZyA9IHRoaXMuZGVmYXVsdExhbmd1YWdlO1xuICAgICAgICBjb25zb2xlLmxvZygnTm8gbGFuZ3VhZ2UgY29va2llIGZvdW5kISBVc2luZyBkZSBhcyBkZWZhdWx0Jyk7XG4gICAgICB9XG4gICAgfSBlbHNlIHtcbiAgICAgIGNvbnNvbGUubG9nKCdMYW5ndWFnZSBjaGFuZ2VkIHRvICcgKyBsYW5nKTtcbiAgICB9XG5cbiAgICBsb2NhbFN0b3JhZ2Uuc2V0SXRlbSgnbGFuZ3VhZ2UnLCBsYW5nKTtcblxuICAgIHJldHVybiBuZXcgUHJvbWlzZTx7fT4oKHJlc29sdmUpID0+IHtcbiAgICAgIGNvbnN0IGxhbmdQYXRoID0gYGFzc2V0cy9pMThuLyR7bGFuZyB8fCB0aGlzLmRlZmF1bHRMYW5ndWFnZX0uanNvbmA7XG5cbiAgICAgIC8vIG5vaW5zcGVjdGlvbiBKU1VudXNlZExvY2FsU3ltYm9sc1xuICAgICAgdGhpcy5odHRwLmdldDx7fT4obGFuZ1BhdGgpLnN1YnNjcmliZShcbiAgICAgICAgKHRyYW5zbGF0aW9uKSA9PiB7XG4gICAgICAgICAgdGhpcy50cmFuc2xhdGlvbnMgPSBPYmplY3QuYXNzaWduKHt9LCB0cmFuc2xhdGlvbiB8fCB7fSk7XG4gICAgICAgICAgcmVzb2x2ZSh0aGlzLnRyYW5zbGF0aW9ucyk7XG4gICAgICAgIH0sXG4gICAgICAgIChlcnJvcikgPT4ge1xuICAgICAgICAgIHRoaXMudHJhbnNsYXRpb25zID0ge307XG4gICAgICAgICAgcmVzb2x2ZSh0aGlzLnRyYW5zbGF0aW9ucyk7XG4gICAgICAgIH1cbiAgICAgICk7XG5cbiAgICAgIGNvbnN0IGF1dG9MYW5nUGF0aCA9IGBhc3NldHMvaTE4bi8ke2xhbmcgfHwgdGhpcy5hdXRvR2VuZXJhdGVkRGVmYXVsdExhbmd1YWdlfV9hdXRvLmpzb25gO1xuICAgICAgLy8gbm9pbnNwZWN0aW9uIEpTVW51c2VkTG9jYWxTeW1ib2xzXG4gICAgICB0aGlzLmh0dHAuZ2V0PHt9PihhdXRvTGFuZ1BhdGgpLnN1YnNjcmliZShcbiAgICAgICAgKHRyYW5zbGF0aW9uKSA9PiB7XG4gICAgICAgICAgdGhpcy5hdXRvR2VuZXJhdGVkVHJhbnNsYXRpb25zID0gT2JqZWN0LmFzc2lnbih7fSwgdHJhbnNsYXRpb24gfHwge30pO1xuICAgICAgICAgIHJlc29sdmUodGhpcy5hdXRvR2VuZXJhdGVkVHJhbnNsYXRpb25zKTtcbiAgICAgICAgfSxcbiAgICAgICAgKGVycm9yKSA9PiB7XG4gICAgICAgICAgdGhpcy5hdXRvR2VuZXJhdGVkVHJhbnNsYXRpb25zID0ge307XG4gICAgICAgICAgcmVzb2x2ZSh0aGlzLmF1dG9HZW5lcmF0ZWRUcmFuc2xhdGlvbnMpO1xuICAgICAgICB9XG4gICAgICApO1xuICAgIH0pO1xuICB9XG59XG4iXX0=

fesm2015/dfx-translate.js

@@ -5,21 +5,20 @@ import * as i0 from '@angular/core';
 
-// noinspection JSUnusedLocalSymbols
 class Translator {
     constructor(config, http) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b;
         this.config = config;
         this.http = http;
-        this.translation = {};
-        this.autoGeneratedTranslation = {};
+        this.translations = {};
+        this.autoGeneratedTranslations = {};
         this.defaultLanguage = 'de';
         this.autoGeneratedDefaultLanguage = 'en';
-        this.defaultLanguage = ((_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.defaultLanguage) === null || _b === void 0 ? void 0 : _b.length) > 2 ? (_c = this.config) === null || _c === void 0 ? void 0 : _c.defaultLanguage : this.defaultLanguage;
-        this.autoGeneratedDefaultLanguage = ((_e = (_d = this.config) === null || _d === void 0 ? void 0 : _d.autoGeneratedDefaultLanguage) === null || _e === void 0 ? void 0 : _e.length) > 2 ? (_f = this.config) === null || _f === void 0 ? void 0 : _f.autoGeneratedDefaultLanguage : this.autoGeneratedDefaultLanguage;
+        this.defaultLanguage = ((_a = config === null || config === void 0 ? void 0 : config.defaultLanguage) === null || _a === void 0 ? void 0 : _a.length) > 0 ? config.defaultLanguage : this.defaultLanguage;
+        this.autoGeneratedDefaultLanguage = ((_b = config === null || config === void 0 ? void 0 : config.autoGeneratedDefaultLanguage) === null || _b === void 0 ? void 0 : _b.length) > 0 ? config.autoGeneratedDefaultLanguage : this.autoGeneratedDefaultLanguage;
     }
     translate(key) {
-        if (this.translation[key]) {
-            return this.translation[key];
+        if (this.translations[key]) {
+            return this.translations[key];
         }
-        else if (this.autoGeneratedTranslation[key]) {
-            return this.autoGeneratedTranslation[key];
+        else if (this.autoGeneratedTranslations[key]) {
+            return this.autoGeneratedTranslations[key];
         }
@@ -32,11 +31,11 @@ else {
         if (lang === 'DEFAULT') {
-            const langCookie = localStorage.getItem('language');
-            if (langCookie == null) {
+            const language = localStorage.getItem('language');
+            if (language != null) {
+                lang = language;
+                console.log('Language cookie found! Using ' + lang);
+            }
+            else {
                 lang = this.defaultLanguage;
                 console.log('No language cookie found! Using de as default');
             }
-            else {
-                console.log('Language cookie found! Using ' + lang);
-                lang = langCookie;
-            }
         }
@@ -49,16 +48,18 @@ else {
             const langPath = `assets/i18n/${lang || this.defaultLanguage}.json`;
+            // noinspection JSUnusedLocalSymbols
             this.http.get(langPath).subscribe((translation) => {
-                this.translation = Object.assign({}, translation || {});
-                resolve(this.translation);
+                this.translations = Object.assign({}, translation || {});
+                resolve(this.translations);
             }, (error) => {
-                this.translation = {};
-                resolve(this.translation);
+                this.translations = {};
+                resolve(this.translations);
             });
             const autoLangPath = `assets/i18n/${lang || this.autoGeneratedDefaultLanguage}_auto.json`;
+            // noinspection JSUnusedLocalSymbols
             this.http.get(autoLangPath).subscribe((translation) => {
-                this.autoGeneratedTranslation = Object.assign({}, translation || {});
-                resolve(this.autoGeneratedTranslation);
+                this.autoGeneratedTranslations = Object.assign({}, translation || {});
+                resolve(this.autoGeneratedTranslations);
             }, (error) => {
-                this.autoGeneratedTranslation = {};
-                resolve(this.autoGeneratedTranslation);
+                this.autoGeneratedTranslations = {};
+                resolve(this.autoGeneratedTranslations);
             });
@@ -81,11 +82,11 @@ });
 class TranslatePipe {
-    constructor(translator) {
-        this.translator = translator;
+    constructor(translate) {
+        this.translate = translate;
     }
     transform(key) {
-        if (this.translator.translation[key]) {
-            return this.translator.translation[key];
+        if (this.translate.translations[key]) {
+            return this.translate.translations[key];
         }
-        else if (this.translator.autoGeneratedTranslation[key]) {
-            return this.translator.autoGeneratedTranslation[key];
+        else if (this.translate.autoGeneratedTranslations[key]) {
+            return this.translate.autoGeneratedTranslations[key];
         }
@@ -99,10 +100,7 @@ else {
 TranslatePipe.ɵpipe = i0.ɵɵngDeclarePipe({ minVersion: "12.0.0", version: "12.1.0", ngImport: i0, type: TranslatePipe, name: "tr", pure: false });
-TranslatePipe.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.1.0", ngImport: i0, type: TranslatePipe });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.1.0", ngImport: i0, type: TranslatePipe, decorators: [{
-            type: Injectable
-        }, {
             type: Pipe,
             args: [{
                     name: 'tr',
-                    pure: false
+                    pure: false,
                 }]
@@ -116,3 +114,3 @@ }], ctorParameters: function () { return [{ type: Translator }]; } });
             ngModule: DfxTranslateModule,
-            providers: [{ provide: 'config', useValue: configuration },]
+            providers: [{ provide: 'config', useValue: configuration }]
         };
@@ -119,0 +117,0 @@ }

lib/translate.pipe.d.ts

 import { PipeTransform } from '@angular/core';
-import { Translator } from "./translator.service";
+import { Translator } from './translator.service';
 import * as i0 from "@angular/core";
 export declare class TranslatePipe implements PipeTransform {
-    private translator;
-    constructor(translator: Translator);
+    private translate;
+    constructor(translate: Translator);
     transform(key: any): any;
     static ɵfac: i0.ɵɵFactoryDeclaration<TranslatePipe, never>;
     static ɵpipe: i0.ɵɵPipeDeclaration<TranslatePipe, "tr">;
-    static ɵprov: i0.ɵɵInjectableDeclaration<TranslatePipe>;
 }

lib/translator.service.d.ts

@@ -6,8 +6,8 @@ import { HttpClient } from '@angular/common/http';
     private http;
-    translation: any;
-    autoGeneratedTranslation: any;
+    translations: any;
+    autoGeneratedTranslations: any;
     defaultLanguage: string;
     autoGeneratedDefaultLanguage: string;
     constructor(config: any, http: HttpClient);
-    translate(key: string): string;
+    translate(key: string): any;
     use(lang: string): Promise<{}>;
@@ -14,0 +14,0 @@ static ɵfac: i0.ɵɵFactoryDeclaration<Translator, never>;

package.json

 {
   "name": "dfx-translate",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "private": false,
-  "description": "Translation package for Angular",
-  "main": "bundles/dfx-translate.umd.js",
-  "repository": {
-    "type": "git",
-    "url": "git+https://gitlab.com/DatePoll/common/dfx-translate.git"
-  },
+  "license": "MIT",
+  "homepage": "https://datepoll.org",
   "keywords": [
@@ -20,10 +16,12 @@ "angular2",
   "author": "Dafnik",
-  "license": "MIT",
   "bugs": {
     "url": "https://gitlab.com/DatePoll/common/dfx-translate/issues"
   },
-  "homepage": "https://datepoll.org",
+  "repository": {
+    "type": "git",
+    "url": "git+https://gitlab.com/DatePoll/common/dfx-translate.git"
+  },
   "peerDependencies": {
-    "@angular/common": "^12|^11|^10|^9|^8|^7|^6",
-    "@angular/core": "^12|^11|^10|^9|^8|^7|^6",
+    "@angular/common": "^12.1.0",
+    "@angular/core": "^12.1.0",
     "node-fetch": "^2.6.1"
@@ -34,2 +32,3 @@ },
   },
+  "main": "bundles/dfx-translate.umd.js",
   "module": "fesm2015/dfx-translate.js",
@@ -36,0 +35,0 @@ "es2015": "fesm2015/dfx-translate.js",

README.md

@@ -1,24 +0,3 @@
-# DfxTranslate
+# dfx-translate
 
-This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version 12.1.0.
 
-## Code scaffolding
-
-Run `ng generate component component-name --project dfx-translate` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module --project dfx-translate`.
-> Note: Don't forget to add `--project dfx-translate` or else it will be added to the default project in your `angular.json` file. 
-
-## Build
-
-Run `ng build dfx-translate` to build the project. The build artifacts will be stored in the `dist/` directory.
-
-## Publishing
-
-After building your library with `ng build dfx-translate`, go to the dist folder `cd dist/dfx-translate` and run `npm publish`.
-
-## Running unit tests
-
-Run `ng test dfx-translate` to execute the unit tests via [Karma](https://karma-runner.github.io).
-
-## Further help
-
-To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.io/cli) page.

New alerts

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

61443

decreased by-2.3%

Lines of code

746

decreased by-0.13%

Number of lines in readme file

4

decreased by-84%

Number of medium supply chain risk alerts

2

increased by100%

No dependency changes