From c14540da4e778c5fba792eb4aa1c0d35d0bdb7b0 Mon Sep 17 00:00:00 2001 From: lmm214 Date: Sat, 25 Mar 2023 14:09:04 +0800 Subject: [PATCH] 2023.03.25 --- README.md | 2 + _locales/en/messages.json | 77 ++++++++++++++++++++++++++++++++++++ _locales/zh_CN/messages.json | 76 ++++++++++++++++++++++++++++++++--- css/main.css | 4 +- js/background.js | 12 +++--- js/i18n.js | 14 +++++++ js/oper.js | 64 +++++++++++++++--------------- manifest.json | 4 +- popup.html | 22 ++++++----- 9 files changed, 221 insertions(+), 54 deletions(-) create mode 100644 _locales/en/messages.json create mode 100644 js/i18n.js diff --git a/README.md b/README.md index 3de2fe1..f5f9749 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ Chrome 应用商店： { chrome.contextMenus.create( { type: 'normal', - title: '发送 “%s” 至 Memos ', + title: chrome.i18n.getMessage("sendTo") + '“%s”', id: 'Memos-send', contexts: ['all'] }, ) - }) - chrome.contextMenus.onClicked.addListener(info => { - chrome.storage.sync.set({open_action: "save_text",open_content:info.selectionText}); - }) \ No newline at end of file +}) +let tempCont='' +chrome.contextMenus.onClicked.addListener(info => { + tempCont += info.selectionText + '\n' + chrome.storage.sync.set({open_action: "save_text",open_content:tempCont}); +}) \ No newline at end of file diff --git a/js/i18n.js b/js/i18n.js new file mode 100644 index 0000000..24e76bd --- /dev/null +++ b/js/i18n.js @@ -0,0 +1,14 @@ +document.getElementById("saveKey").textContent = chrome.i18n.getMessage("saveBtn"); +document.getElementById("saveTag").textContent = chrome.i18n.getMessage("saveBtn"); + +document.getElementById("apiUrl").placeholder = chrome.i18n.getMessage("placeApiUrl"); +document.getElementById("content").placeholder = chrome.i18n.getMessage("placeContent"); + +document.getElementById("lockPrivate").textContent = chrome.i18n.getMessage("lockPrivate"); +document.getElementById("lockProtected").textContent = chrome.i18n.getMessage("lockProtected"); +document.getElementById("lockPublic").textContent = chrome.i18n.getMessage("lockPublic"); + +document.getElementById("content_submit_text").textContent = chrome.i18n.getMessage("submitBtn"); + +document.getElementById("hideInput").placeholder = chrome.i18n.getMessage("placeHideInput"); +document.getElementById("showInput").placeholder = chrome.i18n.getMessage("placeShowInput"); \ No newline at end of file diff --git a/js/oper.js b/js/oper.js index fe4062e..46806b8 100644 --- a/js/oper.js +++ b/js/oper.js @@ -44,14 +44,14 @@ get_info(function (info) { chrome.storage.sync.set( { memo_lock: 'PUBLIC'} ) - $("#lock-now").text("所有人可见") + $("#lock-now").text(chrome.i18n.getMessage("lockPublic")) } if(memoNow == "PUBLIC"){ - $("#lock-now").text("所有人可见") + $("#lock-now").text(chrome.i18n.getMessage("lockPublic")) }else if(memoNow == "PRIVATE"){ - $("#lock-now").text("仅自己可见") + $("#lock-now").text(chrome.i18n.getMessage("lockPrivate")) }else if(memoNow == "PROTECTED"){ - $("#lock-now").text("登录用户可见") + $("#lock-now").text(chrome.i18n.getMessage("lockProtected")) } $('#apiUrl').val(info.apiUrl) $('#hideInput').val(info.hidetag) @@ -104,16 +104,15 @@ function initDrag() { obj.ondragenter = function (ev) { if (ev.target.className === 'common-editor-inputer') { $.message({ - message: '拖拽到窗口上传该图片', + message: chrome.i18n.getMessage("picDrag"), autoClose: false }) $('body').css('opacity', 0.3) } - ev.dataTransfer.dropEffect = 'copy' } obj.ondragover = function (ev) { - ev.preventDefault() //防止默认事件拖入图片 放开的时候打开图片了 + ev.preventDefault() ev.dataTransfer.dropEffect = 'copy' } obj.ondrop = function (ev) { @@ -129,7 +128,7 @@ function initDrag() { ev.preventDefault() if (ev.target.className === 'common-editor-inputer') { $.message({ - message: '取消上传' + message: chrome.i18n.getMessage("picCancelDrag") }) $('body').css('opacity', 1) } @@ -138,9 +137,8 @@ function initDrag() { let relistNow = [] function uploadImage(data) { - //显示上传中的动画…… $.message({ - message: '上传图片中……', + message: chrome.i18n.getMessage("picUploading"), autoClose: false }) //根据data判断是图片地址还是base64加密的数据 @@ -172,13 +170,12 @@ function uploadImage(data) { }, function () { $.message({ - message: '上传成功' + message: chrome.i18n.getMessage("picSuccess") }) } ) } else { - //发送失败 - //清空open_action（打开时候进行的操作）,同时清空open_content + //发送失败 清空open_action（打开时候进行的操作）,同时清空open_content chrome.storage.sync.set( { open_action: '', @@ -187,7 +184,7 @@ function uploadImage(data) { }, function () { $.message({ - message: '上传图片失败' + message: chrome.i18n.getMessage("picFailed") }) } ) @@ -196,21 +193,20 @@ function uploadImage(data) { }) } else { $.message({ - message: '所需要信息不足，请先填写好绑定信息' + message: chrome.i18n.getMessage("placeApiUrl") }) } }) } $('#saveKey').click(function () { - // 保存数据 chrome.storage.sync.set( { apiUrl: $('#apiUrl').val() }, function () { $.message({ - message: '保存信息成功' + message: chrome.i18n.getMessage("saveSuccess") }) $('#blog_info').hide() } @@ -238,7 +234,7 @@ $('#tags').click(function () { }); } else { $.message({ - message: '请先填写好 API 链接' + message: chrome.i18n.getMessage("placeApiUrl") }) } }) @@ -257,7 +253,7 @@ $('#saveTag').click(function () { }, function () { $.message({ - message: '保存信息成功' + message: chrome.i18n.getMessage("saveSuccess") }) $('#taghide').hide() } @@ -316,12 +312,12 @@ $('#search').click(function () { }); }else{ $.message({ - message: '想搜点啥？' + message: chrome.i18n.getMessage("searchNow") }) } } else { $.message({ - message: '请先填写好 API 链接' + message: chrome.i18n.getMessage("placeApiUrl") }) } }) @@ -356,7 +352,7 @@ $('#random').click(function () { } } else { $.message({ - message: '请先填写好 API 链接' + message: chrome.i18n.getMessage("placeApiUrl") }) } }) @@ -413,11 +409,11 @@ get_info(function (info) { success: function(result){ $("#randomlist").html('').hide() $.message({ - message: '归档成功！😊' + message: chrome.i18n.getMessage("archiveSuccess") }) },error:function(err){//清空open_action（打开时候进行的操作）,同时清空open_content $.message({ - message: '网络问题，归档失败！😭' + message: chrome.i18n.getMessage("archiveFailed") }) } }) @@ -440,7 +436,9 @@ $('#getlink').click(function () { if(tab.url){ add(linkHtml); }else{ - $.message({message: '获取失败 😂'}) + $.message({ + message: chrome.i18n.getMessage("getTabFailed") + }) } }) }) @@ -482,7 +480,9 @@ $('#content_submit_text').click(function () { if(contentVal){ sendText() }else{ - $.message({message: '写点什么，再记呗？'}) + $.message({ + message: chrome.i18n.getMessage("placeContent") + }) } }) @@ -496,7 +496,7 @@ function getOne(memosId){ }); } else { $.message({ - message: '请先填写好 API 链接' + message: chrome.i18n.getMessage("placeApiUrl") }) } }) @@ -505,7 +505,9 @@ function getOne(memosId){ function sendText() { get_info(function (info) { if (info.status) { - $.message({message: '发送中～～'}) + $.message({ + message: chrome.i18n.getMessage("memoUploading") + }) //$("#content_submit_text").attr('disabled','disabled'); let content = $("textarea[name=text]").val() var hideTag = info.hidetag @@ -536,7 +538,7 @@ function sendText() { { open_action: '', open_content: '',resourceIdList:''}, function () { $.message({ - message: '发送成功！😊' + message: chrome.i18n.getMessage("memoSuccess") }) //$("#content_submit_text").removeAttr('disabled'); $("textarea[name=text]").val('') @@ -547,14 +549,14 @@ function sendText() { { open_action: '', open_content: '',resourceIdList:'' }, function () { $.message({ - message: '网络问题，发送失败！😭' + message: chrome.i18n.getMessage("memoFailed") }) } )}, }) } else { $.message({ - message: '请先填写好 API 链接' + message: chrome.i18n.getMessage("placeApiUrl") }) } }) diff --git a/manifest.json b/manifest.json index ec9799c..f5da903 100644 --- a/manifest.json +++ b/manifest.json @@ -1,13 +1,13 @@ { "manifest_version": 3, "name": "__MSG_extName__", - "version": "2023.03.19", + "default_locale": "zh_CN", + "version": "2023.03.25", "action": { "default_popup": "popup.html", "default_icon": "assets/logo_24x24.png", "default_title": "__MSG_actionTitle__" }, - "default_locale": "zh_CN", "description": "__MSG_extDescription__", "homepage_url": "https://immmmm.com", "icons": { diff --git a/popup.html b/popup.html index dbfc181..4b2a75e 100644 --- a/popup.html +++ b/popup.html @@ -24,10 +24,10 @@ type="text" value="" maxlength="245" - placeholder="请填入 Memos Open API 链接" + placeholder="" required /> - 保存 +
@@ -36,7 +36,7 @@ rows="4" name="text" id="content" - placeholder="现在的想法是..." + placeholder="" required="" >
@@ -79,14 +79,14 @@
-
仅自己可见
-
登录用户可见
-
所有人可见
+
+
+
- +
@@ -98,7 +98,7 @@ type="text" value="" maxlength="50" - placeholder="默认“仅自己可见”标签名" + placeholder="" /> - 保存 +
+ +