Fix the import of subfolders on linux (#121)

* Fix the import of subfolders on linux Addresses #87 * Support more than 1 nesting * Consistently manage the subgroup
barryvdh · Aug 17, 2016 · 4e70c98 · 4e70c98
1 parent be4c04b
commit 4e70c98
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 19 deletions.
diff --git a/src/Controller.php b/src/Controller.php
@@ -50,12 +50,10 @@ public function getIndex($group = null)
             ->with('deleteEnabled', $this->manager->getConfig('delete_enabled'));
     }
 
-    public function getView($group, $sub_group = null)
+    public function getView()
     {
-        if ($sub_group) {
-            return $this->getIndex($group.'/'.$sub_group);
-        }
-
+        $groups = func_get_args();
+        $group = implode('/', $groups);
         return $this->getIndex($group);
     }
 
@@ -70,13 +68,13 @@ protected function loadLocales()
         return array_unique($locales);
     }
 
-    public function postAdd(Request $request, $group, $sub_group = null)
+    public function postAdd(Request $request)
     {
         $keys = explode("\n", $request->get('keys'));
 
-        if ($sub_group) {
-            $group = $group . "/" . $sub_group;
-        }
+        $groups = func_get_args();
+        array_shift($groups); // remove the $request
+        $group = implode('/', $groups);
 
         foreach($keys as $key){
             $key = trim($key);
@@ -87,16 +85,19 @@ public function postAdd(Request $request, $group, $sub_group = null)
         return redirect()->back();
     }
 
-    public function postEdit(Request $request, $group, $sub_group = null)
+    public function postEdit(Request $request, $group)
     {
         if(!in_array($group, $this->manager->getConfig('exclude_groups'))) {
+            $groups = func_get_args();
+            array_shift($groups); // remove the $request
+            $group = implode('/', $groups);
             $name = $request->get('name');
             $value = $request->get('value');
 
             list($locale, $key) = explode('|', $name, 2);
             $translation = Translation::firstOrNew([
                 'locale' => $locale,
-                'group' => $sub_group ? $group . "/" . $sub_group: $group,
+                'group' => $group,
                 'key' => $key,
             ]);
             $translation->value = (string) $value ?: null;
@@ -106,8 +107,11 @@ public function postEdit(Request $request, $group, $sub_group = null)
         }
     }
 
-    public function postDelete($group, $key, $sub_group = null)
+    public function postDelete()
     {
+        $groups = func_get_args();
+        $key = array_pop($groups); // the last arg is the key
+        $group = implode('/', $groups);
         if(!in_array($group, $this->manager->getConfig('exclude_groups')) && $this->manager->getConfig('delete_enabled')) {
             Translation::where('group', $group)->where('key', $key)->delete();
             return ['status' => 'ok'];
@@ -129,13 +133,11 @@ public function postFind()
         return ['status' => 'ok', 'counter' => (int) $numFound];
     }
 
-    public function postPublish($group, $sub_group = null)
+    public function postPublish()
     {
-        if ($sub_group) {
-            $this->manager->exportTranslations($group.'/'.$sub_group);
-        } else {
-            $this->manager->exportTranslations($group);
-        }
+        $groups = func_get_args();
+        $group = implode('/', $groups);
+        $this->manager->exportTranslations($group);
 
         return ['status' => 'ok'];
     }

diff --git a/src/Manager.php b/src/Manager.php
@@ -52,7 +52,7 @@ public function importTranslations($replace = false)
                     continue;
                 }
 
-                $subLangPath = str_replace($langPath . "\\", "", $info['dirname']);
+                $subLangPath = str_replace($langPath . DIRECTORY_SEPARATOR, "", $info['dirname']);
                 if ($subLangPath != $langPath) {
                     $group = $subLangPath . "/" . $group;
                 }