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

Merge pull request #425 from halkyon/gridfielddetailform_lang

Browse Source 
BUGFIX #7298 Fixed incorrect message in GridFieldDetailForm from en.yml
This commit is contained in:
Stig Lindqvist 2012-05-09 23:03:26 -07:00
commit 42e3d94639
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
forms/gridfield/GridFieldDetailForm.php
View File

@ -266,13 +266,13 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler {
$actions = new FieldList(); $actions = new FieldList();
if($this->record->ID !== 0) { if($this->record->ID !== 0) {
$actions->push(FormAction::create('doSave', _t('GridFieldDetailsForm.Save', 'Save')) $actions->push(FormAction::create('doSave', _t('GridFieldDetailForm.Save', 'Save'))
->setUseButtonTag(true)->addExtraClass('ss-ui-action-constructive')->setAttribute('data-icon', 'accept')); ->setUseButtonTag(true)->addExtraClass('ss-ui-action-constructive')->setAttribute('data-icon', 'accept'));
$actions->push(FormAction::create('doDelete', _t('GridFieldDetailsForm.Delete', 'Delete')) $actions->push(FormAction::create('doDelete', _t('GridFieldDetailForm.Delete', 'Delete'))
->addExtraClass('ss-ui-action-destructive')); ->addExtraClass('ss-ui-action-destructive'));
}else{ // adding new record }else{ // adding new record
//Change the Save label to 'Create' //Change the Save label to 'Create'
$actions->push(FormAction::create('doSave', _t('GridFieldDetailsForm.Create', 'Create')) $actions->push(FormAction::create('doSave', _t('GridFieldDetailForm.Create', 'Create'))
->setUseButtonTag(true)->addExtraClass('ss-ui-action-constructive')->setAttribute('data-icon', 'add')); ->setUseButtonTag(true)->addExtraClass('ss-ui-action-constructive')->setAttribute('data-icon', 'add'));
// Add a Cancel link which is a button-like link and link back to one level up. // Add a Cancel link which is a button-like link and link back to one level up.
@ -347,7 +347,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler {
// TODO Save this item into the given relationship // TODO Save this item into the given relationship
$message = sprintf( $message = sprintf(
_t('ComplexTableField.SUCCESSEDIT2', 'Saved %s %s'), _t('GridFieldDetailForm.Saved', 'Saved %s %s'),
$this->record->singular_name(), $this->record->singular_name(),
'<a href="' . $this->Link('edit') . '">"' . htmlspecialchars($this->record->Title, ENT_QUOTES) . '"</a>' '<a href="' . $this->Link('edit') . '">"' . htmlspecialchars($this->record->Title, ENT_QUOTES) . '"</a>'
); );
@ -361,7 +361,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler {
try { try {
$toDelete = $this->record; $toDelete = $this->record;
if (!$toDelete->canDelete()) { if (!$toDelete->canDelete()) {
throw new ValidationException(_t('GridFieldDetailsForm.DeletePermissionsFailure',"No delete permissions"),0); throw new ValidationException(_t('GridFieldDetailForm.DeletePermissionsFailure',"No delete permissions"),0);
} }
$toDelete->delete(); $toDelete->delete();
@ -371,7 +371,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler {
} }
$message = sprintf( $message = sprintf(
_t('ComplexTableField.SUCCESSEDIT2', 'Deleted %s %s'), _t('GridFieldDetailForm.Deleted', 'Deleted %s %s'),
$this->record->singular_name(), $this->record->singular_name(),
'<a href="' . $this->Link('edit') . '">"' . htmlspecialchars($this->record->Title, ENT_QUOTES) . '"</a>' '<a href="' . $this->Link('edit') . '">"' . htmlspecialchars($this->record->Title, ENT_QUOTES) . '"</a>'
); );

4
lang/en.yml
View File

@ -188,11 +188,13 @@ en:
ResetFilter: Reset ResetFilter: Reset
GridFieldAction_Delete: GridFieldAction_Delete:
DeletePermissionsFailure: 'No delete permissions' DeletePermissionsFailure: 'No delete permissions'
GridFieldDetailsForm: GridFieldDetailForm:
Create: Create Create: Create
Delete: Delete Delete: Delete
DeletePermissionsFailure: 'No delete permissions' DeletePermissionsFailure: 'No delete permissions'
Save: Save Save: Save
Saved: 'Saved %s %s'
Deleted: 'Deleted %s %s'
GridFieldItemEditView.ss: GridFieldItemEditView.ss:
'Go back': 'Go back' 'Go back': 'Go back'
Group: Group: