tonyair
/
silverstripe-blog
mirror of https://github.com/silverstripe/silverstripe-blog
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '2'

This commit is contained in:
Robbie Averill 2018-02-20 11:05:54 +13:00
parent b79f3db883 fbfa5e38c1
commit 5c1cedeb98
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lang/en.yml
View File

@ -5,6 +5,7 @@ en:
PermissionFail: 'You don''t have permission to create a {class}.'
SilverStripe\Blog\Forms\GridField\GridFieldBlogPostState:
Draft: 'Saved as Draft on {date}'
Modified: 'Modified'
Published: 'Published on {date}'
Timer: 'Publish at {date}'
SilverStripe\Blog\Model:

2
src/Forms/GridField/GridFieldBlogPostState.php
View File

@ -23,7 +23,7 @@ class GridFieldBlogPostState extends GridFieldSiteTreeState
$modifiedLabel = '';
if ($record->isModifiedOnStage) {
$modifiedLabel = '<span class="modified">' . _t(__CLASS__ . '.Modified') . '</span>';
$modifiedLabel = '<span class="modified">' . _t(__CLASS__ . '.Modified', 'Modified') . '</span>';
}
if (!$record->isPublished()) {

2
src/Model/BlogController.php
View File

@ -443,7 +443,7 @@ class BlogController extends PageController
$posts->setPageLength($pageSize);
// Set current page
$start = $this->request->getVar($posts->getPaginationGetVar());
$start = (int)$this->request->getVar($posts->getPaginationGetVar());
$posts->setPageStart($start);
return $posts;