Skip to content

Commit

Permalink
[BUGFIX] Solved empty $fileRow variable
Browse files Browse the repository at this point in the history
  • Loading branch information
lewisvoncken authored Nov 5, 2020
1 parent 24c2166 commit 91c8747
Showing 1 changed file with 14 additions and 12 deletions.
26 changes: 14 additions & 12 deletions Module/I18n/Parser/Adapter/Js.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,22 @@ protected function _parse()
while (!feof($fileHandle)) {
$lineNumber++;
$fileRow = fgets($fileHandle, 4096);
$results = [];
preg_match_all('/mage\.__\(\s*([\'"])(.*?[^\\\])\1.*?[),]/', $fileRow, $results, PREG_SET_ORDER);
for ($i = 0; $i < count($results); $i++) {
if (isset($results[$i][2])) {
$quote = $results[$i][1];
$this->_addPhrase($quote . $results[$i][2] . $quote, $lineNumber);
if ($fileRow) {
$results = [];
preg_match_all('/mage\.__\(\s*([\'"])(.*?[^\\\])\1.*?[),]/', $fileRow, $results, PREG_SET_ORDER);
for ($i = 0; $i < count($results); $i++) {
if (isset($results[$i][2])) {
$quote = $results[$i][1];
$this->_addPhrase($quote . $results[$i][2] . $quote, $lineNumber);
}
}
}

preg_match_all('/\\$t\(\s*([\'"])(.*?[^\\\])\1.*?[),]/', $fileRow, $results, PREG_SET_ORDER);
for ($i = 0; $i < count($results); $i++) {
if (isset($results[$i][2])) {
$quote = $results[$i][1];
$this->_addPhrase($quote . $results[$i][2] . $quote, $lineNumber);
preg_match_all('/\\$t\(\s*([\'"])(.*?[^\\\])\1.*?[),]/', $fileRow, $results, PREG_SET_ORDER);
for ($i = 0; $i < count($results); $i++) {
if (isset($results[$i][2])) {
$quote = $results[$i][1];
$this->_addPhrase($quote . $results[$i][2] . $quote, $lineNumber);
}
}
}
}
Expand Down

0 comments on commit 91c8747

Please sign in to comment.