Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
4f73e14f
Commit
4f73e14f
authored
7 years ago
by
Winnie Hellmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add createDateTimeFormat to format dates based on locale
parent
2bad3b0e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
75 additions
and
3 deletions
+75
-3
app/assets/javascripts/locale/index.js
app/assets/javascripts/locale/index.js
+12
-3
changelogs/unreleased/winh-translate-contributors-page-dates.yml
...ogs/unreleased/winh-translate-contributors-page-dates.yml
+5
-0
doc/development/i18n/externalization.md
doc/development/i18n/externalization.md
+15
-0
spec/javascripts/locale/index_spec.js
spec/javascripts/locale/index_spec.js
+43
-0
No files found.
app/assets/javascripts/locale/index.js
View file @
4f73e14f
import
Jed
from
'
jed
'
;
import
sprintf
from
'
./sprintf
'
;
const
langAttribute
=
document
.
querySelector
(
'
html
'
).
getAttribute
(
'
lang
'
);
const
lang
=
(
langAttribute
||
'
en
'
).
replace
(
/-/g
,
'
_
'
);
const
languageCode
=
()
=>
document
.
querySelector
(
'
html
'
).
getAttribute
(
'
lang
'
)
||
'
en
'
;
const
locale
=
new
Jed
(
window
.
translations
||
{});
delete
window
.
translations
;
...
...
@@ -47,9 +46,19 @@ const pgettext = (keyOrContext, key) => {
return
translated
[
translated
.
length
-
1
];
};
export
{
lang
};
/**
Creates an instance of Intl.DateTimeFormat for the current locale.
@param formatOptions for available options, please see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/DateTimeFormat
@returns {Intl.DateTimeFormat}
*/
const
createDateTimeFormat
=
formatOptions
=>
Intl
.
DateTimeFormat
(
languageCode
(),
formatOptions
);
export
{
languageCode
};
export
{
gettext
as
__
};
export
{
ngettext
as
n__
};
export
{
pgettext
as
s__
};
export
{
sprintf
};
export
{
createDateTimeFormat
};
export
default
locale
;
This diff is collapsed.
Click to expand it.
changelogs/unreleased/winh-translate-contributors-page-dates.yml
0 → 100644
View file @
4f73e14f
---
title
:
Translate date ranges on contributors page
merge_request
:
15846
author
:
type
:
changed
This diff is collapsed.
Click to expand it.
doc/development/i18n/externalization.md
View file @
4f73e14f
...
...
@@ -262,6 +262,21 @@ Sometimes you need to add some context to the text that you want to translate
s__('OpenedNDaysAgo|Opened')
```
### Dates / times
-
In JavaScript:
```
js
import
{
createDateTimeFormat
}
from
'
.../locale
'
;
const
dateFormat
=
createDateTimeFormat
({
year
:
'
numeric
'
,
month
:
'
long
'
,
day
:
'
numeric
'
});
console
.
log
(
dateFormat
.
format
(
new
Date
(
'
2063-04-05
'
)))
// April 5, 2063
```
This makes use of [
`Intl.DateTimeFormat`
].
[
`Intl.DateTimeFormat`
]:
https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/DateTimeFormat
## Adding a new language
Let's suppose you want to add translations for a new language, let's say French.
...
...
This diff is collapsed.
Click to expand it.
spec/javascripts/locale/index_spec.js
0 → 100644
View file @
4f73e14f
import
{
createDateTimeFormat
,
languageCode
}
from
'
~/locale
'
;
const
setLanguage
=
(
languageCode
)
=>
{
const
htmlElement
=
document
.
querySelector
(
'
html
'
);
if
(
languageCode
)
{
htmlElement
.
setAttribute
(
'
lang
'
,
languageCode
);
}
else
{
htmlElement
.
removeAttribute
(
'
lang
'
);
}
};
describe
(
'
locale
'
,
()
=>
{
afterEach
(()
=>
{
setLanguage
(
null
);
});
describe
(
'
languageCode
'
,
()
=>
{
it
(
'
parses the lang attribute
'
,
()
=>
{
setLanguage
(
'
ja
'
);
expect
(
languageCode
()).
toBe
(
'
ja
'
);
});
it
(
'
falls back to English
'
,
()
=>
{
setLanguage
(
null
);
expect
(
languageCode
()).
toBe
(
'
en
'
);
});
});
describe
(
'
createDateTimeFormat
'
,
()
=>
{
beforeEach
(()
=>
{
setLanguage
(
'
de
'
);
});
it
(
'
creates an instance of Intl.DateTimeFormat
'
,
()
=>
{
const
dateFormat
=
createDateTimeFormat
({
year
:
'
numeric
'
,
month
:
'
long
'
,
day
:
'
numeric
'
});
expect
(
dateFormat
.
format
(
new
Date
(
2015
,
6
,
3
))).
toBe
(
'
3. Juli 2015
'
);
});
});
});
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
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