fixup! Allow vue-translator comments

nextcloud · Mar 2, 2021 · b437a95 · b437a95
1 parent 7544e13
commit b437a95
Showing 1 changed file with 10 additions and 12 deletions.
diff --git a/translations/translationtool/src/translationtool.php b/translations/translationtool/src/translationtool.php
@@ -336,12 +336,11 @@ private function createFakeFileForVueFiles() {
 				$regexMatches = preg_grep($regex, $vueSource);
 
 				foreach ($regexMatches as $lineNum => $match) {
-					// Check for comment in previous line. Either HTML or JS comment. HTML-Comments terminate with '-->', JS do not
-					if(preg_match("/\W(TRANSLATORS)\s(.+)(-->)/", $vueSource[$lineNum-1], $commentSplit)
-						|| preg_match("/\W(TRANSLATORS)\s(.+)/", $vueSource[$lineNum-1], $commentSplit)) {
-
-						// Insert comment
-						$fakeFileContent .= "// TRANSLATORS " . preg_replace('/\s+/', ' ', $commentSplit[2]) . PHP_EOL;
+					// Check for comment in previous line. Either HTML or JS comment.
+					if(preg_match("/\W(\/\/|\/\*|<!--)\s(TRANSLATORS)\s(.+)/", $vueSource[$lineNum-1], $commentSplit)) {
+						// Remove possible comment-end-tags and insert comment
+						$commentText = preg_replace('/\s*(-->|\*\/)\s*/', '', $commentSplit[3]);
+						$fakeFileContent .= "// TRANSLATORS " . preg_replace('/\s+/', ' ', $commentText) . PHP_EOL;
 					}
 
 					// Insert translation-function
@@ -360,12 +359,11 @@ private function createFakeFileForVueFiles() {
 				$regexMatches = preg_grep($regex, $vueSource);
 
 				foreach ($regexMatches as $lineNum => $match) {
-					// Check for comment in previous line. Either HTML or JS comment. HTML-Comments terminate with '-->', JS do not
-					if(preg_match("/\W(TRANSLATORS)\s(.+)(-->)/", $vueSource[$lineNum-1], $commentSplit)
-						|| preg_match("/\W(TRANSLATORS)\s(.+)/", $vueSource[$lineNum-1], $commentSplit)) {
-
-						// Insert comment
-						$fakeFileContent .= "// TRANSLATORS " . preg_replace('/\s+/', ' ', $commentSplit[2]) . PHP_EOL;
+					// Check for comment in previous line. Either HTML or JS comment.
+					if(preg_match("/\W(\/\/|\/\*|<!--)\s(TRANSLATORS)\s(.+)/", $vueSource[$lineNum-1], $commentSplit)) {
+						// Remove possible comment-end-tags and insert comment
+						$commentText = preg_replace('/\s*(-->|\*\/)\s*/', '', $commentSplit[3]);
+						$fakeFileContent .= "// TRANSLATORS " . preg_replace('/\s+/', ' ', $commentText) . PHP_EOL;
 					}
 
 					// Insert translation-function