Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions backend/Dockerfile.acceptance
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ RUN --mount=type=cache,target=/root/.cache \
--no-editable

# Move skeleton files to /app
ENV SITE_DEFAULT_LANGUAGE=en
RUN <<EOT
mv /app_base/* /app
rm -Rf /app_base
Expand Down
2 changes: 1 addition & 1 deletion backend/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ update-example-content: $(VENV_FOLDER) ## Export example content inside package
.PHONY: cleanup-example-content
cleanup-example-content: $(VENV_FOLDER) ## Remove invalid references to http://nohost/Plone
@echo "$(GREEN)==> 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
Expand Down
1 change: 1 addition & 0 deletions backend/news/+german.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Create new sites in German by default. @davisagli
2 changes: 1 addition & 1 deletion backend/scripts/create_site.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down
2 changes: 1 addition & 1 deletion backend/scripts/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

This file was deleted.

4 changes: 1 addition & 3 deletions docker-compose-dev.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
name: kitconcept-intranet-dev


x-frontend: &frontend
image: ghcr.io/kitconcept/kitconcept-intranet-frontend:latest
pull_policy: build
Expand Down Expand Up @@ -56,9 +55,7 @@ x-solr: &solr
- plone
- /plone-config


services:

traefik:
image: traefik:v2.11
profiles: ["dev"]
Expand Down Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions frontend/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions frontend/packages/volto-intranet/news/+german.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add German as a supported frontend language. @davisagli
4 changes: 2 additions & 2 deletions frontend/packages/volto-intranet/src/config/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down