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
a6795f44
Commit
a6795f44
authored
Mar 28, 2018
by
Gijs Hendriksen
Browse files
Merge branch 'fix/locale-membership-today' into 'master'
Fix translation of 'heden' See merge request
!171
parents
52bc4f38
d48c14df
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/assets/locales/nl/app/ui/screens/user/Profile.json
View file @
a6795f44
...
...
@@ -10,5 +10,6 @@
"Personal information"
:
"Persoonlijke gegevens"
,
"Achievements for Thalia"
:
"Verdiensten voor Thalia"
,
"Chair"
:
"Voorzitter"
,
"Sorry! We couldn't load any data."
:
"Sorry! We konden geen gegevens laden."
"Sorry! We couldn't load any data."
:
"Sorry! We konden geen gegevens laden."
,
"today"
:
"heden"
}
app/ui/screens/user/Profile.js
View file @
a6795f44
...
...
@@ -92,7 +92,7 @@ const getAchievements = (profile, t) => {
{
achievement
.
periods
&&
achievement
.
periods
.
map
((
period
)
=>
{
let
start
=
Moment
(
period
.
since
);
start
=
start
.
isSame
(
Moment
([
1970
,
1
,
1
]),
'
day
'
)
?
'
?
'
:
start
.
format
(
'
D MMMM YYYY
'
);
const
end
=
period
.
until
?
Moment
(
period
.
until
).
format
(
'
D MMMM YYYY
'
)
:
'
heden
'
;
const
end
=
period
.
until
?
Moment
(
period
.
until
).
format
(
'
D MMMM YYYY
'
)
:
t
(
'
today
'
)
;
let
text
=
''
;
if
(
period
.
role
)
{
...
...
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