Compare commits

...

9 Commits

Author SHA1 Message Date
Yifei Zhang
f21f922160 Update tauri.conf.json 2023-10-09 22:46:36 +08:00
Yifei Zhang
fd413c7b52 Merge pull request #2947 from KeithHello/main 2023-10-09 22:45:56 +08:00
Yifei Zhang
3e2c5af4b5 Merge pull request #2975 from luckykong/patch-1 2023-10-09 22:38:45 +08:00
Kong Gaowen
bdb49b1171 修改界面
似乎这里引入了一个逻辑判断错误,会导致打包之后的界面变宽变高。
2023-10-09 18:50:10 +08:00
GH Action - Upstream Sync
5933b3d7eb Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web 2023-10-08 00:19:29 +00:00
Yifei Zhang
4c8d606fae Merge pull request #2950 from PeterDaveHello/locale-tw 2023-10-08 00:20:39 +08:00
Peter Dave Hello
88f8c43472 Improve tw locale 2023-10-07 23:06:20 +08:00
KeithHello
1505372e20 Change log
-   config.ts
    -   line 72: remove type confirmation of x as x always has type 'number'
    -   line 135: remove the redundant local variable
-   chat.ts
    -   delete the unused import
2023-10-04 18:08:29 +09:00
KeithHello
ad5093ce05 Change log
-   config.ts
    -   line 72 remove type confirmation of x as x always has type 'number'
    -   line 135 remove redundant local variable
-   chat.ts
    -   delete unused import
2023-10-04 17:40:23 +09:00
5 changed files with 26 additions and 31 deletions

View File

