Merge branch 'release/1.4.1'

getgrav · May 3, 2016 · e217f02 · e217f02
2 parents 3026e8f + aacd3e8
commit e217f02
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.4.1
+## 05/03/2016
+
+1. [](#bugfix)
+    * Fixed translated months
+
 # v1.4.0
 ## 01/06/2016
 

diff --git a/archives.php b/archives.php
@@ -11,11 +11,6 @@
 
 class ArchivesPlugin extends Plugin
 {
-    /**
-     * @var ArchivesPlugin
-     */
-
-
     /**
      * @return array
      */
@@ -116,7 +111,7 @@ public function onTwigSiteVariables()
         }
 
         // slice the array to the limit you want
-        $archives = array_slice($archives, 0, intval($this->config->get('plugins.archives.limit')));
+        $archives = array_slice($archives, 0, intval($this->config->get('plugins.archives.limit')), is_string(reset($archives)) ? false : true );
 
         // add the archives_start date to the twig variables
         $this->grav['twig']->twig_vars['archives_show_count'] = $this->config->get('plugins.archives.show_count');

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Archives
-version: 1.4.0
+version: 1.4.1
 description: The **Archives** plugin creates links for pages grouped by month/year
 icon: university
 author:
@@ -17,12 +17,12 @@ form:
   fields:
     enabled:
       type: toggle
-      label: Plugin status
+      label: PLUGIN_ADMIN.PLUGIN_STATUS
       highlight: 1
       default: 1
       options:
-          1: Enabled
-          0: Disabled
+          1: PLUGIN_ADMIN.ENABLED
+          0: PLUGIN_ADMIN.DISABLED
       validate:
            type: bool
 
@@ -32,8 +32,8 @@ form:
       highlight: 1
       default: 1
       options:
-        1: Enabled
-        0: Disabled
+        1: PLUGIN_ADMIN.ENABLED
+        0: PLUGIN_ADMIN.DISABLED
       validate:
         type: bool
 
@@ -56,8 +56,8 @@ form:
       highlight: 1
       default: 1
       options:
-        1: Enabled
-        0: Disabled
+        1: PLUGIN_ADMIN.ENABLED
+        0: PLUGIN_ADMIN.DISABLED
       validate:
         type: bool
 

diff --git a/templates/partials/archives.html.twig b/templates/partials/archives.html.twig
@@ -6,7 +6,7 @@
         {% if archives_show_count %}
         <span class="label">{{ items|length }}</span>
         {% endif %}
-        <span class="archive_date">{{ 'MONTHS_OF_THE_YEAR'|ta(month|date('n') -1) }} {{ month|date('Y') }}</span>
+        <span class="archive_date">{{ month }}</span>
         </a>
     </li>
 {% endfor %}