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

All: Added option to set date and time format

Browse Source
This commit is contained in:
Laurent Cozic
2017-11-28 18:02:54 +00:00
parent 6e23fead59
commit f9f5974267
6 changed files with 80 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ElectronClient/app/gui/PromptDialog.jsx
View File

@@ -2,6 +2,7 @@ const React = require('react');
const { connect } = require('react-redux');
const { _ } = require('lib/locale.js');
const { themeStyle } = require('../theme.js');
const { time } = require('lib/time-utils.js');
const Datetime = require('react-datetime');
class PromptDialog extends React.Component {
@@ -106,8 +107,8 @@ class PromptDialog extends React.Component {
if (this.props.inputType === 'datetime') {
inputComp = <Datetime
value={this.state.answer}
dateFormat="DD/MM/YYYY"
timeFormat="HH:mm"
dateFormat={time.dateFormat()}
timeFormat={time.timeFormat()}
onChange={(momentObject) => onDateTimeChange(momentObject)}
/>
} else {