wip

fidum · Oct 6, 2023 · a5a3b8e · a5a3b8e
1 parent bf06754
commit a5a3b8e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/Commands/UnusedCommand.php b/src/Commands/UnusedCommand.php
@@ -20,11 +20,11 @@ public function handle(
         UnusedResultCollection $results,
         UnusedTranslationLinter $linter,
     ): int {
-        foreach ($linter->execute() as $lang => $namespaces) {
+        foreach ($linter->execute() as $locale => $namespaces) {
             foreach ($namespaces as $namespace => $translations) {
                 foreach ($translations as $key => $value) {
-                    if ($filters->shouldReport($lang, $namespace, $key, $value)) {
-                        $results->addUnusedLanguageKey($lang, $namespace, $key, $value);
+                    if ($filters->shouldReport($locale, $namespace, $key, $value)) {
+                        $results->addUnusedLanguageKey($locale, $namespace, $key, $value);
                     }
                 }
             }

diff --git a/src/LaravelTranslationLinterServiceProvider.php b/src/LaravelTranslationLinterServiceProvider.php
@@ -71,7 +71,7 @@ public function registeringPackage()
         $this->app->bind(UnusedResultCollectionContract::class, UnusedResultCollection::class);
         $this->app->bind(UnusedTranslationLinterContract::class, UnusedTranslationLinter::class);
         $this->app->when(UnusedTranslationLinter::class)
-            ->needs('$languages')
+            ->needs('$locales')
             ->giveConfig('translation-linter.lang.locales');
     }
 

diff --git a/src/Linters/UnusedTranslationLinter.php b/src/Linters/UnusedTranslationLinter.php
@@ -20,7 +20,7 @@ public function __construct(
         protected LanguageFileFinder $files,
         protected LanguageFileReader $translations,
         protected LanguageNamespaceFinder $namespaces,
-        protected array $languages,
+        protected array $locales,
     ) {}
 
     public function execute(): Collection
@@ -29,11 +29,11 @@ public function execute(): Collection
         $used = $this->used->execute();
         $namespaces = $this->namespaces->execute();
 
-        foreach ($this->languages as $language) {
-            $unused[$language] = [];
+        foreach ($this->locales as $locale) {
+            $unused[$locale] = [];
 
             foreach ($namespaces as $namespace => $path) {
-                $unused[$language][$namespace] = [];
+                $unused[$locale][$namespace] = [];
 
                 // TODO: Support json files
                 $files = $this->files->execute($path, ['php']);
@@ -43,7 +43,7 @@ public function execute(): Collection
                     $translations = $this->translations->execute($file);
 
                     foreach ($translations as $field => $children) {
-                        $group = $this->getLanguageKey($file, $language, $field);
+                        $group = $this->getLanguageKey($file, $locale, $field);
 
                         foreach (Arr::dot(Arr::wrap($children)) as $key => $value) {
                             $groupedKey = Str::of($group)
@@ -56,7 +56,7 @@ public function execute(): Collection
                                 ->toString();
 
                             if ($used->doesntContain($namespacedKey)) {
-                                $unused[$language][$namespace][$groupedKey] = $value;
+                                $unused[$locale][$namespace][$groupedKey] = $value;
                             }
                         }
                     }