Merge branch '3'

silverstripe · Dec 6, 2018 · 9b85524 · 9b85524
2 parents 5a355f2 + 23ea092
commit 9b85524
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Model/BlogController.php b/src/Model/BlogController.php
@@ -397,9 +397,9 @@ public function getFilterDescription()
             if ($this->owner->getArchiveDay()) {
                 $date = $this->owner->getArchiveDate()->Nice();
             } elseif ($this->owner->getArchiveMonth()) {
-                $date = $this->owner->getArchiveDate()->format('F, Y');
+                $date = $this->owner->getArchiveDate()->format('MMMM, y');
             } else {
-                $date = $this->owner->getArchiveDate()->format('Y');
+                $date = $this->owner->getArchiveDate()->format('y');
             }
 
             $items[] = _t(

diff --git a/templates/SilverStripe/Blog/Model/Layout/Blog.ss b/templates/SilverStripe/Blog/Model/Layout/Blog.ss
@@ -9,9 +9,9 @@
 				<% if $ArchiveDay %>
 					$ArchiveDate.Nice
 				<% else_if $ArchiveMonth %>
-					$ArchiveDate.format('F, Y')
+					$ArchiveDate.format('MMMM, y')
 				<% else %>
-					$ArchiveDate.format('Y')
+					$ArchiveDate.format('y')
 				<% end_if %>
 			<% else_if $CurrentTag %>
 				<%t SilverStripe\\Blog\\Model\\Blog.Tag 'Tag' %>: $CurrentTag.Title