Merge branch 'release/v1.4' into develop/add-no-csp-option

Author: cyfung1031

src/locales/ach-UG/translation.json

@@ -20,6 +20,8 @@
   "subscribe": "crwdns7918:0crwdne7918:0",
   "logs": "crwdns7920:0crwdne7920:0",
   "tools": "crwdns7922:0crwdne7922:0",
+  "find": "Find",
+  "replace": "Replace",
   "settings": "crwdns7924:0crwdne7924:0",
   "hide_main_sidebar": "Collapse sidebar",
   "show_main_sidebar": "Expand sidebar",
@@ -219,6 +221,11 @@
   "run_once": "crwdns8308:0crwdne8308:0",
   "stop": "crwdns8310:0crwdne8310:0",
   "edit": "crwdns8312:0crwdne8312:0",
+  "undo": "Undo",
+  "redo": "Redo",
+  "cut": "Cut",
+  "copy": "Copy",
+  "paste": "Paste",
   "exclude_on": "crwdns8922:0crwdne8922:0",
   "exclude_off": "crwdns8924:0crwdne8924:0",
   "user_config": "crwdns8320:0crwdne8320:0",

src/locales/de-DE/translation.json

@@ -20,6 +20,8 @@
   "subscribe": "Abonnieren",
   "logs": "Protokolle",
   "tools": "Werkzeuge",
+  "find": "Suchen",
+  "replace": "Ersetzen",
   "settings": "Einstellungen",
   "hide_main_sidebar": "Seitenleiste einklappen",
   "show_main_sidebar": "Seitenleiste ausklappen",
@@ -220,6 +222,11 @@
   "run_once": "Einmal ausführen",
   "stop": "Stoppen",
   "edit": "Bearbeiten",
+  "undo": "Rückgängig",
+  "redo": "Wiederherstellen",
+  "cut": "Ausschneiden",
+  "copy": "Kopieren",
+  "paste": "Einfügen",
   "exclude_on": "Wiederherstellen auf $0 zur Ausführung",
   "exclude_off": "Ausschließen auf $0 zur Ausführung",
   "user_config": "Benutzerkonfiguration",

src/locales/en-US/translation.json

@@ -20,6 +20,8 @@
   "subscribe": "Subscribe",
   "logs": "Logs",
   "tools": "Tools",
+  "find": "Find",
+  "replace": "Replace",
   "settings": "Settings",
   "hide_main_sidebar": "Collapse sidebar",
   "show_main_sidebar": "Expand sidebar",
@@ -220,6 +222,11 @@
   "run_once": "Run Once",
   "stop": "Stop",
   "edit": "Edit",
+  "undo": "Undo",
+  "redo": "Redo",
+  "cut": "Cut",
+  "copy": "Copy",
+  "paste": "Paste",
   "exclude_on": "Reinstate $0's execution",
   "exclude_off": "Exclude $0's exeuction",
   "user_config": "User Config",

src/locales/ja-JP/translation.json

@@ -20,6 +20,8 @@
   "subscribe": "サブスクライブ",
   "logs": "ログ",
   "tools": "ツール",
+  "find": "検索",
+  "replace": "置換",
   "settings": "設定",
   "hide_main_sidebar": "サイドバーを折りたたむ",
   "show_main_sidebar": "サイドバーを展開",
@@ -220,6 +222,11 @@
   "run_once": "一度実行",
   "stop": "中止",
   "edit": "編集",
+  "undo": "元に戻す",
+  "redo": "やり直し",
+  "cut": "切り取り",
+  "copy": "コピー",
+  "paste": "貼り付け",
   "exclude_on": "$0の実行を復元",
   "exclude_off": "$0の実行を除外",
   "user_config": "ユーザー設定",

src/locales/ru-RU/translation.json

@@ -20,6 +20,8 @@
   "subscribe": "Подписаться",
   "logs": "Журналы",
   "tools": "Инструменты",
+  "find": "Найти",
+  "replace": "Заменить",
   "settings": "Настройки",
   "hide_main_sidebar": "Свернуть боковую панель",
   "show_main_sidebar": "Развернуть боковую панель",
@@ -220,6 +222,11 @@
   "run_once": "Запустить один раз",
   "stop": "Остановить",
   "edit": "Редактировать",
+  "undo": "Отменить",
+  "redo": "Повторить",
+  "cut": "Вырезать",
+  "copy": "Копировать",
+  "paste": "Вставить",
   "exclude_on": "Восстановить в $0 выполнении",
   "exclude_off": "Исключить в $0 выполнении",
   "user_config": "Конфигурация пользователя",

src/locales/vi-VN/translation.json

@@ -20,6 +20,8 @@
   "subscribe": "Đăng ký",
   "logs": "Nhật ký",
   "tools": "Công cụ",
+  "find": "Tìm kiếm",
+  "replace": "Thay thế",
   "settings": "Cài đặt",
   "hide_main_sidebar": "Thu gọn thanh bên",
   "show_main_sidebar": "Mở rộng thanh bên",
@@ -220,6 +222,11 @@
   "run_once": "Chạy một lần",
   "stop": "Dừng",
   "edit": "Sửa",
+  "undo": "Hoàn tác",
+  "redo": "Làm lại",
+  "cut": "Cắt",
+  "copy": "Sao chép",
+  "paste": "Dán",
   "exclude_on": "Cho phép chạy lại $0",
   "exclude_off": "Loại trừ chạy $0",
   "user_config": "Cấu hình người dùng",

