Merge branch 'master' into Issue_1723

browser/components/NoteItem.js

@@ -8,6 +8,7 @@ import CSSModules from 'browser/lib/CSSModules'
 import { getTodoStatus } from 'browser/lib/getTodoStatus'
 import styles from './NoteItem.styl'
 import TodoProcess from './TodoProcess'
+import i18n from 'browser/lib/i18n'
 
 /**
  * @description Tag element component.
@@ -76,7 +77,7 @@ const NoteItem = ({
       <div styleName='item-title'>
         {note.title.trim().length > 0
           ? note.title
-          : <span styleName='item-title-empty'>Empty</span>
+          : <span styleName='item-title-empty'>{i18n.__('Empty note')}</span>
         }
       </div>
       {['ALL', 'STORAGE'].includes(viewType) && <div styleName='item-middle'>
@@ -93,7 +94,7 @@ const NoteItem = ({
         <div styleName='item-bottom-tagList'>
           {note.tags.length > 0
             ? TagElementList(note.tags)
-            : <span style={{ fontStyle: 'italic', opacity: 0.5 }} styleName='item-bottom-tagList-empty'>No tags</span>
+            : <span style={{ fontStyle: 'italic', opacity: 0.5 }} styleName='item-bottom-tagList-empty'>{i18n.__('No tags')}</span>
           }
         </div>
         <div>

browser/components/NoteItemSimple.js

@@ -5,6 +5,7 @@ import PropTypes from 'prop-types'
 import React from 'react'
 import CSSModules from 'browser/lib/CSSModules'
 import styles from './NoteItemSimple.styl'
+import i18n from 'browser/lib/i18n'
 
 /**
  * @description Note item component when using simple display mode.
@@ -45,7 +46,7 @@ const NoteItemSimple = ({
       }
       {note.title.trim().length > 0
         ? note.title
-        : <span styleName='item-simple-title-empty'>Empty</span>
+        : <span styleName='item-simple-title-empty'>{i18n.__('Empty note')}</span>
       }
       {isAllNotesView && <div styleName='item-simple-right'>
         <span styleName='item-simple-right-storageName'>

browser/components/SnippetTab.js

@@ -2,6 +2,7 @@ import React from 'react'
 import CSSModules from 'browser/lib/CSSModules'
 import styles from './SnippetTab.styl'
 import context from 'browser/lib/context'
+import i18n from 'browser/lib/i18n'
 
 class SnippetTab extends React.Component {
   constructor (props) {
@@ -28,7 +29,7 @@ class SnippetTab extends React.Component {
   handleContextMenu (e) {
     context.popup([
       {
-        label: 'Rename',
+        label: i18n.__('Rename'),
         click: (e) => this.handleRenameClick(e)
       }
     ])
@@ -114,7 +115,7 @@ class SnippetTab extends React.Component {
             {snippet.name.trim().length > 0
               ? snippet.name
               : <span styleName='button-unnamed'>
-                Unnamed
+                {i18n.__('Unnamed')}
               </span>
             }
           </button>

browser/lib/i18n.js

@@ -1,7 +1,7 @@
 // load package for localization
 const i18n = new (require('i18n-2'))({
   // setup some locales - other locales default to the first locale
-  locales: ['en', 'sq', 'zh-CN', 'zh-TW', 'da', 'fr', 'de', 'hu', 'ja', 'ko', 'no', 'pl', 'pt', 'es'],
+  locales: ['en', 'sq', 'zh-CN', 'zh-TW', 'da', 'fr', 'de', 'hu', 'ja', 'ko', 'no', 'pl', 'pt', 'es-ES'],
   extension: '.json',
   devMode: false
 })

browser/main/Main.js

@@ -175,8 +175,8 @@ class Main extends React.Component {
       i18n.setLocale('pt')
     } else if (config.ui.language === 'ru') {
       i18n.setLocale('ru')
-    } else if (config.ui.language === 'es') {
-      i18n.setLocale('es')
+    } else if (config.ui.language === 'es-ES') {
+      i18n.setLocale('es-ES')
     } else {
       i18n.setLocale('en')
     }

browser/main/NoteList/index.js

@@ -650,7 +650,7 @@ class NoteList extends React.Component {
       .createNote(storage.key, {
         type: firstNote.type,
         folder: folder.key,
-        title: firstNote.title + ' copy',
+        title: firstNote.title + ' ' + i18n.__('copy'),
         content: firstNote.content
       })
       .then((note) => {

browser/main/lib/ConfigManager.js

@@ -164,8 +164,8 @@ function set (updates) {
     i18n.setLocale('pt')
   } else if (newConfig.ui.language === 'ru') {
     i18n.setLocale('ru')
-  } else if (newConfig.ui.language === 'es') {
-    i18n.setLocale('es')
+  } else if (newConfig.ui.language === 'es-ES') {
+    i18n.setLocale('es-ES')
   } else {
     i18n.setLocale('en')
   }

browser/main/modals/CreateFolderModal.js

@@ -96,7 +96,7 @@ class CreateFolderModal extends React.Component {
           <button styleName='control-confirmButton'
             onClick={(e) => this.handleConfirmButtonClick(e)}
           >
-            Create
+            {i18n.__('Create')}
           </button>
         </div>
       </div>

browser/main/modals/PreferencesModal/FolderItem.js

@@ -151,12 +151,12 @@ class FolderItem extends React.Component {
           <button styleName='folderItem-right-confirmButton'
             onClick={(e) => this.handleConfirmButtonClick(e)}
           >
-            Confirm
+            {i18n.__('Confirm')}
           </button>
           <button styleName='folderItem-right-button'
             onClick={(e) => this.handleCancelButtonClick(e)}
           >
-            Cancel
+            {i18n.__('Cancel')}
           </button>
         </div>
       </div>

browser/main/modals/PreferencesModal/HotkeyTab.js

@@ -120,8 +120,8 @@ class HotkeyTab extends React.Component {
               onClick={(e) => this.handleHintToggleButtonClick(e)}
             >
               {this.state.isHotkeyHintOpen
-                ? 'Hide Help'
-                : 'Help'
+                ? i18n.__('Hide Help')
+                : i18n.__('Help')
               }
             </button>
             <button styleName='group-control-rightButton'
@@ -131,7 +131,7 @@ class HotkeyTab extends React.Component {
           </div>
           {this.state.isHotkeyHintOpen &&
             <div styleName='group-hint'>
-              <p>Available Keys</p>
+              <p>{i18n.__('Available Keys')}</p>
               <ul>
                 <li><code>0</code> to <code>9</code></li>
                 <li><code>A</code> to <code>Z</code></li>

browser/main/modals/PreferencesModal/StorageItem.js

@@ -23,7 +23,7 @@ class StorageItem extends React.Component {
   handleNewFolderButtonClick (e) {
     const { storage } = this.props
     const input = {
-      name: 'Untitled',
+      name: i18n.__('New Folder'),
       color: consts.FOLDER_COLORS[Math.floor(Math.random() * 7) % 7]
     }
 

browser/main/modals/RenameFolderModal.js

@@ -88,7 +88,7 @@ class RenameFolderModal extends React.Component {
           <button styleName='control-confirmButton'
             onClick={(e) => this.handleConfirmButtonClick(e)}
           >
-            Confirm
+            {i18n.__('Confirm')}
           </button>
         </div>
       </div>