Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed dependency to marked and update locale

pull/41/head
Laurent Cozic 2017-11-28 18:07:49 +00:00
parent f9f5974267
commit 033d356b56
13 changed files with 75 additions and 1301 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
const fs = require('fs-extra'); const fs = require('fs-extra');
const { fileExtension, basename, dirname } = require('lib/path-utils.js'); const { fileExtension, basename, dirname } = require('lib/path-utils.js');
const { _, setLocale, languageCode } = require('lib/locale.js'); const { _, setLocale, languageCode } = require('lib/locale.js');
const marked = require('lib/marked.js'); const marked = require('marked');
const Mustache = require('mustache'); const Mustache = require('mustache');
const headerHtml = `<!doctype html> const headerHtml = `<!doctype html>

21
CliClient/locales/en_GB.po
View File

@ -562,6 +562,9 @@ msgstr ""
msgid "Rename notebook:" msgid "Rename notebook:"
msgstr "" msgstr ""
msgid "Set or clear alarm:"
msgstr ""
msgid "Layout" msgid "Layout"
msgstr "" msgstr ""
@ -587,9 +590,15 @@ msgstr ""
msgid "Attach file" msgid "Attach file"
msgstr "" msgstr ""
msgid "Set or clear alarm"
msgstr ""
msgid "Refresh" msgid "Refresh"
msgstr "" msgstr ""
msgid "Clear"
msgstr ""
msgid "OneDrive Login" msgid "OneDrive Login"
msgstr "" msgstr ""
@ -740,6 +749,12 @@ msgstr ""
msgid "Language" msgid "Language"
msgstr "" msgstr ""
msgid "Date format"
msgstr ""
msgid "Time format"
msgstr ""
msgid "Theme" msgid "Theme"
msgstr "" msgstr ""
@ -839,6 +854,12 @@ msgstr ""
msgid "Move %d notes to notebook \"%s\"?" msgid "Move %d notes to notebook \"%s\"?"
msgstr "" msgstr ""
msgid "Select date"
msgstr ""
msgid "Confirm"
msgstr ""
msgid "Cancel synchronisation" msgid "Cancel synchronisation"
msgstr "" msgstr ""

25
CliClient/locales/fr_FR.po
View File

@ -614,6 +614,9 @@ msgstr "Séparez chaque étiquette par une virgule."
msgid "Rename notebook:" msgid "Rename notebook:"
msgstr "Renommer le carnet :" msgstr "Renommer le carnet :"
msgid "Set or clear alarm:"
msgstr "Définir ou modifier alarme :"
msgid "Layout" msgid "Layout"
msgstr "Disposition" msgstr "Disposition"
@ -640,9 +643,15 @@ msgstr "Lien ou message non géré : %s"
msgid "Attach file" msgid "Attach file"
msgstr "Attacher un fichier" msgstr "Attacher un fichier"
msgid "Set or clear alarm"
msgstr "Définir ou modifier alarme"
msgid "Refresh" msgid "Refresh"
msgstr "Rafraîchir" msgstr "Rafraîchir"
msgid "Clear"
msgstr "Supprimer"
msgid "OneDrive Login" msgid "OneDrive Login"
msgstr "Connexion OneDrive" msgstr "Connexion OneDrive"
@ -799,6 +808,12 @@ msgstr ""
msgid "Language" msgid "Language"
msgstr "Langue" msgstr "Langue"
msgid "Date format"
msgstr "Format de la date"
msgid "Time format"
msgstr "Format de l'heure"
msgid "Theme" msgid "Theme"
msgstr "Apparence" msgstr "Apparence"
@ -902,6 +917,12 @@ msgstr "Déplacer la note vers carnet..."
msgid "Move %d notes to notebook \"%s\"?" msgid "Move %d notes to notebook \"%s\"?"
msgstr "Déplacer %d notes vers carnet \"%s\" ?" msgstr "Déplacer %d notes vers carnet \"%s\" ?"
msgid "Select date"
msgstr "Sélectionner date"
msgid "Confirm"
msgstr "Confirmer"
msgid "Cancel synchronisation" msgid "Cancel synchronisation"
msgstr "Annuler synchronisation" msgstr "Annuler synchronisation"
@ -1031,10 +1052,6 @@ msgstr "Bienvenue"
#~ msgid "Done editing." #~ msgid "Done editing."
#~ msgstr "Edition terminée." #~ msgstr "Edition terminée."
#, fuzzy
#~ msgid "Confirm"
#~ msgstr "Conflits"
#~ msgid "Last error: %s (stacktrace in log)." #~ msgid "Last error: %s (stacktrace in log)."
#~ msgstr "Dernière erreur : %s (Plus d'information dans le journal d'erreurs)" #~ msgstr "Dernière erreur : %s (Plus d'information dans le journal d'erreurs)"