src/locales/zh-CN/translation.json

@@ -20,6 +20,8 @@
   "subscribe": "订阅",
   "logs": "日志",
   "tools": "工具",
+  "find": "查找",
+  "replace": "替换",
   "settings": "设置",
   "hide_main_sidebar": "收起侧边栏",
   "show_main_sidebar": "展开侧边栏",
@@ -220,6 +222,11 @@
   "run_once": "运行一次",
   "stop": "停止",
   "edit": "编辑",
+  "undo": "撤销",
+  "redo": "重做",
+  "cut": "剪切",
+  "copy": "复制",
+  "paste": "粘贴",
   "exclude_on": "恢复在 $0 上执行",
   "exclude_off": "排除在 $0 上执行",
   "user_config": "用户配置",

src/locales/zh-TW/translation.json

@@ -20,6 +20,8 @@
   "subscribe": "訂閱",
   "logs": "紀錄",
   "tools": "工具",
+  "find": "尋找",
+  "replace": "取代",
   "settings": "設定",
   "hide_main_sidebar": "摺疊側邊欄",
   "show_main_sidebar": "展開側邊欄",
@@ -220,6 +222,11 @@
   "run_once": "執行一次",
   "stop": "停止",
   "edit": "編輯",
+  "undo": "復原",
+  "redo": "重做",
+  "cut": "剪下",
+  "copy": "複製",
+  "paste": "貼上",
   "exclude_on": "恢復 $0 的執行",
   "exclude_off": "排除 $0 的執行",
   "user_config": "使用者設定",

src/pages/options/routes/ScriptList/components.tsx

@@ -7,7 +7,7 @@ import { TbWorldWww } from "react-icons/tb";
 import { semTime } from "@App/pkg/utils/dayjs";
 import { useTranslation } from "react-i18next";
 import { ListHomeRender } from "../utils";
-import { IconEdit, IconLink, IconUserAdd } from "@arco-design/web-react/icon";
+import { IconEdit, IconLink, IconSync, IconUserAdd } from "@arco-design/web-react/icon";
 import type { SearchType } from "@App/app/service/service_worker/types";
 import type { TFunction } from "i18next";
 import type { SearchFilterKeyEntry, SearchFilterRequest } from "./SearchFilter";
@@ -133,52 +133,61 @@ HomeCell.displayName = "HomeCell";
 
 export const UpdateTimeCell = React.memo(({ className, script }: { className?: string; script: ScriptLoading }) => {
   const { t } = useTranslation();
-  const { handleClick } = {
-    handleClick: () => {
-      if (!script.checkUpdateUrl) {
-        Message.warning(t("update_not_supported")!);
-        return;
-      }
-      Message.info({
-        id: "checkupdate",
-        content: t("checking_for_updates"),
-      });
-      scriptClient
-        .requestCheckUpdate(script.uuid)
-        .then((res) => {
-          if (res) {
-            Message.warning({
-              id: "checkupdate",
-              content: t("new_version_available"),
-            });
-          } else {
-            Message.success({
-              id: "checkupdate",
-              content: t("latest_version"),
-            });
-          }
-        })
-        .catch((e) => {
-          Message.error({
+  const [checking, setChecking] = React.useState(false);
+  const handleClick = () => {
+    if (checking) return;
+    if (!script.checkUpdateUrl) {
+      Message.warning(t("update_not_supported")!);
+      return;
+    }
+    Message.info({
+      id: "checkupdate",
+      content: t("checking_for_updates"),
+    });
+    setChecking(true);
+    scriptClient
+      .requestCheckUpdate(script.uuid)
+      .then((res) => {
+        if (res) {
+          Message.warning({
             id: "checkupdate",
-            content: `${t("update_check_failed")}: ${e.message}`,
+            content: t("new_version_available"),
           });
+        } else {
+          Message.success({
+            id: "checkupdate",
+            content: t("latest_version"),
+          });
+        }
+      })
+      .catch((e) => {
+        Message.error({
+          id: "checkupdate",
+          content: `${t("update_check_failed")}: ${e.message}`,
         });
-    },
+      })
+      .finally(() => {
+        setChecking(false);
+      });
   };
 
   return (
-    <Tooltip content={t("check_update")} position="tl">
-      <Typography.Text
-        className={className}
-        style={{
-          cursor: "pointer",
-        }}
-        onClick={handleClick}
-      >
-        {script.updatetime && semTime(new Date(script.updatetime))}
-      </Typography.Text>
-    </Tooltip>
+    <Space size={4}>
+      <Tooltip content={t("check_update")} position="tl">
+        <Typography.Text className={`tw-cursor-pointer ${className ?? ""}`} onClick={handleClick}>
+          {script.updatetime && semTime(new Date(script.updatetime))}
+        </Typography.Text>
+      </Tooltip>
+      {script.checkUpdateUrl && (
+        <Tooltip content={t("check_update")} position="tl">
+          <IconSync
+            className={`tw-cursor-pointer tw-opacity-45 hover:tw-opacity-100 tw-transition-opacity ${checking ? "arco-icon-loading tw-opacity-100" : ""}`}
+            spin={checking}
+            onClick={handleClick}
+          />
+        </Tooltip>
+      )}
+    </Space>
   );
 });
 UpdateTimeCell.displayName = "UpdateTimeCell";