Merge pull request #73 from Laravel-Lang/2.x

Fixed string search error
Laravel-Lang · Mar 22, 2024 · 58738a4 · 58738a4
2 parents 3716bc0 + 7649c04
commit 58738a4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/src/Services/Packages/Finder.php b/src/Services/Packages/Finder.php
@@ -14,7 +14,7 @@ class Finder
     protected array $contains = [
         '__(',
         '$t(',
-        '$fail(',
+        'fail(',
         'lang(',
         'Lang::choice(',
         'Lang::get(',

diff --git a/src/Services/Packages/Parser.php b/src/Services/Packages/Parser.php
@@ -78,7 +78,7 @@ protected function parse(string $content): void
                 continue;
             }
 
-            if ($this->isKeyName((string) $value)) {
+            if ($this->isNotTranslatable((string) $value)) {
                 continue;
             }
 
@@ -148,10 +148,23 @@ protected function subMethods(): array
             ->toArray();
     }
 
-    protected function isKeyName(string $value): bool
+    protected function isNotTranslatable(string $value): bool
     {
-        return Str::contains($value, '.')
+        return $this->isKey($value)
+            || $this->isHeader($value);
+    }
+
+    protected function isKey(string $value): bool
+    {
+        return Str::contains($value, ['.', '-', '_', ':'])
             && ! Str::contains($value, ' ')
             && $value === Str::lower($value);
     }
+
+    protected function isHeader(string $value): bool
+    {
+        return Str::contains($value, '-')
+            && ! Str::contains($value, ' ')
+            && ($value === Str::lower($value) || $value === Str::title($value));
+    }
 }