Electron release v1.1.3

CliClient/locales-build/index.js

@@ -38,42 +38,42 @@ locales['tr_TR'] = require('./tr_TR.json');
 locales['vi'] = require('./vi.json');
 locales['zh_CN'] = require('./zh_CN.json');
 locales['zh_TW'] = require('./zh_TW.json');
-stats['ar'] = {"percentDone":82};
-stats['eu'] = {"percentDone":35};
-stats['bs_BA'] = {"percentDone":85};
-stats['bg_BG'] = {"percentDone":68};
-stats['ca'] = {"percentDone":54};
+stats['ar'] = {"percentDone":80};
+stats['eu'] = {"percentDone":34};
+stats['bs_BA'] = {"percentDone":83};
+stats['bg_BG'] = {"percentDone":66};
+stats['ca'] = {"percentDone":53};
 stats['hr_HR'] = {"percentDone":28};
-stats['cs_CZ'] = {"percentDone":84};
-stats['da_DK'] = {"percentDone":76};
-stats['de_DE'] = {"percentDone":99};
-stats['et_EE'] = {"percentDone":68};
+stats['cs_CZ'] = {"percentDone":82};
+stats['da_DK'] = {"percentDone":74};
+stats['de_DE'] = {"percentDone":95};
+stats['et_EE'] = {"percentDone":66};
 stats['en_GB'] = {"percentDone":100};
 stats['en_US'] = {"percentDone":100};
-stats['es_ES'] = {"percentDone":91};
-stats['eo'] = {"percentDone":39};
-stats['fr_FR'] = {"percentDone":97};
-stats['gl_ES'] = {"percentDone":44};
-stats['id_ID'] = {"percentDone":95};
-stats['it_IT'] = {"percentDone":93};
-stats['nl_NL'] = {"percentDone":99};
-stats['nl_BE'] = {"percentDone":35};
-stats['nb_NO'] = {"percentDone":91};
-stats['fa'] = {"percentDone":34};
-stats['pl_PL'] = {"percentDone":87};
-stats['pt_PT'] = {"percentDone":91};
-stats['pt_BR'] = {"percentDone":98};
-stats['ro'] = {"percentDone":35};
-stats['sl_SI'] = {"percentDone":44};
-stats['sv'] = {"percentDone":73};
-stats['th_TH'] = {"percentDone":54};
-stats['vi'] = {"percentDone":88};
-stats['tr_TR'] = {"percentDone":99};
-stats['el_GR'] = {"percentDone":93};
-stats['ru_RU'] = {"percentDone":90};
-stats['sr_RS'] = {"percentDone":74};
-stats['zh_CN'] = {"percentDone":99};
-stats['zh_TW'] = {"percentDone":98};
-stats['ja_JP'] = {"percentDone":99};
-stats['ko'] = {"percentDone":89};
+stats['es_ES'] = {"percentDone":95};
+stats['eo'] = {"percentDone":38};
+stats['fr_FR'] = {"percentDone":94};
+stats['gl_ES'] = {"percentDone":43};
+stats['id_ID'] = {"percentDone":93};
+stats['it_IT'] = {"percentDone":91};
+stats['nl_NL'] = {"percentDone":96};
+stats['nl_BE'] = {"percentDone":34};
+stats['nb_NO'] = {"percentDone":88};
+stats['fa'] = {"percentDone":80};
+stats['pl_PL'] = {"percentDone":96};
+stats['pt_PT'] = {"percentDone":89};
+stats['pt_BR'] = {"percentDone":96};
+stats['ro'] = {"percentDone":78};
+stats['sl_SI'] = {"percentDone":42};
+stats['sv'] = {"percentDone":71};
+stats['th_TH'] = {"percentDone":52};
+stats['vi'] = {"percentDone":85};
+stats['tr_TR'] = {"percentDone":96};
+stats['el_GR'] = {"percentDone":96};
+stats['ru_RU'] = {"percentDone":95};
+stats['sr_RS'] = {"percentDone":72};
+stats['zh_CN'] = {"percentDone":96};
+stats['zh_TW'] = {"percentDone":95};
+stats['ja_JP'] = {"percentDone":96};
+stats['ko'] = {"percentDone":86};
 module.exports = { locales: locales, stats: stats };

CliClient/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "joplin",
-  "version": "1.0.167",
+  "version": "1.0.168",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

CliClient/package.json

@@ -28,7 +28,7 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "1.1.167",
+  "version": "1.0.168",
   "bin": {
     "joplin": "./main.js"
   },

CliClient/tests/services_KeymapService.js

