public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge 240b08eaea into c3b968aa10

Browse source
This commit is contained in:
Iván Eixarch 2020-09-15 16:43:49 +02:00 • committed by GitHub
commit c6164fb898
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
client/src/lib/i18n.js
View file

@ -6,6 +6,7 @@ import {I18nextProvider} from 'react-i18next';
import i18n from 'i18next'; import i18n from 'i18next';
import LanguageDetector from 'i18next-browser-languagedetector'; import LanguageDetector from 'i18next-browser-languagedetector';
import mailtrainConfig from 'mailtrainConfig'; import mailtrainConfig from 'mailtrainConfig';
import moment from 'moment';
import {convertToFake, getLang} from '../../../shared/langs'; import {convertToFake, getLang} from '../../../shared/langs';
import {createComponentMixin} from "./decorator-helpers"; import {createComponentMixin} from "./decorator-helpers";
@ -63,6 +64,8 @@ i18n
debug: false debug: false
}); });
// Show moment text in selected language
moment.locale(i18n.language);
export default i18n; export default i18n;

3
client/src/lists/fields/CUD.js
View file

@ -426,7 +426,8 @@ export default class CUD extends Component {
<Dropdown id="dateFormat" label={t('dateFormat')} <Dropdown id="dateFormat" label={t('dateFormat')}
options={[ options={[
{key: DateFormat.US, label: t('mmddyyyy')}, {key: DateFormat.US, label: t('mmddyyyy')},
{key: DateFormat.EU, label: t('ddmmyyyy')} {key: DateFormat.EU, label: t('ddmmyyyy')},
{key: DateFormat.INTL, label: t('YYYY-MM-DD')}
]} ]}
/> />
<InputField id="default_value" label={t('defaultValue')} help={<Trans i18nKey="defaultValueUsedWhenTheFieldIsEmpty">Default value used when the field is empty.</Trans>}/> <InputField id="default_value" label={t('defaultValue')} help={<Trans i18nKey="defaultValueUsedWhenTheFieldIsEmpty">Default value used when the field is empty.</Trans>}/>

2
server/models/fields.js
View file

@ -233,7 +233,7 @@ fieldTypes.option = {
fieldTypes['date'] = { fieldTypes['date'] = {
validate: field => { validate: field => {
enforce(['eur', 'us'].includes(field.settings.dateFormat), 'Date format incorrect'); enforce(['eur', 'us', 'intl'].includes(field.settings.dateFormat), 'Date format incorrect');
}, },
addColumn: (table, name) => table.dateTime(name), addColumn: (table, name) => table.dateTime(name),
indexed: true, indexed: true,

4
server/models/subscriptions.js
View file

@ -62,7 +62,7 @@ fieldTypes.date = {
afterJSON: (groupedField, entity) => { afterJSON: (groupedField, entity) => {
const key = getFieldColumn(groupedField); const key = getFieldColumn(groupedField);
if (key in entity) { if (key in entity) {
entity[key] = entity[key] ? moment(entity[key]).toISOString() : null; entity[key] = entity[key] ? moment(entity[key]).utc().format("YYYY-MM-DD HH:mm:ss") : null;
} }
}, },
listRender: (groupedField, value) => formatDate(groupedField.settings.dateFormat, value) listRender: (groupedField, value) => formatDate(groupedField.settings.dateFormat, value)
@ -72,7 +72,7 @@ fieldTypes.birthday = {
afterJSON: (groupedField, entity) => { afterJSON: (groupedField, entity) => {
const key = getFieldColumn(groupedField); const key = getFieldColumn(groupedField);
if (key in entity) { if (key in entity) {
entity[key] = entity[key] ? moment(entity[key]).toISOString() : null; entity[key] = entity[key] ? moment(entity[key]).utc().format("YYYY-MM-DD HH:mm:ss") : null;
} }
}, },
listRender: (groupedField, value) => formatBirthday(groupedField.settings.dateFormat, value) listRender: (groupedField, value) => formatBirthday(groupedField.settings.dateFormat, value)