From 3337135043925568384ab2c529bf0e7a082d9677 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Thu, 1 Jul 2021 16:24:01 +0200
Subject: [PATCH] Alwayse use the i18next default language as the lang
attribute default
So we only need to define it in one place.
---
packages/auth/src/auth-keycloak.js | 2 +-
packages/auth/src/dbp-auth-demo.js | 2 +-
packages/auth/src/login-button.js | 2 +-
packages/check-in-place-select/src/check-in-place-select.js | 2 +-
.../src/dbp-check-in-place-select-demo.js | 5 ++++-
5 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/packages/auth/src/auth-keycloak.js b/packages/auth/src/auth-keycloak.js
index f5b5ab71..60c3b161 100644
--- a/packages/auth/src/auth-keycloak.js
+++ b/packages/auth/src/auth-keycloak.js
@@ -20,7 +20,6 @@ import {AdapterLitElement} from "@dbp-toolkit/provider/src/adapter-lit-element";
export class AuthKeycloak extends AdapterLitElement {
constructor() {
super();
- this.lang = 'de';
this.forceLogin = false;
this.loadPerson = false;
this.token = "";
@@ -33,6 +32,7 @@ export class AuthKeycloak extends AdapterLitElement {
this._loginStatus = LoginStatus.UNKNOWN;
this.requestedLoginStatus = LoginStatus.UNKNOWN;
this._i18n = createInstance();
+ this.lang = this._i18n.language;
// Keycloak config
this.keycloakUrl = null;
diff --git a/packages/auth/src/dbp-auth-demo.js b/packages/auth/src/dbp-auth-demo.js
index 3b9170f6..93aa4627 100644
--- a/packages/auth/src/dbp-auth-demo.js
+++ b/packages/auth/src/dbp-auth-demo.js
@@ -10,11 +10,11 @@ import DBPLitElement from "@dbp-toolkit/common/dbp-lit-element";
export class DbpAuthDemo extends ScopedElementsMixin(DBPLitElement) {
constructor() {
super();
- this.lang = 'de';
this.entryPointUrl = '';
this.auth = {};
this.noAuth = false;
this._i18n = createInstance();
+ this.lang = this._i18n.language;
}
static get scopedElements() {
diff --git a/packages/auth/src/login-button.js b/packages/auth/src/login-button.js
index 63e7353d..55423562 100644
--- a/packages/auth/src/login-button.js
+++ b/packages/auth/src/login-button.js
@@ -55,8 +55,8 @@ export class LoginButton extends ScopedElementsMixin(AdapterLitElement) {
constructor() {
super();
- this.lang = 'de';
this._i18n = createInstance();
+ this.lang = this._i18n.language;
this.auth = {};
}
diff --git a/packages/check-in-place-select/src/check-in-place-select.js b/packages/check-in-place-select/src/check-in-place-select.js
index f2ed817d..992b6148 100644
--- a/packages/check-in-place-select/src/check-in-place-select.js
+++ b/packages/check-in-place-select/src/check-in-place-select.js
@@ -25,7 +25,6 @@ export class CheckInPlaceSelect extends ScopedElementsMixin(AdapterLitElement) {
constructor() {
super();
Object.assign(CheckInPlaceSelect.prototype, errorUtils.errorMixin);
- this.lang = 'de';
this.entryPointUrl = '';
this.jsonld = null;
this.$select = null;
@@ -42,6 +41,7 @@ export class CheckInPlaceSelect extends ScopedElementsMixin(AdapterLitElement) {
this.showCapacity = false;
this.auth = {};
this._i18n = createInstance();
+ this.lang = this._i18n.language;
this._onDocumentClicked = this._onDocumentClicked.bind(this);
}
diff --git a/packages/check-in-place-select/src/dbp-check-in-place-select-demo.js b/packages/check-in-place-select/src/dbp-check-in-place-select-demo.js
index d77e8561..b56c85ab 100644
--- a/packages/check-in-place-select/src/dbp-check-in-place-select-demo.js
+++ b/packages/check-in-place-select/src/dbp-check-in-place-select-demo.js
@@ -5,11 +5,14 @@ import {AuthKeycloak, LoginButton} from '@dbp-toolkit/auth';
import * as commonUtils from '@dbp-toolkit/common/utils';
import * as commonStyles from '@dbp-toolkit/common/styles';
import DBPLitElement from "@dbp-toolkit/common/dbp-lit-element";
+import {createInstance} from './i18n.js';
+
export class CheckInPlaceSelectDemo extends ScopedElementsMixin(DBPLitElement) {
constructor() {
super();
- this.lang = 'de';
+ this._i18n = createInstance();
+ this.lang = this._i18n.language;
this.entryPointUrl = '';
this.noAuth = false;
}
--
GitLab