diff --git a/.env b/.env index d0756d1..3231a43 100644 --- a/.env +++ b/.env @@ -43,4 +43,4 @@ RESULT_BASE_URL="http://127.0.0.1:9000/sitespeedio" SITESPEED.IO_HTML_HOMEURL="http://127.0.0.1:3000/" # The sitespeed.io container that actually runs the tests -SITESPEED_IO_CONTAINER="sitespeedio/sitespeed.io:39" \ No newline at end of file +SITESPEED_IO_CONTAINER="sitespeedio/sitespeed.io:39" diff --git a/docker-compose.app.yml b/docker-compose.app.yml index 99720df..19e8373 100644 --- a/docker-compose.app.yml +++ b/docker-compose.app.yml @@ -7,6 +7,8 @@ services: redis_host: redis postgresql_server: postgresql validTestDomains: ${VALID_TEST_DOMAINS} + localization_locale: ${LOCALIZATION_LOCALE} + sitespeed.io_html_homeurl: ${SITESPEED_IO_HTML_HOMEURL} ports: - "3000:3000" networks: @@ -42,4 +44,4 @@ services: - minio - sitespeed.io-server networks: - - skynet \ No newline at end of file + - skynet diff --git a/server/config/default.yaml b/server/config/default.yaml index 416ec23..9cdd68e 100644 --- a/server/config/default.yaml +++ b/server/config/default.yaml @@ -90,4 +90,7 @@ queue: # If you don't setup a default sitespeed.io configuration, you can add # your sitespeed.io configuration directly in this block -sitespeed.io: \ No newline at end of file +sitespeed.io: + # Link target for the logo in generated HTML reports. + html: + homeurl: "http://127.0.0.1:3000/" diff --git a/server/docker/dockerdefault.yaml b/server/docker/dockerdefault.yaml index acbccd3..8271d4f 100644 --- a/server/docker/dockerdefault.yaml +++ b/server/docker/dockerdefault.yaml @@ -83,3 +83,10 @@ admin: queue: removeOnComplete: 50 removeOnFail: 50 + +# If you don't setup a default sitespeed.io configuration, you can add +# your sitespeed.io configuration directly in this block +sitespeed.io: + # Link target for the logo in generated HTML reports. + html: + homeurl: "http://127.0.0.1:3000/" diff --git a/server/src/util/text.js b/server/src/util/text.js index 99ef804..3424f57 100644 --- a/server/src/util/text.js +++ b/server/src/util/text.js @@ -1,6 +1,7 @@ import { nconf } from '../config.js'; import y18n from 'y18n'; import { getBaseFilePath } from './fileutil.js'; + const locale = nconf.get('localization:locale'); const directory = nconf.get('localization:directory') || getBaseFilePath('./locales');