Merge branch 'develop' into feature/es6_revamp

CHANGELOG.md

@@ -1,3 +1,9 @@
+# v1.0.9
+## 02/11/2016
+
+1. [](#bugfix)
+    * Fix language translation files
+
 # v1.0.8
 ## 02/05/2016
 

admin.php

@@ -540,15 +540,6 @@ class AdminPlugin extends Plugin
             throw new \RuntimeException('One of the required plugins is missing or not enabled');
         }
 
-        // Double check we have system.yaml and site.yaml
-        $config_files[] = $this->grav['locator']->findResource('user://config') . '/system.yaml';
-        $config_files[] = $this->grav['locator']->findResource('user://config') . '/site.yaml';
-        foreach ($config_files as $config_file) {
-            if (!file_exists($config_file)) {
-                touch($config_file);
-            }
-        }
-
         // Initialize Admin Language if needed
         /** @var Language $language */
         $language = $this->grav['language'];
@@ -576,6 +567,15 @@ class AdminPlugin extends Plugin
         // And store the class into DI container.
         $this->grav['admin'] = $this->admin;
 
+        // Double check we have system.yam, site.yaml etc
+        $config_path = $this->grav['locator']->findResource('user://config');
+        foreach ($this->admin->configurations() as $config_file) {
+            $config_file = "{$config_path}/{$config_file}.yaml";
+            if (!file_exists($config_file)) {
+                touch($config_file);
+            }
+        }
+
         // Get theme for admin
         $this->theme = $this->config->get('plugins.admin.theme', 'grav');
 

blueprints.yaml

@@ -1,5 +1,5 @@
 name: Admin Panel
-version: 1.0.8
+version: 1.0.9
 description: Adds an advanced administration panel to manage your site
 icon: empire
 author:

classes/controller.php

@@ -22,6 +22,10 @@ use RocketTheme\Toolbox\File\JsonFile;
 use Symfony\Component\Yaml\Exception\ParseException;
 use Symfony\Component\Yaml\Yaml;
 
