Merge branch 'master' of https:/bestmomo/laravel-artisan-…

…language
bestmomo · Oct 3, 2019 · 05236c0 · 05236c0
2 parents 8de477d + 1481dcc
commit 05236c0
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/Commands/LanguageBase.php b/src/Commands/LanguageBase.php
@@ -47,12 +47,13 @@ protected function getStrings()
  {
  return collect([
  $this->filesystem->allFiles(app_path()),
- $this->filesystem->allFiles(resource_path('views'))
+ $this->filesystem->allFiles(resource_path('views')),
+ $this->filesystem->allFiles(resource_path('js'))
  ])
  ->collapse()
  ->map(function (SplFileInfo $item) {
  preg_match_all(
- '/(@lang|__)\s*(\(\s*[\'"])([^$]*)([\'"]\s*\))/U',
+ '/(@lang|__|\$t|\$tc)\s*(\(\s*[\'"])([^$]*[^.])([\'"].*)\)*/U',
  $item->getContents(),
  $out,
  PREG_PATTERN_ORDER);