Minor fixes and improvements

CliClient/app/app-gui.js

@@ -499,13 +499,14 @@ class AppGui {
 				const shortcutKey = this.currentShortcutKeys_.join('');
 				const cmd = shortcutKey in this.shortcuts_ ? this.shortcuts_[shortcutKey] : null;
 
-				let processShortcutKeys = !this.app().currentCommand() && !statusBar.promptActive && cmd;
+				let processShortcutKeys = !this.app().currentCommand() && cmd;
 				if (cmd && cmd.canRunAlongOtherCommands) processShortcutKeys = true;
+				if (statusBar.promptActive) processShortcutKeys = false;
 				if (cmd && cmd.isDocOnly) processShortcutKeys = false;
 
-				this.logger().info('Shortcut:', shortcutKey, processShortcutKeys, cmd ? cmd.description : '(no command)');
-
 				if (processShortcutKeys) {
+					this.logger().info('Shortcut:', shortcutKey, cmd.description);
+
 					this.currentShortcutKeys_ = [];
 					if (typeof cmd.action === 'function') {
 						await cmd.action();

CliClient/app/command-edit.js

@@ -94,7 +94,7 @@ class Command extends BaseCommand {
 				let updatedNote = await Note.unserializeForEdit(updatedContent);
 				updatedNote.id = note.id;
 				await Note.save(updatedNote);
-				this.logger().info('Note has been saved');
+				this.stdout(_('Note has been saved.'));
 			}
 
 			this.dispatch({

CliClient/app/gui/ConsoleWidget.js

@@ -8,6 +8,7 @@ class ConsoleWidget extends TextWidget {
 		this.updateText_ = false;
 		this.markdownRendering = false;
 		this.stickToBottom = true;
+		this.maxLines_ = 1000;
 	}
 
 	get name() {
@@ -36,6 +37,9 @@ class ConsoleWidget extends TextWidget {
 
 	render() {
 		if (this.updateText_) {
+			if (this.lines_.length > this.maxLines_) {
+				this.lines_.splice(0, this.lines_.length - this.maxLines_);
+			}
 			this.text = this.lines_.join("\n");
 			this.updateText_ = false;
 		}

CliClient/locales/en_GB.po

@@ -30,6 +30,12 @@ msgstr ""
 msgid "Exit command line mode"
 msgstr ""
 
+msgid "Cancel the current command."
+msgstr ""
+
+msgid "Exit the application."
+msgstr ""
+
 msgid "Create a new note"
 msgstr ""
 
@@ -189,6 +195,9 @@ msgstr ""
 msgid "Starting to edit note. Close the editor to get back to the prompt."
 msgstr ""
 
+msgid "Note has been saved."
+msgstr ""
+
 msgid "Exports Joplin data to the given target."
 msgstr ""
 

CliClient/locales/fr_FR.po

@@ -32,6 +32,14 @@ msgstr ""
 msgid "Exit command line mode"
 msgstr ""
 
+#, fuzzy
+msgid "Cancel the current command."
+msgstr "Annulation..."
+
+#, fuzzy
+msgid "Exit the application."
+msgstr "Quitter le logiciel."
+
 #, fuzzy
 msgid "Create a new note"
 msgstr "Créer une note."
@@ -208,6 +216,10 @@ msgstr ""
 "Edition de la note en cours. Fermez l'éditeur de texte pour retourner à "
 "l'invite de commande."
 
+#, fuzzy
+msgid "Note has been saved."
+msgstr "Aucun carnet n'est spécifié."
+
 msgid "Exports Joplin data to the given target."
 msgstr ""
 
@@ -768,10 +780,6 @@ msgstr "Bienvenue"
 #~ msgid "Last error: %s (stacktrace in log)."
 #~ msgstr "Dernière erreur : %s (Plus d'information dans le journal d'erreurs)"
 
-#, fuzzy
-#~ msgid "Cancelling command..."
-#~ msgstr "Annulation..."
-
 #~ msgid "Done."
 #~ msgstr "Terminé."
 

CliClient/locales/joplin.pot

@@ -30,6 +30,12 @@ msgstr ""
 msgid "Exit command line mode"
 msgstr ""
 
+msgid "Cancel the current command."
+msgstr ""
+
+msgid "Exit the application."
+msgstr ""
+
 msgid "Create a new note"
 msgstr ""
 
@@ -189,6 +195,9 @@ msgstr ""
 msgid "Starting to edit note. Close the editor to get back to the prompt."
 msgstr ""
 
+msgid "Note has been saved."
+msgstr ""
+
 msgid "Exports Joplin data to the given target."
 msgstr ""
 

CliClient/package.json

@@ -7,7 +7,7 @@
     "url": "https://github.com/laurent22/joplin"
   },
   "url": "git://github.com/laurent22/joplin.git",
-  "version": "0.10.35",
+  "version": "0.10.38",
   "bin": {
     "joplin": "./main.js"
   },

CliClient/package.json.md5

@@ -1 +1 @@
-e1aaff911b34e00fcdbf4ec7c40f0aa6
+460c7642ca80c76758df33c7811fabec