From f4c171c49b0e7bed050eaca23faa800802fa161c Mon Sep 17 00:00:00 2001
From: lesion
Date: Tue, 29 Nov 2022 16:38:47 +0100
Subject: [PATCH 01/19] no hans
---
locales/email/zh_Hans.json | 1 -
locales/zh_Hans.json | 293 -------------------------------------
2 files changed, 294 deletions(-)
delete mode 100644 locales/email/zh_Hans.json
delete mode 100644 locales/zh_Hans.json
diff --git a/locales/email/zh_Hans.json b/locales/email/zh_Hans.json
deleted file mode 100644
index 0967ef42..00000000
--- a/locales/email/zh_Hans.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/locales/zh_Hans.json b/locales/zh_Hans.json
deleted file mode 100644
index f4c5b3be..00000000
--- a/locales/zh_Hans.json
+++ /dev/null
@@ -1,293 +0,0 @@
-{
- "common": {
- "embed_help": "将以下代码复制并粘贴到你的网站,此事件将像这样显示",
- "follow": "关注",
- "add_event": "添加事件",
- "send": "发送",
- "where": "地点",
- "address": "地址",
- "when": "时间",
- "what": "事件",
- "media": "媒体",
- "login": "登录",
- "email": "电子邮箱",
- "register": "注册",
- "description": "描述",
- "hide": "隐藏",
- "search": "搜索",
- "confirm": "确认",
- "admin": "管理员",
- "users": "用户",
- "events": "事件",
- "actions": "操作",
- "deactivate": "取消",
- "remove_admin": "移除管理员",
- "activate": "激活",
- "save": "该村",
- "logout": "登出",
- "name": "名称",
- "associate": "合作者",
- "add": "添加",
- "recover_password": "重置密码",
- "enable": "启用",
- "me": "你",
- "ok": "完成",
- "resources": "资源",
- "n_resources": "无资源|1 个资源|{n} 个资源",
- "displayname": "显示名称",
- "copy_link": "复制链接",
- "send_via_mail": "发送电子邮件",
- "embed": "嵌入式页面",
- "feed_url_copied": "在你的 RSS 阅读器中打开复制的链接",
- "follow_me_title": "在 Fediverse 网络中关注更新",
- "feed": "RSS 源",
- "moderation": "中等",
- "authorize": "认证",
- "title": "标题",
- "filter": "筛选",
- "pause": "暂停",
- "start": "开始",
- "announcements": "公告",
- "url": "URL",
- "place": "地点",
- "theme": "主题",
- "label": "标签",
- "collections": "收藏",
- "max_events": "最大事件数",
- "next": "下一个",
- "export": "导出",
- "remove": "移除",
- "settings": "选项",
- "logout_ok": "已登出",
- "new_password": "新密码",
- "new_user": "新用户",
- "places": "地点",
- "edit": "编辑",
- "cancel": "取消",
- "password": "密码",
- "info": "信息",
- "preview": "预览",
- "share": "分享",
- "edit_event": "编辑事件",
- "copy": "复制",
- "related": "相关",
- "set_password": "设置密码",
- "instances": "实例",
- "activate_user": "已确认",
- "federation": "联盟",
- "add_to_calendar": "添加到日历",
- "copied": "已复制",
- "embed_title": "在你的网页上嵌入此事件",
- "user": "用户",
- "event": "事件",
- "fediverse": "Fediverse 网络",
- "skip": "跳过",
- "delete": "移除",
- "import": "导入",
- "tags": "标签",
- "close": "关闭",
- "disable": "禁用",
- "password_updated": "密码已修改。",
- "reset": "重置"
- },
- "export": {
- "list_description": "如果你有一个网站并希望展示一个事件列表,使用以下代码",
- "email_description": "你可以通过发给你的电子邮件了解你感兴趣的事件。",
- "insert_your_address": "输入你的电子邮箱地址",
- "ical_description": "电脑和智能手机通常预装了能够导入远程日历的日历应用。",
- "intro": "与那些竭尽全力保留用户和数据的非社交平台不同,我们认为信息和人一样,都必须是自由的。因此,即使不通过此网站,你仍可随时了解你想了解的事件之最新情况。",
- "feed_description": "要想从电脑或智能手机上关注更新,而无需定期打开本网站,请使用RSS订阅。
\n\n通过RSS订阅,您可以使用一个特殊的应用程序来接收你感兴趣的网站的更新。这是一个快速关注许多网站的好方法,不需要创建账户或做其他事。
\n\n 如果您使用 Android,我们推荐 Flym 或 Feeder。\n 对于iPhone/iPad,您可以使用 Feed4U \n 对于台式机/笔记本电脑,我们推荐可在 Firefox 或 Chrome 上安装的 Feedbro。\n
\n将此链接添加到你的RSS阅读器中,以获得最新信息。"
- },
- "register": {
- "description": "社会运动应该组织起来,并自筹资金
\n
在你能发布内容之前,你的账户必须审核通过,考虑到你可以通过此网站发现现实中的人,请写一些东西告诉我们你希望发布什么。",
- "error": "错误: ",
- "complete": "注册必须经过确认。",
- "first_user": "管理员已创建"
- },
- "event": {
- "anon_description": "即使不登录或注册,你也可以创建事件,但必须等待一些人看到它,\n并确认这是一个合适的事件。此外你也不能够修改它。
\n你也可以 登录 或 注册。或者继续浏览以得到答案。 ",
- "anon": "匿名",
- "same_day": "在同一天",
- "what_description": "标题",
- "description_description": "描述",
- "added": "事件已添加",
- "saved": "事件已保存",
- "added_anon": "事件已添加,等待确认。",
- "updated": "事件已更新",
- "where_description": "事件的地点在哪里?如果不存在,你可以创建一个。",
- "confirmed": "事件已确认",
- "not_found": "找不到事件",
- "recurrent": "日常事件",
- "edit_recurrent": "编辑日常事件:",
- "show_recurrent": "日常事件",
- "show_past": "以及过往的事件",
- "multidate_description": "这是一个节日吗?选择它开始和结束的时间",
- "multidate": "更多日期",
- "normal_description": "选择日期。",
- "recurrent_2w_days": "每 {days} 天一次",
- "each_week": "每周",
- "each_2w": "隔周一次",
- "due": "直到",
- "from": "来自",
- "image_too_big": "图片不能大于 4MB",
- "interact_with_me_at": "在 Fediverse 网络上与我互动",
- "interact_with_me": "关注我",
- "remove_recurrent_confirmation": "你确定要移除这个日常事件吗?\n过去的事件仍将被维护,但不会再添加新事件。",
- "import_URL": "从 URL 导入",
- "import_ICS": "从 ICS 导入",
- "ics": "ICS",
- "alt_text_description": "为视觉障碍者提供的说明",
- "choose_focal_point": "选择联络点",
- "download_flyer": "下载传单",
- "tag_description": "标签",
- "media_description": "你可以添加一份传单(可选)",
- "recurrent_description": "选择频率和日期",
- "only_future": "仅限即将到来的事件",
- "normal": "普通",
- "recurrent_1w_days": "每 {days} 天",
- "recurrent_1m_days": "|每月的第 {days} 天|每月的第 {days} 天",
- "recurrent_1m_ordinal": "每月的第 {n} 个 {days}",
- "each_month": "每月",
- "follow_me_description": "一种对这里发布的 {title} 事件保持关注的方法,\n是在 Fediverse 网络,比如 Mastodon,上关注 {account},亦有可能通过此方式给此事件添加资源。
\n如果你没听说过 Mastodon 和 Fediverse,我们建议你阅读 这篇文章。
在下方输入你的实例名称(例如:mastodon.social)",
- "import_description": "你可以从其他平台和实例通过标准格式(ICS 和 hCalendar)导入事件",
- "remove_media_confirmation": "你确认要删除图片吗?",
- "remove_confirmation": "你确定要移除此事件吗?"
- },
- "login": {
- "check_email": "检查你的电子邮箱收件箱和垃圾邮件箱。",
- "not_registered": "还未注册?",
- "forgot_password": "忘记密码了?",
- "insert_email": "输入你的电子邮箱地址",
- "error": "无法登录,检查你的登录信息。",
- "ok": "已登录",
- "description": "登录以发布新事件。"
- },
- "recover": {
- "not_valid_code": "发生了一些错误。"
- },
- "admin": {
- "delete_user": "移除",
- "remove_admin": "移除管理员",
- "disable_user_confirm": "你确定禁用 {user} 吗?",
- "disable_admin_user_confirm": "你确定移除 {user} 的管理员权限吗?",
- "user_remove_ok": "用户已移除",
- "user_create_ok": "用户已创建",
- "event_remove_ok": "事件已移除",
- "allow_registration_description": "允许公众注册?",
- "allow_anon_event": "允许发布匿名事件(需要确认)?",
- "allow_recurrent_event": "允许日常事件",
- "federation": "联邦社交网络 / ActivityPub",
- "enable_federation": "启用联邦社交网络",
- "add_instance": "添加实例",
- "select_instance_timezone": "时区",
- "enable_resources": "启用资源",
- "hide_boost_bookmark": "隐藏助力/书签",
- "block": "屏蔽",
- "unblock": "解除屏蔽",
- "instance_name": "实例名称",
- "hide_resource": "隐藏资源",
- "delete_resource_confirm": "你确定要删除此资源吗?",
- "filter_instances": "筛选实例",
- "resources": "资源",
- "favicon": "图标",
- "user_block_confirm": "你确定要屏蔽用户 {user} 吗?",
- "delete_announcement_confirm": "你确定要移除这个公告吗?",
- "announcement_remove_ok": "公告已移除",
- "instance_locale": "默认语言",
- "title_description": "这将被用作页面的标题和电子邮件的主题,以导出 RSS 和 ICS 源。",
- "description_description": "在标题旁的页眉中显示",
- "instance_place_help": "在其他的实例中显示的标签",
- "delete_trusted_instance_confirm": "你确定要从友好实例菜单中删除此项目吗?",
- "edit_place": "编辑地点",
- "new_announcement": "新公告",
- "show_smtp_setup": "电子邮件设置",
- "smtp_port": "SMTP 端口",
- "smtp_secure": "SMTP 安全协议(TLS 或 STARTTLS)",
- "smtp_test_success": "一封测试邮件已发送至 {admin_mail},请检查你的收件箱",
- "sender_email": "发件人",
- "widget": "小组件",
- "wrong_domain_warning": "在 config.json 中设置的 baseurl {baseurl} 与你正在访问的 {url} 不同",
- "edit_collection": "编辑收藏",
- "event_confirm_description": "你可以在此确认匿名用户提交的事件",
- "recurrent_event_visible": "默认显示日常事件",
- "place_description": "如果你弄错了地点或地址,你可以修改。
与这个地点相关的当前和过去的所有事件都会改变地址。",
- "delete_user_confirm": "你确定移除 {user} 吗?",
- "enable_admin_user_confirm": "你确定授予 {user} 管理员权限吗",
- "enable_federation_help": "这将允许从 Fediverse 上关注此实例",
- "enable_resources_help": "允许从 Fediverse 为此事件添加资源",
- "hide_boost_bookmark_help": "隐藏来自 Fediverse 上的助力和书签数量图标",
- "block_user": "屏蔽用户",
- "filter_users": "筛选用户",
- "user_add_help": "一封带有确认订阅和设置密码指引的邮件将被发送给新用户",
- "show_resource": "显示资源",
- "delete_resource": "删除资源",
- "user_blocked": "用户 {user} 已屏蔽",
- "instance_block_confirm": "你确定要屏蔽实例 {instance} 吗?",
- "announcement_description": "你可以在此段落插入显示于首页的公告",
- "instance_timezone_description": "Gancio 被设计用来收集特定区域,比如一座城市所发生的事件。这里的所有事件将以所选择的时区显示。",
- "instance_locale_description": "特定页面偏好的用户语言。有时信息必须以相同的语言对所有人显示(比如通过 ActivityPub 发布内容或发送一些电子邮件时)。在这种情况下将使用上面选择的语言。",
- "instance_place": "该实例的指示性位置",
- "trusted_instances_help": "友好实例的列表将被显示于页眉",
- "footer_links": "页脚链接",
- "smtp_description": "- 当匿名事件被添加时(如果启用),管理员应当收到邮件
管理员应当会受到注册请求邮件(如果启用)。- 用户应当会受到注册请求邮件。
- 用户应当收到注册确认邮件。
- 当管理员直接订阅时,用户应当受到邮件。
- 用户忘记密码时应当收到密码重置邮件。
",
- "smtp_use_sendmail": "使用 sendmail",
- "smtp_test_button": "发送测试邮件",
- "new_collection": "新建收藏",
- "collections_description": "收藏是按标签和地点分组的事件。它们将于主页上显示",
- "enable_trusted_instances": "启用友好实例",
- "add_trusted_instance": "添加一个友好实例",
- "add_link": "添加链接",
- "delete_footer_link_confirm": "确定移除此链接吗?",
- "instance_name_help": "要关注的 ActivityPub 账号",
- "is_dark": "暗色主题",
- "smtp_hostname": "SMTP 主机名"
- },
- "auth": {
- "fail": "无法登录。你确定密码正确吗?",
- "not_confirmed": "尚未确认……"
- },
- "settings": {
- "change_password": "修改密码",
- "password_updated": "密码已修改。",
- "remove_account_confirm": "你即将永久删除你的账号",
- "update_confirm": "你希望保存你的修改吗?",
- "remove_account": "按下下方的按钮后你的账号将被删除。你发布的事件不会删除。",
- "danger_section": "危险段落"
- },
- "error": {
- "email_taken": "此电子邮箱地址已被使用。",
- "nick_taken": "此昵称已被使用。"
- },
- "confirm": {
- "title": "用户确认",
- "not_valid": "出现了一些错误。",
- "valid": "你的账户已被确认,你现在可以 登录"
- },
- "ordinal": {
- "4": "第四",
- "5": "第五",
- "2": "第二",
- "-1": "最后",
- "1": "第一",
- "3": "第三"
- },
- "validators": {
- "required": "{fieldName} 是必填项",
- "email": "输入有效的电子邮箱地址"
- },
- "oauth": {
- "authorization_request": "应用 {app}
申请在 {instance_name}
上获得以下权限:",
- "redirected_to": "在确认后你将被重定向到 {url}
",
- "scopes": {
- "event:write": "添加与编辑你的事件"
- }
- },
- "setup": {
- "completed_description": "你现在可以以以下用户登录
用户名:{email}
密码:{password}
",
- "copy_password_dialog": "没错,你必须复制密码!",
- "start": "开始",
- "https_warning": "你正在使用 HTTP 访问,如果你切换到 HTTPS,记得在 config.json 中修改 baseurl!",
- "completed": "安装完成"
- },
- "about": "\n Gancio 是为本地社区设计的的共享日程表。
\n "
-}
From 341578b82a4b749330daded7c78e71ff33975d5a Mon Sep 17 00:00:00 2001
From: lesion
Date: Tue, 29 Nov 2022 23:00:42 +0100
Subject: [PATCH 02/19] fix ics uuid
---
server/api/controller/export.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/server/api/controller/export.js b/server/api/controller/export.js
index 176a6f6f..13ac9b8b 100644
--- a/server/api/controller/export.js
+++ b/server/api/controller/export.js
@@ -88,6 +88,7 @@ const exportController = {
const start = tmpStart.utc(true).format('YYYY-M-D-H-m').split('-').map(Number)
const end = tmpEnd.utc(true).format('YYYY-M-D-H-m').split('-').map(Number)
return {
+ uid: `${e.id}@${settings.hostname}`,
start,
end,
title: `[${settings.title}] ${e.title}`,
From aafafe8eaac8d108572a62ac2f26db1674b7d7bc Mon Sep 17 00:00:00 2001
From: lesion
Date: Tue, 29 Nov 2022 23:02:50 +0100
Subject: [PATCH 03/19] improve header gradient
---
components/Appbar.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/Appbar.vue b/components/Appbar.vue
index abbe6427..2d3da1e3 100644
--- a/components/Appbar.vue
+++ b/components/Appbar.vue
@@ -32,13 +32,13 @@ export default {