Merge pull request #242 from briedis/vuejs-utf8-fix

Fix UTF-8 handling for VueJs scanner.

Author: Oscar Otero

src/Extractors/VueJs.php

@@ -165,7 +165,10 @@ protected static function convertHtmlToDom($html)
         $dom = new DOMDocument;
 
         libxml_use_internal_errors(true);
-        $dom->loadHTML($html);
+
+        // Prepend xml encoding so DOMDocument document handles UTF8 correctly.
+        // Assuming that vue template files will not have any xml encoding tags, because duplicate tags may be ignored.
+        $dom->loadHTML('<?xml encoding="utf-8"?>' . $html);
 
         libxml_clear_errors();
 

tests/AssetsTest.php

@@ -557,6 +557,18 @@ public function testMissingDomainScanWithOtherStringsInFile()
         self::assertCount(0, $translations);
     }
 
+    public function testVueJsUtf8Scanning()
+    {
+        $translations = new Translations();
+
+        VueJs::fromFile(static::asset('vuejs3/input.vue'), $translations);
+
+        self::assertCount(2, $translations);
+
+        self::assertNotFalse($translations->find('', 'Let’s test ā ūtf8 štriņģ 😎️'));
+        self::assertNotFalse($translations->find('', 'We’re happy to have you here, 愛'));
+    }
+
     public function testXliffUnitIds()
     {
         $translations = static::get('xliff/Xliff', 'Xliff', ['unitid_as_id' => true]);

tests/assets/vuejs3/input.vue

@@ -0,0 +1,13 @@
+<template>
+    {{ __('Let’s test ā ūtf8 štriņģ 😎️') }}
+</template>
+
+<script>
+    export default {
+        computed: {
+            buttonText() {
+                return __('We’re happy to have you here, 愛');
+            }
+        },
+    }
+</script>