From 64bb5b09ce3fc00a14be86c09229a1e579bfc710 Mon Sep 17 00:00:00 2001
From: Ryan Cramer <ryan@processwire.com>
Date: Wed, 15 Apr 2020 15:37:37 -0400
Subject: [PATCH] Fix issue processwire/processwire-issues#1139

---
 .../LanguageSupport/LanguageParser.php        | 46 +++++++++++--------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/wire/modules/LanguageSupport/LanguageParser.php b/wire/modules/LanguageSupport/LanguageParser.php
index 3324ab56..59043290 100644
--- a/wire/modules/LanguageSupport/LanguageParser.php
+++ b/wire/modules/LanguageSupport/LanguageParser.php
@@ -211,7 +211,7 @@ class LanguageParser extends Wire {
 			2 => array(),	// __('text', [textdomain]);
 			3 => array(),	// _x('text', 'context', [textdomain]) or $this->_x('text', 'context'); 
 			4 => array(),	// _n('singular', 'plural', $cnt, [textdomain]) or $this->_n(...); 
-			);
+		);
 
 		if(!is_file($file)) return $matches; 
 
@@ -219,30 +219,38 @@ class LanguageParser extends Wire {
 		$this->findArrayTranslations($data);
 
 		// Find $this->_('text') style matches
-		preg_match_all(	'/(>_)\(\s*' .				// $this->_( 
-				'([\'"])(.+?)(?<!\\\\)\\2' . 		// "text"
-				'\s*\)+(.*)$/m',					// and everything else
-				$data, $matches[1]); 
+		preg_match_all(	
+			'/(>_)\(\s*' . // $this->_( 
+			'([\'"])(.+?)(?<!\\\\)\\2' . // "text"
+			'\s*\)+(.*)$/m', // and everything else
+			$data, $matches[1]
+		); 
 
 		// Find __('text', textdomain) style matches
-		preg_match_all(	'/([\s.=(]__|^__)\(\s*' . 		// __(
-				'([\'"])(.+?)(?<!\\\\)\\2\s*' . 	// "text"
-				'(?:,\s*[^)]+)?\)+(.*)$/m', 		// , textdomain (optional) and everything else
-				$data, $matches[2]); 
+		preg_match_all(	
+			'/([\s.=(\\\\]__|^__)\(\s*' . // __(
+			'([\'"])(.+?)(?<!\\\\)\\2\s*' . // "text"
+			'(?:,\s*[^)]+)?\)+(.*)$/m', // , textdomain (optional) and everything else
+			$data, $matches[2]
+		); 
 
 		// Find _x('text', 'context', textdomain) or $this->_x('text', 'context') style matches
-		preg_match_all(	'/([\s.=>(]_x|^_x)\(\s*' . 		// _x( or $this->_x(
-				'([\'"])(.+?)(?<!\\\\)\\2\s*,\s*' . 	// "text", 
-				'([\'"])(.+?)(?<!\\\\)\\4\s*' . 	// "context"
-				'[^)]*\)+(.*)$/m',			// , textdomain (optional) and everything else 
-				$data, $matches[3]); 
+		preg_match_all(	
+			'/([\s.=>(\\\\]_x|^_x)\(\s*' . // _x( or $this->_x(
+			'([\'"])(.+?)(?<!\\\\)\\2\s*,\s*' . // "text", 
+			'([\'"])(.+?)(?<!\\\\)\\4\s*' . // "context"
+			'[^)]*\)+(.*)$/m', // , textdomain (optional) and everything else 
+			$data, $matches[3]
+		); 
 
 		// Find _n('singular text', 'plural text', $cnt, textdomain) or $this->_n(...) style matches
-		preg_match_all(	'/([\s.=>(]_n|^_n)\(\s*' . 		// _n( or $this->_n(
-				'([\'"])(.+?)(?<!\\\\)\\2\s*,\s*' . 	// "singular", 
-				'([\'"])(.+?)(?<!\\\\)\\4\s*,\s*' . 	// "plural", 
-				'.+?\)+(.*)$/m', 			// $count, optional textdomain, closing function parenthesis ) and rest of line
-				$data, $matches[4]); 
+		preg_match_all(	
+			'/([\s.=>(\\\\]_n|^_n)\(\s*' . // _n( or $this->_n(
+			'([\'"])(.+?)(?<!\\\\)\\2\s*,\s*' . // "singular", 
+			'([\'"])(.+?)(?<!\\\\)\\4\s*,\s*' . // "plural", 
+			'.+?\)+(.*)$/m', // $count, optional textdomain, closing function parenthesis ) and rest of line
+			$data, $matches[4]
+		); 
 
 		return $matches; 
 	}