Merge branch 'release/1.0.2'

getgrav · Dec 19, 2015 · 261001e · 261001e
2 parents f1fd89c + 331898d
commit 261001e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.0.2
+## 12/18/2015
+
+1. [](#bugfix)
+    * Fixed issue with user edit page causing error due to individual language files
+
 # v1.0.1
 ## 12/18/2015
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Admin Panel
-version: 1.0.1
+version: 1.0.2
 description: Adds an advanced administration panel to manage your site
 icon: empire
 author:

diff --git a/classes/admin.php b/classes/admin.php
@@ -689,9 +689,19 @@ public function getPage($path)
     public static function adminLanguages()
     {
         $languages = [];
-        $lang_data = Yaml::parse(file_get_contents(__DIR__ . '/../languages.yaml'));
-        foreach ($lang_data as $lang => $values) {
+
+        $path = Grav::instance()['locator']->findResource('plugins://admin/languages');
+
+        /** @var \DirectoryIterator $directory */
+        foreach (new \DirectoryIterator($path) as $file) {
+            if ($file->isDir() || $file->isDot()) {
+                continue;
+            }
+
+            $lang = basename($file->getBasename(), '.yaml');
+
             $languages[$lang] = LanguageCodes::getNativeName($lang);
+
         }
         return $languages;
     }