+/**
+ * Class AdminController
+ * @package Grav\Plugin
+ */
 class AdminController
 {
     /**
@@ -125,7 +129,7 @@ class AdminController
 
         if (method_exists($this, $method)) {
             try {
-                $success = call_user_func(array($this, $method));
+                $success = call_user_func([$this, $method]);
             } catch (\RuntimeException $e) {
                 $success = true;
                 $this->admin->setMessage($e->getMessage(), 'error');
@@ -474,7 +478,7 @@ class AdminController
 
         if (count($flags)) {
             // Filter by state
-            $pageStates = array('modular', 'nonmodular', 'visible', 'nonvisible', 'routable', 'nonroutable', 'published', 'nonpublished');
+            $pageStates = ['modular', 'nonmodular', 'visible', 'nonvisible', 'routable', 'nonroutable', 'published', 'nonpublished'];
 
             if (count(array_intersect($pageStates, $flags)) > 0) {
                 if (in_array('modular', $flags))
@@ -573,7 +577,7 @@ class AdminController
             return false;
         }
 
-        $media_list = array();
+        $media_list = [];
         foreach ($page->media()->all() as $name => $media) {
             $media_list[$name] = ['url' => $media->cropZoom(150, 100)->url(), 'size' => $media->get('size')];
         }
@@ -772,11 +776,11 @@ class AdminController
         }
 
         // Filter value and save it.
-        $this->post = array('enabled' => true);
+        $this->post = ['enabled' => true];
         $obj = $this->prepareData();
         $obj->save();
 
-        $this->post = array('_redirect' => 'plugins');
+        $this->post = ['_redirect' => 'plugins'];
         $this->admin->setMessage($this->admin->translate('PLUGIN_ADMIN.SUCCESSFULLY_ENABLED_PLUGIN'), 'info');
 
         return true;
@@ -951,7 +955,7 @@ class AdminController
                 $this->admin->setMessage($this->admin->translate('PLUGIN_ADMIN.INSTALLATION_FAILED'), 'error');
             }
 
-            $this->post = array('_redirect' => $this->view . '/' . $this->route);
+            $this->post = ['_redirect' => $this->view . '/' . $this->route];
         }
 
         return true;
@@ -993,7 +997,6 @@ class AdminController
      */
     private function cleanFilesData($key, $file)
     {
-        $config  = $this->grav['config'];
         $blueprint = isset($this->items['fields'][$key]['files']) ? $this->items['fields'][$key]['files'] : [];
 
         /** @var Page $page */
@@ -1059,7 +1062,7 @@ class AdminController
     private function match_in_array($needle, $haystack)
     {
         foreach ((array)$haystack as $item) {
-            if (true == preg_match("#^" . strtr(preg_quote($item, '#'), array('\*' => '.*', '\?' => '.')) . "$#i", $needle)) {
+            if (true == preg_match("#^" . strtr(preg_quote($item, '#'), ['\*' => '.*', '\?' => '.']) . "$#i", $needle)) {
                 return true;
             }
         }
@@ -1126,6 +1129,7 @@ class AdminController
         }
 
         Folder::mkdir($path . '/' . $orderOfNewFolder . '.' . $data['folder']);
+        Cache::clearCache('standard');
 
         $this->admin->setMessage($this->admin->translate('PLUGIN_ADMIN.SUCCESSFULLY_SAVED'), 'info');
 
@@ -1137,8 +1141,9 @@ class AdminController
         return true;
     }
 
-    /*
+    /**
      * @param string $frontmatter
+     *
      * @return bool
      */
     public function checkValidFrontmatter($frontmatter)
@@ -1359,7 +1364,6 @@ class AdminController
         try {
             /** @var Pages $pages */
             $pages = $this->grav['pages'];
-            $data = $this->post;
 
             // And then get the current page.
             $page = $this->admin->page(true);
@@ -1435,9 +1439,6 @@ class AdminController
             return false;
         }
 
-        /** @var Uri $uri */
-        $uri = $this->grav['uri'];
-
         try {
             $page = $this->admin->page();
 
@@ -1447,8 +1448,7 @@ class AdminController
                 Folder::delete($page->path());
             }
 
-
+            Cache::clearCache('standard');
-            $results = Cache::clearCache('standard');
 
             // Set redirect to either referrer or pages list.
             $redirect = 'pages';

languages/cs.yaml

@@ -1,4 +1,3 @@
----
 PLUGIN_ADMIN:
   ADMIN_BETA_MSG: Jedná se o beta verzi! V ostrém provozu používejte pouze na vlastní nebezpečí...
   ADMIN_REPORT_ISSUE: Objevili jste problém? Nahlaste ho, prosím, na GitHub.

languages/cy.yaml

@@ -1,4 +1,3 @@
----
 PLUGIN_ADMIN:
   ADMIN_BETA_MSG: Mae hwn yn fersiwn beta! Defnyddio hwn yn cynhyrchu ar risg eich hun...
   ADMIN_REPORT_ISSUE: Canfod problem? Rhowch wybod ar GitHub.

languages/de.yaml

@@ -1,4 +1,3 @@
----
 PLUGIN_ADMIN:
   ADMIN_BETA_MSG: Dies ist eine Beta-Version! Benutzung auf eigene Gefahr...
   ADMIN_REPORT_ISSUE: Fehler gefunden? Bitte melden Sie ihn auf GitHub.

languages/es.yaml

@@ -1,4 +1,3 @@
----
 PLUGIN_ADMIN:
   ADMIN_BETA_MSG: ¡Ésta es una versión Beta! Utilízala bajo tu propio riesgo...
   ADMIN_REPORT_ISSUE: ¿Encontraste algún problema de funcionamiento? Por favor, repórtalo en GitHub.

languages/fi.yaml

@@ -1,4 +1,3 @@
----
 PLUGIN_ADMIN:
   ADMIN_BETA_MSG: Tämä on beta versio! Käytä tuotannossa omalla vastuulla...
   ADMIN_REPORT_ISSUE: Löysit virheen tai puutteen? Ilmoita siitä Github-palveluun.

languages/fr.yaml

@@ -1,4 +1,3 @@
----
 PLUGIN_ADMIN:
   ADMIN_BETA_MSG: Ceci est une version bêta ! Utilisez-là en production à vos risques et périls...
   ADMIN_REPORT_ISSUE: Vous avez rencontré une anomalie ? Veuillez la signaler sur GitHub.

languages/hr.yaml

@@ -1,4 +1,3 @@
----
 PLUGIN_ADMIN:
   ADMIN_BETA_MSG: Ovo je Beta izdanje! Koristite u produkciji na vlastiti rizik...
   ADMIN_REPORT_ISSUE: Pronašli ste grešku? Molimo Vas da prijavite na GitHub.

languages/hu.yaml

@@ -1,4 +1,3 @@
----
 PLUGIN_ADMIN:
   ADMIN_BETA_MSG: Ez egy béta kiadás! Éles környezetben csak saját felelősségre használd...
   ADMIN_REPORT_ISSUE: Találtál egy hibát? Kérlek jelezd a GitHub-on.

languages/it.yaml

@@ -1,4 +1,3 @@
----
 PLUGIN_ADMIN:
   ADMIN_BETA_MSG: Questa è una versione beta! Usare in produzione a proprio rischio e pericolo…
   ADMIN_REPORT_ISSUE: Trovato un problema? Per favore, apri un ticket su GitHub

languages/ja.yaml

@@ -1,4 +1,3 @@
----
 PLUGIN_ADMIN:
   ADMIN_BETA_MSG: これはベータリリースです。稼働中サイトでは、自己責任においてご利用ください。
   ADMIN_REPORT_ISSUE: 問題を見つけた場合は、GitHub にてご報告をお願いします。

languages/lt.yaml

@@ -1,4 +1,3 @@
----
 PLUGIN_ADMIN:
   MANAGE_PAGES: Tvarkyti puslapius
   PAGES: Puslapiai

languages/nl.yaml

@@ -1,4 +1,3 @@
----
 PLUGIN_ADMIN:
   ADMIN_BETA_MSG: Dit is een betaversie! Gebruik op een live site is voor eigen risico...
   ADMIN_REPORT_ISSUE: Kom je een probleem tegen? Meld het op GitHub.

languages/no.yaml

@@ -1,4 +1,3 @@
----
 PLUGIN_ADMIN:
   ADMIN_BETA_MSG: Dette er en betaversjon! Bruk denne i produksjon på egen risiko...
   ADMIN_REPORT_ISSUE: Oppdaget et problem? Vennligst rapport det på GitHub.

languages/pl.yaml

@@ -1,4 +1,3 @@
----
 PLUGIN_ADMIN:
   ADMIN_BETA_MSG: To jest wersja Beta! Używasz tego w produkcji na własne ryzyko...
   ADMIN_REPORT_ISSUE: Znalazłeś błąd? Zgłoś to na GitHub.

languages/pt.yaml

@@ -1,4 +1,3 @@
----
 PLUGIN_ADMIN:
   ADMIN_BETA_MSG: Esta é uma versão Beta! Use por sua conta em risco...
   ADMIN_REPORT_ISSUE: Um problema foi encontrado? Por favor, reporte no GitHub.

languages/ru.yaml

@@ -1,4 +1,3 @@
----
 PLUGIN_ADMIN:
   ADMIN_BETA_MSG: Это бета-релиз! Вы используете это расширение на свой страх и риск...
   ADMIN_REPORT_ISSUE: Нашли ошибку? Пожалуйста, сообщите об этом на GitHub.

languages/sv.yaml

@@ -1,4 +1,3 @@
----
 PLUGIN_ADMIN:
   ADMIN_BETA_MSG: Detta är en betaversion! Använda detta i produktion på egen risk...
   ADMIN_REPORT_ISSUE: Hittade ett fel? Vänligen rapportera det på GitHub.

languages/tlh.yaml

@@ -1,4 +1,3 @@
----
 PLUGIN_ADMIN:
   LOGIN_BTN_FORGOT: lIj
   BACK: chap

languages/tr.yaml

@@ -1,4 +1,3 @@
----
 PLUGIN_ADMIN:
   LOGIN_BTN: Giriş Yap
   LOGIN_BTN_FORGOT: Şifremi Unuttum

languages/uk.yaml

@@ -1,4 +1,3 @@
----
 PLUGIN_ADMIN:
   LOGIN_BTN: Увійти
   LOGIN_BTN_FORGOT: Забув

languages/zh.yaml

@@ -1,4 +1,3 @@
----
 PLUGIN_ADMIN:
   ADMIN_BETA_MSG: 這是 Beta 版！如果要用在營運中請自行承擔風險…
   ADMIN_REPORT_ISSUE: 發現有問題？請回報到 GitHub 上。