From 2ef33dc608e539bd6fe0f477758a2369014c0970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Pablo=20Villafa=C3=B1ez?= Date: Mon, 6 Sep 2021 16:20:13 +0200 Subject: [PATCH] Set english as default language (#2465) * Set english as default language * Add changelog entry * Adjust acceptance test --- changelog/unreleased/set-english-default-dropdown.md | 5 +++++ settings/pkg/service/v0/settings.go | 1 + settings/ui/tests/acceptance/features/settings.feature | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 changelog/unreleased/set-english-default-dropdown.md diff --git a/changelog/unreleased/set-english-default-dropdown.md b/changelog/unreleased/set-english-default-dropdown.md new file mode 100644 index 0000000000..d2dadd412e --- /dev/null +++ b/changelog/unreleased/set-english-default-dropdown.md @@ -0,0 +1,5 @@ +Bugfix: Set English as default language in the dropdown in the settings page + +The language dropdown didn't have a default language selected, and it was showing an empty value. Now it shows English instead. + +https://github.com/owncloud/ocis/pull/2465 diff --git a/settings/pkg/service/v0/settings.go b/settings/pkg/service/v0/settings.go index f858395f67..b96819f000 100644 --- a/settings/pkg/service/v0/settings.go +++ b/settings/pkg/service/v0/settings.go @@ -128,6 +128,7 @@ var languageSetting = settings.Setting_SingleChoiceValue{ }, }, DisplayValue: "English", + Default: true, }, { Value: &settings.ListOptionValue{ diff --git a/settings/ui/tests/acceptance/features/settings.feature b/settings/ui/tests/acceptance/features/settings.feature index b59894357f..9b61ca5a8b 100644 --- a/settings/ui/tests/acceptance/features/settings.feature +++ b/settings/ui/tests/acceptance/features/settings.feature @@ -13,7 +13,7 @@ Feature: Set user specific settings Scenario: Check the default settings Given user "user1" has logged in using the webUI And the user browses to the settings page - Then the setting "Language" should not have any value + Then the setting "Language" should have value "English" When the user browses to the files page Then the files menu should be listed in language "English"