From e2f82b96a58d2758b27440fa0da1d0e37d8e22e0 Mon Sep 17 00:00:00 2001 From: Sebastian Blank Date: Thu, 29 Feb 2024 15:14:47 +0100 Subject: [PATCH 1/4] Remove "Default-Language in Admin-Interface" --- .github/ci/files/config/system.yaml | 2 -- public/js/pimcore/settings/system.js | 17 ----------------- translations/admin_ext.en.yaml | 1 - 3 files changed, 20 deletions(-) diff --git a/.github/ci/files/config/system.yaml b/.github/ci/files/config/system.yaml index 63900a209d..8c62b9e89c 100644 --- a/.github/ci/files/config/system.yaml +++ b/.github/ci/files/config/system.yaml @@ -4,7 +4,6 @@ pimcore: path_variable: '' domain: pimcore-test.dev redirect_to_maindomain: false - language: en valid_languages: - en - de @@ -65,4 +64,3 @@ pimcore_admin: login_screen_custom_image: '' translations: path: "@PimcoreCoreBundle/translations" - diff --git a/public/js/pimcore/settings/system.js b/public/js/pimcore/settings/system.js index ed8e9e2bd0..572069f6c8 100644 --- a/public/js/pimcore/settings/system.js +++ b/public/js/pimcore/settings/system.js @@ -125,23 +125,6 @@ pimcore.settings.system = Class.create({ defaultType: 'textfield', defaults: {width: 300}, items: [{ - xtype: 'combo', - fieldLabel: t('language_admin'), - typeAhead: true, - value: this.getValue("general.language"), - queryMode: 'local', - mode: 'local', - listWidth: 100, - width: 500, - //editable: true, // If typeAhead is enabled the combo must be editable: true -- please change one of those settings. - store: pimcore.globalmanager.get("pimcorelanguages"), - displayField: 'display', - valueField: 'language', - forceSelection: true, - triggerAction: 'all', - name: 'general.language', - cls: "pimcore_extra_label_bottom" - }, { xtype: "container", html: '' + t('frontend_languages') + '' }, { diff --git a/translations/admin_ext.en.yaml b/translations/admin_ext.en.yaml index fbe9c09b73..eade908d9b 100644 --- a/translations/admin_ext.en.yaml +++ b/translations/admin_ext.en.yaml @@ -317,7 +317,6 @@ non_stable_updates: Available non-stable updates latest_pimcore_version_already_installed: You have installed the latest version of pimcore. table: Table rows: Rows -language_admin: Default-Language in Admin-Interface exclude_patterns: Exclude Patterns cover: Cover contain: Contain From 312c7f0b68312c8caace3d85fcd7ff1ab03bcfec Mon Sep 17 00:00:00 2001 From: Sebastian Blank Date: Thu, 29 Feb 2024 15:44:44 +0100 Subject: [PATCH 2/4] Add changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b6a0df534..c292790a00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ - Bumped `pimcore/pimcore` minimum requirement to `^11.1.0` - DataObject used to automatically reload version after save, but now it's triggered only on successfull save. The reload can be forced by setting `forceReloadVersionsAfterSave` to `true` in a `postSaveObject` event listener. - [User -> Settings] When resetting password, setting the new password same as the old one would throw an error. + - [System Settings] Removed "Default-Language in Admin-Interface" setting. #### v1.1.0 - `Pimcore\Bundle\AdminBundle\Service\ElementService` is marked as internal. From 4b7a20ab0b7b173752c54b4a2da19efeb5168cc3 Mon Sep 17 00:00:00 2001 From: Sebastian Blank Date: Mon, 4 Mar 2024 09:56:11 +0100 Subject: [PATCH 3/4] Fix Changelog --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c292790a00..6c52fd86ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,10 @@ +#### v1.4.0 + - [System Settings] Removed "Default-Language in Admin-Interface" setting. + #### v1.2.0 - Bumped `pimcore/pimcore` minimum requirement to `^11.1.0` - DataObject used to automatically reload version after save, but now it's triggered only on successfull save. The reload can be forced by setting `forceReloadVersionsAfterSave` to `true` in a `postSaveObject` event listener. - [User -> Settings] When resetting password, setting the new password same as the old one would throw an error. - - [System Settings] Removed "Default-Language in Admin-Interface" setting. #### v1.1.0 - `Pimcore\Bundle\AdminBundle\Service\ElementService` is marked as internal. From 3da87244014be7dfb7f11f15dde9c60d76ebfa14 Mon Sep 17 00:00:00 2001 From: Sebastian Blank Date: Mon, 1 Apr 2024 16:55:43 +0200 Subject: [PATCH 4/4] Require pimcore/pimcore ^11.3 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index def9dc67f2..6aed9e5fb3 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ }, "require": { "cbschuld/browser.php": "^1.9.6", - "pimcore/pimcore": "^11.2.0", + "pimcore/pimcore": "^11.3", "symfony/webpack-encore-bundle": "^1.13.2" }, "require-dev": {