Merge branch 'main' into commenting-styling

Author: danalvrz

backend/news/+solr-rev-pin.bugfix

@@ -0,0 +1 @@
+Pin kitconcept.solr to a revision instead of the branch: backend, frontend and the solr image. Includes the Plate RAG chunking fix (kitconcept.solr#112). @reebalazs

backend/pyproject.toml

@@ -67,7 +67,7 @@ container = [
 
 [tool.uv.sources]
 kitconcept-plate = { path = "container/kitconcept-plate.tar.gz" }
-kitconcept-solr = { git = "https://github.com/kitconcept/kitconcept.solr.git", subdirectory = "backend", branch = "feature-ai-rag" }
+kitconcept-solr = { git = "https://github.com/kitconcept/kitconcept.solr.git", subdirectory = "backend", rev = "a8953cefb2d250bb83213bef0099ffceda87dc78" }
 
 [tool.hatch.metadata]
 allow-direct-references = true

backend/uv.lock

@@ -97,7 +97,7 @@ services:
           - ${STACK_NAME}-tika
 
   solr:
-    image: ghcr.io/kitconcept/solr:${SOLR_TAG:-feature-ai-rag}
+    image: ghcr.io/kitconcept/solr:${SOLR_TAG:-sha-826383b}
     command:
       - solr-precreate
       - plone

devops/stacks/demo.yml

@@ -132,7 +132,7 @@ services:
           - ${STACK_NAME}-tika
 
   solr:
-    image: ghcr.io/kitconcept/solr:${SOLR_TAG:-feature-ai-rag}
+    image: ghcr.io/kitconcept/solr:${SOLR_TAG:-sha-826383b}
     command:
       - solr-precreate
       - plone

devops/stacks/persistent.yml

@@ -52,7 +52,7 @@ x-tika: &tika
     - 9998:9998
 
 x-solr: &solr
-  image: ghcr.io/kitconcept/solr:${SOLR_TAG:-feature-ai-rag}
+  image: ghcr.io/kitconcept/solr:${SOLR_TAG:-sha-826383b}
   platform: linux/amd64
   ports:
     - 8983:8983

docker-compose-dev.yml

@@ -135,7 +135,7 @@
     "url": "git@github.com:kitconcept/kitconcept.solr.git",
     "https": "https://github.com/kitconcept/kitconcept.solr.git",
     "path": "frontend/packages/volto-solr",
-    "branch": "feature-ai-rag"
+    "tag": "a8953cefb2d250bb83213bef0099ffceda87dc78"
   },
   "volto-contact-block": {
     "develop": true,

frontend/mrs.developer.json

@@ -226,6 +226,7 @@ msgstr "Rückmeldung"
 
 #. Default: "Feedback about this page"
 #: components/Footer/slots/FollowUsLogoAndLinks
+#: slots/AboutThisContent/AboutThisContent
 msgid "Feedback about this page"
 msgstr "Feedback zu dieser Seite"
 
@@ -259,6 +260,11 @@ msgstr "Ordner"
 msgid "Generating answer…"
 msgstr "Antwort wird erstellt …"
 
+#. Default: "Give feedback on this page"
+#: slots/AboutThisContent/AboutThisContent
+msgid "Give feedback on this page"
+msgstr "Feedback zu dieser Seite geben"
+
 #. Default: "Home"
 #: components/Header/HeaderBreadcrumbs
 msgid "Home"
@@ -289,11 +295,6 @@ msgstr "Intranet Portal"
 msgid "Invalid url"
 msgstr "Ungültige URL"
 
-#. Default: "Is something unclear or outdated? Let us know so we can improve the page."
-#: slots/AboutThisContent/AboutThisContent
-msgid "Is something unclear or outdated? Let us know so we can improve the page."
-msgstr "Etwas unklar oder veraltet? Lass es uns wissen, um die Seite zu verbessern."
-
 #. Default: "Item batch size"
 #: components/widgets/QuerystringWidget
 msgid "Item batch size"
@@ -448,6 +449,7 @@ msgstr "Überprüfung verschieben"
 
 #. Default: "Private"
 #: components/Header/HeaderSearch
+#: slots/AboutThisContent/AboutThisContent
 msgid "Private"
 msgstr "Privat"
 
@@ -702,6 +704,11 @@ msgstr "Die Überprüfung wurde erfolgreich delegiert."
 msgid "delegateTitle"
 msgstr "Prüfung oder Anpassung delegieren"
 
+#. Default: "goes to"
+#: slots/AboutThisContent/AboutThisContent
+msgid "goes to"
+msgstr "geht an"
+
 #. Default: "The check interval is set to {interval}. To change it, you must edit the content."
 #: components/ContentReviewSidebar/PostponeReview
 msgid "help"

frontend/packages/kitconcept-intranet/locales/de/LC_MESSAGES/volto.po

@@ -226,6 +226,7 @@ msgstr ""
 
 #. Default: "Feedback about this page"
 #: components/Footer/slots/FollowUsLogoAndLinks
+#: slots/AboutThisContent/AboutThisContent
 msgid "Feedback about this page"
 msgstr ""
 
@@ -259,6 +260,11 @@ msgstr ""
 msgid "Generating answer…"
 msgstr ""
 
+#. Default: "Give feedback on this page"
+#: slots/AboutThisContent/AboutThisContent
+msgid "Give feedback on this page"
+msgstr ""
+
 #. Default: "Home"
 #: components/Header/HeaderBreadcrumbs
 msgid "Home"
@@ -289,11 +295,6 @@ msgstr ""
 msgid "Invalid url"
 msgstr ""
 
-#. Default: "Is something unclear or outdated? Let us know so we can improve the page."
-#: slots/AboutThisContent/AboutThisContent
-msgid "Is something unclear or outdated? Let us know so we can improve the page."
-msgstr ""
-
 #. Default: "Item batch size"
 #: components/widgets/QuerystringWidget
 msgid "Item batch size"
@@ -448,6 +449,7 @@ msgstr ""
 
 #. Default: "Private"
 #: components/Header/HeaderSearch
+#: slots/AboutThisContent/AboutThisContent
 msgid "Private"
 msgstr ""
 
@@ -702,6 +704,11 @@ msgstr ""
 msgid "delegateTitle"
 msgstr ""
 
+#. Default: "goes to"
+#: slots/AboutThisContent/AboutThisContent
+msgid "goes to"
+msgstr ""
+
 #. Default: "The check interval is set to {interval}. To change it, you must edit the content."
 #: components/ContentReviewSidebar/PostponeReview
 msgid "help"

frontend/packages/kitconcept-intranet/locales/en/LC_MESSAGES/volto.po

@@ -233,6 +233,7 @@ msgstr ""
 
 #. Default: "Feedback about this page"
 #: components/Footer/slots/FollowUsLogoAndLinks
+#: slots/AboutThisContent/AboutThisContent
 msgid "Feedback about this page"
 msgstr ""
 
@@ -266,6 +267,11 @@ msgstr ""
 msgid "Generating answer…"
 msgstr ""
 
+#. Default: "Give feedback on this page"
+#: slots/AboutThisContent/AboutThisContent
+msgid "Give feedback on this page"
+msgstr ""
+
 #. Default: "Home"
 #: components/Header/HeaderBreadcrumbs
 msgid "Home"
@@ -296,11 +302,6 @@ msgstr ""
 msgid "Invalid url"
 msgstr ""
 
-#. Default: "Is something unclear or outdated? Let us know so we can improve the page."
-#: slots/AboutThisContent/AboutThisContent
-msgid "Is something unclear or outdated? Let us know so we can improve the page."
-msgstr ""
-
 #. Default: "Item batch size"
 #: components/widgets/QuerystringWidget
 msgid "Item batch size"
@@ -455,6 +456,7 @@ msgstr ""
 
 #. Default: "Private"
 #: components/Header/HeaderSearch
+#: slots/AboutThisContent/AboutThisContent
 msgid "Private"
 msgstr ""
 
@@ -709,6 +711,11 @@ msgstr ""
 msgid "delegateTitle"
 msgstr ""
 
+#. Default: "goes to"
+#: slots/AboutThisContent/AboutThisContent
+msgid "goes to"
+msgstr ""
+
 #. Default: "The check interval is set to {interval}. To change it, you must edit the content."
 #: components/ContentReviewSidebar/PostponeReview
 msgid "help"