diff --git a/backend/Dockerfile.acceptance b/backend/Dockerfile.acceptance index ab7bec4b5..3e31688b8 100644 --- a/backend/Dockerfile.acceptance +++ b/backend/Dockerfile.acceptance @@ -35,6 +35,7 @@ RUN --mount=type=cache,target=/root/.cache \ --no-editable # Move skeleton files to /app +ENV SITE_DEFAULT_LANGUAGE=en RUN < Remove invalid references to http://nohost/Plone $(RESET)" - @find $(EXAMPLE_CONTENT_FOLDER)/content -type f -name 'data.json' -exec sed -i 's/http:\/\/nohost\/Plone\//\//' {} \; + @find $(EXAMPLE_CONTENT_FOLDER)/content -type f -name 'data.json' -exec sed -i '' -e 's#http://nohost/Plone/#/#g' {} \; # QA .PHONY: lint diff --git a/backend/news/+german.feature b/backend/news/+german.feature new file mode 100644 index 000000000..da0884416 --- /dev/null +++ b/backend/news/+german.feature @@ -0,0 +1 @@ +Create new sites in German by default. @davisagli diff --git a/backend/scripts/create_site.py b/backend/scripts/create_site.py index 64b3951e3..42bb7c98b 100644 --- a/backend/scripts/create_site.py +++ b/backend/scripts/create_site.py @@ -19,7 +19,7 @@ def _string_as_list(value: str) -> list[str]: "title": os.getenv("SITE_TITLE"), "description": os.getenv("SITE_DESCRIPTION"), "available_languages": _string_as_list( - os.getenv("SITE_AVAILABLE_LANGUAGES", os.getenv("SITE_DEFAULT_LANGUAGE", "en")) + os.getenv("SITE_AVAILABLE_LANGUAGES", os.getenv("SITE_DEFAULT_LANGUAGE", "de")) ), "portal_timezone": os.getenv("SITE_PORTAL_TIMEZONE"), "setup_content": os.getenv("SITE_SETUP_CONTENT", "true"), diff --git a/backend/scripts/default.json b/backend/scripts/default.json index e4f99dcd2..787b96095 100644 --- a/backend/scripts/default.json +++ b/backend/scripts/default.json @@ -2,7 +2,7 @@ "site_id": "Plone", "title": "Plone Intranet by kitconcept", "description": "A Plone Intranet distribution provided by kitconcept GmbH", - "available_languages": ["en"], + "available_languages": ["de"], "portal_timezone": "Europe/Berlin", "workflow": "public", "setup_solr": false, diff --git a/backend/src/kitconcept/intranet/profiles/default/registry/plone.i18n.interfaces.ILanguageSchema.xml b/backend/src/kitconcept/intranet/profiles/default/registry/plone.i18n.interfaces.ILanguageSchema.xml deleted file mode 100644 index cd2730fcf..000000000 --- a/backend/src/kitconcept/intranet/profiles/default/registry/plone.i18n.interfaces.ILanguageSchema.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - en - - en - - diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index d9465891e..21b7cb7fd 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -1,7 +1,6 @@ --- name: kitconcept-intranet-dev - x-frontend: &frontend image: ghcr.io/kitconcept/kitconcept-intranet-frontend:latest pull_policy: build @@ -56,9 +55,7 @@ x-solr: &solr - plone - /plone-config - services: - traefik: image: traefik:v2.11 profiles: ["dev"] @@ -177,6 +174,7 @@ services: environment: RAZZLE_API_PATH: http://localhost:55001/plone RAZZLE_INTERNAL_API_PATH: http://backend-acceptance:55001/plone + SITE_DEFAULT_LANGUAGE: en depends_on: - backend-acceptance diff --git a/frontend/Makefile b/frontend/Makefile index eb0e43915..4a82a5bfd 100644 --- a/frontend/Makefile +++ b/frontend/Makefile @@ -118,11 +118,11 @@ storybook-build: ## Build Storybook ## Acceptance .PHONY: acceptance-frontend-dev-start acceptance-frontend-dev-start: ## Start acceptance frontend in development mode - RAZZLE_API_PATH=http://127.0.0.1:55001/plone NODE_OPTIONS=--dns-result-order=ipv4first pnpm start + RAZZLE_API_PATH=http://127.0.0.1:55001/plone SITE_DEFAULT_LANGUAGE=en NODE_OPTIONS=--dns-result-order=ipv4first pnpm start .PHONY: acceptance-frontend-prod-start acceptance-frontend-prod-start: ## Start acceptance frontend in production mode - RAZZLE_API_PATH=http://127.0.0.1:55001/plone pnpm build && pnpm start:prod + RAZZLE_API_PATH=http://127.0.0.1:55001/plone SITE_DEFAULT_LANGUAGE=en pnpm build && pnpm start:prod .PHONY: acceptance-test acceptance-test: ## Start Cypress in interactive mode diff --git a/frontend/packages/volto-intranet/news/+german.feature b/frontend/packages/volto-intranet/news/+german.feature new file mode 100644 index 000000000..fd19e422e --- /dev/null +++ b/frontend/packages/volto-intranet/news/+german.feature @@ -0,0 +1 @@ +Add German as a supported frontend language. @davisagli diff --git a/frontend/packages/volto-intranet/src/config/settings.ts b/frontend/packages/volto-intranet/src/config/settings.ts index dc6bfeac8..30084c9f0 100644 --- a/frontend/packages/volto-intranet/src/config/settings.ts +++ b/frontend/packages/volto-intranet/src/config/settings.ts @@ -3,8 +3,8 @@ import type { apiExpandersType } from '@plone/types'; export default function install(config: ConfigType) { config.settings.isMultilingual = false; - config.settings.supportedLanguages = ['en']; - config.settings.defaultLanguage = 'en'; + config.settings.defaultLanguage = process.env.SITE_DEFAULT_LANGUAGE || 'de'; + config.settings.supportedLanguages = ['de', 'en']; // Volto Light Theme Configuration config.settings.intranetHeader = true;