Update submodule

qgis · Apr 10, 2024 · b17ac6b · b17ac6b
1 parent e0a954d
commit b17ac6b
Show file tree

Hide file tree

Showing 17 changed files with 60 additions and 2 deletions.
diff --git 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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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ı",
+16 −0		actions/localConfig.js
+2 −2		components/AttributeForm.jsx
+7 −1		components/PluginsContainer.jsx
+11 −1		doc/plugins.md
+1 −1		package.json
+146 −1		plugins/API.jsx
+42 −0		plugins/CookiePopup.jsx
+2 −2		plugins/Editing.jsx
+1 −1		plugins/FeatureForm.jsx
+8 −6		plugins/MapLegend.jsx
+24 −0		plugins/style/CookiePopup.css
+4 −4		reducers/editing.js
+20 −1		reducers/localConfig.js
+4 −0		translations/ca-ES.json
+4 −0		translations/cs-CZ.json
+4 −0		translations/de-CH.json
+4 −0		translations/de-DE.json
+4 −0		translations/en-US.json
+4 −0		translations/es-ES.json
+4 −0		translations/fi-FI.json
+4 −0		translations/fr-FR.json
+4 −0		translations/hu-HU.json
+4 −0		translations/it-IT.json
+4 −0		translations/no-NO.json
+4 −0		translations/pl-PL.json
+4 −0		translations/pt-BR.json
+4 −0		translations/pt-PT.json
+4 −0		translations/ro-RO.json
+4 −0		translations/ru-RU.json
+4 −0		translations/sv-SE.json
+4 −0		translations/tr-TR.json
+2 −0		translations/tsconfig.json
+22 −8		utils/ServiceLayerUtils.js