21
CliClient/locales/joplin.pot
View File

@ -562,6 +562,9 @@ msgstr ""
msgid "Rename notebook:" msgid "Rename notebook:"
msgstr "" msgstr ""
msgid "Set or clear alarm:"
msgstr ""
msgid "Layout" msgid "Layout"
msgstr "" msgstr ""
@ -587,9 +590,15 @@ msgstr ""
msgid "Attach file" msgid "Attach file"
msgstr "" msgstr ""
msgid "Set or clear alarm"
msgstr ""
msgid "Refresh" msgid "Refresh"
msgstr "" msgstr ""
msgid "Clear"
msgstr ""
msgid "OneDrive Login" msgid "OneDrive Login"
msgstr "" msgstr ""
@ -740,6 +749,12 @@ msgstr ""
msgid "Language" msgid "Language"
msgstr "" msgstr ""
msgid "Date format"
msgstr ""
msgid "Time format"
msgstr ""
msgid "Theme" msgid "Theme"
msgstr "" msgstr ""
@ -839,6 +854,12 @@ msgstr ""
msgid "Move %d notes to notebook \"%s\"?" msgid "Move %d notes to notebook \"%s\"?"
msgstr "" msgstr ""
msgid "Select date"
msgstr ""
msgid "Confirm"
msgstr ""
msgid "Cancel synchronisation" msgid "Cancel synchronisation"
msgstr "" msgstr ""

6
CliClient/package-lock.json generated
View File

@ -797,6 +797,12 @@
"highlight.js": "9.12.0" "highlight.js": "9.12.0"
} }
}, },
"marked": {
"version": "0.3.6",
"resolved": "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz",
"integrity": "sha1-ssbGGPzOzk74bE/Gy4p8v1rtqNc=",
"dev": true
},
"md5": { "md5": {
"version": "2.2.1", "version": "2.2.1",
"resolved": "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz", "resolved": "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz",

1
CliClient/package.json
View File

@ -62,6 +62,7 @@
"devDependencies": { "devDependencies": {
"gettext-parser": "^1.2.2", "gettext-parser": "^1.2.2",
"jasmine": "^2.6.0", "jasmine": "^2.6.0",
"marked": "^0.3.6",
"mustache": "^2.3.0" "mustache": "^2.3.0"
}, },
"scripts": { "scripts": {

2
ElectronClient/app/locales/en_GB.json
View File

File diff suppressed because one or more lines are too long

2
ElectronClient/app/locales/fr_FR.json
View File

File diff suppressed because one or more lines are too long

5
ElectronClient/app/package-lock.json generated
View File

@ -2800,11 +2800,6 @@
"uc.micro": "1.0.3" "uc.micro": "1.0.3"
} }
}, },
"marked": {
"version": "0.3.6",
"resolved": "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz",
"integrity": "sha1-ssbGGPzOzk74bE/Gy4p8v1rtqNc="
},
"md5": { "md5": {
"version": "2.2.1", "version": "2.2.1",
"resolved": "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz", "resolved": "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz",

1
ElectronClient/app/package.json
View File

@ -60,7 +60,6 @@
"levenshtein": "^1.0.5", "levenshtein": "^1.0.5",
"lodash": "^4.17.4", "lodash": "^4.17.4",
"markdown-it": "^8.4.0", "markdown-it": "^8.4.0",
"marked": "^0.3.6",
"md5": "^2.2.1", "md5": "^2.2.1",
"mime": "^2.0.3", "mime": "^2.0.3",
"moment": "^2.19.1", "moment": "^2.19.1",

1286
ReactNativeClient/lib/marked.js
View File

File diff suppressed because it is too large Load Diff

2
ReactNativeClient/locales/en_GB.json
View File

File diff suppressed because one or more lines are too long

2
ReactNativeClient/locales/fr_FR.json
View File

File diff suppressed because one or more lines are too long