From 722864da624e1cd8e74013adeacca429352cb8e6 Mon Sep 17 00:00:00 2001 From: SiderealArt Date: Mon, 25 Jul 2022 16:07:52 +0800 Subject: [PATCH 1/3] update tw.json (#2511) --- packages/hoppscotch-app/locales/tw.json | 73 ++++++++++++++++++++----- 1 file changed, 58 insertions(+), 15 deletions(-) diff --git a/packages/hoppscotch-app/locales/tw.json b/packages/hoppscotch-app/locales/tw.json index 6facfc2fb..0c390c118 100644 --- a/packages/hoppscotch-app/locales/tw.json +++ b/packages/hoppscotch-app/locales/tw.json @@ -1,5 +1,6 @@ { "action": { + "autoscroll": "自動捲動", "cancel": "取消", "choose_file": "選擇一個檔案", "clear": "清除", @@ -9,10 +10,11 @@ "delete": "刪除", "disconnect": "斷開連線", "dismiss": "忽略", - "download_file": "下載檔案", "dont_save": "不要儲存", + "download_file": "下載檔案", "duplicate": "複製", "edit": "編輯", + "filter_response": "篩選回應", "go_back": "返回", "label": "標籤", "learn_more": "瞭解更多", @@ -20,11 +22,14 @@ "more": "更多", "new": "新增", "no": "否", + "open_workspace": "開啟工作區", "paste": "貼上", "prettify": "美化", "remove": "移除", "restore": "還原", "save": "儲存", + "scroll_to_bottom": "捲動至底部", + "scroll_to_top": "捲動至頂部", "search": "搜尋", "send": "傳送", "start": "開始", @@ -46,10 +51,10 @@ "contact_us": "聯絡我們", "copy": "複製", "copy_user_id": "複製使用者驗證權杖", - "discord": "Discord", - "documentation": "幫助文件", "developer_option": "開發者選項", "developer_option_description": "協助開發和維護 Hoppscotch 的工具。", + "discord": "Discord", + "documentation": "幫助文件", "github": "GitHub", "help": "幫助與回饋", "home": "主頁", @@ -164,6 +169,7 @@ "profile": "登入以檢視您的設定檔", "protocols": "協議為空", "schema": "連線至 GraphQL 端點", + "shortcodes": "Shortcodes 為空", "team_name": "團隊名稱為空", "teams": "團隊為空", "tests": "沒有針對該請求的測試" @@ -197,9 +203,11 @@ "invalid_link": "連結無效", "invalid_link_description": "您點擊的連結無效或已過期。", "json_prettify_invalid_body": "無法美化無效的請求主體，處理 JSON 語法錯誤並重試", + "json_parsing_failed": "JSON 無效", "network_error": "似乎有網路錯誤。請再試一次。", "network_fail": "無法傳送請求", "no_duration": "無持續時間", + "no_results_found": "找不到結果", "script_fail": "無法執行預請求指令碼", "something_went_wrong": "發生了一些錯誤", "test_script_fail": "無法執行測試指令碼" @@ -266,15 +274,19 @@ "from_url": "從網址匯入", "gist_url": "輸入 Gist 網址", "json_description": "從 Hoppscotch 組合 JSON 檔匯入組合", - "title": "匯入" + "title": "匯入", + "import_from_url_success": "已匯入組合", + "import_from_url_invalid_file_format": "匯入組合時發生錯誤", + "import_from_url_invalid_type": "不支援此類型。可接受的值為 'hoppscotch'、'openapi'、'postman'、'insomnia'", + "import_from_url_invalid_fetch": "無法從網址取得資料" }, "layout": { - "column": "垂直布局", - "row": "水平布局", - "zen_mode": "專注模式", - "collapse_sidebar": "隱藏或顯示側邊欄", "collapse_collection": "隱藏或顯示組合", - "name": "配置" + "collapse_sidebar": "隱藏或顯示側邊欄", + "column": "垂直布局", + "name": "配置", + "row": "水平布局", + "zen_mode": "專注模式" }, "modal": { "collections": "組合", @@ -331,6 +343,11 @@ "body": "請求本體", "choose_language": "選擇語言", "content_type": "內容類型", + "content_type_titles": { + "others": "其他", + "structured": "結構", + "text": "文字" + }, "copy_link": "複製連結", "duration": "持續時間", "enter_curl": "輸入 cURL", @@ -341,6 +358,9 @@ "method": "方法", "name": "請求名稱", "new": "新請求", + "override": "覆寫", + "override_help": "在標頭設置 Content-Type", + "overriden": "已覆寫", "parameter_list": "查詢參數", "parameters": "參數", "path": "路徑", @@ -358,12 +378,11 @@ "type": "請求類型", "url": "網址", "variables": "變數", - "override": "覆寫", - "override_help": "在標頭設置 Content-Type", - "overriden": "已覆寫" + "view_my_links": "檢視我的連結" }, "response": { "body": "回應本體", + "filter_response_body": "篩選 JSON 回應本體 (使用 JSONPath 語法)", "headers": "回應標頭", "html": "HTML", "image": "影像", @@ -415,6 +434,8 @@ "proxy_use_toggle": "使用 Proxy 中介軟體傳送請求", "read_the": "閱讀", "reset_default": "重置為預設", + "short_codes": "快捷碼", + "short_codes_description": "我們為您打造的快捷碼。", "sidebar_on_left": "左側邊欄", "sync": "同步", "sync_collections": "組合", @@ -447,7 +468,7 @@ "documentation": "前往文件頁面", "forward": "前往下一頁面", "graphql": "前往 GraphQL 頁面", - "profile": "Go to Profile page", + "profile": "前往個人檔案頁面", "realtime": "前往實時頁面", "rest": "前往 REST 頁面", "settings": "前往設定頁面", @@ -476,6 +497,15 @@ "title": "主題" } }, + "shortcodes":{ + "actions":"操作", + "created_on": "建立於", + "deleted" : "已刪除快捷碼", + "method": "方法", + "not_found":"找不到快捷碼", + "short_code":"快捷碼", + "url": "網址" + }, "show": { "code": "顯示程式碼", "more": "顯示更多", @@ -487,7 +517,8 @@ "event_name": "事件名稱", "events": "事件", "log": "日誌", - "url": "網址" + "url": "網址", + "connection_not_authorized": "此 SocketIO 連線未使用任何驗證。" }, "sse": { "event_type": "事件類型", @@ -517,7 +548,19 @@ "loading": "正在載入……", "none": "無", "nothing_found": "沒有找到", - "waiting_send_request": "等待傳送請求" + "waiting_send_request": "等待傳送請求", + "subscribed_success": "成功訂閱此主題：{topic}", + "unsubscribed_success": "成功取消訂閱此主題：{topic}", + "subscribed_failed": "無法訂閱此主題：{topic}", + "unsubscribed_failed": "無法取消訂閱此主題：{topic}", + "published_message": "已將此訊息：{message} 發布至主題：{topic}", + "published_error": "將訊息：{topic} 發布至主題：{message} 時發生錯誤", + "message_received": "訊息：{message}已抵達主題：{topic}", + "mqtt_subscription_failed": "訂閱此主題時發生錯誤：{topic}", + "connection_lost": "失去連線", + "connection_failed": "連線失敗", + "connection_error": "連線失敗", + "reconnection_error": "重新連線失敗" }, "support": { "changelog": "閱讀更多有關最新版本的內容", From c0e3a2be0bd9d53027a17a124ed74061dc40f664 Mon Sep 17 00:00:00 2001 From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com> Date: Mon, 25 Jul 2022 14:01:26 +0530 Subject: [PATCH 2/3] fix: disabled search in team collection (#2523) Co-authored-by: liyasthomas --- packages/hoppscotch-app/components/collections/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/hoppscotch-app/components/collections/index.vue b/packages/hoppscotch-app/components/collections/index.vue index c842ce96e..6b49dba8f 100644 --- a/packages/hoppscotch-app/components/collections/index.vue +++ b/packages/hoppscotch-app/components/collections/index.vue @@ -11,6 +11,7 @@ autocomplete="off" :placeholder="$t('action.search')" class="py-2 pl-4 pr-2 bg-transparent" + :disabled="collectionsType.type == 'team-collections'" /> Date: Mon, 25 Jul 2022 13:58:02 +0500 Subject: [PATCH 3/3] fix: search panel position in response (#2510) Co-authored-by: liyasthomas --- packages/hoppscotch-app/helpers/editor/themes/baseTheme.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/hoppscotch-app/helpers/editor/themes/baseTheme.ts b/packages/hoppscotch-app/helpers/editor/themes/baseTheme.ts index d1668f0f9..2c55f55bd 100644 --- a/packages/hoppscotch-app/helpers/editor/themes/baseTheme.ts +++ b/packages/hoppscotch-app/helpers/editor/themes/baseTheme.ts @@ -61,6 +61,8 @@ export const baseTheme = EditorView.theme({ }, ".cm-panels.cm-panels-top": { borderBottom: "1px solid var(--divider-light-color)", + top: "var(--lower-tertiary-sticky-fold) !important", + "z-index": "10", }, ".cm-panels.cm-panels-bottom": { borderTop: "1px solid var(--divider-light-color)", @@ -388,5 +390,7 @@ export const basicSetup: Extension = [ ...completionKeymap, ...lintKeymap, ]), - search(), + search({ + top: true, + }), ]