Fixed javascript parser #187

Author: oscarotero

CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 Previous releases are documented in [github releases](https://github.com/oscarotero/Gettext/releases)
 
+## [4.6.1] - 2018-08-27
+
+### Fixed
+
+- VueJS DOM parsing [#188]
+- Javascript parser was unable to extract some functions [#187]
+
 ## [4.6.0] - 2018-06-26
 
 ### Added
@@ -93,6 +100,8 @@ Previous releases are documented in [github releases](https://github.com/oscarot
 
 - Fixed a bug related with the javascript source extraction with single quotes
 
+[#188]: https://github.com/oscarotero/Gettext/issues/188
+[#187]: https://github.com/oscarotero/Gettext/issues/187
 [#178]: https://github.com/oscarotero/Gettext/issues/178
 [#182]: https://github.com/oscarotero/Gettext/issues/182
 [#177]: https://github.com/oscarotero/Gettext/issues/177
@@ -112,6 +121,7 @@ Previous releases are documented in [github releases](https://github.com/oscarot
 [#145]: https://github.com/oscarotero/Gettext/issues/145
 [#146]: https://github.com/oscarotero/Gettext/issues/146
 
+[4.6.1]: https://github.com/oscarotero/Gettext/compare/v4.6.0...v4.6.1
 [4.6.0]: https://github.com/oscarotero/Gettext/compare/v4.5.0...v4.6.0
 [4.5.0]: https://github.com/oscarotero/Gettext/compare/v4.4.4...v4.5.0
 [4.4.4]: https://github.com/oscarotero/Gettext/compare/v4.4.3...v4.4.4

src/Utils/JsFunctionsScanner.php

@@ -165,6 +165,7 @@ public function getFunctions(array $constants = [])
                             break;
 
                         default:
+                            $buffer = '';
                             continue 3;
                     }
                     break;

tests/AssetsTest.php

@@ -232,7 +232,7 @@ public function testJsCode()
     public function testJs2Code()
     {
         $translations = static::get('jscode2/input', 'JsCode');
-        $countTranslations = 3;
+        $countTranslations = 4;
         $countTranslated = 0;
         $countHeaders = 8;
 

tests/assets/jscode2/Csv.csv

@@ -10,3 +10,4 @@ Report-Msgid-Bugs-To:
 ,"some message",
 "some context","some message in a context",
 ,"%s message",
+,"my translate 3",

tests/assets/jscode2/CsvDictionary.csv

@@ -1,3 +1,4 @@
 "some message",
 "some message in a context",
 "%s message",
+"my translate 3",

tests/assets/jscode2/Jed.json

@@ -13,6 +13,9 @@
         ],
         "%s message": [
             ""
+        ],
+        "my translate 3": [
+            ""
         ]
     }
 }

tests/assets/jscode2/Json.json

@@ -11,6 +11,9 @@
             ],
             "%s message": [
                 ""
+            ],
+            "my translate 3": [
+                ""
             ]
         },
         "some context": {

tests/assets/jscode2/JsonDictionary.json

@@ -1,5 +1,6 @@
 {
     "some message": "",
     "some message in a context": "",
-    "%s message": ""
+    "%s message": "",
+    "my translate 3": ""
 }

tests/assets/jscode2/PhpArray.php

@@ -25,6 +25,10 @@
       array (
         0 => '',
       ),
+      'my translate 3' => 
+      array (
+        0 => '',
+      ),
     ),
     'some context' => 
     array (

tests/assets/jscode2/Po.po

@@ -22,3 +22,7 @@ msgstr ""
 msgid "%s message"
 msgid_plural "%s messages"
 msgstr[0] ""
+
+#: ./tests/assets/jscode2/input.js:8
+msgid "my translate 3"
+msgstr ""