Merge branch 'master' into add-editor-rulers

browser/main/modals/PreferencesModal/Blog.js

@@ -43,7 +43,7 @@ class Blog extends React.Component {
     this.handleSettingError = (err) => {
       this.setState({BlogAlert: {
         type: 'error',
-        message: err.message != null ? err.message : 'Error occurs!'
+        message: err.message != null ? err.message : i18n.__('Error occurs!')
       }})
     }
     this.oldBlog = this.state.config.blog
@@ -70,7 +70,7 @@ class Blog extends React.Component {
       this.props.haveToSave({
         tab: 'Blog',
         type: 'warning',
-        message: 'You have to save!'
+        message: i18n.__('You have to save!')
       })
     }
   }
@@ -111,7 +111,7 @@ class Blog extends React.Component {
                 ref='typeDropdown'
                 onChange={(e) => this.handleBlogChange(e)}
               >
-                <option value='wordpress' key='wordpress'>wordpress</option>
+                <option value='wordpress' key='wordpress'>{i18n.__('wordpress')}</option>
               </select>
             </div>
           </div>

browser/main/modals/PreferencesModal/FolderList.js

@@ -6,6 +6,7 @@ import styles from './FolderList.styl'
 import store from 'browser/main/store'
 import FolderItem from './FolderItem'
 import { SortableContainer } from 'react-sortable-hoc'
+import i18n from 'browser/lib/i18n'
 
 class FolderList extends React.Component {
   render () {
@@ -24,7 +25,7 @@ class FolderList extends React.Component {
       <div styleName='folderList'>
         {folderList.length > 0
           ? folderList
-          : <div styleName='folderList-empty'>No Folders</div>
+          : <div styleName='folderList-empty'>{i18n.__('No Folders')}</div>
         }
       </div>
     )

browser/main/modals/PreferencesModal/HotkeyTab.js

@@ -30,7 +30,7 @@ class HotkeyTab extends React.Component {
     this.handleSettingError = (err) => {
       this.setState({keymapAlert: {
         type: 'error',
-        message: err.message != null ? err.message : 'Error occurs!'
+        message: err.message != null ? err.message : i18n.__('Error occurs!')
       }})
     }
     this.oldHotkey = this.state.config.hotkey

browser/main/modals/PreferencesModal/StoragesTab.js

@@ -15,7 +15,7 @@ function browseFolder () {
   const defaultPath = remote.app.getPath('home')
   return new Promise((resolve, reject) => {
     dialog.showOpenDialog({
-      title: 'Select Directory',
+      title: i18n.__('Select Directory'),
       defaultPath,
       properties: ['openDirectory', 'createDirectory']
     }, function (targetPaths) {

browser/main/modals/PreferencesModal/UiTab.js

@@ -36,7 +36,7 @@ class UiTab extends React.Component {
     this.handleSettingError = (err) => {
       this.setState({UiAlert: {
         type: 'error',
-        message: err.message != null ? err.message : 'Error occurs!'
+        message: err.message != null ? err.message : i18n.__('Error occurs!')
       }})
     }
     ipc.addListener('APP_SETTING_DONE', this.handleSettingDone)
@@ -93,7 +93,8 @@ class UiTab extends React.Component {
         latexBlockOpen: this.refs.previewLatexBlockOpen.value,
         latexBlockClose: this.refs.previewLatexBlockClose.value,
         scrollPastEnd: this.refs.previewScrollPastEnd.checked,
-        smartQuotes: this.refs.previewSmartQuotes.checked
+        smartQuotes: this.refs.previewSmartQuotes.checked,
+        sanitize: this.refs.previewSanitize.value
       }
     }
 
@@ -188,6 +189,7 @@ class UiTab extends React.Component {
                 <option value='en'>{i18n.__('English')}</option>
                 <option value='fr'>{i18n.__('French')}</option>
                 <option value='de'>{i18n.__('German')}</option>
+                <option value='hu'>{i18n.__('Hungarian')}</option>
                 <option value='ja'>{i18n.__('Japanese')}</option>
                 <option value='ko'>{i18n.__('Korean')}</option>
                 <option value='no'>{i18n.__('Norwegian')}</option>
@@ -472,6 +474,23 @@ class UiTab extends React.Component {
               Enable smart quotes
             </label>
           </div>
+
+          <div styleName='group-section'>
+            <div styleName='group-section-label'>
+              {i18n.__('Sanitization')}
+            </div>
+            <div styleName='group-section-control'>
+              <select value={config.preview.sanitize}
+                ref='previewSanitize'
+                onChange={(e) => this.handleUIChange(e)}
+              >
+                <option value='STRICT'>✅ {i18n.__('Only allow secure html tags (recommended)')}
+                </option>
+                <option value='ALLOW_STYLES'>⚠️ {i18n.__('Allow styles')}</option>
+                <option value='NONE'>❌ {i18n.__('Allow dangerous html tags')}</option>
+              </select>
+            </div>
+          </div>
           <div styleName='group-section'>
             <div styleName='group-section-label'>
               {i18n.__('LaTeX Inline Open Delimiter')}