From e87daa23619acc0cf38012e95191a380b155aedb Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Fri, 18 Dec 2015 12:29:45 -0700
Subject: [PATCH] Added support to get plugin languages from individual
 language files in `languages` folder of plugin

---
 .../Common/Service/ConfigServiceProvider.php  | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/system/src/Grav/Common/Service/ConfigServiceProvider.php b/system/src/Grav/Common/Service/ConfigServiceProvider.php
index 9efbd7465..ebb156b1a 100644
--- a/system/src/Grav/Common/Service/ConfigServiceProvider.php
+++ b/system/src/Grav/Common/Service/ConfigServiceProvider.php
@@ -108,10 +108,45 @@ class ConfigServiceProvider implements ServiceProviderInterface
             $files += (new ConfigFileFinder)->locateFiles($paths);
             $paths = $locator->findResources('plugins://');
             $files += (new ConfigFileFinder)->setBase('plugins')->locateInFolders($paths, 'languages');
+            $paths = static::pluginFolderPaths($paths, 'languages');
+            $files += (new ConfigFileFinder)->locateFiles($paths);
         }
 
         $languages = new CompiledLanguages($cache, $files, GRAV_ROOT);
 
         return $languages->name("master-{$setup->environment}")->load();
     }
+
+    /**
+     * Find specific paths in plugins
+     *
+     * @param $plugins
+     * @param $folder_path
+     * @return array
+     */
+    private static function pluginFolderPaths($plugins, $folder_path)
+    {
+        $paths = [];
+
+        foreach ($plugins as $path) {
+            $iterator = new \DirectoryIterator($path);
+
+            /** @var \DirectoryIterator $directory */
+            foreach ($iterator as $directory) {
+                if (!$directory->isDir() || $directory->isDot()) {
+                    continue;
+                }
+
+                // Path to the languages folder
+                $lang_path = $directory->getPathName() . '/' . $folder_path;
+
+                // If this folder exists, add it to the list of paths
+                if (file_exists($lang_path)) {
+                    $paths []= $lang_path;
+                }
+            }
+        }
+        return $paths;
+    }
+
 }