adjust strings in the whole array

martinlindhe · Nov 9, 2015 · aac9136 · aac9136
1 parent 18635f6
commit aac9136
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 17 deletions.
diff --git a/src/Generator.php b/src/Generator.php
@@ -45,19 +45,29 @@ private function allocateLocaleArray($path)
             if (!$fileinfo->isDot()) {
                 $noExt = $this->removeExtension($fileinfo->getFilename());
                 $tmp = include($path . '/' . $fileinfo->getFilename());
-                $res = [];
 
-                foreach ($tmp as $key => $val) {
-                    $res[$key] = $this->adjustString($val);
-                }
-
-                $data[$noExt] = $res;
+                $data[$noExt] = $this->adjustArray($tmp);
             }
         }
 
         return $data;
     }
 
+    private function adjustArray(array $arr)
+    {
+        $res = [];
+
+        foreach ($arr as $key => $val) {
+            if (is_string($val)) {
+                $res[$key] = $this->adjustString($val);
+            } else {
+                $res[$key] = $this->adjustArray($val);
+            }
+        }
+
+        return $res;
+    }
+
     /**
      * Turn Laravel style ":link" into vue-i18n style "{link}"
      * @param string $s

diff --git a/tests/GenerateTest.php b/tests/GenerateTest.php
@@ -94,11 +94,9 @@ function testNamed()
             'en' => [
                 'help' => [
                     'yes' => 'see :link y :lonk',
-                ]
-            ],
-            'sv' => [
-                'help' => [
-                    'yes' => 'se :lonk a :link',
+                    'no' => [
+                        'one' => 'see :link',
+                    ]
                 ]
             ]
         ];
@@ -109,12 +107,10 @@ function testNamed()
             'export default {' . PHP_EOL
             . '    "en": {' . PHP_EOL
             . '        "help": {' . PHP_EOL
-            . '            "yes": "see {link} y {lonk}"' . PHP_EOL
-            . '        }' . PHP_EOL
-            . '    },' . PHP_EOL
-            . '    "sv": {' . PHP_EOL
-            . '        "help": {' . PHP_EOL
-            . '            "yes": "se {lonk} a {link}"' . PHP_EOL
+            . '            "yes": "see {link} y {lonk}",' . PHP_EOL
+            . '            "no": {' . PHP_EOL
+            . '                "one": "see {link}"' . PHP_EOL
+            . '            }' . PHP_EOL
             . '        }' . PHP_EOL
             . '    }' . PHP_EOL
             . '}' . PHP_EOL,