Merge pull request #67 from olelis/master

rmariuzzo · web-flow · commit 6efa777d2312 · 2016-11-13T15:55:40.000-04:00
Fixed problem with folder separator in Windows platform
diff --git a/Lang.js b/Lang.js
@@ -1 +1 @@
-Subproject commit 117a9e0559b7fca449d767f8a22c24bdc110755b
+Subproject commit 4761d5409e89a71f093be7c5ee42a17721fca019
diff --git a/lib/lang.min.js b/lib/lang.min.js
diff --git a/src/Mariuzzo/LaravelJsLocalization/Generators/LangJsGenerator.php b/src/Mariuzzo/LaravelJsLocalization/Generators/LangJsGenerator.php
@@ -103,7 +103,7 @@ protected function getMessages()
             $key = str_replace('\\', '.', $key);
             $key = str_replace('/', '.', $key);
 
-            $messages[$key] = include "${path}/${pathName}";
+            $messages[$key] = include $path.DIRECTORY_SEPARATOR.$pathName;
         }
 
         return $messages;
@@ -136,6 +136,8 @@ protected function isMessagesExcluded($filePath)
             return false;
         }
 
+        $filePath = str_replace(DIRECTORY_SEPARATOR,'/',$filePath);
+
         $localeDirSeparatorPosition = strpos($filePath, '/');
         $filePath = substr($filePath, $localeDirSeparatorPosition);
         $filePath = ltrim($filePath, '/');

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ protected function getMessages()`
`103`	`103`	`$key = str_replace('\\', '.', $key);`
`104`	`104`	`$key = str_replace('/', '.', $key);`
`105`	`105`
`106`		`- $messages[$key] = include "${path}/${pathName}";`
	`106`	`+ $messages[$key] = include $path.DIRECTORY_SEPARATOR.$pathName;`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`return $messages;`
`@@ -136,6 +136,8 @@ protected function isMessagesExcluded($filePath)`
`136`	`136`	`return false;`
`137`	`137`	`}`
`138`	`138`
	`139`	`+ $filePath = str_replace(DIRECTORY_SEPARATOR,'/',$filePath);`
	`140`	`+`
`139`	`141`	`$localeDirSeparatorPosition = strpos($filePath, '/');`
`140`	`142`	`$filePath = substr($filePath, $localeDirSeparatorPosition);`
`141`	`143`	`$filePath = ltrim($filePath, '/');`