Merge pull request ARCANEDEV#223 from ARCANEDEV/patch-1

Fixing the Log Levels translations
neoteknic · Jul 19, 2018 · 1b15cb8 · 1b15cb8
2 parents b40ad66 + 8490d1b
commit 1b15cb8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/src/Tables/StatsTable.php b/src/Tables/StatsTable.php
@@ -103,10 +103,8 @@ protected function prepareFooter(array $data)
      *
      * @return \Illuminate\Support\Collection
      */
-    public function totals($locale = null)
+    public function totals()
     {
-        $this->setLocale($locale);
-
         $totals = Collection::make();
 
         foreach (Arr::except($this->footer(), 'all') as $level => $count) {

diff --git a/src/Utilities/LogLevels.php b/src/Utilities/LogLevels.php
@@ -162,8 +162,6 @@ public static function all($flip = false)
      */
     public function get($key, $locale = null)
     {
-        $this->setLocale($locale);
-
-        return $this->translator->get("log-viewer::levels.$key", [], $this->getLocale());
+        return $this->translator->get("log-viewer::levels.$key", [], $locale ?: $this->getLocale());
     }
 }
diff --git a/tests/Utilities/LogLevelsTest.php b/tests/Utilities/LogLevelsTest.php
@@ -97,12 +97,8 @@ public function it_can_translate_levels_automatically()
             );
 
             $this->assertTranslatedLevels(
-                $this->app->getLocale(),
-                $this->levels->names('auto')
-            );
-
-            $this->assertTranslatedLevels(
-                $locale, $this->levels->names($locale)
+                $locale,
+                $this->levels->names($locale)
             );
         }
     }