diff --git a/branding/app/assets/index.html b/branding/app/assets/index.html
index 5c580679..d7034b8f 100644
--- a/branding/app/assets/index.html
+++ b/branding/app/assets/index.html
@@ -1,5 +1,5 @@
-
+
diff --git a/branding/app/js/i18next-config.js b/branding/app/js/i18next-config.js
index 938f0b33..4b1ef4f9 100644
--- a/branding/app/js/i18next-config.js
+++ b/branding/app/js/i18next-config.js
@@ -4,7 +4,6 @@ var jqueryI18next = require('jquery-i18next');
var backend = require("i18next-http-backend");
var lngDetector = require('i18next-browser-languagedetector');
var Url = require('domurl');
-var Cookies = require('js-cookie');
const i18nOpts = {
backend: {
@@ -12,14 +11,8 @@ const i18nOpts = {
crossDomain: false,
initImmediate: false,
},
- // lng: 'nl', cookieOptions: { path: '/', sameSite: 'strict' },
supportedLngs: [settings.enabledLangs],
- fallbackLng: {
- "en-US": ['en'],
- "nl-NL": ['nl'],
- "nl-BE": ['nl'],
- default: ['nl']
- },
+ fallbackLng: 'nl',
sendMissingTo: 'en',
interpolation: {
escapeValue: false,
@@ -47,24 +40,18 @@ const i18nOpts = {
const detectorOptions = {
// order and from where user language should be detected
- order: ['querystring', 'cookie', 'navigator'],
+ order: ['querystring', 'cookie', 'navigator', 'htmlTag'],
// keys or params to lookup language from
lookupQuerystring: 'lang',
lookupCookie: 'vbp-lang',
cookieMinutes: 525600, // a year
cookiePath: '/',
- cookieDomain: `.${settings.mainDomain}`,
cookieOptions: { path: '/', sameSite: 'strict', secure: settings.mainLAUrl.startsWith('https') },
caches: ['cookie'],
excludeCacheFor: ['cimode']
};
-if (document.location.host !== 'localhost:3333') {
- // We set the upper domain in production so all ALA modules get the same locale
- detectorOptions.cookieDomain = settings.mainDomain;
-}
-
i18nOpts.detection = detectorOptions;
i18nOpts.sendMissing = false;
@@ -95,7 +82,9 @@ i18n.use(backend)
console.log('jquery i18next initialized');
$("body").localize();
+
$('.locale-link').on('click', function(e) {
+
e.preventDefault();
const lang = $(this).data('locale');
console.log(`Lang clicked ${lang}`);
diff --git a/branding/app/js/index-auth.js b/branding/app/js/index-auth.js
index fab98a87..8b077f1a 100644
--- a/branding/app/js/index-auth.js
+++ b/branding/app/js/index-auth.js
@@ -1,5 +1,5 @@
var Cookies = require("js-cookie");
-const settings = require("js/settings");
+const settings = require("./settings");
const authCookieName = "VBP-AUTH";
const loginClass = "signedIn";
const logoutClass = "signedOut";
diff --git a/docker/alerts/resources.xml b/docker/alerts/resources.xml
index 726a5093..1378dd20 100644
--- a/docker/alerts/resources.xml
+++ b/docker/alerts/resources.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/docker/apikey/resources.xml b/docker/apikey/resources.xml
index 726a5093..1378dd20 100644
--- a/docker/apikey/resources.xml
+++ b/docker/apikey/resources.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/docker/bie-hub/resources.xml b/docker/bie-hub/resources.xml
index 726a5093..1378dd20 100644
--- a/docker/bie-hub/resources.xml
+++ b/docker/bie-hub/resources.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/docker/bie-index/resources.xml b/docker/bie-index/resources.xml
index 726a5093..1378dd20 100644
--- a/docker/bie-index/resources.xml
+++ b/docker/bie-index/resources.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/docker/biocache-hub/resources.xml b/docker/biocache-hub/resources.xml
index 726a5093..1378dd20 100644
--- a/docker/biocache-hub/resources.xml
+++ b/docker/biocache-hub/resources.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/docker/collectory/resources.xml b/docker/collectory/resources.xml
index 726a5093..1378dd20 100644
--- a/docker/collectory/resources.xml
+++ b/docker/collectory/resources.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/docker/doi-service/resources.xml b/docker/doi-service/resources.xml
index 726a5093..1378dd20 100644
--- a/docker/doi-service/resources.xml
+++ b/docker/doi-service/resources.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/docker/image-service/resources.xml b/docker/image-service/resources.xml
index 726a5093..1378dd20 100644
--- a/docker/image-service/resources.xml
+++ b/docker/image-service/resources.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/docker/logger/resources.xml b/docker/logger/resources.xml
index 726a5093..1378dd20 100644
--- a/docker/logger/resources.xml
+++ b/docker/logger/resources.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/docker/regions/resources.xml b/docker/regions/resources.xml
index 726a5093..1378dd20 100644
--- a/docker/regions/resources.xml
+++ b/docker/regions/resources.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/docker/spatial-hub/resources.xml b/docker/spatial-hub/resources.xml
index 726a5093..1378dd20 100644
--- a/docker/spatial-hub/resources.xml
+++ b/docker/spatial-hub/resources.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/docker/species-list/resources.xml b/docker/species-list/resources.xml
index 726a5093..1378dd20 100644
--- a/docker/species-list/resources.xml
+++ b/docker/species-list/resources.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/docker/userdetails/resources.xml b/docker/userdetails/resources.xml
index 726a5093..1378dd20 100644
--- a/docker/userdetails/resources.xml
+++ b/docker/userdetails/resources.xml
@@ -6,7 +6,7 @@
-
+