Merge branch 'release/1.6.0'

getgrav · Apr 29, 2016 · 4b7d56c · 4b7d56c
2 parents 671a735 + 5c5310d
commit 4b7d56c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# v1.6.0
+## 04/29/2016
+
+1. [](#new)
+    * Added compatibility with Grav Admin 1.1
+1. [](#improved)
+    * Use some common translated strings in the blueprint
+
 # v1.5.0
 ## 01/06/2016
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Sitemap
-version: 1.5.0
+version: 1.6.0
 description: "Provide automatically generated **XML sitemaps** with this very useful, but simple to configure, Grav plugin."
 icon: map-marker
 author:
@@ -16,12 +16,12 @@ form:
   fields:
     enabled:
       type: toggle
-      label: Plugin status
+      label: PLUGIN_ADMIN.PLUGIN_STATUS
       highlight: 1
       default: 0
       options:
-        1: Enabled
-        0: Disabled
+        1: PLUGIN_ADMIN.ENABLED
+        0: PLUGIN_ADMIN.DISABLED
       validate:
         type: bool
 

diff --git a/sitemap.php b/sitemap.php
@@ -123,7 +123,7 @@ public function onBlueprintCreated(Event $event)
 
         /** @var Data\Blueprint $blueprint */
         $blueprint = $event['blueprint'];
-        if (!$inEvent && $blueprint->get('form.fields.tabs')) {
+        if (!$inEvent && $blueprint->get('form/fields/tabs', null, '/')) {
             $inEvent = true;
             $blueprints = new Data\Blueprints(__DIR__ . '/blueprints/');
             $extends = $blueprints->get('sitemap');