Skip to content

Commit

Permalink
Merge branch '3.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
sampoyigi committed Mar 15, 2023
2 parents b15e906 + c61abcb commit 0d08f5a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 19 deletions.
23 changes: 6 additions & 17 deletions app/admin/assets/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions app/system/classes/LanguageManager.php
Expand Up @@ -115,9 +115,9 @@ public function listTranslations($sourceLines, $translationLines, $options = [])

if ($stringFilter === 'unchanged' && array_has($translationLines, $key)) continue;

if ((!is_null($sourceLine) && !is_string($sourceLine))) continue;
if (!is_null($sourceLine) && !is_string($sourceLine)) continue;

if ((!is_null($translationLine) && !is_string($translationLine))) continue;
if (!is_null($translationLine) && !is_string($translationLine)) continue;

$namespacedKey = sprintf('%s::%s.%s', $file['namespace'], $file['group'], $key);

Expand Down

0 comments on commit 0d08f5a

Please sign in to comment.