From aa9ef186cb93dc06e5d5b31ad270f877fa7f74bf Mon Sep 17 00:00:00 2001
From: Dick van der Heiden <d.vanderheiden@vdhicts.nl>
Date: Sat, 21 Jan 2023 11:38:47 +0100
Subject: [PATCH 1/2] Support Laravel 9 location of language files

---
 README.md                                                    | 2 +-
 src/UFirst/LangImportExport/Console/ImportFromCsvCommand.php | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 44255bd..ad5d817 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ navigation.tips.play,"Autoplay the slide show"
 Installation
 ------------
 
-### Laravel 8.* and above
+### Laravel 9.* and above
 
 ```bash
 composer require ufirst/lang-import-export:^8.1.0
diff --git a/src/UFirst/LangImportExport/Console/ImportFromCsvCommand.php b/src/UFirst/LangImportExport/Console/ImportFromCsvCommand.php
index 9d66934..4f99e94 100644
--- a/src/UFirst/LangImportExport/Console/ImportFromCsvCommand.php
+++ b/src/UFirst/LangImportExport/Console/ImportFromCsvCommand.php
@@ -133,11 +133,14 @@ private function writeLangList($languages, $new_translations, $should_merge_tran
 				}
 				$header = "<?php\n\nreturn ";
 				$language_dir = base_path("resources/lang/{$locale}");
+                if (! file_exists($language_dir) && file_exists(base_path("lang/{$locale}"))) {
+                    $language_dir = base_path("lang/{$locale}");
+                }
 				if (!is_writable($language_dir)) {
 					$this->error("Language directory $language_dir does not exist or is not writeable. Skipping");
 					continue;
 				}
-				$language_file = base_path("resources/lang/{$locale}/{$group}.php");
+				$language_file = $language_dir . "/{$group}.php";
 				if (!is_writable($language_file)) {
 					$this->info("Creating language file: $language_file");
 					touch($language_file);

From e94c33e3c3439508c8690729c3bcd120fdeaf135 Mon Sep 17 00:00:00 2001
From: Dick van der Heiden <d.vanderheiden@vdhicts.nl>
Date: Sat, 21 Jan 2023 11:40:08 +0100
Subject: [PATCH 2/2] Revert readme change

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ad5d817..44255bd 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ navigation.tips.play,"Autoplay the slide show"
 Installation
 ------------
 
-### Laravel 9.* and above
+### Laravel 8.* and above
 
 ```bash
 composer require ufirst/lang-import-export:^8.1.0