From 4378816e44a274a4bc1468346a2a898be72f0c4e Mon Sep 17 00:00:00 2001 From: Steven Date: Wed, 21 Feb 2024 23:02:18 +0800 Subject: [PATCH] chore: tweak i18n --- web/src/components/CreateTagDialog.tsx | 14 ++++---- .../components/DisablePasswordLoginDialog.tsx | 2 +- web/src/components/MemoContent/CodeBlock.tsx | 15 +++++---- web/src/components/ShareMemoDialog.tsx | 2 +- web/src/locales/ar.json | 2 +- web/src/locales/de.json | 2 +- web/src/locales/en.json | 33 ++++++------------- web/src/locales/es.json | 2 +- web/src/locales/fr.json | 2 +- web/src/locales/hi.json | 2 +- web/src/locales/hr.json | 2 +- web/src/locales/hu.json | 2 +- web/src/locales/it.json | 2 +- web/src/locales/ja.json | 2 +- web/src/locales/ko.json | 2 +- web/src/locales/nl.json | 2 +- web/src/locales/pl.json | 2 +- web/src/locales/pt-BR.json | 2 +- web/src/locales/ru.json | 2 +- web/src/locales/sl.json | 2 +- web/src/locales/sv.json | 2 +- web/src/locales/tr.json | 2 +- web/src/locales/uk.json | 2 +- web/src/locales/vi.json | 4 +-- web/src/locales/zh-Hans.json | 9 +++-- web/src/locales/zh-Hant.json | 2 +- 26 files changed, 52 insertions(+), 65 deletions(-) diff --git a/web/src/components/CreateTagDialog.tsx b/web/src/components/CreateTagDialog.tsx index 34b8940c3..e1e9847b0 100644 --- a/web/src/components/CreateTagDialog.tsx +++ b/web/src/components/CreateTagDialog.tsx @@ -62,7 +62,7 @@ const CreateTagDialog: React.FC = (props: Props) => { const handleSaveBtnClick = async () => { if (!validateTagName(tagName)) { - toast.error(t("tag-list.invalid-tag-name")); + toast.error(t("tag.invalid-tag-name")); return; } @@ -90,7 +90,7 @@ const CreateTagDialog: React.FC = (props: Props) => { return ( <>
-

{t("tag-list.create-tag")}

+

{t("tag.create-tag")}

destroy()}> @@ -99,7 +99,7 @@ const CreateTagDialog: React.FC = (props: Props) => { = (props: Props) => { /> {tagNameList.length > 0 && ( <> -

{t("tag-list.all-tags")}

+

{t("tag.all-tags")}

{Array.from(tagNameList) .sort() @@ -130,12 +130,12 @@ const CreateTagDialog: React.FC = (props: Props) => { {shownSuggestTagNameList.length > 0 && ( <>
- {t("tag-list.tag-suggestions")} + {t("tag.tag-suggestions")} - {showTagSuggestions ? t("tag-list.hide") : t("tag-list.show")} + {showTagSuggestions ? t("tag.hide") : t("tag.show")}
{showTagSuggestions && ( @@ -153,7 +153,7 @@ const CreateTagDialog: React.FC = (props: Props) => { ))}
)} diff --git a/web/src/components/DisablePasswordLoginDialog.tsx b/web/src/components/DisablePasswordLoginDialog.tsx index 85827eb83..18499324c 100644 --- a/web/src/components/DisablePasswordLoginDialog.tsx +++ b/web/src/components/DisablePasswordLoginDialog.tsx @@ -45,7 +45,7 @@ const DisablePasswordLoginDialog: React.FC = ({ destroy }: Props) => { handleCloseBtnClick(); } catch (error: any) { console.error(error); - toast.error(error.response.data.message || t("message.updating-setting-failed")); + toast.error(error.response.data.message); } } }; diff --git a/web/src/components/MemoContent/CodeBlock.tsx b/web/src/components/MemoContent/CodeBlock.tsx index 75ab07e8b..2bac583b2 100644 --- a/web/src/components/MemoContent/CodeBlock.tsx +++ b/web/src/components/MemoContent/CodeBlock.tsx @@ -6,7 +6,11 @@ import Icon from "../Icon"; import MermaidBlock from "./MermaidBlock"; import { BaseProps } from "./types"; -const MERMAID_LANGUAGE = "mermaid"; +// Special languages that are rendered differently. +enum SpecialLanguage { + HTML = "__html", + MERMAID = "mermaid", +} interface Props extends BaseProps { language: string; @@ -15,17 +19,14 @@ interface Props extends BaseProps { const CodeBlock: React.FC = ({ language, content }: Props) => { const formatedLanguage = (language || "").toLowerCase() || "text"; - let highlightedCode = content; - // Users can set Markdown code blocks as `__html` to render HTML directly. - if (formatedLanguage === "__html") { + if (formatedLanguage === SpecialLanguage.HTML) { return
; - } - - if (formatedLanguage === MERMAID_LANGUAGE) { + } else if (formatedLanguage === SpecialLanguage.MERMAID) { return ; } + let highlightedCode = content; try { const temp = hljs.highlight(content, { language: formatedLanguage, diff --git a/web/src/components/ShareMemoDialog.tsx b/web/src/components/ShareMemoDialog.tsx index 9e84b9f8c..f86a8040f 100644 --- a/web/src/components/ShareMemoDialog.tsx +++ b/web/src/components/ShareMemoDialog.tsx @@ -92,7 +92,7 @@ const ShareMemoDialog: React.FC = (props: Props) => { ); if (updatedMemo.visibility == visibility) { - toast.success(t("common.changed")); + toast.success(t("message.update-succeed")); } }; diff --git a/web/src/locales/ar.json b/web/src/locales/ar.json index 15346f7fa..3d4e67f5c 100644 --- a/web/src/locales/ar.json +++ b/web/src/locales/ar.json @@ -166,7 +166,7 @@ "storage": "المساحة التخزينية", "system": "النظام" }, - "tag-list": { + "tag": { "all-tags": "جميع العلامات", "create-tag": "انشاء علامة", "hide": "اخفاء", diff --git a/web/src/locales/de.json b/web/src/locales/de.json index 28baf92a7..cfa460c25 100644 --- a/web/src/locales/de.json +++ b/web/src/locales/de.json @@ -351,7 +351,7 @@ "telegram-bot-token-placeholder": "Dein Telegram Bot token" } }, - "tag-list": { + "tag": { "all-tags": "Alle Tags", "create-tag": "Tag erstellen", "hide": "Ausblenden", diff --git a/web/src/locales/en.json b/web/src/locales/en.json index bd6f1478c..902be1597 100644 --- a/web/src/locales/en.json +++ b/web/src/locales/en.json @@ -40,16 +40,11 @@ "type": "Type", "title": "Title", "filter": "Filter", - "filter-period": "{{from}} to {{to}}", "tags": "Tags", "yourself": "Yourself", - "changed": "changed", - "fold": "Fold", - "expand": "Expand", "image": "Image", "file": "File", "link": "Link", - "vacuum": "Vacuum", "select": "Select", "database": "Database", "upload": "Upload", @@ -84,10 +79,7 @@ "cancel-edit": "Cancel edit", "save": "Save", "placeholder": "Any thoughts...", - "only-image-supported": "Only image file supported.", - "cant-empty": "Content can't be empty", - "local": "Local", - "resources": "Resources" + "local": "Local" }, "memo": { "view-detail": "View Detail", @@ -106,7 +98,7 @@ "disabled": "Public memos are disabled" }, "delete-memo": "Delete Memo", - "delete-confirm": "Are you sure you want to delete this memo?\n\nTHIS ACTION IS IRREVERSIBLE", + "delete-confirm": "Are you sure you want to delete this memo? THIS ACTION IS IRREVERSIBLE", "comment": { "self": "Comments", "no-comment": "No comment" @@ -118,11 +110,11 @@ "copy-link": "Copy Link", "reset-link": "Reset Link", "reset-resource-link": "Reset Resource Link", - "reset-link-prompt": "Are you sure to reset the link?\nThis will break all current link usages.\n\nTHIS ACTION IS IRREVERSIBLE", + "reset-link-prompt": "Are you sure to reset the link? This will break all current link usages. THIS ACTION IS IRREVERSIBLE", "delete-resource": "Delete Resource", "linked-amount": "Linked amount", - "warning-text": "Are you sure to delete this resource?\n\nTHIS ACTION IS IRREVERSIBLE", - "warning-text-unused": "Are you sure to delete these unused resources?\n\nTHIS ACTION IS IRREVERSIBLE", + "warning-text": "Are you sure to delete this resource? THIS ACTION IS IRREVERSIBLE", + "warning-text-unused": "Are you sure to delete these unused resources? THIS ACTION IS IRREVERSIBLE", "no-unused-resources": "No unused resources", "delete-selected-resources": "Delete Selected Resources", "no-files-selected": "No files selected", @@ -148,7 +140,7 @@ } } }, - "tag-list": { + "tag": { "tip-text": "Input `#tag` to create", "create-tag": "Create Tag", "all-tags": "All Tags", @@ -206,7 +198,7 @@ "storage-services": "Storage services", "create-a-service": "Create a service", "update-a-service": "Update a service", - "warning-text": "Are you sure to delete storage service \"{{name}}\"?\n\nTHIS ACTION IS IRREVERSIBLE", + "warning-text": "Are you sure to delete storage service \"{{name}}\"? THIS ACTION IS IRREVERSIBLE", "delete-storage": "Delete Storage", "local-storage-path": "Local storage path", "update-local-path": "Update Local Storage Path", @@ -237,7 +229,7 @@ "archive-member": "Archive member", "archive-warning": "Are you sure to archive {{username}}?", "delete-member": "Delete Member", - "delete-warning": "Are you sure to delete {{username}}?\n\nTHIS ACTION IS IRREVERSIBLE" + "delete-warning": "Are you sure to delete {{username}}? THIS ACTION IS IRREVERSIBLE" }, "system-section": { "server-name": "Server Name", @@ -276,7 +268,7 @@ "sso-section": { "sso-list": "SSO List", "delete-sso": "Confirm delete", - "confirm-delete": "Are you sure to delete \"{{name}}\" SSO configuration?\n\nTHIS ACTION IS IRREVERSIBLE", + "confirm-delete": "Are you sure to delete \"{{name}}\" SSO configuration? THIS ACTION IS IRREVERSIBLE", "create-sso": "Create SSO", "update-sso": "Update SSO", "sso-created": "SSO {{name}} created", @@ -326,7 +318,6 @@ "about-memos": "About memos", "memos-description": "memos is a web-based note-taking application that you can use to write, organize, and share notes.", "no-server-description": "No description configured for this server.", - "powered-by": "Powered by", "other-projects": "Other Projects" }, "message": { @@ -366,11 +357,7 @@ "succeed-update-customized-profile": "Profile successfully customized.", "succeed-update-additional-script": "Additional script updated successfully.", "update-succeed": "Update succeeded", - "page-not-found": "404 - Page Not Found", - "maximum-upload-size-is": "Maximum allowed upload size is {{size}} MiB", - "file-exceeds-upload-limit-of": "File {{file}} exceeds upload limit of {{size}} MiB", - "updating-setting-failed": "Updating setting failed", - "password-login-disabled": "Can't remove last identity provider when password login is disabled" + "maximum-upload-size-is": "Maximum allowed upload size is {{size}} MiB" }, "inbox": { "memo-comment": "{{user}} has a comment on your {{memo}}.", diff --git a/web/src/locales/es.json b/web/src/locales/es.json index c1cbc0a6e..67cd54602 100644 --- a/web/src/locales/es.json +++ b/web/src/locales/es.json @@ -80,7 +80,7 @@ "disabled": "Las notas públicas están deshabilitadas" } }, - "tag-list": { + "tag": { "tip-text": "Escribe '#etiqueta' para crearlo" }, "setting": { diff --git a/web/src/locales/fr.json b/web/src/locales/fr.json index a510a963b..d91cbc00c 100644 --- a/web/src/locales/fr.json +++ b/web/src/locales/fr.json @@ -360,7 +360,7 @@ "telegram-bot-token-placeholder": "Votre jeton de Bot Telegram" } }, - "tag-list": { + "tag": { "all-tags": "Toutes les Étiquettes", "create-tag": "Créer une Étiquette", "hide": "Cacher", diff --git a/web/src/locales/hi.json b/web/src/locales/hi.json index 112cf9007..c5885a2ec 100644 --- a/web/src/locales/hi.json +++ b/web/src/locales/hi.json @@ -262,7 +262,7 @@ }, "system": "सिस्टम" }, - "tag-list": { + "tag": { "all-tags": "सभी टैग", "create-tag": "टैग बनाएँ", "tag-name": "टैग_नाम", diff --git a/web/src/locales/hr.json b/web/src/locales/hr.json index 975e5db27..8891a17b0 100644 --- a/web/src/locales/hr.json +++ b/web/src/locales/hr.json @@ -354,7 +354,7 @@ "telegram-bot-token-placeholder": "Tvoj Telegram Bot token" } }, - "tag-list": { + "tag": { "all-tags": "Svi Tagovi", "create-tag": "Stvori Tag", "hide": "Sakrij", diff --git a/web/src/locales/hu.json b/web/src/locales/hu.json index a95a78a59..f83758cf0 100644 --- a/web/src/locales/hu.json +++ b/web/src/locales/hu.json @@ -248,7 +248,7 @@ "telegram-bot-token-placeholder": "Telegram bot tokened" } }, - "tag-list": { + "tag": { "all-tags": "Minden címke", "create-tag": "Címke létrehozása", "hide": "Elrejt", diff --git a/web/src/locales/it.json b/web/src/locales/it.json index 165ce5d35..32bd5ae89 100644 --- a/web/src/locales/it.json +++ b/web/src/locales/it.json @@ -341,7 +341,7 @@ "telegram-bot-token-placeholder": "Il token del tuo bot Telegram" } }, - "tag-list": { + "tag": { "all-tags": "Tutti i Tags", "create-tag": "Crea Tag", "invalid-tag-name": "Nome tag non valido", diff --git a/web/src/locales/ja.json b/web/src/locales/ja.json index f988a3a55..c801dcfdd 100644 --- a/web/src/locales/ja.json +++ b/web/src/locales/ja.json @@ -148,7 +148,7 @@ } } }, - "tag-list": { + "tag": { "tip-text": "作成するには`#tag`のように入力してください", "create-tag": "タグを作成する", "all-tags": "すべてのタグ", diff --git a/web/src/locales/ko.json b/web/src/locales/ko.json index 98b2d8018..e493084a6 100644 --- a/web/src/locales/ko.json +++ b/web/src/locales/ko.json @@ -351,7 +351,7 @@ "telegram-bot-token-placeholder": "서버의 텔레그램 봇 토큰" } }, - "tag-list": { + "tag": { "all-tags": "모든 태그", "create-tag": "태그 생성", "hide": "숨기기", diff --git a/web/src/locales/nl.json b/web/src/locales/nl.json index 087a209f2..e50060fbc 100644 --- a/web/src/locales/nl.json +++ b/web/src/locales/nl.json @@ -116,7 +116,7 @@ }, "no-archived-memos": "Geen gearchiveerde memos." }, - "tag-list": { + "tag": { "tip-text": "Typ `#label` om aan te maken", "create-tag": "Label maken", "all-tags": "Alle labels", diff --git a/web/src/locales/pl.json b/web/src/locales/pl.json index ded4dfae2..d98fe0bf7 100644 --- a/web/src/locales/pl.json +++ b/web/src/locales/pl.json @@ -227,7 +227,7 @@ "server-name": "Nazwa serwera" } }, - "tag-list": { + "tag": { "tip-text": "Wprowadź `#tag` aby utworzyć" } } diff --git a/web/src/locales/pt-BR.json b/web/src/locales/pt-BR.json index 2476b6b18..91804efdb 100644 --- a/web/src/locales/pt-BR.json +++ b/web/src/locales/pt-BR.json @@ -361,7 +361,7 @@ "vacuum-hint": "Limpa dados não utilizados." } }, - "tag-list": { + "tag": { "all-tags": "Todas as Tags", "create-tag": "Criar Tag", "hide": "Ocultar", diff --git a/web/src/locales/ru.json b/web/src/locales/ru.json index ffb6c3425..e69af167f 100644 --- a/web/src/locales/ru.json +++ b/web/src/locales/ru.json @@ -333,7 +333,7 @@ "telegram-bot-token-placeholder": "Ваш токен Telegram бота" } }, - "tag-list": { + "tag": { "all-tags": "Все теги", "create-tag": "Создать тег", "tag-name": "Тег", diff --git a/web/src/locales/sl.json b/web/src/locales/sl.json index e0d8419fb..c062013a9 100644 --- a/web/src/locales/sl.json +++ b/web/src/locales/sl.json @@ -104,7 +104,7 @@ "disabled": "Javne beležke so onemogočene" } }, - "tag-list": { + "tag": { "tip-text": "Vnesite `#značka` za izdalavo", "create-tag": "Kreiraj značko", "all-tags": "Vse značke", diff --git a/web/src/locales/sv.json b/web/src/locales/sv.json index 8b36978f2..d3f9cc7d7 100644 --- a/web/src/locales/sv.json +++ b/web/src/locales/sv.json @@ -78,7 +78,7 @@ "disabled": "Offentliga anteckningar är inaktiverade" } }, - "tag-list": { + "tag": { "tip-text": "Ange `#tag ` för att skapa" }, "setting": { diff --git a/web/src/locales/tr.json b/web/src/locales/tr.json index 5caaf5eae..7ebd3234e 100644 --- a/web/src/locales/tr.json +++ b/web/src/locales/tr.json @@ -69,7 +69,7 @@ "disabled": "Halka açık notlar devre dışı bırakıldı" } }, - "tag-list": { + "tag": { "tip-text": "Oluşturmak için #etiket girin" }, "setting": { diff --git a/web/src/locales/uk.json b/web/src/locales/uk.json index 29b0b1e06..8fa89a097 100644 --- a/web/src/locales/uk.json +++ b/web/src/locales/uk.json @@ -78,7 +78,7 @@ "disabled": "Public memos are disabled" } }, - "tag-list": { + "tag": { "tip-text": "Введіть `#tag` щоб створити" }, "setting": { diff --git a/web/src/locales/vi.json b/web/src/locales/vi.json index 605f196ba..bcd467189 100644 --- a/web/src/locales/vi.json +++ b/web/src/locales/vi.json @@ -148,7 +148,7 @@ } } }, - "tag-list": { + "tag": { "tip-text": "Nhập `#tag` để tạo mới", "create-tag": "Tạo thẻ", "all-tags": "Tất cả thẻ", @@ -377,4 +377,4 @@ "version-update": "Phiên bản mới {{version}} đã có sẵn!" } } -} \ No newline at end of file +} diff --git a/web/src/locales/zh-Hans.json b/web/src/locales/zh-Hans.json index a21b0da11..3df2acd32 100644 --- a/web/src/locales/zh-Hans.json +++ b/web/src/locales/zh-Hans.json @@ -3,8 +3,7 @@ "about-memos": "关于 Memos", "memos-description": "Memos 是一个基于网页的笔记应用程序，您可以使用它来编写、组织和共享笔记。", "no-server-description": "没有为此服务器配置描述。", - "other-projects": "其他的项目", - "powered-by": "Powered by" + "other-projects": "其他的项目" }, "amount-text": { "memo": "MEMO" @@ -101,7 +100,7 @@ "editing": "编辑中...", "local": "本地", "only-image-supported": "仅支持图片文件。", - "placeholder": "任何想法...", + "placeholder": "此刻的想法...", "resources": "资源库", "save": "保存" }, @@ -127,7 +126,7 @@ "self": "评论" }, "copy-link": "复制链接", - "delete-confirm": "您确定要删除此备忘录吗？\n\n此操作不可逆", + "delete-confirm": "您确定要删除此备忘录吗？此操作不可逆", "delete-memo": "删除备忘录", "embed": "嵌入", "fetch-more": "点击此处获取更多", @@ -357,7 +356,7 @@ "telegram-bot-token-placeholder": "您的 Telegram 机器人 Token" } }, - "tag-list": { + "tag": { "all-tags": "全部标签", "create-tag": "创建标签", "hide": "收起", diff --git a/web/src/locales/zh-Hant.json b/web/src/locales/zh-Hant.json index e6afe2b81..b77030b94 100644 --- a/web/src/locales/zh-Hant.json +++ b/web/src/locales/zh-Hant.json @@ -360,7 +360,7 @@ "vacuum-hint": "清理未使用的資料" } }, - "tag-list": { + "tag": { "all-tags": "所有標籤", "create-tag": "建立標籤", "hide": "隱藏",