diff --git a/.github/workflows/meta.yml b/.github/workflows/meta.yml index 981e32a..97d9123 100644 --- a/.github/workflows/meta.yml +++ b/.github/workflows/meta.yml @@ -30,8 +30,6 @@ jobs: uses: plone/meta/.github/workflows/test.yml@main coverage: uses: plone/meta/.github/workflows/coverage.yml@main - dependencies: - uses: plone/meta/.github/workflows/dependencies.yml@main release_ready: uses: plone/meta/.github/workflows/release_ready.yml@main diff --git a/.meta.toml b/.meta.toml index a5f8827..99326a9 100644 --- a/.meta.toml +++ b/.meta.toml @@ -3,13 +3,12 @@ # See the inline comments on how to expand/tweak this configuration file [meta] template = "default" -commit-id = "d03b196d" +commit-id = "18642aac" [github] jobs = [ "qa", "test", "coverage", - "dependencies", "release_ready", ] diff --git a/news/3.bugfix b/news/3.bugfix new file mode 100644 index 0000000..bb5ed92 --- /dev/null +++ b/news/3.bugfix @@ -0,0 +1,2 @@ +Override `@@plone_portal_state/language` to fix `mockup` translations. +[petschki] diff --git a/src/cs/adminlanguage/browser.py b/src/cs/adminlanguage/browser.py new file mode 100644 index 0000000..13d2c69 --- /dev/null +++ b/src/cs/adminlanguage/browser.py @@ -0,0 +1,23 @@ +from Acquisition import aq_inner +from cs.adminlanguage.negotiator import get_editor_language +from cs.adminlanguage.negotiator import logger +from plone.app.layout.globals.portal import PortalState as PortalStateBase + + +class PortalState(PortalStateBase): + + def language(self): + try: + language = get_editor_language(self.request) + if language: + return language + except Exception as e: + # Some defensive programming here + logger.error("Admin language force patch failed") + logger.exception(e) + + return ( + self.request.get("LANGUAGE", None) + or aq_inner(self.context).Language() + or self.default_language() + ) diff --git a/src/cs/adminlanguage/configure.zcml b/src/cs/adminlanguage/configure.zcml index 3ae2363..36f1054 100755 --- a/src/cs/adminlanguage/configure.zcml +++ b/src/cs/adminlanguage/configure.zcml @@ -51,4 +51,14 @@ + + +