From b17ac6bc5f4ba90a2f5b5b795a6d8702423d19bc Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 10 Apr 2024 11:31:01 +0200 Subject: [PATCH] Update submodule --- js/appConfig.js | 2 ++ package.json | 2 +- qwc2 | 2 +- static/translations/cs-CZ.json | 4 ++++ static/translations/de-CH.json | 4 ++++ static/translations/de-DE.json | 4 ++++ static/translations/en-US.json | 4 ++++ static/translations/es-ES.json | 4 ++++ static/translations/fr-FR.json | 4 ++++ static/translations/it-IT.json | 4 ++++ static/translations/pl-PL.json | 4 ++++ static/translations/pt-BR.json | 4 ++++ static/translations/pt-PT.json | 4 ++++ static/translations/ro-RO.json | 4 ++++ static/translations/ru-RU.json | 4 ++++ static/translations/sv-SE.json | 4 ++++ static/translations/tr-TR.json | 4 ++++ 17 files changed, 60 insertions(+), 2 deletions(-) diff --git a/js/appConfig.js b/js/appConfig.js index 101d76ff7..405d5d05d 100644 --- a/js/appConfig.js +++ b/js/appConfig.js @@ -16,6 +16,7 @@ import AuthenticationPlugin from 'qwc2/plugins/Authentication'; import BackgroundSwitcherPlugin from 'qwc2/plugins/BackgroundSwitcher'; import BookmarkPlugin from 'qwc2/plugins/Bookmark'; import BottomBarPlugin from 'qwc2/plugins/BottomBar'; +import CookiePopupPlugin from 'qwc2/plugins/CookiePopup'; import CyclomediaPlugin from 'qwc2/plugins/Cyclomedia'; import DxfExportPlugin from 'qwc2/plugins/DxfExport'; import EditingPlugin from 'qwc2/plugins/Editing'; @@ -92,6 +93,7 @@ export default { BackgroundSwitcherPlugin: BackgroundSwitcherPlugin, BookmarkPlugin: BookmarkPlugin, BottomBarPlugin: BottomBarPlugin, + CookiePopupPlugin: CookiePopupPlugin, CyclomediaPlugin: CyclomediaPlugin, DxfExportPlugin: DxfExportPlugin, EditingPlugin: EditingPlugin(/* CustomEditingInterface */), diff --git a/package.json b/package.json index 5f5b47a50..288b85cfc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "QWC2App", - "version": "2024.04.08-master", + "version": "2024.04.10-master", "description": "QGIS Web Client 2 application", "author": "Sourcepole", "license": "BSD-2-Clause", diff --git a/qwc2 b/qwc2 index bedad09ab..11b51edb0 160000 --- a/qwc2 +++ b/qwc2 @@ -1 +1 @@ -Subproject commit bedad09ab13e47a237e1be3d03f8f4c53d007b17 +Subproject commit 11b51edb0d9f9adea2f9330ef0247805647b6411 diff --git a/static/translations/cs-CZ.json b/static/translations/cs-CZ.json index ae901c107..4ea3884fa 100644 --- a/static/translations/cs-CZ.json +++ b/static/translations/cs-CZ.json @@ -121,6 +121,10 @@ "terms_label": "Podmínky použití", "viewertitle_label": "" }, + "cookiepopup": { + "accept": "", + "message": "" + }, "copybtn": { "click_to_copy": "Zkopírovat do schránky", "copied": "Zkopírováno", diff --git a/static/translations/de-CH.json b/static/translations/de-CH.json index ab706a428..c96357687 100644 --- a/static/translations/de-CH.json +++ b/static/translations/de-CH.json @@ -121,6 +121,10 @@ "terms_label": "Nutzungsbedingungen", "viewertitle_label": "" }, + "cookiepopup": { + "accept": "Akzeptieren", + "message": "Diese Seite verwendet Cookies." + }, "copybtn": { "click_to_copy": "In Zwischenablage kopieren", "copied": "Kopiert", diff --git a/static/translations/de-DE.json b/static/translations/de-DE.json index d32c921b5..5586dc785 100644 --- a/static/translations/de-DE.json +++ b/static/translations/de-DE.json @@ -121,6 +121,10 @@ "terms_label": "Nutzungsbedingungen", "viewertitle_label": "QWC2 Demo" }, + "cookiepopup": { + "accept": "Akzeptieren", + "message": "Diese Seite verwendet Cookies." + }, "copybtn": { "click_to_copy": "In Zwischenablage kopieren", "copied": "Kopiert", diff --git a/static/translations/en-US.json b/static/translations/en-US.json index 691b29017..098a386c5 100644 --- a/static/translations/en-US.json +++ b/static/translations/en-US.json @@ -121,6 +121,10 @@ "terms_label": "Terms of use", "viewertitle_label": "QWC2 Demo" }, + "cookiepopup": { + "accept": "Accept", + "message": "This website uses cookies." + }, "copybtn": { "click_to_copy": "Click to copy", "copied": "Copied", diff --git a/static/translations/es-ES.json b/static/translations/es-ES.json index fd604b501..bd65f515d 100644 --- a/static/translations/es-ES.json +++ b/static/translations/es-ES.json @@ -121,6 +121,10 @@ "terms_label": "Términos de uso", "viewertitle_label": "" }, + "cookiepopup": { + "accept": "", + "message": "" + }, "copybtn": { "click_to_copy": "Clic para copiar", "copied": "Copiado", diff --git a/static/translations/fr-FR.json b/static/translations/fr-FR.json index f2a9750df..6e95aaef1 100644 --- a/static/translations/fr-FR.json +++ b/static/translations/fr-FR.json @@ -121,6 +121,10 @@ "terms_label": "Conditions d'utilisation", "viewertitle_label": "Page d'accueil" }, + "cookiepopup": { + "accept": "Accepter", + "message": "Ce site web utilise des cookies." + }, "copybtn": { "click_to_copy": "Cliquer pour copier", "copied": "Copié", diff --git a/static/translations/it-IT.json b/static/translations/it-IT.json index 998636e3c..6f8823797 100644 --- a/static/translations/it-IT.json +++ b/static/translations/it-IT.json @@ -121,6 +121,10 @@ "terms_label": "Condizioni di uso", "viewertitle_label": "QWC2 Demo" }, + "cookiepopup": { + "accept": "Accetta", + "message": "Questo sito web utilizza cookie." + }, "copybtn": { "click_to_copy": "Clicca per copiare", "copied": "Copiato", diff --git a/static/translations/pl-PL.json b/static/translations/pl-PL.json index f75a4fd7b..3128122f7 100644 --- a/static/translations/pl-PL.json +++ b/static/translations/pl-PL.json @@ -121,6 +121,10 @@ "terms_label": "Warunki korzystania", "viewertitle_label": "" }, + "cookiepopup": { + "accept": "", + "message": "" + }, "copybtn": { "click_to_copy": "Kliknij, aby skopiować", "copied": "Skopiowano", diff --git a/static/translations/pt-BR.json b/static/translations/pt-BR.json index dffcf6de4..da1429af9 100644 --- a/static/translations/pt-BR.json +++ b/static/translations/pt-BR.json @@ -121,6 +121,10 @@ "terms_label": "Termos de uso", "viewertitle_label": "QWC2 Demo" }, + "cookiepopup": { + "accept": "", + "message": "" + }, "copybtn": { "click_to_copy": "Clique para copiar", "copied": "Copiado", diff --git a/static/translations/pt-PT.json b/static/translations/pt-PT.json index 0317d623f..85412825d 100644 --- a/static/translations/pt-PT.json +++ b/static/translations/pt-PT.json @@ -121,6 +121,10 @@ "terms_label": "Termos de Uso", "viewertitle_label": "" }, + "cookiepopup": { + "accept": "", + "message": "" + }, "copybtn": { "click_to_copy": "Clique para Copiar", "copied": "Copiado", diff --git a/static/translations/ro-RO.json b/static/translations/ro-RO.json index 9ad9290f1..d60653b8b 100644 --- a/static/translations/ro-RO.json +++ b/static/translations/ro-RO.json @@ -121,6 +121,10 @@ "terms_label": "Termeni de utilizare", "viewertitle_label": "Despre" }, + "cookiepopup": { + "accept": "", + "message": "" + }, "copybtn": { "click_to_copy": "Click pt. copiere", "copied": "Copiat", diff --git a/static/translations/ru-RU.json b/static/translations/ru-RU.json index b74fdd852..2fcbde1e6 100644 --- a/static/translations/ru-RU.json +++ b/static/translations/ru-RU.json @@ -121,6 +121,10 @@ "terms_label": "Условия использования", "viewertitle_label": "Домашняя страница" }, + "cookiepopup": { + "accept": "", + "message": "" + }, "copybtn": { "click_to_copy": "Копировать", "copied": "Скопировано", diff --git a/static/translations/sv-SE.json b/static/translations/sv-SE.json index 7964d3c86..ee042c93b 100644 --- a/static/translations/sv-SE.json +++ b/static/translations/sv-SE.json @@ -121,6 +121,10 @@ "terms_label": "Villkor", "viewertitle_label": "QWC2 Demo" }, + "cookiepopup": { + "accept": "", + "message": "" + }, "copybtn": { "click_to_copy": "Klicka för att kopiera", "copied": "Kopierade", diff --git a/static/translations/tr-TR.json b/static/translations/tr-TR.json index 03aa95178..c94c798ea 100644 --- a/static/translations/tr-TR.json +++ b/static/translations/tr-TR.json @@ -121,6 +121,10 @@ "terms_label": "Kullanım Şartları", "viewertitle_label": "" }, + "cookiepopup": { + "accept": "", + "message": "" + }, "copybtn": { "click_to_copy": "Kopyalamak için tıkla", "copied": "Kopyalandı",