Remove "Default-Language in Admin-Interface" (#447)

* Remove "Default-Language in Admin-Interface" * Add changelog entry * Fix Changelog * Require pimcore/pimcore ^11.3
pimcore · Jun 18, 2024 · fbf9568 · fbf9568
1 parent db29c04
commit fbf9568
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 27 deletions.
diff --git 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/CHANGELOG.md b/CHANGELOG.md
@@ -4,18 +4,19 @@
 - [Date & date/time fields] Date & date/time fields are now configured with `date` and `datetime` column type by default.
 - [Date/time fields] Date/time fields now support the usage without timezone support.
 - [Icons] Overhauled Icon library and icon dropdown selector in class definition editor.
+- [System Settings] Removed "Default-Language in Admin-Interface" setting.
 
 #### v1.4.0
 - [DataObject] Password data type algorithms other than `password_hash` are deprecated since `pimcore/pimcore:^11.2` and will be removed in `pimcore/pimcore:^12`.
 
 #### 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.
+- 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.
 
 #### v1.1.0
- - `Pimcore\Bundle\AdminBundle\Service\ElementService` is marked as internal.
- - Deprecated `DocumentTreeConfigTrait`
- - Added `pimcore.events.prepareAffectedNodes` js event to extend node refresh on tree update. It can be used to 
+- `Pimcore\Bundle\AdminBundle\Service\ElementService` is marked as internal.
+- Deprecated `DocumentTreeConfigTrait`
+- Added `pimcore.events.prepareAffectedNodes` js event to extend node refresh on tree update. It can be used to 
    extends the affected nodes array on `pimcore.elementservice.getAffectedNodes`.
- - Added `pimcore_editor_tabbar` css class to element tab bars.
+- Added `pimcore_editor_tabbar` css class to element tab bars.
diff --git 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: '<strong>' + t('frontend_languages') + '</strong>'
                         }, {

diff --git a/translations/admin_ext.en.yaml b/translations/admin_ext.en.yaml
@@ -325,7 +325,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