From 4739277b470f304a4146c5571c390a59263f0ed3 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 5 Dec 2022 12:42:32 +1100
Subject: [PATCH] Allow overriding the default locale in .env file

---
 app/Jobs/Util/Import.php | 2 +-
 config/app.php           | 2 +-
 lang/en/texts.php        | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php
index 1ed28640e4cc..40305dc6eb20 100644
--- a/app/Jobs/Util/Import.php
+++ b/app/Jobs/Util/Import.php
@@ -190,7 +190,7 @@ class Import implements ShouldQueue
 
     public function middleware()
     {
-        return [new WithoutOverlapping($this->company->company_key)];
+        return [new WithoutOverlapping("only_one_migration_at_a_time_ever")];
     }
 
     /**
diff --git a/config/app.php b/config/app.php
index 445a57e65d66..40e80de7fa27 100644
--- a/config/app.php
+++ b/config/app.php
@@ -81,7 +81,7 @@ return [
     |
     */
 
-    'locale' => 'en',
+    'locale' => env('DEFAULT_LOCALE', 'en'),
 
     /*
     |--------------------------------------------------------------------------
diff --git a/lang/en/texts.php b/lang/en/texts.php
index d9c66e9fedca..c55a6ec412d3 100644
--- a/lang/en/texts.php
+++ b/lang/en/texts.php
@@ -4566,9 +4566,9 @@ $LANG = array(
     'invalid_time' => 'Invalid Time',
     'signed_in_as' => 'Signed in as',
     'total_results' => 'Total results',
-    'restore_company_gateway' => 'Restore payment gateway',
-    'archive_company_gateway' => 'Archive payment gateway',
-    'delete_company_gateway' => 'Delete payment gateway',
+    'restore_company_gateway' => 'Restore gateway',
+    'archive_company_gateway' => 'Archive gateway',
+    'delete_company_gateway' => 'Delete gateway',
     'exchange_currency' => 'Exchange currency',
     'tax_amount1' => 'Tax Amount 1',
     'tax_amount2' => 'Tax Amount 2',