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

Doc: Fix documentation and source comment typos (#2037)

Browse Source 
* Misc. typo and whitespace fixes

Found via `codespell -q 3 -S *.po,*.pot,./ElectronClient/app/locales,./ReactNativeClient/locales,./CliClient/locales -L adresse,ba,fonction,te,whet`

* Revert a previous change
This commit is contained in:
luzpaz 2019-10-29 05:02:42 -04:00 committed by Laurent Cozic
parent 1f42c10c2a
commit d3ba6798d7
15 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CliClient/app/app.js
View File

@ -399,7 +399,7 @@ class Application extends BaseApplication {
await Setting.saveAll();
// Need to call exit() explicitely, otherwise Node wait for any timeout to complete
// Need to call exit() explicitly, otherwise Node wait for any timeout to complete
// https://stackoverflow.com/questions/18050095
process.exit(0);
} else {

2
CliClient/app/autocompletion.js
View File

@ -11,7 +11,7 @@ async function handleAutocompletionPromise(line) {
const names = await app().commandNames();
let words = getArguments(line);
// If there is only one word and it is not already a command name then you
// should look for commmands it could be
// should look for commands it could be
if (words.length == 1) {
if (names.indexOf(words[0]) === -1) {
let x = names.filter(n => n.indexOf(words[0]) === 0);

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

@ -197,7 +197,7 @@ class Command extends BaseCommand {
// When using the tool in command line mode, the ResourceFetcher service is
// not going to be running in the background, so the resources need to be
// explicitely downloaded below.
// explicitly downloaded below.
if (!app().hasGui()) {
this.stdout(_('Downloading resources...'));
await ResourceFetcher.instance().fetchAll();

2
CliClient/app/onedrive-api-node-utils.js
View File

@ -107,7 +107,7 @@ class OneDriveApiNodeUtils {
enableServerDestroy(this.oauthServer_);
// Rather than displaying authCodeUrl directly, we go throught the local
// Rather than displaying authCodeUrl directly, we go through the local
// server. This is just so that the URL being displayed is shorter and
// doesn't get cut in terminals (especially those that don't handle multi
// lines URLs).

2
CliClient/tests/html_to_md/table_no_header.html
View File

@ -1,4 +1,4 @@
<table>
<tr><td>No</td><td>header</td></tr>
<tr><td>And no</td><td>suprises</td></tr>
<tr><td>And no</td><td>surprises</td></tr>
</table>

2
CliClient/tests/html_to_md/table_no_header.md
View File

@ -1,4 +1,4 @@
| | |
| --- | --- |
| No | header |
| And no | suprises |
| And no | surprises |

2
CliClient/tests/markdownUtils.js
View File

@ -23,7 +23,7 @@ describe('markdownUtils', function() {
['![something](/img/test.png)', '![something](https://test.com/img/test.png)'],
['[![something](/img/test.png)](/index.html "Home page")', '[![something](https://test.com/img/test.png)](https://test.com/index.html "Home page")'],
['[onelink.com](/jmp/?id=123&u=http://something.com/test)', '[onelink.com](https://test.com/jmp/?id=123&u=http://something.com/test)'],
['[![some text](/img/test.png)](/jmp/?s=80&l=related&u=http://example.com "some decription")', '[![some text](https://test.com/img/test.png)](https://test.com/jmp/?s=80&l=related&u=http://example.com "some decription")'],
['[![some text](/img/test.png)](/jmp/?s=80&l=related&u=http://example.com "some description")', '[![some text](https://test.com/img/test.png)](https://test.com/jmp/?s=80&l=related&u=http://example.com "some description")'],
];
for (let i = 0; i < testCases.length; i++) {

2
CliClient/tests/test-utils.js
View File

@ -287,7 +287,7 @@ async function loadEncryptionMasterKey(id = null, useExisting = false) {
masterKey = await MasterKey.save(masterKey);
} else { // Use the one already available
const masterKeys = await MasterKey.all();
if (!masterKeys.length) throw new Error('No mater key available');
if (!masterKeys.length) throw new Error('No master key available');
masterKey = masterKeys[0];
}

2
CliClient/tests/urlUtils.js
View File

@ -25,7 +25,7 @@ describe('urlUtils', function() {
expect(urlUtils.prependBaseUrl('', 'http://example.com/something')).toBe('http://example.com/something');
expect(urlUtils.prependBaseUrl('testing.html', '')).toBe('testing.html');
// It shouldn't prepend anyting for these:
// It shouldn't prepend anything for these:
expect(urlUtils.prependBaseUrl('mailto:emailme@example.com', 'http://example.com')).toBe('mailto:emailme@example.com');
expect(urlUtils.prependBaseUrl('javascript:var%20testing=true', 'http://example.com')).toBe('javascript:var%20testing=true');
expect(urlUtils.prependBaseUrl('http://alreadyabsolute.com', 'http://example.com')).toBe('http://alreadyabsolute.com');

4
ElectronClient/app/ElectronAppWrapper.js
View File

@ -87,7 +87,7 @@ class ElectronAppWrapper {
// user clicks on the icon in the task bar).
// On Windows and Linux, the app is closed when the window is closed *except* if the tray icon is used. In which
// case the app must be explicitely closed with Ctrl+Q or by right-clicking on the tray icon and selecting "Exit".
// case the app must be explicitly closed with Ctrl+Q or by right-clicking on the tray icon and selecting "Exit".
if (process.platform === 'darwin') {
if (this.willQuitApp_) {
@ -138,7 +138,7 @@ class ElectronAppWrapper {
}
// This method is used in macOS only to hide the whole app (and not just the main window)
// including the menu bar. This follows the macOS way of hidding an app.
// including the menu bar. This follows the macOS way of hiding an app.
hide() {
this.electronApp_.hide();
}

2
Tools/buildReactNativeInjectedJs.js
View File

@ -1,5 +1,5 @@
// React Native WebView cannot load external JS files, however it can load
// arbitraty JS via the injectedJavaScript property. So we use this to load external
// arbitrary JS via the injectedJavaScript property. So we use this to load external
// files: First here we convert the JS file to a plain string, and that string
// is then loaded by eg. the Mermaid plugin, and finally injected in the WebView.

6
docs/spec/index.html
View File

@ -108,7 +108,7 @@ https://github.com/laurent22/joplin/blob/master/readme/spec.md
height: 3em;
text-align: center;
}
table.screenshots th,
table.screenshots th,
table.screenshots td {
border: 1px solid #C2C2C2;
}
@ -404,11 +404,11 @@ https://github.com/laurent22/joplin/blob/master/readme/spec.md
</ul>
<script>
function stickyHeader() {
function stickyHeader() {
return; // Disabled
if ($(window).scrollTop() > 179) {
$('.nav').addClass('sticky');
$('.nav').addClass('sticky');
} else {
$('.nav').removeClass('sticky');
}

4
docs/terminal/index.html
View File

@ -672,8 +672,8 @@ Possible keys/values:
Type: string.
sync.target Synchronisation target.
The target to synchonise to. Each sync target may
have additional parameters which are named as
The target to synchronise to. Each sync target may
have additional parameters which are named as
`sync.NUM.NAME` (all documented below).
Type: Enum.
Possible values: 2 (File system), 3 (OneDrive), 4

2
readme/spec.md
View File

@ -32,7 +32,7 @@ Data | ("Length" bytes) (ASCII)
## Master Keys
The master keys are used to encrypt and decrypt data. They can be generated from the Encryption Service and are saved to the database. They are themselves encrypted via a user password using a [strong encyption method](https://github.com/laurent22/joplin/blob/fb6dee32ac035b00153106273135fb16be4b4fa5/ReactNativeClient/lib/services/EncryptionService.js#L263).
The master keys are used to encrypt and decrypt data. They can be generated from the Encryption Service and are saved to the database. They are themselves encrypted via a user password using a [strong encryption method](https://github.com/laurent22/joplin/blob/fb6dee32ac035b00153106273135fb16be4b4fa5/ReactNativeClient/lib/services/EncryptionService.js#L263).
These encrypted master keys are transmitted with the sync data so that they can be available to each client. Each client will need to supply the user password to decrypt each key.

6
readme/terminal.md
View File

@ -322,10 +322,10 @@ The following commands are available in [command-line mode](#command-line-mode):
will be used to open a note. If none is provided
it will try to auto-detect the default editor.
Type: string.
sync.target Synchronisation target.
The target to synchonise to. Each sync target may
have additional parameters which are named as
The target to synchronise to. Each sync target may
have additional parameters which are named as
`sync.NUM.NAME` (all documented below).
Type: Enum.
Possible values: 2 (File system), 3 (OneDrive), 4