From fc11a38457a7c175065418e33b5c0fec1b4eab0b Mon Sep 17 00:00:00 2001
From: Peter Papp <peterpapp@makingcg.com>
Date: Sat, 17 Apr 2021 10:12:26 +0200
Subject: [PATCH] language fixes

---
 app/Http/helpers.php                            | 14 ++++++++++++--
 resources/js/views/Admin/Languages/Language.vue |  4 ++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/Http/helpers.php b/app/Http/helpers.php
index 21aee097..7142137f 100644
--- a/app/Http/helpers.php
+++ b/app/Http/helpers.php
@@ -10,6 +10,7 @@ use App\Models\LanguageTranslation;
 use ByteUnits\Metric;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\QueryException;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
@@ -851,11 +852,20 @@ function __t($key, $values = null)
 {
     // Get current locale
     $locale = cache()->rememberForever('language', function () {
-        return get_setting('language') ?? 'en';
+        try {
+            return get_setting('language') ?? 'en';
+        } catch (QueryException $e) {
+            return 'en';
+        }
     });
 
+    // Get language strings
     $strings = cache()->rememberForever("language-translations-$locale", function () use ($locale) {
-        return Language::whereLocale($locale)->first()->languageTranslations ?? get_default_language_translations();
+        try {
+            return Language::whereLocale($locale)->first()->languageTranslations ?? get_default_language_translations();
+        } catch (QueryException $e) {
+            return get_default_language_translations();
+        }
     });
 
     // Find the string by key
diff --git a/resources/js/views/Admin/Languages/Language.vue b/resources/js/views/Admin/Languages/Language.vue
index 078a76b9..26b0fd7a 100644
--- a/resources/js/views/Admin/Languages/Language.vue
+++ b/resources/js/views/Admin/Languages/Language.vue
@@ -386,7 +386,7 @@
         }
 
         .languages-wrapper {
-            margin-top: 0px;
+            margin-top: 0;
         }
     }
 }
@@ -430,7 +430,7 @@
 @media only screen and (max-width: 1024px) {
 
     .search-bar-wrapper {
-        top: 15px;
+        top: 58px;
         z-index: 7;
     }
 }