feat: pass locale to template & bump htmx to v2

The-NeXT-Project · Jun 21, 2024 · 844095e · 844095e
1 parent 611b03e
commit 844095e
Show file tree

Hide file tree

Showing 9 changed files with 106 additions and 103 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ NeXT Panel is a multipurpose proxy service management system designed for Shadow
 - Refactored store system, support billing modes including but not limited to annual/monthly, pay-as-you-go, access type billing, etc.
 - Refactored scheduled task system, one command can automatically complete all scheduled tasks
 - Deep integration of large language models, support intelligent replies to tickets, document generation, and other functions
-- One-click access to OpenAI, Google AI, Vertex AI, Hugging Face Hosted API, Cloudflare Workers AI, Anthropic, and other large language model services
+- One-click access to OpenAI, Google AI, Vertex AI, Hugging Face Hosted API, Cloudflare Workers AI, Anthropic, AWS Bedrock and other large language model services
 
 ## Installation
 

diff --git a/app/predefine.php b/app/predefine.php
@@ -5,5 +5,5 @@
 // Global constants
 const BASE_PATH = __DIR__ . '/..';
 const PANEL_NAME = 'NeXT-Panel';
-const PANEL_VERSION = '24.4.0';
+const PANEL_VERSION = '24.5.0';
 const OTA_API_URL = 'https://api.nextpanel.dev/v1/version/latest';
diff --git a/composer.lock b/composer.lock
diff --git a/resources/views/tabler/admin/header.tpl b/resources/views/tabler/admin/header.tpl
@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="zh">
+<html lang="{$user->locale}">
 
 <head>
     <meta charset="utf-8"/>
@@ -14,7 +14,7 @@
     <script src="//{$config['jsdelivr_url']}/npm/qrcode_js@latest/qrcode.min.js"></script>
     <script src="//{$config['jsdelivr_url']}/npm/clipboard@latest/dist/clipboard.min.js"></script>
     <script src="//{$config['jsdelivr_url']}/npm/jquery/dist/jquery.min.js"></script>
-    <script src="//{$config['jsdelivr_url']}/npm/htmx.org@latest/dist/htmx.min.js"></script>
+    <script src="//{$config['jsdelivr_url']}/npm/htmx.org@v2/dist/htmx.min.js"></script>
     <style>
         .home-subtitle {
             font-size: 14px;

diff --git a/resources/views/tabler/header.tpl b/resources/views/tabler/header.tpl
@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="zh">
+<html lang="{$config['locale']}">
 
 <head>
     <meta charset="utf-8"/>
@@ -13,5 +13,5 @@
     <link href="//{$config['jsdelivr_url']}/npm/@tabler/icons-webfont@latest/tabler-icons.min.css" rel="stylesheet"/>
     <!-- JS files -->
     <script src="/assets/js/fuck.min.js"></script>
-    <script src="//{$config['jsdelivr_url']}/npm/htmx.org@latest/dist/htmx.min.js"></script>
+    <script src="//{$config['jsdelivr_url']}/npm/htmx.org@v2/dist/htmx.min.js"></script>
 </head>
diff --git a/resources/views/tabler/tinymce.tpl b/resources/views/tabler/tinymce.tpl
@@ -1,8 +1,8 @@
-<script src="//cdnjs.cloudflare.com/ajax/libs/tinymce/7.1.2/tinymce.min.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/tinymce/7.2.0/tinymce.min.js"></script>
 
 <script>
     document.addEventListener("DOMContentLoaded", function () {
-        tinyMCE.baseURL = '//cdnjs.cloudflare.com/ajax/libs/tinymce/7.1.2';
+        tinyMCE.baseURL = '//cdnjs.cloudflare.com/ajax/libs/tinymce/7.2.0';
         tinyMCE.suffix = '.min';
         tinyMCE.init({
             selector: '#tinymce',

diff --git a/resources/views/tabler/user/header.tpl b/resources/views/tabler/user/header.tpl
@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="zh">
+<html lang="{$user->locale}">
 
 <head>
     <meta charset="utf-8"/>
@@ -15,7 +15,7 @@
     <script src="/assets/js/fuck.min.js"></script>
     <script src="//{$config['jsdelivr_url']}/npm/qrcode_js@latest/qrcode.min.js"></script>
     <script src="//{$config['jsdelivr_url']}/npm/clipboard@latest/dist/clipboard.min.js"></script>
-    <script src="//{$config['jsdelivr_url']}/npm/htmx.org@latest/dist/htmx.min.js"></script>
+    <script src="//{$config['jsdelivr_url']}/npm/htmx.org@v2/dist/htmx.min.js"></script>
     <style>
         .home-subtitle {
             font-size: 14px;

diff --git a/src/Services/View.php b/src/Services/View.php
@@ -69,6 +69,8 @@ public static function getConfig(): array
             'enable_change_email' => $_ENV['enable_change_email'],
             'enable_r2_client_download' => $_ENV['enable_r2_client_download'],
             'jsdelivr_url' => $_ENV['jsdelivr_url'],
+            // site default language
+            'locale' => $_ENV['locale'],
         ];
     }
 }
diff --git a/tests/App/Services/ViewTest.php b/tests/App/Services/ViewTest.php
@@ -50,6 +50,7 @@ public function testGetConfig(): void
         $_ENV['enable_change_email'] = true;
         $_ENV['enable_r2_client_download'] = true;
         $_ENV['jsdelivr_url'] = 'https://cdn.jsdelivr.net';
+        $_ENV['locale'] = 'en_US';
 
         $config = $this->view->getConfig();
 
@@ -68,5 +69,6 @@ public function testGetConfig(): void
         $this->assertTrue($config['enable_change_email']);
         $this->assertTrue($config['enable_r2_client_download']);
         $this->assertEquals('https://cdn.jsdelivr.net', $config['jsdelivr_url']);
+        $this->assertEquals('en_US', $config['locale']);
     }
 }