Merge pull request zencart#6474 from lat9/zc-plugin-language-default

`zc_plugin`: Enable installer language default
drbyte · May 24, 2024 · 8da6f3c · 8da6f3c
2 parents f520793 + 9a37abb
commit 8da6f3c
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/includes/classes/PluginSupport/BasePluginInstaller.php b/includes/classes/PluginSupport/BasePluginInstaller.php
@@ -94,13 +94,22 @@ protected function setPluginVersionStatus($pluginKey, $version, $status)
         $this->dbConn->execute($sql);
     }
 
-
     protected function loadInstallerLanguageFile($file)
     {
         $lng = $_SESSION['language'];
         $filename = $this->pluginDir . '/Installer/languages/' . $lng . '/' . $file;
         if (file_exists($filename)) {
-            require_once($filename);
+            require_once $filename;
+            return;
+        }
+
+        if ($lng === 'english') {
+            return;
+        }
+
+        $filename = $this->pluginDir . '/Installer/languages/english/' . $file;
+        if (file_exists($filename)) {
+            require_once $filename;
         }
     }