tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-01 13:48:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '5.0' into 5

Browse Source
This commit is contained in:
Steve Boyd 2023-05-31 14:26:21 +12:00
commit e1ffa18db6
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lang/eo.yml
View File

@ -370,3 +370,6 @@ eo:
PASSWORDRESETSENTTEXT: 'Dankon. Reagorda ligilo sendiĝis, kondiĉe ke konto ekzistas por ĉi tiu retadreso.' PASSWORDRESETSENTTEXT: 'Dankon. Reagorda ligilo sendiĝis, kondiĉe ke konto ekzistas por ĉi tiu retadreso.'
SilverStripe\View\Shortcodes\EmbedShortcodeProvider: SilverStripe\View\Shortcodes\EmbedShortcodeProvider:
INVALID_URL: 'Okazis problemo ŝargi la aŭdvidaĵon.' INVALID_URL: 'Okazis problemo ŝargi la aŭdvidaĵon.'
DataObject:
php:
SilverStripe\ORM\DataObjectGENERALSEARCH: 'Ĝenerala serĉo'

3
lang/nl.yml
View File

@ -370,3 +370,6 @@ nl:
PASSWORDRESETSENTTEXT: 'Bedankt! Er is een e-mail verstuurd om je wachtwoord opnieuw in te stellen - mits het e-mailadres reeds bekend is bij ons.' PASSWORDRESETSENTTEXT: 'Bedankt! Er is een e-mail verstuurd om je wachtwoord opnieuw in te stellen - mits het e-mailadres reeds bekend is bij ons.'
SilverStripe\View\Shortcodes\EmbedShortcodeProvider: SilverStripe\View\Shortcodes\EmbedShortcodeProvider:
INVALID_URL: 'Het inladen van de media-bestanden is mislukt.' INVALID_URL: 'Het inladen van de media-bestanden is mislukt.'
DataObject:
php:
SilverStripe\ORM\DataObjectGENERALSEARCH: 'Alles doorzoeken'

12
src/Forms/GridField/GridFieldDetailForm_ItemRequest.php
View File

@ -137,7 +137,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler
$form = $this->ItemEditForm(); $form = $this->ItemEditForm();
$form->makeReadonly(); $form->makeReadonly();
$data = new ArrayData([ $data = ArrayData::create([
'Backlink' => $controller->Link(), 'Backlink' => $controller->Link(),
'ItemEditForm' => $form 'ItemEditForm' => $form
]); ]);
@ -235,7 +235,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler
} }
} }
$form = new Form( $form = Form::create(
$this, $this,
'ItemEditForm', 'ItemEditForm',
$fields, $fields,
@ -434,7 +434,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler
$oneLevelUp->Link, // url $oneLevelUp->Link, // url
_t('SilverStripe\\Forms\\GridField\\GridFieldDetailForm.CancelBtn', 'Cancel') // label _t('SilverStripe\\Forms\\GridField\\GridFieldDetailForm.CancelBtn', 'Cancel') // label
); );
$actions->insertAfter('MajorActions', new LiteralField('cancelbutton', $text)); $actions->insertAfter('MajorActions', LiteralField::create('cancelbutton', $text));
} }
} }
@ -879,17 +879,17 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler
$items = $this->popupController->Breadcrumbs($unlinked); $items = $this->popupController->Breadcrumbs($unlinked);
if (!$items) { if (!$items) {
$items = new ArrayList(); $items = ArrayList::create();
} }
if ($this->record && $this->record->ID) { if ($this->record && $this->record->ID) {
$title = ($this->record->Title) ? $this->record->Title : "#{$this->record->ID}"; $title = ($this->record->Title) ? $this->record->Title : "#{$this->record->ID}";
$items->push(new ArrayData([ $items->push(ArrayData::create([
'Title' => $title, 'Title' => $title,
'Link' => $this->Link() 'Link' => $this->Link()
])); ]));
} else { } else {
$items->push(new ArrayData([ $items->push(ArrayData::create([
'Title' => _t('SilverStripe\\Forms\\GridField\\GridField.NewRecord', 'New {type}', ['type' => $this->record->i18n_singular_name()]), 'Title' => _t('SilverStripe\\Forms\\GridField\\GridField.NewRecord', 'New {type}', ['type' => $this->record->i18n_singular_name()]),
'Link' => false 'Link' => false
])); ]));