Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
ThaliApp
Commits
e879e307
Commit
e879e307
authored
Dec 21, 2017
by
Gijs Hendriksen
Browse files
Merge branch '36-hour-formatting' into 'master'
Fixed Time Display Closes #36 See merge request thalia/ThaliApp-react!111
parents
54289dcb
ec72caac
Changes
1
Hide whitespace changes
Inline
Side-by-side
app/components/Event.js
View file @
e879e307
...
...
@@ -142,7 +142,7 @@ class Event extends Component {
text
=
event
.
no_registration_message
;
}
}
else
if
(
!
regStarted
)
{
const
registrationStart
=
Moment
(
event
.
registration_start
).
format
(
'
D MMM YYYY, HH:m
'
);
const
registrationStart
=
Moment
(
event
.
registration_start
).
format
(
'
D MMM YYYY, HH:m
m
'
);
text
=
`Aanmelden opent
${
registrationStart
}
.`
;
}
else
if
(
!
regAllowed
)
{
text
=
'
Aanmelden is niet meer mogelijk.
'
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment