Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 8 commits into from
Jun 18, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/ci/files/config/system.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ pimcore:
path_variable: ''
domain: pimcore-test.dev
redirect_to_maindomain: false
language: en
valid_languages:
- en
- de
Expand Down Expand Up @@ -65,4 +64,3 @@ pimcore_admin:
login_screen_custom_image: ''
translations:
path: "@PimcoreCoreBundle/translations"

3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#### v1.5.0
- [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`.

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
17 changes: 0 additions & 17 deletions public/js/pimcore/settings/system.js
Original file line number Diff line number Diff line change
Expand Up @@ -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>'
}, {
Expand Down
1 change: 0 additions & 1 deletion translations/admin_ext.en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading