Merge branch 'release/1.0.5'

Author: flaviocopes

CHANGELOG.md

@@ -1,3 +1,9 @@
+# v1.0.5
+## 04/26/2016
+
+1. [](#bugfix)
+	* Default to use `.yaml` data files extension. Also check for `.txt`
+
 # v1.0.4
 ## 02/18/2016
 

README.md

@@ -63,7 +63,7 @@ form:
         - save:
             fileprefix: contact-
             dateformat: Ymd-His-u
-            extension: txt
+            extension: yaml
             body: "{% include 'forms/data.txt.twig' %}"
         - message: Thank you for your feedback!
 ---
@@ -137,12 +137,12 @@ By default, the single item view lists all the fields found in the file.
 
 ## File extension customization
 
-Usually data is saved in .txt files. You can change that per-type by setting:
+Usually data is saved in .yaml files. You can change that per-type by setting:
 
 ```yaml
 types:
   contactform:
-    file_extension: '.yml'
+    file_extension: '.txt'
 ```
 
 ## Customize the type name

blueprints.yaml

@@ -1,5 +1,5 @@
 name: Data Manager
-version: 1.0.4
+version: 1.0.5
 description: Adds an administration panel to visualize the data
 icon: database
 author:

data-manager.php

@@ -123,8 +123,12 @@ public function onPluginsInitialized()
      */
     private function getFileContentFromRoute($type, $fileRoute) {
 
-        //Single item details
-        $fileInstance = File::instance(DATA_DIR . $type . '/' . $fileRoute .  $this->config->get('plugins.data-manager.types.' . $type . '.file_extension', '.txt'));
+        //get .yaml file
+        $fileInstance = File::instance(DATA_DIR . $type . '/' . $fileRoute .  $this->config->get('plugins.data-manager.types.' . $type . '.file_extension', '.yaml'));
+
+        if (!$fileInstance->content()) { //try using .txt if not found
+            $fileInstance = File::instance(DATA_DIR . $type . '/' . $fileRoute .  $this->config->get('plugins.data-manager.types.' . $type . '.file_extension', '.txt'));
+        }
 
         if (!$fileInstance->content()) {
             //Item not found

languages.yaml

@@ -5,3 +5,11 @@ en:
     ITEMS_LIST: Items List
     ITEMS: Items
     ITEM_DETAILS: Item Details
+    
+fr:
+  PLUGIN_DATA_MANAGER:
+    DATA_MANAGER: Gestion des données
+    DATA_TYPES: Types de données
+    ITEMS_LIST: Listes des éléments
+    ITEMS: Éléments
+    ITEM_DETAILS: Détails de l'élément