Skip to content

Commit

Permalink
Merge pull request #47 from TankNee/rebuild/develop
Browse files Browse the repository at this point in the history
202001128
  • Loading branch information
TankNee authored Nov 28, 2020
2 parents 4c6f745 + a121aa3 commit 2e1e680
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
7 changes: 2 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "neeto.vue.electron",
"version": "0.0.18",
"version": "0.0.19",
"description": "An Awesome WizNote Desktop Application",
"productName": "Neeto-Vue",
"author": "tanknee <[email protected]>",
Expand Down Expand Up @@ -34,6 +34,7 @@
"lodash": "^4.17.20",
"node-schedule": "^1.3.2",
"quasar": "^1.0.0",
"sanitize-filename": "^1.6.3",
"turndown": "^6.0.0",
"vditor": "^3.6.6",
"vue-i18n": "^8.0.0"
Expand Down
3 changes: 3 additions & 0 deletions src-electron/main-process/Api.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// import i18n from 'boot/i18n'

const { ipcMain, app, dialog } = require('electron')
const sanitize = require('sanitize-filename')

const fs = require('fs-extra')

/**
Expand Down Expand Up @@ -62,6 +64,7 @@ export default {
}).then((result) => {
if (result.canceled) return
const promises = contents.map(({ content, title }) => {
title = sanitize(title)
return fs.writeFile(`${result.filePaths[0]}/${title}.md`, content).catch(err => throw err)
})
Promise.all(promises).catch(err => throw err)
Expand Down
1 change: 0 additions & 1 deletion src-electron/main-process/electron-main.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ function createWindow () {
event.preventDefault()
shell.openExternal(linkUrl)
})
console.log('Begin register handler')
registerApiHandler()
if (isMac) {
enforceMacOSAppLocation()
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/zh-cn/components/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export default {
search: '搜索',
settings: '设置',
logout: '登出',
logoutHint: '你确定要立刻注销登录吗?',
logoutHint: '确定要立刻注销登录吗?',
cancel: '取消',
switchView: '切换界面视图',
changed: '已修改'
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/zh-cn/components/ui/NoteItem.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export default {
modifiedAt: '修改于 {date}',
discardNote: '丢弃当前笔记的修改',
discardNoteHint: '你是否要丢弃对当前笔记对修改并切换笔记?'
discardNoteHint: '是否丢弃对当前笔记的修改并切换笔记?'
}

0 comments on commit 2e1e680

Please sign in to comment.