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

Localization

Browse Source
This commit is contained in:
Laurent Cozic
2017-07-26 22:27:03 +01:00
parent 89f1d5e6e7
commit 1cb23df869
9 changed files with 73 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReactNativeClient/lib/components/screens/note.js
View File

@@ -274,7 +274,7 @@ class NoteScreenComponent extends BaseScreenComponent {
const note = this.state.note;
return [
{ title: _('Attach file'), onPress: () => { this.attachFile_onPress(); } },
// { title: _('Attach file'), onPress: () => { this.attachFile_onPress(); } },
{ title: _('Delete note'), onPress: () => { this.deleteNote_onPress(); } },
{ title: note && !!note.is_todo ? _('Convert to regular note') : _('Convert to todo'), onPress: () => { this.toggleIsTodo_onPress(); } },
{ title: this.state.showNoteMetadata ? _('Hide metadata') : _('Show metadata'), onPress: () => { this.showMetadata_onPress(); } },

6
ReactNativeClient/lib/components/side-menu-content.js
View File

@@ -16,6 +16,8 @@ let styles = {
menu: {
flex: 1,
backgroundColor: globalStyle.backgroundColor,
borderTopWidth: 1,
borderTopColor: globalStyle.dividerColor,
},
name: {
position: 'absolute',
@@ -148,7 +150,7 @@ class SideMenuContentComponent extends Component {
}
synchronizeButton(state) {
const title = state == 'sync' ? _('Synchronize') : _('Cancel synchronization');
const title = state == 'sync' ? _('Synchronise') : _('Cancel synchronisation');
const iconComp = state == 'sync' ? <Icon name='md-sync' style={globalStyle.icon} /> : <Icon name='md-close' style={globalStyle.icon} />;
return (
@@ -211,7 +213,7 @@ class SideMenuContentComponent extends Component {
return (
<View style={{flex:1, borderRightWidth: 1, borderRightColor: globalStyle.dividerColor }}>
<View style={{flexDirection:'row'}}>
<Image style={{flex:1, height: 150}} source={require('../images/SideMenuHeader.png')} />
<Image style={{flex:1, height: 100}} source={require('../images/SideMenuHeader.png')} />
</View>
<ScrollView scrollsToTop={false} style={styles.menu}>
{ items }

2
ReactNativeClient/lib/registry.js
View File

@@ -122,7 +122,7 @@ reg.scheduleSync = async (delay = null) => {
const syncTargetId = Setting.value('sync.target');
if (!reg.syncHasAuth(syncTargetId)) {
reg.logger().info('Synchronizer is missing credentials - manual sync required to authenticate.');
reg.logger().info('Synchroniser is missing credentials - manual sync required to authenticate.');
return;
}

9
ReactNativeClient/lib/synchronizer.js
View File

@@ -150,10 +150,9 @@ class Synchronizer {
if (!options) options = {};
if (this.state() != 'idle') {
let error = new Error(_('Synchronization is already in progress. State: %s', this.state()));
let error = new Error(_('Synchronisation is already in progress. State: %s', this.state()));
error.code = 'alreadyStarted';
throw error;
//this.logger().info('Synchronization is already in progress. State: ' + this.state());
return;
}
@@ -180,7 +179,7 @@ class Synchronizer {
this.dispatch({ type: 'SYNC_STARTED' });
this.logSyncOperation('starting', null, null, 'Starting synchronization to target ' + syncTargetId + '... [' + synchronizationId + ']');
this.logSyncOperation('starting', null, null, 'Starting synchronisation to target ' + syncTargetId + '... [' + synchronizationId + ']');
try {
await this.api().mkdir(this.syncDirName_);
@@ -460,7 +459,7 @@ class Synchronizer {
}
if (this.cancelling()) {
this.logger().info('Synchronization was cancelled.');
this.logger().info('Synchronisation was cancelled.');
this.cancelling_ = false;
}
@@ -468,7 +467,7 @@ class Synchronizer {
this.progressReport_.completedTime = time.unixMs();
this.logSyncOperation('finished', null, null, 'Synchronization finished [' + synchronizationId + ']');
this.logSyncOperation('finished', null, null, 'Synchronisation finished [' + synchronizationId + ']');
await this.logSyncSummary(this.progressReport_);