self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-11-27 08:21:03 +02:00
Code Issues Releases Activity

todo => to-do

Browse Source
This commit is contained in:
Laurent Cozic 2017-10-30 00:37:34 +00:00
parent 5a7028bd11
commit a43f5a1b53
10 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CliClient/app/app-gui.js
View File

@ -340,7 +340,7 @@ class AppGui {
shortcuts[' '] = {
friendlyName: 'SPACE',
description: _('Set a todo as completed / not completed'),
description: _('Set a to-do as completed / not completed'),
action: 'todo toggle $n',
}

4
CliClient/app/build-doc.js
View File

@ -80,7 +80,7 @@ function getHeader() {
output.push('NAME');
output.push('');
output.push(wrap('joplin - a note taking and todo app with synchronisation capabilities'), INDENT);
output.push(wrap('joplin - a note taking and to-do app with synchronisation capabilities'), INDENT);
output.push('');
@ -88,7 +88,7 @@ function getHeader() {
output.push('');
let description = [];
description.push('Joplin is a note taking and todo application, which can handle a large number of notes organised into notebooks.');
description.push('Joplin is a note taking and to-do application, which can handle a large number of notes organised into notebooks.');
description.push('The notes are searchable, can be copied, tagged and modified with your own text editor.');
description.push("\n\n");
description.push('The notes can be synchronised with various target including the file system (for example with a network directory) or with Microsoft OneDrive.');

4
CliClient/app/build-website.js
View File

@ -10,7 +10,7 @@ const headerHtml = `
<!doctype html>
<html>
<head>
<title>Joplin - a free, open source, note taking and todo application with synchronisation capabilities</title>
<title>Joplin - a free, open source, note taking and to-do application with synchronisation capabilities</title>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
@ -95,7 +95,7 @@ const headerHtml = `
<div class="header">
<a class="forkme" href="https://github.com/laurent22/joplin"><img src="docs/images/ForkMe.png"/></a>
<h1 id="joplin"><img class="title-icon" src="docs/images/Icon512.png">oplin</h1>
<p class="sub-title">A free, open source, note taking and todo application with synchronisation capabilities.</p>
<p class="sub-title">A free, open source, note taking and to-do application with synchronisation capabilities.</p>
</div>
<div class="content">

4
CliClient/app/command-done.js
View File

@ -13,13 +13,13 @@ class Command extends BaseCommand {
}
description() {
return _('Marks a todo as done.');
return _('Marks a to-do as done.');
}
static async handleAction(args, isCompleted) {
const note = await app().loadItem(BaseModel.TYPE_NOTE, args.note);
if (!note) throw new Error(_('Cannot find "%s".', args.note));
if (!note.is_todo) throw new Error(_('Note is not a todo: "%s"', args.note));
if (!note.is_todo) throw new Error(_('Note is not a to-do: "%s"', args.note));
const todoCompleted = !!note.todo_completed;

4
CliClient/app/command-ls.js
View File

@ -28,9 +28,9 @@ class Command extends BaseCommand {
['-n, --limit <num>', _('Displays only the first top <num> notes.')],
['-s, --sort <field>', _('Sorts the item by <field> (eg. title, updated_time, created_time).')],
['-r, --reverse', _('Reverses the sorting order.')],
['-t, --type <type>', _('Displays only the items of the specific type(s). Can be `n` for notes, `t` for todos, or `nt` for notes and todos (eg. `-tt` would display only the todos, while `-ttd` would display notes and todos.')],
['-t, --type <type>', _('Displays only the items of the specific type(s). Can be `n` for notes, `t` for to-dos, or `nt` for notes and to-dos (eg. `-tt` would display only the to-dos, while `-ttd` would display notes and to-dos.')],
['-f, --format <format>', _('Either "text" or "json"')],
['-l, --long', _('Use long list format. Format is ID, NOTE_COUNT (for notebook), DATE, TODO_CHECKED (for todos), TITLE')],
['-l, --long', _('Use long list format. Format is ID, NOTE_COUNT (for notebook), DATE, TODO_CHECKED (for to-dos), TITLE')],
];
}

2
CliClient/app/command-mktodo.js
View File

@ -10,7 +10,7 @@ class Command extends BaseCommand {
}
description() {
return _('Creates a new todo.');
return _('Creates a new to-do.');
}
async action(args) {

2
CliClient/app/command-todo.js
View File

@ -13,7 +13,7 @@ class Command extends BaseCommand {
}
description() {
return _('<todo-command> can either be "toggle" or "clear". Use "toggle" to toggle the given todo between completed and uncompleted state (If the target is a regular note it will be converted to a todo). Use "clear" to convert the todo back to a regular note.');
return _('<todo-command> can either be "toggle" or "clear". Use "toggle" to toggle the given to-do between completed and uncompleted state (If the target is a regular note it will be converted to a to-do). Use "clear" to convert the to-do back to a regular note.');
}
async action(args) {

2
CliClient/app/command-undone.js
View File

@ -15,7 +15,7 @@ class Command extends BaseCommand {
}
description() {
return _('Marks a todo as non-completed.');
return _('Marks a to-do as non-completed.');
}
async action(args) {

8
README.md
View File

@ -1,6 +1,6 @@
# Joplin
Joplin is a free, open source note taking and todo application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified with your own text editor.
Joplin is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified with your own text editor.
Notes exported from Evernote via .enex files [can be imported](#importing-notes-from-evernote) into Joplin, including the formatted content (which is converted to markdown), resources (images, attachments, etc.) and complete metadata (geolocation, updated time, created time, etc.).
@ -18,7 +18,7 @@ To start it, type `joplin`.
# Demo
The demo application shows various Wikipedia articles converted to Markdown and organised into notebooks, as well as an example todo list, in order to test and demonstrate the application. The demo application and its settings will be installed in a separate directory so as not to interfere with any existing Joplin application.
The demo application shows various Wikipedia articles converted to Markdown and organised into notebooks, as well as an example to-do list, in order to test and demonstrate the application. The demo application and its settings will be installed in a separate directory so as not to interfere with any existing Joplin application.
npm install -g demo-joplin
@ -27,7 +27,7 @@ To start it, type `demo-joplin`.
# Features
- Mobile and command line applications.
- Support notes, todos, tags and notebooks.
- Support notes, to-dos, tags and notebooks.
- Offline first, so the entire data is always available on the device.
- Ability to synchronise with multiple targets, including the file system and OneDrive (Dropbox is planned).
- Synchronises to a plain text format, which can be easily manipulated, backed up, or exported to a different format.
@ -70,7 +70,7 @@ Create a new note with title "Wednesday's meeting":
mknote "Wednesday's meeting"
Create a new todo:
Create a new to-do:
mktodo "Buy bread"

2
ReactNativeClient/lib/components/action-button.js
View File

@ -67,7 +67,7 @@ class ActionButtonComponent extends React.Component {
if (this.props.addFolderNoteButtons) {
if (this.props.folders.length) {
buttons.push({
title: _('New todo'),
title: _('New to-do'),
onPress: () => { this.newTodo_press() },
color: '#9b59b6',
icon: 'md-checkbox-outline',