tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-09-06 09:41:12 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #741 from mateusz/rollback-messages

Browse Source 
Update doRollback messages to work well with the new reverts.
This commit is contained in:
Sean Harvey 2013-05-15 16:11:58 -07:00
commit 38c025f8ba
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
code/controllers/CMSMain.php
View File

@ -1092,15 +1092,14 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
if($version) { if($version) {
$record->doRollbackTo($version); $record->doRollbackTo($version);
$message = _t( $message = _t(
'CMSMain.ROLLEDBACKVERSION', 'CMSMain.ROLLEDBACKVERSIONv2',
"Rolled back to version #%d. New version number is #%d", "Rolled back to version #%d.",
array('version' => $data['Version'], 'versionnew' => $record->Version) array('version' => $data['Version'])
); );
} else { } else {
$record->doRollbackTo('Live'); $record->doRollbackTo('Live');
$message = _t( $message = _t(
'CMSMain.ROLLEDBACKPUB',"Rolled back to published version. New version number is #{version}", 'CMSMain.ROLLEDBACKPUBv2',"Rolled back to published version."
array('version' => $record->Version)
); );
} }

4
lang/en.yml
View File

@ -101,8 +101,8 @@ en:
RESTORE: Restore RESTORE: Restore
RESTORED: 'Restored ''{title}'' successfully' RESTORED: 'Restored ''{title}'' successfully'
ROLLBACK: 'Roll back to this version' ROLLBACK: 'Roll back to this version'
ROLLEDBACKPUB: 'Rolled back to published version. New version number is #{version}' ROLLEDBACKPUBv2: 'Rolled back to published version.'
ROLLEDBACKVERSION: 'Rolled back to version #%d. New version number is #%d' ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.'
SAVE: Save SAVE: Save
SAVEDRAFT: 'Save Draft' SAVEDRAFT: 'Save Draft'
TabContent: Content TabContent: Content