Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Abc #5934

Closed
wants to merge 25 commits into from
Closed

Abc #5934

Show file tree
Hide file tree
Changes from 14 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/components/auth.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export function AuthPage() {

<div className={styles["auth-title"]}>{Locale.Auth.Title}</div>
<div className={styles["auth-tips"]}>{Locale.Auth.Tips}</div>


<input
className={styles["auth-input"]}
Expand All @@ -53,6 +54,7 @@ export function AuthPage() {
{!accessStore.hideUserApiKey ? (
<>
<div className={styles["auth-tips"]}>{Locale.Auth.SubTips}</div>

<input
className={styles["auth-input"]}
type="password"
Expand Down
12 changes: 10 additions & 2 deletions app/components/sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ import {
MIN_SIDEBAR_WIDTH,
NARROW_SIDEBAR_WIDTH,
Path,
BLOG_URL,
FAKA_URL,
REPO_URL,
} from "../constant";

Expand Down Expand Up @@ -155,10 +157,10 @@ export function SideBar(props: { className?: string }) {
>
<div className={styles["sidebar-header"]} data-tauri-drag-region>
<div className={styles["sidebar-title"]} data-tauri-drag-region>
NextChat
ChatGPT-青云依兮
</div>
<div className={styles["sidebar-sub-title"]}>
Build your own AI assistant.
构建自己的人工智能助手。
</div>
1422756921 marked this conversation as resolved.
Show resolved Hide resolved
<div className={styles["sidebar-logo"] + " no-dark"}>
<ChatGptIcon />
Expand Down Expand Up @@ -186,6 +188,12 @@ export function SideBar(props: { className?: string }) {
onClick={() => showToast(Locale.WIP)}
shadow
/>
<a href={FAKA_URL} target="_blank">
<IconButton
text={shouldNarrow ? undefined : Locale.Mask.faka}
shadow
/>
</a>
</div>

<div
Expand Down
2 changes: 2 additions & 0 deletions app/constant.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
export const OWNER = "Yidadaa";
export const REPO = "ChatGPT-Next-Web";
export const BLOG_URL = `https://blog.aerr.cn`;
export const FAKA_URL = `http://fk.ikun.bf`;
1422756921 marked this conversation as resolved.
Show resolved Hide resolved
export const REPO_URL = `https://github.com/${OWNER}/${REPO}`;
export const ISSUE_URL = `https://github.com/${OWNER}/${REPO}/issues`;
export const UPDATE_URL = `${REPO_URL}#keep-updated`;
Expand Down
4 changes: 2 additions & 2 deletions app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { GoogleTagManager } from "@next/third-parties/google";
const serverConfig = getServerSideConfig();

export const metadata: Metadata = {
title: "NextChat",
title: "ChatGPT-青云依兮",
description: "Your personal ChatGPT Chat Bot.",
viewport: {
width: "device-width",
Expand All @@ -22,7 +22,7 @@ export const metadata: Metadata = {
{ media: "(prefers-color-scheme: dark)", color: "#151515" },
],
appleWebApp: {
title: "NextChat",
title: "ChatGPT-青云依兮",
statusBarStyle: "default",
},
};
Expand Down
18 changes: 11 additions & 7 deletions app/locales/cn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,16 @@ const cn = {
WIP: "该功能仍在开发中……",
Error: {
Unauthorized: isApp
? "检测到无效 API Key,请前往[设置](/#/settings)页检查 API Key 是否配置正确。"
: "访问密码不正确或为空,请前往[登录](/#/auth)页输入正确的访问密码,或者在[设置](/#/settings)页填入你自己的 OpenAI API Key。",
? "检测到无效 API Key,请前往[设置](/#/settings)页检查 API Key 是否配置正确。需要key联系QQ:[1422756921](http://wpa.qq.com/msgrd?v=3&uin=1422756921&site=qq&menu=yes)。[青云博客](https://blog.aerr.cn)"
: "访问密码不正确或为空,请前往[登录](/#/auth)页输入正确的访问密码,或者填入你自己的 OpenAI API Key。如果自己没有key联系QQ:[1422756921](http://wpa.qq.com/msgrd?v=3&uin=1422756921&site=qq&menu=yes)。[青云博客](https://blog.aerr.cn)",
1422756921 marked this conversation as resolved.
Show resolved Hide resolved
},
Auth: {
Title: "需要密码",
Tips: "管理员开启了密码验证,请在下方填入访问码",
SubTips: "或者输入你的 OpenAI 或 Google API 密钥",
Input: "在此处填写访问码",
Title: "需要访问密码或者key",
Tips: "管理员开启了验证,请在下方填入访问密码",
Tips1: "访问密码和key只需填一个即可",
SubTips1: "如果自己没有key联系QQ:1422756921",
SubTips: "或者输入你的 OpenAI API key",
Input: "在此处填写访问密码",
Confirm: "确认",
Later: "稍后再说",
},
Expand Down Expand Up @@ -377,7 +379,7 @@ const cn = {
},
Store: {
DefaultTopic: "新的聊天",
BotHello: "有什么可以帮你的吗",
BotHello: "有什么可以帮你的吗,如有问题请联系QQ:[1422756921](http://wpa.qq.com/msgrd?v=3&uin=1422756921&site=qq&menu=yes)",
Error: "出错了,稍后重试吧",
Prompt: {
History: (content: string) => "这是历史聊天总结作为前情提要:" + content,
Expand Down Expand Up @@ -409,6 +411,8 @@ const cn = {
Sysmessage: "你是一个助手",
},
Mask: {
blog: "博客",
faka: "卡密",
Name: "面具",
Page: {
Title: "预设角色面具",
Expand Down
22 changes: 13 additions & 9 deletions app/locales/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,18 @@ const en: LocaleType = {
WIP: "Coming Soon...",
Error: {
Unauthorized: isApp
? "Invalid API Key, please check it in [Settings](/#/settings) page."
: "Unauthorized access, please enter access code in [auth](/#/auth) page, or enter your OpenAI API Key.",
? "检测到无效 API Key,请前往[设置](/#/settings)页检查 API Key 是否配置正确。需要key联系QQ:[1422756921](http://wpa.qq.com/msgrd?v=3&uin=1422756921&site=qq&menu=yes)。[青云博客](https://blog.aerr.cn)"
: "访问密码不正确或为空,请前往[登录](/#/auth)页输入正确的访问密码,或者填入你自己的 OpenAI API Key。如果自己没有key联系QQ:[1422756921](http://wpa.qq.com/msgrd?v=3&uin=1422756921&site=qq&menu=yes)。[青云博客](https://blog.aerr.cn)",
},
Auth: {
Title: "Need Access Code",
Tips: "Please enter access code below",
SubTips: "Or enter your OpenAI or Google API Key",
Input: "access code",
Confirm: "Confirm",
Later: "Later",
Title: "需要访问密码或者key",
Tips: "管理员开启了验证,请在下方填入访问密码",
Tips1: "访问密码和key只需填一个即可",
SubTips1: "如果自己没有key联系QQ:1422756921",
SubTips: "或者输入你的 OpenAI API key",
Input: "在此处填写访问密码",
Confirm: "确认",
Later: "稍后再说",
1422756921 marked this conversation as resolved.
Show resolved Hide resolved
},
ChatItem: {
ChatItemCount: (count: number) => `${count} messages`,
Expand Down Expand Up @@ -416,7 +418,9 @@ const en: LocaleType = {
Sysmessage: "You are an assistant that",
},
Mask: {
Name: "Mask",
blog: "博客",
faka: "卡密",
Name: "面具",
1422756921 marked this conversation as resolved.
Show resolved Hide resolved
Page: {
Title: "Prompt Template",
SubTitle: (count: number) => `${count} prompt templates`,
Expand Down
2 changes: 2 additions & 0 deletions app/locales/id.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ const id: PartialLocaleType = {
Auth: {
Title: "Diperlukan Kode Akses",
Tips: "Masukkan kode akses di bawah",
Tips1: "密码和key只需填一个即可",
SubTips1: "如果自己没有key联系QQ:1422756921 ",
1422756921 marked this conversation as resolved.
Show resolved Hide resolved
SubTips: "Atau masukkan kunci API OpenAI Anda",
Input: "Kode Akses",
Confirm: "Konfirmasi",
Expand Down
23 changes: 13 additions & 10 deletions app/locales/tw.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,18 @@ const tw = {
WIP: "該功能仍在開發中……",
Error: {
Unauthorized: isApp
? "檢測到無效 API Key,請前往[設定](/#/settings)頁檢查 API Key 是否設定正確。"
: "存取密碼不正確或未填寫,請前往[登入](/#/auth)頁輸入正確的存取密碼,或者在[設定](/#/settings)頁填入你自己的 OpenAI API Key。",
? "检测到无效 API Key,请前往[设置](/#/settings)页检查 API Key 是否配置正确。需要key联系QQ:[1422756921](http://wpa.qq.com/msgrd?v=3&uin=1422756921&site=qq&menu=yes)。[青云博客](https://blog.aerr.cn)"
: "访问密码不正确或为空,请前往[登录](/#/auth)页输入正确的访问密码,或者填入你自己的 OpenAI API Key。如果自己没有key联系QQ:[1422756921](http://wpa.qq.com/msgrd?v=3&uin=1422756921&site=qq&menu=yes)。[青云博客](https://blog.aerr.cn)",
1422756921 marked this conversation as resolved.
Show resolved Hide resolved
},

Auth: {
Title: "需要密碼",
Tips: "管理員開啟了密碼驗證,請在下方填入存取密碼",
SubTips: "或者輸入你的 OpenAI 或 Google API 金鑰",
Input: "在此處填寫存取密碼",
Confirm: "確認",
Later: "稍候再說",
Title: "需要访问密码或者key",
Tips: "管理员开启了验证,请在下方填入访问密码",
Tips1: "访问密码和key只需填一个即可",
SubTips1: "如果自己没有key联系QQ:1422756921",
SubTips: "或者输入你的 OpenAI API key",
Input: "在此处填写访问密码",
Confirm: "确认",
Later: "稍后再说",
},
ChatItem: {
ChatItemCount: (count: number) => `${count} 則對話`,
Expand Down Expand Up @@ -407,7 +408,9 @@ const tw = {
Plugin: { Name: "外掛" },
FineTuned: { Sysmessage: "你是一個助手" },
Mask: {
Name: "角色範本",
blog: "青云博客",
faka: "购买卡密",
Name: "面具",
Page: {
Title: "預設角色角色範本",
SubTitle: (count: number) => `${count} 個預設角色定義`,
Expand Down