@@ -173,7 +173,7 @@ describe('services_KeymapService', () => {
 			keymapService.initialize('darwin');
 			const customKeymapItems_Darwin = [
 				{ command: 'newNote', accelerator: 'Option+Shift+Cmd+N' },
-				{ command: 'synchronize', accelerator: 'F11' },
+				{ command: 'synchronize', accelerator: 'Ctrl+F11' },
 				{ command: 'textBold', accelerator: 'Shift+F5' },
 				{ command: 'showLocalSearch', accelerator: 'Ctrl+Option+S' },
 				{ command: 'gotoAnything', accelerator: 'Ctrl+Shift+G' },
@@ -194,7 +194,7 @@ describe('services_KeymapService', () => {
 			keymapService.initialize('win32');
 			const customKeymapItems_Win32 = [
 				{ command: 'newNote', accelerator: 'Ctrl+Alt+Shift+N' },
-				{ command: 'synchronize', accelerator: 'F11' },
+				{ command: 'synchronize', accelerator: 'Ctrl+F11' },
 				{ command: 'textBold', accelerator: 'Shift+F5' },
 				{ command: 'showLocalSearch', accelerator: 'Ctrl+Alt+S' },
 				{ command: 'gotoAnything', accelerator: 'Ctrl+Shift+G' },

ElectronClient/gui/KeymapConfig/KeymapConfigScreen.tsx

@@ -62,7 +62,7 @@ export const KeymapConfigScreen = ({ themeId }: KeymapConfigScreenProps) => {
 				const keymapFile = await shim.fsDriver().readFile(actualFilePath, 'utf-8');
 				overrideKeymapItems(JSON.parse(keymapFile));
 			} catch (err) {
-				bridge().showErrorMessageBox(`${_('An unexpected error occured while importing the keymap!')}\n${err.message}`);
+				bridge().showErrorMessageBox(_('Error: %s', err.message));
 			}
 		}
 	};

ElectronClient/gui/KeymapConfig/utils/getLabel.ts

@@ -1,4 +1,4 @@
-import CommandService from '../../../lib/services/CommandService';
+import CommandService from 'lib/services/CommandService';
 
 const { _ } = require('lib/locale');
 const { shim } = require('lib/shim');
@@ -6,7 +6,7 @@ const { shim } = require('lib/shim');
 const commandService = CommandService.instance();
 
 const getLabel = (commandName: string) => {
-	if (commandService.exists(commandName)) return commandService.label(commandName);
+	if (commandService.exists(commandName)) return commandService.label(commandName, true);
 
 	// Some commands are not registered in CommandService at the moment
 	// Following hard-coded labels are used as a workaround

ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/Editor.tsx

@@ -152,6 +152,10 @@ function Editor(props: EditorProps, ref: any) {
 			'Insert': 'toggleOverwrite',
 			'Esc': 'singleSelection',
 		};
+		// Add some of the Joplin smart list handling to emacs mode
+		CodeMirror.keyMap.emacs['Tab'] = 'smartListIndent';
+		CodeMirror.keyMap.emacs['Enter'] = 'insertListElement';
+		CodeMirror.keyMap.emacs['Shift-Tab'] = 'smartListUnindent';
 
 		if (shim.isMac()) {
 			CodeMirror.keyMap.default = {

ElectronClient/gui/NoteEditor/commands/focusElementNoteBody.ts

@@ -4,6 +4,7 @@ const { _ } = require('lib/locale');
 export const declaration:CommandDeclaration = {
 	name: 'focusElementNoteBody',
 	label: () => _('Note body'),
+	parentLabel: () => _('Focus'),
 };
 
 export const runtime = (comp:any):CommandRuntime => {

ElectronClient/gui/NoteEditor/commands/focusElementNoteTitle.ts

@@ -4,6 +4,7 @@ const { _ } = require('lib/locale');
 export const declaration:CommandDeclaration = {
 	name: 'focusElementNoteTitle',
 	label: () => _('Note title'),
+	parentLabel: () => _('Focus'),
 };
 
 export const runtime = (comp:any):CommandRuntime => {

ElectronClient/gui/NoteList/commands/focusElementNoteList.ts

@@ -4,6 +4,7 @@ const { _ } = require('lib/locale');
 export const declaration:CommandDeclaration = {
 	name: 'focusElementNoteList',
 	label: () => _('Note list'),
+	parentLabel: () => _('Focus'),
 };
 
 export const runtime = (comp:any):CommandRuntime => {

ElectronClient/gui/SideBar/commands/focusElementSideBar.ts

@@ -4,6 +4,7 @@ const { _ } = require('lib/locale');
 export const declaration:CommandDeclaration = {
 	name: 'focusElementSideBar',
 	label: () => _('Sidebar'),
+	parentLabel: () => _('Focus'),
 };
 
 export const runtime = (comp:any):CommandRuntime => {