Merge branch 'master' into paste_storage_link_should_clone_attachment

browser/components/CodeEditor.js

@@ -413,25 +413,58 @@ export default class CodeEditor extends React.Component {
     const taggedUrl = `<${pastedTxt}>`
     editor.replaceSelection(taggedUrl)
 
-    fetch(pastedTxt, {
+    const isImageReponse = (response) => {
-      method: 'get'
+      return response.headers.has('content-type') &&
-    }).then((response) => {
+        response.headers.get('content-type').match(/^image\/.+$/)
-      return this.decodeResponse(response)
+    }
-    }).then((response) => {
+    const replaceTaggedUrl = (replacement) => {
-      const parsedResponse = (new window.DOMParser()).parseFromString(response, 'text/html')
       const value = editor.getValue()
       const cursor = editor.getCursor()
-      const LinkWithTitle = `[${parsedResponse.title}](${pastedTxt})`
+      const newValue = value.replace(taggedUrl, replacement)
-      const newValue = value.replace(taggedUrl, LinkWithTitle)
       const newCursor = Object.assign({}, cursor, { ch: cursor.ch + newValue.length - value.length })
       editor.setValue(newValue)
       editor.setCursor(newCursor)
+    }
+
+    fetch(pastedTxt, {
+      method: 'get'
+    }).then((response) => {
+      if (isImageReponse(response)) {
+        return this.mapImageResponse(response, pastedTxt)
+      } else {
+        return this.mapNormalResponse(response, pastedTxt)
+      }
+    }).then((replacement) => {
+      replaceTaggedUrl(replacement)
     }).catch((e) => {
-      const value = editor.getValue()
+      replaceTaggedUrl(pastedTxt)
-      const newValue = value.replace(taggedUrl, pastedTxt)
+    })
-      const cursor = editor.getCursor()
+  }
-      editor.setValue(newValue)
+
-      editor.setCursor(cursor)
+  mapNormalResponse (response, pastedTxt) {
+    return this.decodeResponse(response).then((body) => {
+      return new Promise((resolve, reject) => {
+        try {
+          const parsedBody = (new window.DOMParser()).parseFromString(body, 'text/html')
+          const linkWithTitle = `[${parsedBody.title}](${pastedTxt})`
+          resolve(linkWithTitle)
+        } catch (e) {
+          reject(e)
+        }
+      })
+    })
+  }
+
+  mapImageResponse (response, pastedTxt) {
+    return new Promise((resolve, reject) => {
+      try {
+        const url = response.url
+        const name = url.substring(url.lastIndexOf('/') + 1)
+        const imageLinkWithName = `![${name}](${pastedTxt})`
+        resolve(imageLinkWithName)
+      } catch (e) {
+        reject(e)
+      }
     })
   }
 

browser/components/MarkdownEditor.js

@@ -283,7 +283,7 @@ class MarkdownEditor extends React.Component {
           indentSize={editorIndentSize}
           scrollPastEnd={config.preview.scrollPastEnd}
           smartQuotes={config.preview.smartQuotes}
-          smartArrows={config.previw.smartArrows}
+          smartArrows={config.preview.smartArrows}
           breaks={config.preview.breaks}
           sanitize={config.preview.sanitize}
           ref='preview'

browser/components/MarkdownPreview.js

@@ -532,11 +532,6 @@ export default class MarkdownPreview extends React.Component {
     e.stopPropagation()
 
     const href = e.target.href
-    if (href.match(/^http/i)) {
-      shell.openExternal(href)
-      return
-    }
-
     const linkHash = href.split('/').pop()
 
     const regexNoteInternalLink = /main.html#(.+)/
@@ -568,6 +563,9 @@ export default class MarkdownPreview extends React.Component {
       eventEmitter.emit('list:jump', linkHash.split('-')[1])
       return
     }
+
+    // other case
+    shell.openExternal(href)
   }
 
   render () {

browser/lib/Languages.js

@@ -58,6 +58,9 @@ const languages = [
   {
     name: 'Spanish',
     locale: 'es-ES'
+  }, {
+    name: 'Turkish',
+    locale: 'tr'
   }
 ]
 

locales/tr.json

@@ -0,0 +1,155 @@
+{
+	"Notes": "Notlar",
+	"Tags": "Etiketler",
+	"Preferences": "Tercihler",
+	"Make a note": "Not Oluştur",
+	"Ctrl": "Ctrl",
+	"Ctrl(^)": "Ctrl",
+	"to create a new note": "yeni not oluşturmak için",
+	"Toggle Mode": "Mod Değiştir",
+	"Trash": "Çöp",
+	"MODIFICATION DATE": "DEĞİŞİKLİK TARİHİ",
+	"Words": "Kelimeler",
+	"Letters": "Harfler",
+	"STORAGE": "SAKLAMA ALANI",
+	"FOLDER": "DOSYA",
+	"CREATION DATE": "OLUŞTURULMA TARİHİ",
+	"NOTE LINK": "NOT BAĞLANTISI",
+	".md": ".md",
+	".txt": ".txt",
+	".html": ".html",
+	"Print": "Yazdır",
+	"Your preferences for Boostnote": "Boostnote tercihleriniz",
+	"Storages": "Saklama Alanları",
+	"Add Storage Location": "Saklama Yeri Ekle",
+	"Add Folder": "Dosya Ekle",
+	"Open Storage folder": "Saklama Alanı Dosyasını Aç",
+	"Unlink": "Bağlantıyı kaldır",
+	"Edit": "Düzenle",
+	"Delete": "Sil",
+	"Interface": "Arayüz",
+	"Interface Theme": "Arayüz Teması",
+	"Default": "Varsayılan",
+	"White": "Beyaz",
+	"Solarized Dark": "Solarize Karanlık",
+	"Dark": "Karanlık",
+	"Show a confirmation dialog when deleting notes": "Notlar silinirken onay ekranını göster",
+	"Editor Theme": "Editör Teması",
+	"Editor Font Size": "Editör Yazı Büyüklüğü",
+	"Editor Font Family": "Editör Yazı Ailesi",
+	"Editor Indent Style": "Editör Girinti Stili",
+	"Spaces": "Boşluklar",
+	"Tabs": "Tablar",
+	"Switch to Preview": "Önizlemeye Geç",
+	"When Editor Blurred": "Editörden çıkıldığında",
+	"When Editor Blurred, Edit On Double Click": "Editörden Çıkıldığında, Çift Tıklayarak Düzenle",
+	"On Right Click": "Sağ tıklandığında",
+	"Editor Keymap": "Editör Tuş Haritası",
+	"default": "varsayılan",
+	"vim": "vim",
+	"emacs": "emacs",
+	"⚠️ Please restart boostnote after you change the keymap": "⚠️ Tuş haritası değişikliklerinden sonra lütfen Boostnote'u yeniden başlatın",
+	"Show line numbers in the editor": "Editörde satır numaralarını göster",
+	"Allow editor to scroll past the last line": "Editörün son satırı geçmesine izin ver",
+	"Bring in web page title when pasting URL on editor": "Editörde URL yapıştırırken web sayfasının başlığını getir",
+	"Preview": "Önizleme",
+	"Preview Font Size": "Yazı Büyüklüğünü Önizle",
+	"Preview Font Family": "Yazı Tipini Önizle",
+	"Code block Theme": "Kod bloğu Teması",
+	"Allow preview to scroll past the last line": "Önizlemenin son satırı geçmesine izin ver",
+	"Show line numbers for preview code blocks": "Kod bloklarının önizlemesinde satır numaralarını göster",
+	"LaTeX Inline Open Delimiter": "LaTeX Inline Open Delimiter",
+	"LaTeX Inline Close Delimiter": "LaTeX Inline Close Delimiter",
+	"LaTeX Block Open Delimiter": "LaTeX Block Open Delimiter",
+	"LaTeX Block Close Delimiter": "LaTeX Block Close Delimiter",
+	"Community": "Topluluk",
+	"Subscribe to Newsletter": "Bültene Kayıt Ol",
+	"GitHub": "GitHub",
+	"Blog": "Blog",
+	"Facebook Group": "Facebook Grubu",
+	"Twitter": "Twitter",
+	"About": "Hakkında",
+	"Boostnote": "Boostnote",
+	"An open source note-taking app made for programmers just like you.": "Tıpkı sizin gibi programcılar için yapılmış açık kaynak not alma uygulaması",
+	"Website": "Websitesi",
+	"Development": "Geliştirme",
+	" : Development configurations for Boostnote.": " : Boostnote için geliştirme ayarları.",
+	"Copyright (C) 2017 - 2018 BoostIO": "Her hakkı saklıdır. (C) 2017 - 2018 BoostIO",
+	"License: GPL v3": "Lisans: GPL v3",
+	"Analytics": "Analizler",
+	"Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.": "Boostnote, uygulamanın geliştirilmesi amacıyla anonim veriler toplar. Notlarınızın içeriği gibi kişisel bilgiler kesinlikle toplanmaz.",
+	"You can see how it works on ": "Nasıl çalıştığını görebilirsiniz ",
+	"You can choose to enable or disable this option.": "Bu seçeneği etkinleştirmeyi veya devre dışı bırakmayı seçebilirsiniz.",
+	"Enable analytics to help improve Boostnote": "Boostnote'un geliştirilmesine katkıda bulunmak için analizleri etkinleştirin",
+	"Crowdfunding": "Kitle Fonlaması",
+	"Dear everyone,": "Sevgili herkes,",
+	"Thank you for using Boostnote!": "Boostnote'u kullandığınız için teşekkürler!",
+	"Boostnote is used in about 200 different countries and regions by an awesome community of developers.": "Boostnote, 200 farklı ülke ve bölgede, harika bir geliştirici topluluğu tarafından kullanılmaktadır.",
+	"To continue supporting this growth, and to satisfy community expectations,": "Bu büyümeyi desteklemeye devam etmek ve topluluk beklentilerini karşılamak için,",
+	"we would like to invest more time and resources in this project.": "bu projeye daha fazla zaman ve kaynak yatırmak istiyoruz.",
+	"If you like this project and see its potential, you can help by supporting us on OpenCollective!": "Bu projeyi beğeniyor ve potansiyel görüyorsanız, OpenCollective üzerinden bizi destekleyerek katkıda bulunabilirsiniz!",
+	"Thanks,": "Teşekkürler,",
+	"Boostnote maintainers": "Boostnote'un bakımını yapanlar",
+	"Support via OpenCollective": "OpenCollective aracılığıyla destekle",
+	"Language": "Dil",
+	"English": "İngilizce",
+	"German": "Almanca",
+	"French": "Fransızca",
+	"Show \"Saved to Clipboard\" notification when copying": "Kopyalandığında \"Clipboard'a kopyalandı\" uyarısını göster",
+	"All Notes": "Tüm Notlar",
+	"Starred": "Yıldızlı",
+	"Are you sure to ": "Bu klasörü",
+	" delete": " silmek istediğinize",
+	"this folder?": " emin misiniz?",
+	"Confirm": "Onayla",
+	"Cancel": "İptal",
+	"Markdown Note": "Markdown Notu",
+	"This format is for creating text documents. Checklists, code blocks and Latex blocks are available.": "Bu format metin dökümanları oluşturmak içindir. Listeler, kod blokları ve Latex blokları mevcuttur.",
+	"Snippet Note": "Parça Not",
+	"This format is for creating code snippets. Multiple snippets can be grouped into a single note.": "Bu format kod parçacıkları oluşturmak içindir. Çoklu kod parçaları tek bir not içinde gruplanabilir.",
+	"Tab to switch format": "Format değiştirmek için Tab tuşunu kullan",
+	"Updated": "Güncellendi",
+	"Created": "Oluşturuldu",
+	"Alphabetically": "Alfabetik Olarak",
+	"Default View": "Varsayılan Görünüm",
+	"Compressed View": "Sıkıştırılmış Görünüm",
+	"Search": "Ara",
+	"Blog Type": "Blog Tipi",
+	"Blog Address": "Blog Adresi",
+	"Save": "Kaydet",
+	"Auth": "Auth",
+	"Authentication Method": "Doğrulama Yöntemi",
+	"JWT": "JWT",
+	"USER": "KULLANICI",
+	"Token": "Token",
+	"Storage": "Saklama Alanı",
+	"Hotkeys": "Kısayol Tuşları",
+	"Show/Hide Boostnote": "Boostnote'u Göster/Gizle ",
+	"Restore": "Geri Yükle",
+	"Permanent Delete": "Kalıcı Olarak Sil",
+	"Confirm note deletion": "Not silmeyi onayla",
+	"This will permanently remove this note.": "Bu not kalıcı olarak silinecektir.",
+	"Successfully applied!": "Başarıyla Uygulandı!",
+	"Albanian": "Arnavutça",
+	"Chinese (zh-CN)": "Çince (zh-CN)",
+	"Chinese (zh-TW)": "Çince (zh-TW)",
+	"Danish": "Danca",
+	"Japanese": "Japonca",
+	"Korean": "Korean",
+	"Norwegian": "Norveççe",
+	"Polish": "Lehçe",
+	"Portuguese": "Portekizce",
+	"Spanish": "İspanyolca",
+	"You have to save!": "Kaydetmelisiniz!",
+	"UserName": "KullanıcıAdı",
+	"Password": "Şifre",
+	"Russian": "Rusça",
+	"Command(⌘)": "Command(⌘)",
+	"Editor Rulers": "Editör Cetvelleri",
+	"Enable": "Etkinleştir",
+	"Disable": "Etkisizleştir",
+	"Sanitization": "Temizleme",
+	"Only allow secure html tags (recommended)": "Sadece güvenli html etiketlerine izin ver (tavsiye edilen)",
+	"Allow styles": "Stillere izin ver",
+	"Allow dangerous html tags": "Tehlikeli html etiketlerine izin ver"
+}

locales/zh-CN.json

@@ -23,7 +23,7 @@
 	"Storages": "本地存储",
 	"Add Storage Location": "添加一个本地存储位置",
 	"Add Folder": "新建文件夹",
-	"Open Storage folder": "打开本地存储位置",
+	"Open Storage folder": "打开本地存储文件夹",
 	"Unlink": "取消链接",
 	"Edit": "编辑",
 	"Delete": "删除",
@@ -34,10 +34,11 @@
 	"Solarized Dark": "Solarized Dark",
 	"Dark": "Dark",
 	"Show a confirmation dialog when deleting notes": "删除笔记的时候，显示确认框",
+	"Editor": "编辑器",
 	"Editor Theme": "编辑器主题",
 	"Editor Font Size": "编辑器字号",
 	"Editor Font Family": "编辑器字体",
-	"Editor Indent Style": "缩进风格",
+	"Editor Indent Style": "编辑器缩进风格",
 	"Spaces": "空格",
 	"Tabs": "Tabs",
 	"Switch to Preview": "快速切换到预览界面",
@@ -48,20 +49,21 @@
 	"default": "默认",
 	"vim": "vim",
 	"emacs": "emacs",
-	"⚠️ Please restart boostnote after you change the keymap": "⚠️ 设置好快捷键后，记得重启boostnote",
+	"⚠️ Please restart boostnote after you change the keymap": "⚠️ 修改后，请重启 boostnote",
 	"Show line numbers in the editor": "在编辑器中显示行号",
 	"Allow editor to scroll past the last line": "允许编辑器滚动到最后一行",
 	"Bring in web page title when pasting URL on editor": "粘贴网页链接的时候，显示为网页标题",
-	"Preview": "预览器",
+	"Preview": "预览",
-	"Preview Font Size": "预览器字号",
+	"Preview Font Size": "预览字号",
-	"Preview Font Family": "预览器字体",
+	"Preview Font Family": "预览字体",
 	"Code block Theme": "代码块主题",
-	"Allow preview to scroll past the last line": "允许预览器滚动到最后一行",
+	"Allow preview to scroll past the last line": "允许预览时滚动到最后一行",
-	"Show line numbers for preview code blocks": "在预览器中显示行号",
+	"Show line numbers for preview code blocks": "在预览时显示行号",
 	"LaTeX Inline Open Delimiter": "LaTeX 单行开头分隔符",
 	"LaTeX Inline Close Delimiter": "LaTeX 单行结尾分隔符",
 	"LaTeX Block Open Delimiter": "LaTeX 多行开头分隔符",
 	"LaTeX Block Close Delimiter": "LaTeX 多行结尾分隔符",
+	"PlantUML Server": "PlantUML 服务器",
 	"Community": "社区",
 	"Subscribe to Newsletter": "订阅邮件",
 	"GitHub": "GitHub",
@@ -73,24 +75,24 @@
 	"An open source note-taking app made for programmers just like you.": "一款专门为程序员朋友量身打造的开源笔记",
 	"Website": "官网",
 	"Development": "开发",
-	" : Development configurations for Boostnote.": " : Boostnote的开发配置",
+	" : Development configurations for Boostnote.": " : Boostnote 的开发配置",
 	"Copyright (C) 2017 - 2018 BoostIO": "Copyright (C) 2017 - 2018 BoostIO",
 	"License: GPL v3": "License: GPL v3",
 	"Analytics": "分析",
 	"Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.": "Boostnote 收集匿名数据只为了提升软件使用体验，绝对不收集任何个人信息（包括笔记内容）",
 	"You can see how it works on ": "你可以看看它的源码是如何运作的 ",
 	"You can choose to enable or disable this option.": "你可以选择开启或不开启这个功能",
-	"Enable analytics to help improve Boostnote": "允许对数据进行分析，帮助我们改进Boostnote",
+	"Enable analytics to help improve Boostnote": "允许对数据进行分析，帮助我们改进 Boostnote",
 	"Crowdfunding": "众筹",
 	"Dear everyone,": "亲爱的用户：",
-	"Thank you for using Boostnote!": "谢谢你使用Boostnote！",
+	"Thank you for using Boostnote!": "谢谢你使用 Boostnote！",
-	"Boostnote is used in about 200 different countries and regions by an awesome community of developers.": "大约有200个不同的国家和地区的优秀开发者们都在使用Boostnote！",
+	"Boostnote is used in about 200 different countries and regions by an awesome community of developers.": "大约有200个不同的国家和地区的优秀开发者们都在使用 Boostnote！",
 	"To continue supporting this growth, and to satisfy community expectations,": "为了继续支持这种发展，和满足社区的期待，",
 	"we would like to invest more time and resources in this project.": "我们非常愿意投入更多的时间和资源到这个项目中。",
-	"If you like this project and see its potential, you can help by supporting us on OpenCollective!": "如果你喜欢这款软件并且看好它的潜力, 请在OpenCollective上支持我们！",
+	"If you like this project and see its potential, you can help by supporting us on OpenCollective!": "如果你喜欢这款软件并且看好它的潜力, 请在 OpenCollective 上支持我们！",
 	"Thanks,": "十分感谢！",
-	"Boostnote maintainers": "Boostnote的维护人员",
+	"Boostnote maintainers": "Boostnote 的维护人员",
-	"Support via OpenCollective": "在OpenCollective上支持我们",
+	"Support via OpenCollective": "在 OpenCollective 上支持我们",
 	"Language": "语言",
 	"English": "English",
 	"German": "German",
@@ -103,14 +105,15 @@
 	"this folder?": "这个文件夹？",
 	"Confirm": "确认",
 	"Cancel": "取消",
-	"Markdown Note": "Markdown笔记",
+	"Markdown Note": "Markdown 笔记",
-	"This format is for creating text documents. Checklists, code blocks and Latex blocks are available.": "创建文档，清单，代码块甚至是Latex格式文档",
+	"This format is for creating text documents. Checklists, code blocks and Latex blocks are available.": "创建文档，清单，代码块甚至是 Latex 格式文档",
 	"Snippet Note": "代码笔记",
 	"This format is for creating code snippets. Multiple snippets can be grouped into a single note.": "创建代码片段，支持多种语法代码片段",
-	"Tab to switch format": "使用Tab键切换格式",
+	"Tab to switch format": "使用 Tab 键切换格式",
 	"Updated": "更新时间",
 	"Created": "创建时间",
-	"Alphabetically": "A~Z排序",
+	"Alphabetically": "A~Z 排序",
+	"Counter":"标签下文章数量排序",
 	"Default View": "默认视图",
 	"Compressed View": "列表视图",
 	"Search": "搜索",
@@ -146,9 +149,63 @@
 	"Enable": "开启",
 	"Disable": "关闭",
 	"Sanitization": "代码处理",
-	"Only allow secure html tags (recommended)": "只允许安全的html标签(推荐)",
+	"Only allow secure html tags (recommended)": "只允许安全的 html 标签(推荐)",
 	"Allow styles": "允许样式",
-	"Allow dangerous html tags": "允许危险的html标签",
+	"Allow dangerous html tags": "允许危险的 html 标签",
+	"Select filter mode": "选择过滤模式",
+	"Add tag...": "添加标签...",
+	"Star":"星标",
+	"Fullscreen": "全屏",
+	"Info":"详情",
+	"Remove pin": "取消置顶",
+	"Pin to Top": "置顶",
+	"Delete Note": "删除笔记",
+	"Clone Note": "复制笔记",
+	"Restore Note": "恢复笔记",
+	"Copy Note Link": "复制笔记链接",
+	"Publish Blog": "发布博客",
+	"Update Blog": "更新博客",
+	"Open Blog": "打开博客",
+	"Empty Trash": "清空废纸篓",
+	"Rename Folder": "重命名文件夹",
+	"Export Folder": "导出文件夹",
+	"Export as txt": "导出为 txt",
+	"Export as md": "导出为 md",
+	"Delete Folder": "删除文件夹",
+	"Select directory": "选择目录",
+	"Select a folder to export the files to": "选择一个导出目录",
+	"Description...": "描述...",
+	"Publish Failed": "发布失败",
+	"Check and update your blog setting and try again.": "检查并修改你的博客设置后重试。",
+	"Delete a snippet": "删除一个代码片段",
+	"This work cannot be undone.": "此操作无法撤销。",
+	"Help": "帮助",
+	"Hungarian": "匈牙利语",
+	"Hide Help": "隐藏帮助",
+	"wordpress": "Wordpress",
+	"Add Storage": "添加存储",
+	"Name": "名称",
+	"Type": "类型",
+	"File System": "文件",
+	"Setting up 3rd-party cloud storage integration:": "设置整合第三方云存储:",
+	"Cloud-Syncing-and-Backup": "云端同步和备份",
+	"Location": "路径",
+	"Select Folder": "选择文件夹",
+	"Add": "添加",
+	"Available Keys": "可用按键",
+	"Select Directory": "选择目录",
+	"copy": "副本",
+	"Create new folder": "创建新文件夹",
+	"Folder name": "文件夹名称",
+	"Create": "创建",
+	"Unlink Storage": "取消存储链接",
+	"Unlinking removes this linked storage from Boostnote. No data is removed, please manually delete the folder from your hard drive if needed.": "取消链接会移除存储和 Boostnote 的链接。文件将不会被删除，如果你需要的话可以手动删除此目录。",
+	"Empty note": "空笔记",
+	"Unnamed":"未命名",
+	"Rename": "重命名",
+	"Folder Name": "文件夹名称",
+	"No tags":"无标签",
+	"Render newlines in Markdown paragraphs as <br>":"在 Markdown 段落中使用 <br> 换行",
 	"Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.": "Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.",
 	"⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠"
 }