Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| fc866e23f9 |
@@ -10,4 +10,7 @@ memos
|
||||
.golangci.yaml
|
||||
.dockerignore
|
||||
docs/
|
||||
.DS_Store
|
||||
.DS_Store
|
||||
memos_prod.db
|
||||
memos_prod.db-shm
|
||||
memos_prod.db-wal
|
||||
|
||||
@@ -31,3 +31,8 @@ dist
|
||||
|
||||
# Frontend test coverage output (Vitest + @vitest/coverage-v8).
|
||||
web/coverage/
|
||||
|
||||
# Database
|
||||
memos_prod.db
|
||||
memos_prod.db-shm
|
||||
memos_prod.db-wal
|
||||
|
||||
@@ -1,3 +1,14 @@
|
||||
# anian-memos
|
||||
|
||||
> 基于原作者v0.29.1代码修改
|
||||
|
||||
#### v0.29.1-1
|
||||
1. 修改默认配置
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div align="center">
|
||||
<p><b>Featured Sponsors</b></p>
|
||||
<table>
|
||||
|
||||
@@ -117,8 +117,8 @@ func EmailConfigFromInstanceSetting(setting *storepb.InstanceNotificationSetting
|
||||
func NewTestEmailMessage(recipientEmail, replyTo string) *email.Message {
|
||||
return &email.Message{
|
||||
To: []string{recipientEmail},
|
||||
Subject: "[Memos] Test email",
|
||||
Body: "This is a test email from your Memos notification settings.",
|
||||
Subject: "[阿年的备忘录] 测试邮件",
|
||||
Body: "这是一封测试邮件,说明通知邮件设置已正确配置。",
|
||||
ReplyTo: replyTo,
|
||||
}
|
||||
}
|
||||
@@ -161,19 +161,17 @@ func (d *EmailDispatcher) buildMemoCommentEmailMessage(message *storepb.InboxMes
|
||||
}
|
||||
|
||||
body := []string{
|
||||
fmt.Sprintf("Hi %s,", displayNameForEmail(receiver)),
|
||||
fmt.Sprintf("%s,你好:", displayNameForEmail(receiver)),
|
||||
"",
|
||||
fmt.Sprintf("%s commented on your memo.", senderName),
|
||||
fmt.Sprintf("%s 评论了你的备忘录。", senderName),
|
||||
"",
|
||||
"Open in Memos:",
|
||||
"前往查看:",
|
||||
url,
|
||||
"",
|
||||
"You are receiving this because you own this memo.",
|
||||
}
|
||||
|
||||
return &email.Message{
|
||||
To: []string{receiver.Email},
|
||||
Subject: fmt.Sprintf("[Memos] %s commented on your memo", senderName),
|
||||
Subject: fmt.Sprintf("[阿年的备忘录] %s评论了你的备忘录", senderName),
|
||||
Body: strings.Join(body, "\n"),
|
||||
}, nil
|
||||
}
|
||||
@@ -193,19 +191,17 @@ func (d *EmailDispatcher) buildMemoMentionEmailMessage(message *storepb.InboxMes
|
||||
}
|
||||
|
||||
body := []string{
|
||||
fmt.Sprintf("Hi %s,", displayNameForEmail(receiver)),
|
||||
fmt.Sprintf("%s,你好:", displayNameForEmail(receiver)),
|
||||
"",
|
||||
fmt.Sprintf("%s mentioned you in a memo.", senderName),
|
||||
fmt.Sprintf("%s 在备忘录中提到了你。", senderName),
|
||||
"",
|
||||
"Open in Memos:",
|
||||
"前往查看:",
|
||||
url,
|
||||
"",
|
||||
"You are receiving this because you were mentioned in this memo.",
|
||||
}
|
||||
|
||||
return &email.Message{
|
||||
To: []string{receiver.Email},
|
||||
Subject: fmt.Sprintf("[Memos] %s mentioned you in a memo", senderName),
|
||||
Subject: fmt.Sprintf("[阿年的备忘录] %s在备忘录中提到了你", senderName),
|
||||
Body: strings.Join(body, "\n"),
|
||||
}, nil
|
||||
}
|
||||
|
||||
@@ -431,7 +431,7 @@ func getDeleteUserAttachmentStorageSetting(ctx context.Context, stores *store.St
|
||||
|
||||
func getDefaultUserGeneralSetting() *v1pb.UserSetting_GeneralSetting {
|
||||
return &v1pb.UserSetting_GeneralSetting{
|
||||
Locale: "en",
|
||||
Locale: "zh-Hans",
|
||||
MemoVisibility: "PRIVATE",
|
||||
Theme: "",
|
||||
}
|
||||
|
||||
@@ -329,7 +329,7 @@ func (*RSSService) generateItemTitle(content string) string {
|
||||
|
||||
// If title is empty, use a default
|
||||
if title == "" {
|
||||
title = "Memo"
|
||||
title = "阿年的备忘录"
|
||||
}
|
||||
|
||||
return title
|
||||
@@ -416,9 +416,9 @@ func getRSSHeading(ctx context.Context, stores *store.Store) (RSSHeading, error)
|
||||
}
|
||||
if settings == nil || settings.CustomProfile == nil {
|
||||
return RSSHeading{
|
||||
Title: "Memos",
|
||||
Description: "An open source, lightweight note-taking service. Easily capture and share your great thoughts.",
|
||||
Language: "en-us",
|
||||
Title: "阿年的备忘录",
|
||||
Description: "一日不见 如隔三秋",
|
||||
Language: "zh-Hans",
|
||||
}, nil
|
||||
}
|
||||
customProfile := settings.CustomProfile
|
||||
@@ -426,6 +426,6 @@ func getRSSHeading(ctx context.Context, stores *store.Store) (RSSHeading, error)
|
||||
return RSSHeading{
|
||||
Title: customProfile.Title,
|
||||
Description: customProfile.Description,
|
||||
Language: "en-us",
|
||||
Language: "zh-Hans",
|
||||
}, nil
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<!doctype html>
|
||||
<html lang="en">
|
||||
<html lang="zh-Hans">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
|
||||
@@ -14,7 +14,7 @@
|
||||
<meta name="apple-mobile-web-app-capable" content="yes" />
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="default" />
|
||||
<!-- memos.metadata.head -->
|
||||
<title>Memos</title>
|
||||
<title>阿年的备忘录</title>
|
||||
</head>
|
||||
<body class="text-base w-full min-h-svh">
|
||||
<div id="root" class="relative w-full min-h-full"></div>
|
||||
|
||||
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 97 KiB |
|
Before Width: | Height: | Size: 138 KiB After Width: | Height: | Size: 97 KiB |
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 97 KiB |
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 58 KiB |
|
Before Width: | Height: | Size: 36 KiB After Width: | Height: | Size: 58 KiB |
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "Memos",
|
||||
"short_name": "Memos",
|
||||
"description": "An open-source, self-hosted note-taking tool. Capture thoughts instantly. Own them completely.",
|
||||
"name": "阿年的备忘录",
|
||||
"short_name": "阿年的备忘录",
|
||||
"description": "一日不见 如隔三秋",
|
||||
"icons": [
|
||||
{ "src": "/android-chrome-192x192.png", "sizes": "192x192", "type": "image/png" },
|
||||
{ "src": "/android-chrome-512x512.png", "sizes": "512x512", "type": "image/png" }
|
||||
|
||||
@@ -45,7 +45,8 @@ export const CalendarCell = memo((props: CalendarCellProps) => {
|
||||
baseClasses,
|
||||
intensityClass,
|
||||
getCalendarCellStateClass(day),
|
||||
isInteractive ? "cursor-pointer hover:bg-muted/40 hover:border-border/30" : "cursor-default",
|
||||
day.isToday && "underline decoration-1 underline-offset-4",
|
||||
isInteractive ? "cursor-pointer hover:bg-muted/40 hover:border-border/30 hover:text-foreground" : "cursor-default",
|
||||
);
|
||||
|
||||
const button = (
|
||||
|
||||
@@ -10,7 +10,7 @@ interface Props {
|
||||
function MemosLogo(props: Props) {
|
||||
const { collapsed } = props;
|
||||
const { generalSetting: instanceGeneralSetting } = useInstance();
|
||||
const title = instanceGeneralSetting.customProfile?.title || "Memos";
|
||||
const title = instanceGeneralSetting.customProfile?.title || "阿年的备忘录";
|
||||
const avatarUrl = instanceGeneralSetting.customProfile?.logoUrl || "/full-logo.webp";
|
||||
|
||||
return (
|
||||
|
||||
@@ -32,7 +32,7 @@ const MobileHeader = (props: Props) => {
|
||||
return (
|
||||
<div
|
||||
className={cn(
|
||||
"sticky top-0 pt-3 pb-2 sm:pt-2 px-4 sm:px-6 sm:mb-1 bg-background bg-opacity-80 backdrop-blur-lg flex flex-row justify-between items-center w-full h-auto flex-nowrap shrink-0 z-1",
|
||||
"sticky top-0 pt-3 pb-2 sm:pt-2 px-4 sm:px-6 sm:mb-1 bg-background bg-opacity-80 backdrop-blur-lg flex flex-row justify-between items-center w-full h-auto flex-nowrap shrink-0 z-4",
|
||||
offsetTop > 0 && "shadow-md",
|
||||
className,
|
||||
)}
|
||||
|
||||
@@ -40,12 +40,6 @@ const Navigation = (props: Props) => {
|
||||
title: t("common.explore"),
|
||||
icon: <EarthIcon className="w-6 h-auto shrink-0" />,
|
||||
};
|
||||
const aboutNavLink: NavLinkItem = {
|
||||
id: "header-about",
|
||||
path: Routes.ABOUT,
|
||||
title: t("common.about"),
|
||||
icon: <InfoIcon className="w-6 h-auto shrink-0" />,
|
||||
};
|
||||
const attachmentsNavLink: NavLinkItem = {
|
||||
id: "header-attachments",
|
||||
path: Routes.ATTACHMENTS,
|
||||
@@ -77,7 +71,7 @@ const Navigation = (props: Props) => {
|
||||
|
||||
const primaryNavLinks: NavLinkItem[] = currentUser
|
||||
? [homeNavLink, exploreNavLink, attachmentsNavLink, inboxNavLink]
|
||||
: [exploreNavLink, aboutNavLink, signInNavLink];
|
||||
: [exploreNavLink, signInNavLink];
|
||||
const inboxAriaLabel = unreadCount > 0 ? `${t("common.inbox")}, ${unreadCount} unread` : t("common.inbox");
|
||||
|
||||
return (
|
||||
|
||||
@@ -10,7 +10,7 @@ const NavigationDrawer = () => {
|
||||
const location = useLocation();
|
||||
const [open, setOpen] = useState(false);
|
||||
const { generalSetting } = useInstance();
|
||||
const title = generalSetting.customProfile?.title || "Memos";
|
||||
const title = generalSetting.customProfile?.title || "阿年的备忘录";
|
||||
const avatarUrl = generalSetting.customProfile?.logoUrl || "/full-logo.webp";
|
||||
|
||||
useEffect(() => {
|
||||
|
||||
@@ -70,7 +70,7 @@ const InstanceSection = () => {
|
||||
<SettingSection title={t("setting.system.label")}>
|
||||
<SettingGroup title={t("common.basic")} description={t("setting.system.basic-description")}>
|
||||
<SettingList>
|
||||
<SettingListItem label={t("setting.system.server-name")} description={instanceGeneralSetting.customProfile?.title || "Memos"}>
|
||||
<SettingListItem label={t("setting.system.server-name")} description={instanceGeneralSetting.customProfile?.title || "阿年的备忘录"}>
|
||||
<Button variant="outline" onClick={customizeDialog.open}>
|
||||
{t("common.edit")}
|
||||
</Button>
|
||||
|
||||
@@ -62,7 +62,7 @@ const PreferencesSection = () => {
|
||||
const setting: UserSetting_GeneralSetting =
|
||||
generalSetting ||
|
||||
create(UserSetting_GeneralSettingSchema, {
|
||||
locale: "en",
|
||||
locale: "zh-Hans",
|
||||
memoVisibility: "PRIVATE",
|
||||
theme: "system",
|
||||
});
|
||||
|
||||
@@ -59,7 +59,7 @@ function UpdateCustomizedProfileDialog({ open, onOpenChange, onSuccess }: Props)
|
||||
|
||||
const handleRestoreButtonClick = () => {
|
||||
setPartialState({
|
||||
title: "Memos",
|
||||
title: "阿年的备忘录",
|
||||
logoUrl: "/logo.webp",
|
||||
description: "",
|
||||
});
|
||||
|
||||
@@ -142,10 +142,6 @@ const UserMenu = (props: Props) => {
|
||||
<ArchiveIcon className="size-4 text-muted-foreground" />
|
||||
{t("common.archived")}
|
||||
</DropdownMenuItem>
|
||||
<DropdownMenuItem onClick={() => navigateTo(Routes.ABOUT)}>
|
||||
<InfoIcon className="size-4 text-muted-foreground" />
|
||||
{t("common.about")}
|
||||
</DropdownMenuItem>
|
||||
<DropdownMenuSub>
|
||||
<DropdownMenuSubTrigger>
|
||||
<GlobeIcon className="size-4 text-muted-foreground" />
|
||||
|
||||
@@ -78,7 +78,7 @@ i18n
|
||||
},
|
||||
fallbackLng: {
|
||||
...fallbacks,
|
||||
...{ default: ["en"] },
|
||||
...{ default: ["zh-Hans"] },
|
||||
} as FallbackLng,
|
||||
});
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ const AdminSignIn = () => {
|
||||
<div className="w-full py-4 grow flex flex-col justify-center items-center">
|
||||
<div className="w-full flex flex-row justify-center items-center mb-6">
|
||||
<img className="h-14 w-auto rounded-full shadow" src={instanceGeneralSetting.customProfile?.logoUrl || "/logo.webp"} alt="" />
|
||||
<p className="ml-2 text-5xl text-foreground opacity-80">{instanceGeneralSetting.customProfile?.title || "Memos"}</p>
|
||||
<p className="ml-2 text-4xl text-foreground opacity-80">{instanceGeneralSetting.customProfile?.title || "阿年的备忘录"}</p>
|
||||
</div>
|
||||
<p className="w-full text-xl font-medium text-muted-foreground">Sign in with admin accounts</p>
|
||||
<PasswordSignInForm />
|
||||
|
||||
@@ -75,7 +75,7 @@ const SignIn = () => {
|
||||
<div className="w-full py-4 grow flex flex-col justify-center items-center">
|
||||
<div className="w-full flex flex-row justify-center items-center mb-6">
|
||||
<img className="h-14 w-auto rounded-full shadow" src={instanceGeneralSetting.customProfile?.logoUrl || "/logo.webp"} alt="" />
|
||||
<p className="ml-2 text-5xl text-foreground opacity-80">{instanceGeneralSetting.customProfile?.title || "Memos"}</p>
|
||||
<p className="ml-2 text-4xl text-foreground opacity-80">{instanceGeneralSetting.customProfile?.title || "阿年的备忘录"}</p>
|
||||
</div>
|
||||
{!instanceGeneralSetting.disallowPasswordAuth ? (
|
||||
<PasswordSignInForm redirectPath={redirectTarget} />
|
||||
|
||||
@@ -92,7 +92,7 @@ const SignUp = () => {
|
||||
<div className="w-full py-4 grow flex flex-col justify-center items-center">
|
||||
<div className="w-full flex flex-row justify-center items-center mb-6">
|
||||
<img className="h-14 w-auto rounded-full shadow" src={instanceGeneralSetting.customProfile?.logoUrl || "/logo.webp"} alt="" />
|
||||
<p className="ml-2 text-5xl text-foreground opacity-80">{instanceGeneralSetting.customProfile?.title || "Memos"}</p>
|
||||
<p className="ml-2 text-4xl text-foreground opacity-80">{instanceGeneralSetting.customProfile?.title || "阿年的备忘录"}</p>
|
||||
</div>
|
||||
{canUsePasswordSignUp ? (
|
||||
<>
|
||||
|
||||