self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-29 22:48:10 +02:00
Code Issues Releases Activity

Merge branch 'master' into resource_cleanup

Browse Source
This commit is contained in:
Laurent Cozic
2018-03-16 10:03:05 +00:00
parent c1bb51c12b e4cf03ae46
commit 3e3fb88de8
9 changed files with 214 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ReactNativeClient/android/app/build.gradle
View File

@@ -90,8 +90,8 @@ android {
applicationId "net.cozic.joplin"
minSdkVersion 16
targetSdkVersion 22
versionCode 2097284
versionName "1.0.106"
versionCode 2097285
versionName "1.0.107"
ndk {
abiFilters "armeabi-v7a", "x86"
}

2
ReactNativeClient/lib/synchronizer.js
View File

@@ -72,7 +72,7 @@ class Synchronizer {
if (report.deleteLocal) lines.push(_("Deleted local items: %d.", report.deleteLocal));
if (report.deleteRemote) lines.push(_("Deleted remote items: %d.", report.deleteRemote));
if (report.fetchingTotal && report.fetchingProcessed) lines.push(_("Fetched items: %d/%d.", report.fetchingProcessed, report.fetchingTotal));
if (!report.completedTime && report.state) lines.push(_('State: "%s".', Synchronizer.stateToLabel(report.state)));
if (!report.completedTime && report.state) lines.push(_('State: %s.', Synchronizer.stateToLabel(report.state)));
if (report.cancelling && !report.completedTime) lines.push(_("Cancelling..."));
if (report.completedTime) lines.push(_("Completed: %s", time.unixMsToLocalDateTime(report.completedTime)));
if (report.errors && report.errors.length) lines.push(_("Last error: %s", report.errors[report.errors.length - 1].toString().substr(0, 500)));