@@ -129,7 +129,7 @@ function Screen() {
const isAuth = location.pathname === Path.Auth; const isAuth = location.pathname === Path.Auth;
const isMobileScreen = useMobileScreen(); const isMobileScreen = useMobileScreen();
const shouldTightBorder = const shouldTightBorder =
config.tightBorder && !isMobileScreen && !getClientConfig()?.isApp; config.tightBorder && !isMobileScreen && getClientConfig()?.isApp;
useEffect(() => { useEffect(() => {
loadAsyncGoogleFont(); loadAsyncGoogleFont();

View File

@@ -7,13 +7,13 @@ const tw: PartialLocaleType = {
Unauthorized: "目前您的狀態是未授權,請前往[設定頁面](/#/auth)輸入授權碼。", Unauthorized: "目前您的狀態是未授權,請前往[設定頁面](/#/auth)輸入授權碼。",
}, },
ChatItem: { ChatItem: {
ChatItemCount: (count: number) => `${count} 對話`, ChatItemCount: (count: number) => `${count} 對話`,
}, },
Chat: { Chat: {
SubTitle: (count: number) => `您已經與 ChatGPT 進行了 ${count} 對話`, SubTitle: (count: number) => `您已經與 ChatGPT 進行了 ${count} 對話`,
Actions: { Actions: {
ChatList: "查看訊息列表", ChatList: "檢視訊息列表",
CompressedHistory: "查看壓縮後的歷史 Prompt", CompressedHistory: "檢視壓縮後的歷史 Prompt",
Export: "匯出聊天紀錄", Export: "匯出聊天紀錄",
Copy: "複製", Copy: "複製",
Stop: "停止", Stop: "停止",
@@ -23,15 +23,15 @@ const tw: PartialLocaleType = {
Rename: "重新命名對話", Rename: "重新命名對話",
Typing: "正在輸入…", Typing: "正在輸入…",
Input: (submitKey: string) => { Input: (submitKey: string) => {
var inputHints = `輸入訊息後,按下 ${submitKey} 鍵即可`; var inputHints = `輸入訊息後,按下 ${submitKey} 鍵即可`;
if (submitKey === String(SubmitKey.Enter)) { if (submitKey === String(SubmitKey.Enter)) {
inputHints += "Shift + Enter 鍵換行"; inputHints += "Shift + Enter 鍵換行";
} }
return inputHints; return inputHints;
}, },
Send: "送", Send: "送",
Config: { Config: {
Reset: "重置預設", Reset: "重設",
SaveAs: "另存新檔", SaveAs: "另存新檔",
}, },
}, },
@@ -46,7 +46,7 @@ const tw: PartialLocaleType = {
Title: "上下文記憶 Prompt", Title: "上下文記憶 Prompt",
EmptyContent: "尚未記憶", EmptyContent: "尚未記憶",
Copy: "複製全部", Copy: "複製全部",
Send: "送記憶", Send: "送記憶",
Reset: "重設對話", Reset: "重設對話",
ResetConfirm: "重設後將清除目前對話記錄以及歷史記憶,確認重設?", ResetConfirm: "重設後將清除目前對話記錄以及歷史記憶,確認重設?",
}, },
@@ -71,22 +71,22 @@ const tw: PartialLocaleType = {
}, },
InjectSystemPrompts: { InjectSystemPrompts: {
Title: "匯入系統提示", Title: "匯入系統提示",
SubTitle: "強制在每個請求的訊息列表開頭添加一個模擬 ChatGPT 的系統提示", SubTitle: "強制在每個請求的訊息列表開頭新增一個模擬 ChatGPT 的系統提示",
}, },
Update: { Update: {
Version: (x: string) => `前版本:${x}`, Version: (x: string) => `前版本:${x}`,
IsLatest: "已是最新版本", IsLatest: "已是最新版本",
CheckUpdate: "檢查更新", CheckUpdate: "檢查更新",
IsChecking: "正在檢查更新...", IsChecking: "正在檢查更新...",
FoundUpdate: (x: string) => `發現新版本:${x}`, FoundUpdate: (x: string) => `發現新版本:${x}`,
GoToUpdate: "前往更新", GoToUpdate: "前往更新",
}, },
SendKey: "送鍵", SendKey: "送鍵",
Theme: "主題", Theme: "主題",
TightBorder: "緊湊邊框", TightBorder: "緊湊邊框",
SendPreviewBubble: { SendPreviewBubble: {
Title: "預覽氣泡", Title: "預覽氣泡",
SubTitle: "在預覽氣泡中預覽 Markdown 容", SubTitle: "在預覽氣泡中預覽 Markdown 容",
}, },
Mask: { Mask: {
Splash: { Splash: {
@@ -101,7 +101,7 @@ const tw: PartialLocaleType = {
}, },
List: "自定義提示詞列表", List: "自定義提示詞列表",
ListCount: (builtin: number, custom: number) => ListCount: (builtin: number, custom: number) =>
`內建 ${builtin} 條,用戶定義 ${custom}`, `內建 ${builtin} 條,使用者定義 ${custom}`,
Edit: "編輯", Edit: "編輯",
Modal: { Modal: {
Title: "提示詞列表", Title: "提示詞列表",
@@ -132,7 +132,7 @@ const tw: PartialLocaleType = {
}, },
IsChecking: "正在檢查…", IsChecking: "正在檢查…",
Check: "重新檢查", Check: "重新檢查",
NoAccess: "輸入API Key查看餘額", NoAccess: "輸入 API Key 檢視餘額",
}, },
AccessCode: { AccessCode: {
Title: "授權碼", Title: "授權碼",
@@ -150,7 +150,7 @@ const tw: PartialLocaleType = {
}, },
PresencePenalty: { PresencePenalty: {
Title: "話題新穎度 (presence_penalty)", Title: "話題新穎度 (presence_penalty)",
SubTitle: "值越大,越有可能展到新話題", SubTitle: "值越大,越有可能展到新話題",
}, },
FrequencyPenalty: { FrequencyPenalty: {
Title: "頻率懲罰度 (frequency_penalty)", Title: "頻率懲罰度 (frequency_penalty)",
@@ -163,7 +163,7 @@ const tw: PartialLocaleType = {
Error: "出錯了,請稍後再嘗試", Error: "出錯了,請稍後再嘗試",
Prompt: { Prompt: {
History: (content: string) => History: (content: string) =>
"這是 AI 與用戶的歷史聊天總結,作為前情提要:" + content, "這是 AI 與使用者的歷史聊天總結,作為前情提要:" + content,
Topic: Topic:
"Use the language used by the user (e.g. en for english conversation, zh-hant for chinese conversation, etc.) to generate a title (at most 6 words) summarizing our conversation without any lead-in, quotation marks, preamble like 'Title:', direct text copies, single-word replies, quotation marks, translations, or brackets. Remove enclosing quotation marks. The title should make third-party grasp the essence of the conversation in first sight.", "Use the language used by the user (e.g. en for english conversation, zh-hant for chinese conversation, etc.) to generate a title (at most 6 words) summarizing our conversation without any lead-in, quotation marks, preamble like 'Title:', direct text copies, single-word replies, quotation marks, translations, or brackets. Remove enclosing quotation marks. The title should make third-party grasp the essence of the conversation in first sight.",
Summarize: Summarize:
@@ -192,16 +192,16 @@ const tw: PartialLocaleType = {
Item: { Item: {
Info: (count: number) => `包含 ${count} 條預設對話`, Info: (count: number) => `包含 ${count} 條預設對話`,
Chat: "對話", Chat: "對話",
View: "查看", View: "檢視",
Edit: "編輯", Edit: "編輯",
Delete: "除", Delete: "除",
DeleteConfirm: "確認除?", DeleteConfirm: "確認除?",
}, },
EditModal: { EditModal: {
Title: (readonly: boolean) => Title: (readonly: boolean) =>
`編輯預設面具 ${readonly ? "(只" : ""}`, `編輯預設面具 ${readonly ? "(只" : ""}`,
Download: "下載預設", Download: "下載預設",
Clone: "克隆預設", Clone: "複製預設",
}, },
Config: { Config: {
Avatar: "角色頭像", Avatar: "角色頭像",
@@ -215,7 +215,7 @@ const tw: PartialLocaleType = {
SubTitle: "現在開始,與面具背後的靈魂思維碰撞", SubTitle: "現在開始,與面具背後的靈魂思維碰撞",
More: "搜尋更多", More: "搜尋更多",
NotShow: "不再呈現", NotShow: "不再呈現",
ConfirmNoShow: "確認用?用後可以時在設定中重新啟用。", ConfirmNoShow: "確認用?用後可以時在設定中重新啟用。",
}, },
UI: { UI: {
Confirm: "確認", Confirm: "確認",

View File

@@ -1,6 +1,3 @@
import { create } from "zustand";
import { persist } from "zustand/middleware";
import { trimTopic } from "../utils"; import { trimTopic } from "../utils";
import Locale, { getLang } from "../locales"; import Locale, { getLang } from "../locales";

View File

@@ -70,7 +70,7 @@ export function limitNumber(
max: number, max: number,
defaultValue: number, defaultValue: number,
) { ) {
if (typeof x !== "number" || isNaN(x)) { if (isNaN(x)) {
return defaultValue; return defaultValue;
} }
@@ -133,9 +133,7 @@ export const useAppConfig = createPersistStore(
.customModels.split(",") .customModels.split(",")
.filter((v) => !!v && v.length > 0) .filter((v) => !!v && v.length > 0)
.map((m) => ({ name: m, available: true })); .map((m) => ({ name: m, available: true }));
return get().models.concat(customModels);
const models = get().models.concat(customModels);
return models;
}, },
}), }),
{ {

View File

@@ -9,7 +9,7 @@
}, },
"package": { "package": {
"productName": "ChatGPT Next Web", "productName": "ChatGPT Next Web",
"version": "2.9.8" "version": "2.9.9"
}, },
"tauri": { "tauri": {
"allowlist": { "allowlist": {