diff options
| -rw-r--r-- | locales/it.json | 3 | ||||
| -rw-r--r-- | locales/ko.json | 14 | ||||
| -rw-r--r-- | package.json | 3 | ||||
| -rw-r--r-- | public/js/index.js | 9 |
4 files changed, 21 insertions, 8 deletions
diff --git a/locales/it.json b/locales/it.json index 8a7f9ee5..8a2ed581 100644 --- a/locales/it.json +++ b/locales/it.json @@ -112,5 +112,6 @@ "This will delete your account, all notes that are owned by you and remove all references to your account from other notes.": "Questo cancellerà il tuo account, tutte le note di cui sei proprietario e rimuoverà i riferimenti al tuo account dalle altre note.", "Delete user": "Elimina utente", "Export user data": "Esporta dati utente", - "Help us translating on %s": "Aiutaci nella traduzione su %s" + "Help us translating on %s": "Aiutaci nella traduzione su %s", + "Source Code": "Codice Sorgente" }
\ No newline at end of file diff --git a/locales/ko.json b/locales/ko.json index 84dda60b..a1df7b9d 100644 --- a/locales/ko.json +++ b/locales/ko.json @@ -84,7 +84,7 @@ "Link": "링크", "Image": "이미지", "Code": "코드", - "Externals": "Externals", + "Externals": "외부 서비스 연동", "This is a alert area.": "여기는 알림 공간입니다.", "Revert": "되돌리기", "Import from clipboard": "클립보드에서 불러오기", @@ -105,5 +105,13 @@ "Export to Snippet": "Export to Snippet", "Select Visibility Level": "Select Visibility Level", "Night Theme": "다크 테마", - "Follow us on %s and %s.": "%s과 %s에서 저희를 팔로우해보세요" -} + "Follow us on %s and %s.": "%s과 %s에서 저희를 팔로우해보세요", + "Privacy": "Privacy", + "Terms of Use": "Terms of Use", + "Do you really want to delete your user account?": "Do you really want to delete your user account?", + "This will delete your account, all notes that are owned by you and remove all references to your account from other notes.": "This will delete your account, all notes that are owned by you and remove all references to your account from other notes.", + "Delete user": "Delete user", + "Export user data": "Export user data", + "Help us translating on %s": "%s에서 번역으로 저희를 도와주세요", + "Source Code": "Source Code" +}
\ No newline at end of file diff --git a/package.json b/package.json index b778e7e0..6d2f35ff 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,6 @@ "moment": "^2.17.1", "morgan": "^1.7.0", "mysql": "^2.12.0", - "node-uuid": "^1.4.7", "passport": "^0.4.0", "passport-dropbox-oauth2": "^1.1.0", "passport-facebook": "^2.1.1", @@ -123,8 +122,8 @@ "store": "^2.0.12", "string": "^3.3.3", "tedious": "^1.14.0", - "to-markdown": "^3.0.3", "toobusy-js": "^0.5.1", + "turndown": "^5.0.1", "uuid": "^3.1.0", "validator": "^10.4.0", "velocity-animate": "^1.4.0", diff --git a/public/js/index.js b/public/js/index.js index c2969e92..a845b5d3 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -12,7 +12,7 @@ require('../css/site.css') require('highlight.js/styles/github-gist.css') -import toMarkdown from 'to-markdown' +import TurndownService from 'turndown' import { saveAs } from 'file-saver' import randomColor from 'randomcolor' @@ -1498,7 +1498,12 @@ $('#snippetExportModalConfirm').click(function () { }) function parseToEditor (data) { - var parsed = toMarkdown(data) + var turndownService = new TurndownService({ + defaultReplacement: function (innerHTML, node) { + return node.isBlock ? '\n\n' + node.outerHTML + '\n\n' : node.outerHTML + } + }) + var parsed = turndownService.turndown(data) if (parsed) { replaceAll(parsed) } } |