mirror of
https://github.com/laurent22/joplin.git
synced 2025-01-11 18:24:43 +02:00
Got Android version working again
This commit is contained in:
parent
4ac86f52df
commit
5a7028bd11
@ -15,10 +15,10 @@ msgstr ""
|
|||||||
"Content-Type: text/plain; charset=CHARSET\n"
|
"Content-Type: text/plain; charset=CHARSET\n"
|
||||||
"Content-Transfer-Encoding: 8bit\n"
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
|
|
||||||
msgid "Give focus to next widget"
|
msgid "Give focus to next pane"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "Give focus to previous widget"
|
msgid "Give focus to previous pane"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "Enter command line mode"
|
msgid "Enter command line mode"
|
||||||
@ -236,7 +236,9 @@ msgstr ""
|
|||||||
msgid "Note has been saved."
|
msgid "Note has been saved."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "Exports Joplin data to the given target."
|
msgid ""
|
||||||
|
"Exports Joplin data to the given directory. By default, it will export the "
|
||||||
|
"complete database including notebooks, notes, tags and resources."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "Exports only the given note."
|
msgid "Exports only the given note."
|
||||||
@ -260,6 +262,12 @@ msgstr ""
|
|||||||
msgid "The possible commands are:"
|
msgid "The possible commands are:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
msgid ""
|
||||||
|
"In any command, a note or notebook can be refered to by title or ID, or "
|
||||||
|
"using the shortcuts `$n` or `$b` for, respectively, the currently selected "
|
||||||
|
"note or notebook. `$c` can be used to refer to the currently selected item."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
msgid "To move from one widget to another, press Tab or Shift+Tab."
|
msgid "To move from one widget to another, press Tab or Shift+Tab."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -15,10 +15,10 @@ msgstr ""
|
|||||||
"Content-Transfer-Encoding: 8bit\n"
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
"X-Generator: Poedit 2.0.3\n"
|
"X-Generator: Poedit 2.0.3\n"
|
||||||
|
|
||||||
msgid "Give focus to next widget"
|
msgid "Give focus to next pane"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "Give focus to previous widget"
|
msgid "Give focus to previous pane"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "Enter command line mode"
|
msgid "Enter command line mode"
|
||||||
@ -261,7 +261,9 @@ msgstr ""
|
|||||||
msgid "Note has been saved."
|
msgid "Note has been saved."
|
||||||
msgstr "Aucun carnet n'est spécifié."
|
msgstr "Aucun carnet n'est spécifié."
|
||||||
|
|
||||||
msgid "Exports Joplin data to the given target."
|
msgid ""
|
||||||
|
"Exports Joplin data to the given directory. By default, it will export the "
|
||||||
|
"complete database including notebooks, notes, tags and resources."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
@ -288,6 +290,12 @@ msgstr ""
|
|||||||
msgid "The possible commands are:"
|
msgid "The possible commands are:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
msgid ""
|
||||||
|
"In any command, a note or notebook can be refered to by title or ID, or "
|
||||||
|
"using the shortcuts `$n` or `$b` for, respectively, the currently selected "
|
||||||
|
"note or notebook. `$c` can be used to refer to the currently selected item."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
msgid "To move from one widget to another, press Tab or Shift+Tab."
|
msgid "To move from one widget to another, press Tab or Shift+Tab."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -15,10 +15,10 @@ msgstr ""
|
|||||||
"Content-Type: text/plain; charset=CHARSET\n"
|
"Content-Type: text/plain; charset=CHARSET\n"
|
||||||
"Content-Transfer-Encoding: 8bit\n"
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
|
|
||||||
msgid "Give focus to next widget"
|
msgid "Give focus to next pane"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "Give focus to previous widget"
|
msgid "Give focus to previous pane"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "Enter command line mode"
|
msgid "Enter command line mode"
|
||||||
@ -236,7 +236,9 @@ msgstr ""
|
|||||||
msgid "Note has been saved."
|
msgid "Note has been saved."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "Exports Joplin data to the given target."
|
msgid ""
|
||||||
|
"Exports Joplin data to the given directory. By default, it will export the "
|
||||||
|
"complete database including notebooks, notes, tags and resources."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "Exports only the given note."
|
msgid "Exports only the given note."
|
||||||
@ -260,6 +262,12 @@ msgstr ""
|
|||||||
msgid "The possible commands are:"
|
msgid "The possible commands are:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
msgid ""
|
||||||
|
"In any command, a note or notebook can be refered to by title or ID, or "
|
||||||
|
"using the shortcuts `$n` or `$b` for, respectively, the currently selected "
|
||||||
|
"note or notebook. `$c` can be used to refer to the currently selected item."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
msgid "To move from one widget to another, press Tab or Shift+Tab."
|
msgid "To move from one widget to another, press Tab or Shift+Tab."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
2
CliClient/package-lock.json
generated
2
CliClient/package-lock.json
generated
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "joplin",
|
"name": "joplin",
|
||||||
"version": "0.10.60",
|
"version": "0.10.61",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
],
|
],
|
||||||
"owner": "Laurent Cozic"
|
"owner": "Laurent Cozic"
|
||||||
},
|
},
|
||||||
"version": "0.10.60",
|
"version": "0.10.61",
|
||||||
"bin": {
|
"bin": {
|
||||||
"joplin": "./main.js"
|
"joplin": "./main.js"
|
||||||
},
|
},
|
||||||
|
@ -90,8 +90,8 @@ android {
|
|||||||
applicationId "net.cozic.joplin"
|
applicationId "net.cozic.joplin"
|
||||||
minSdkVersion 16
|
minSdkVersion 16
|
||||||
targetSdkVersion 22
|
targetSdkVersion 22
|
||||||
versionCode 49
|
versionCode 50
|
||||||
versionName "0.9.36"
|
versionName "0.9.37"
|
||||||
ndk {
|
ndk {
|
||||||
abiFilters "armeabi-v7a", "x86"
|
abiFilters "armeabi-v7a", "x86"
|
||||||
}
|
}
|
||||||
|
@ -130,6 +130,10 @@ class NoteBodyViewer extends Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
renderer.image = (href, title, text) => {
|
renderer.image = (href, title, text) => {
|
||||||
|
if (!Resource.isResourceUrl(href)) {
|
||||||
|
return '<span>' + href + '</span><img title="' + htmlentities(title) + '" src="' + href + '"/>';
|
||||||
|
}
|
||||||
|
|
||||||
const resourceId = Resource.urlToId(href);
|
const resourceId = Resource.urlToId(href);
|
||||||
if (!this.state.resources[resourceId]) {
|
if (!this.state.resources[resourceId]) {
|
||||||
this.loadResource(resourceId);
|
this.loadResource(resourceId);
|
||||||
|
@ -50,7 +50,7 @@ class NoteListComponent extends Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
filterNotes(notes) {
|
filterNotes(notes) {
|
||||||
const todoFilter = Setting.value('todoFilter');
|
const todoFilter = 'all'; //Setting.value('todoFilter');
|
||||||
if (todoFilter == 'all') return notes;
|
if (todoFilter == 'all') return notes;
|
||||||
|
|
||||||
const now = time.unixMs();
|
const now = time.unixMs();
|
||||||
|
@ -21,6 +21,10 @@ class Setting extends BaseModel {
|
|||||||
return output;
|
return output;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static keyExists(key) {
|
||||||
|
return key in this.metadata_;
|
||||||
|
}
|
||||||
|
|
||||||
static keys(publicOnly = false, appType = null) {
|
static keys(publicOnly = false, appType = null) {
|
||||||
if (!this.keys_) {
|
if (!this.keys_) {
|
||||||
this.keys_ = [];
|
this.keys_ = [];
|
||||||
@ -56,12 +60,14 @@ class Setting extends BaseModel {
|
|||||||
this.cache_ = [];
|
this.cache_ = [];
|
||||||
|
|
||||||
// Old keys - can be removed later
|
// Old keys - can be removed later
|
||||||
const ignore = ['clientId', 'sync.onedrive.auth', 'syncInterval', 'todoOnTop', 'todosOnTop'];
|
//const ignore = ['clientId', 'sync.onedrive.auth', 'syncInterval', 'todoOnTop', 'todosOnTop', 'todoFilter'];
|
||||||
|
|
||||||
for (let i = 0; i < rows.length; i++) {
|
for (let i = 0; i < rows.length; i++) {
|
||||||
let c = rows[i];
|
let c = rows[i];
|
||||||
|
|
||||||
if (ignore.indexOf(c.key) >= 0) continue;
|
if (!this.keyExists(c.key)) continue;
|
||||||
|
|
||||||
|
//if (ignore.indexOf(c.key) >= 0) continue;
|
||||||
|
|
||||||
// console.info(c.key + ' = ' + c.value);
|
// console.info(c.key + ' = ' + c.value);
|
||||||
|
|
||||||
|
@ -166,7 +166,7 @@ const reducer = (state = defaultState, action) => {
|
|||||||
|
|
||||||
if (action.routeName == 'Welcome') navHistory = [];
|
if (action.routeName == 'Welcome') navHistory = [];
|
||||||
|
|
||||||
reg.logger().info('Route: ' + currentRouteName + ' => ' + action.routeName);
|
//reg.logger().info('Route: ' + currentRouteName + ' => ' + action.routeName);
|
||||||
|
|
||||||
newState = Object.assign({}, state);
|
newState = Object.assign({}, state);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user