From 5159ed1b3680c476d92c1fe5508bb3c83ff05825 Mon Sep 17 00:00:00 2001 From: iexos Date: Wed, 28 Jun 2023 18:10:57 +0200 Subject: [PATCH 1/3] enable choice of language --- .env.sample | 1 + LocalSettings.php.tmpl | 2 +- abra.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.env.sample b/.env.sample index e99fc96..de93ed0 100644 --- a/.env.sample +++ b/.env.sample @@ -10,6 +10,7 @@ MEDIAWIKI_SITENAMESPACE="Example_Wiki" MEDIAWIKI_EMAIL_CONTACT="info@wiki.example.com" MEDIAWIKI_EMAIL_FROM="wiki@wiki.example.com" MEDIAWIKI_LOGO_FILE='$wgResourceBasePath/resources/assets/wiki.png' +MEDIAWIKI_LANGUAGE="en" MEDIAWIKI_IS_PRIVATE=1 diff --git a/LocalSettings.php.tmpl b/LocalSettings.php.tmpl index 41a2833..62e500e 100644 --- a/LocalSettings.php.tmpl +++ b/LocalSettings.php.tmpl @@ -84,7 +84,7 @@ $wgShellLocale = "C.UTF-8"; #$wgCacheDirectory = "$IP/cache"; # Site language code, should be one of the list in ./languages/data/Names.php -$wgLanguageCode = "en"; +$wgLanguageCode = "{{ env "MEDIAWIKI_LANGUAGE" }}"; $wgSecretKey = rtrim(file_get_contents('/run/secrets/mediawiki_secret_key')); diff --git a/abra.sh b/abra.sh index 52c49d9..baa89a5 100644 --- a/abra.sh +++ b/abra.sh @@ -1,4 +1,4 @@ -export LOCAL_SETTINGS_CONF_VERSION=v20 +export LOCAL_SETTINGS_CONF_VERSION=v21 export HTACCESS_CONF_VERSION=v1 export ENTRYPOINT_CONF_VERSION=v19 export COMPOSER_LOCAL_CONF_VERSION=v5 From 7d1810cf9324b9caea075822d0d99f12648c70c1 Mon Sep 17 00:00:00 2001 From: iexos Date: Thu, 29 Jun 2023 15:46:31 +0200 Subject: [PATCH 2/3] add MEDIAWIKI_LANGUAGE to compose.yml with default --- compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/compose.yml b/compose.yml index 87631bb..29e0971 100644 --- a/compose.yml +++ b/compose.yml @@ -14,6 +14,7 @@ services: - MEDIAWIKI_LOGO_FILE - MEDIAWIKI_IS_PRIVATE - MEDIAWIKI_DEBUG + - MEDIAWIKI_LANGUAGE=${MEDIAWIKI_LANGUAGE:-en} - SAML_ENABLED - OPENID_ENABLED - DB_HOST=db From de60261fcef2ce8ae9f7f70e8bcd434847945a34 Mon Sep 17 00:00:00 2001 From: iexos Date: Thu, 29 Jun 2023 18:29:40 +0200 Subject: [PATCH 3/3] point to list of language options --- .env.sample | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.env.sample b/.env.sample index de93ed0..2b4d548 100644 --- a/.env.sample +++ b/.env.sample @@ -10,6 +10,9 @@ MEDIAWIKI_SITENAMESPACE="Example_Wiki" MEDIAWIKI_EMAIL_CONTACT="info@wiki.example.com" MEDIAWIKI_EMAIL_FROM="wiki@wiki.example.com" MEDIAWIKI_LOGO_FILE='$wgResourceBasePath/resources/assets/wiki.png' + +# list of language options (without ".json"): +# https://gerrit.wikimedia.org/g/mediawiki/core/%2B/HEAD/languages/i18n MEDIAWIKI_LANGUAGE="en" MEDIAWIKI_IS_PRIVATE=1