Skip to content

Commit

Permalink
Reword field instance edit option labels
Browse files Browse the repository at this point in the history
Resolves #16261
  • Loading branch information
brandonkelly committed Dec 5, 2024
1 parent 0aa4936 commit c66045b
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
1 change: 1 addition & 0 deletions CHANGELOG-WIP.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
- Added the “Field” entry condition rule, which replaces “Matrix field”, includes a “has a value” operator. ([#16270](https://github.com/craftcms/cms/discussions/16270))
- Section condition rules now have a “has a value” operator. ([#16270](https://github.com/craftcms/cms/discussions/16270))
- The Queue Manager utility now shows jobs’ class names. ([#16228](https://github.com/craftcms/cms/pull/16228))
- Improved the wording of field instance action labels. ([#16261](https://github.com/craftcms/cms/discussions/16261))

### Development
- Added support for fallback element partial templates, e.g. `_partials/entry.twig` as opposed to `_partials/entry/typeHandle.twig`. ([#16125](https://github.com/craftcms/cms/pull/16125))
Expand Down
2 changes: 2 additions & 0 deletions src/translations/en/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -613,6 +613,7 @@
'Edit entry type' => 'Edit entry type',
'Edit entry types ({count})' => 'Edit entry types ({count})',
'Edit entry types' => 'Edit entry types',
'Edit global field settings' => 'Edit global field settings',
'Edit images uploaded by other users' => 'Edit images uploaded by other users',
'Edit images' => 'Edit images',
'Edit tags in the “{tagGroup}” tag group' => 'Edit tags in the “{tagGroup}” tag group',
Expand Down Expand Up @@ -832,6 +833,7 @@
'Installing Craft CMS…' => 'Installing Craft CMS…',
'Installing the plugin…' => 'Installing the plugin…',
'Installing {name}' => 'Installing {name}',
'Instance settings' => 'Instance settings',
'Instructions' => 'Instructions',
'Interlace' => 'Interlace',
'Interlacing' => 'Interlacing',
Expand Down
2 changes: 2 additions & 0 deletions src/web/assets/cp/CpAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ private function _registerTranslations(View $view): void
'Don’t use for element thumbnails',
'Draft Name',
'Edit draft settings',
'Edit global field settings',
'Edit {type}',
'Edit',
'Edited',
Expand Down Expand Up @@ -226,6 +227,7 @@ private function _registerTranslations(View $view): void
'Hide',
'Incorrect password.',
'Information',
'Instance settings',
'Instructions',
'Invalid email.',
'Invalid username or email.',
Expand Down
2 changes: 1 addition & 1 deletion src/web/assets/cp/dist/cp.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/web/assets/cp/dist/cp.js.map

Large diffs are not rendered by default.

11 changes: 3 additions & 8 deletions src/web/assets/cp/src/js/FieldLayoutDesigner.js
Original file line number Diff line number Diff line change
Expand Up @@ -866,18 +866,13 @@ Craft.FieldLayoutDesigner.Element = Garnish.Base.extend({
}).appendTo(this.$container);
const disclosureMenu = $actionBtn.disclosureMenu().data('disclosureMenu');

let makeRequiredBtn,
dropRequiredBtn,
makeThumbnailBtn,
dropThumbnailBtn,
showInCardsBtn,
omitFromCardsBtn;
let makeRequiredBtn, dropRequiredBtn, makeThumbnailBtn, dropThumbnailBtn;

this.hasSettings = Garnish.hasAttr(this.$container, 'data-has-settings');

if (this.hasSettings) {
disclosureMenu.addItem({
label: Craft.t('app', 'Settings'),
label: Craft.t('app', 'Instance settings'),
icon: 'gear',
onActivate: () => {
this.createSettings();
Expand All @@ -891,7 +886,7 @@ Craft.FieldLayoutDesigner.Element = Garnish.Base.extend({

if (this.fieldId) {
disclosureMenu.addItem({
label: Craft.t('app', 'Edit field'),
label: Craft.t('app', 'Edit global field settings'),
icon: 'pencil',
onActivate: () => {
this.showFieldEditor();
Expand Down

0 comments on commit c66045b

Please sign in to comment.