Merge pull request #69 from Samuell1/develop

Merge develop

components/ContentEditor.php

@@ -11,6 +11,7 @@
 class ContentEditor extends ComponentBase
 {
     public $content;
+    public $defaultFile;
     public $file;
     public $fixture;
     public $tools;
@@ -76,6 +77,7 @@ public function onRender()
         $this->additional_styles = Settings::renderCss();
         $this->renderCount = $this->page['renderCount'] += 1;
 
+        $this->defaultFile = $this->property('file');
         $this->file = $this->setFile($this->property('file'));
         $this->fixture = $this->property('fixture');
         $this->tools = $this->property('tools');
@@ -113,9 +115,11 @@ public function onSave()
 
     public function getFile()
     {
-        // if no locale file exists -> render the default, without language suffix
+
         if (Content::load($this->getTheme(), $this->file)) {
             return $this->renderContent($this->file);
+        } else if (Content::load($this->getTheme(), $this->defaultFile)) { // if no locale file exists -> render the default, without language suffix
+            return $this->renderContent($this->defaultFile);
         }
 
         return '';

updates/version.yaml

@@ -27,3 +27,7 @@
     - Fix renderCount if component using other alias name
 1.2.1:
     - Fix render __SELF__.class  in component partials
+1.2.2:
+    - Handle various storage paths for images
+1.2.3:
+    - Load default file if language file does not exists