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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
e720e8b8
Commit
e720e8b8
authored
Dec 11, 2017
by
Winnie Hellmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Translate date ranges on contributors page
parent
1109a5ce
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
39 additions
and
8 deletions
+39
-8
app/assets/javascripts/graphs/stat_graph_contributors.js
app/assets/javascripts/graphs/stat_graph_contributors.js
+13
-8
spec/javascripts/graphs/stat_graph_contributors_spec.js
spec/javascripts/graphs/stat_graph_contributors_spec.js
+26
-0
No files found.
app/assets/javascripts/graphs/stat_graph_contributors.js
View file @
e720e8b8
/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, one-var, camelcase, one-var-declaration-per-line, quotes, no-param-reassign, quote-props, comma-dangle, prefer-template, max-len, no-return-assign, no-shadow */
/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, one-var, camelcase, one-var-declaration-per-line, quotes, no-param-reassign, quote-props, comma-dangle, prefer-template, max-len, no-return-assign, no-shadow */
import
_
from
'
underscore
'
;
import
_
from
'
underscore
'
;
import
d3
from
'
d3
'
;
import
{
ContributorsGraph
,
ContributorsAuthorGraph
,
ContributorsMasterGraph
}
from
'
./stat_graph_contributors_graph
'
;
import
{
ContributorsGraph
,
ContributorsAuthorGraph
,
ContributorsMasterGraph
}
from
'
./stat_graph_contributors_graph
'
;
import
ContributorsStatGraphUtil
from
'
./stat_graph_contributors_util
'
;
import
ContributorsStatGraphUtil
from
'
./stat_graph_contributors_util
'
;
import
{
n__
}
from
'
../locale
'
;
import
{
n__
,
s__
,
createDateTimeFormat
,
sprintf
}
from
'
../locale
'
;
export
default
(
function
()
{
export
default
(
function
()
{
function
ContributorsStatGraph
()
{}
function
ContributorsStatGraph
()
{
this
.
dateFormat
=
createDateTimeFormat
({
year
:
'
numeric
'
,
month
:
'
long
'
,
day
:
'
numeric
'
});
}
ContributorsStatGraph
.
prototype
.
init
=
function
(
log
)
{
ContributorsStatGraph
.
prototype
.
init
=
function
(
log
)
{
var
author_commits
,
total_commits
;
var
author_commits
,
total_commits
;
...
@@ -95,11 +96,15 @@ export default (function() {
...
@@ -95,11 +96,15 @@ export default (function() {
};
};
ContributorsStatGraph
.
prototype
.
change_date_header
=
function
()
{
ContributorsStatGraph
.
prototype
.
change_date_header
=
function
()
{
var
print
,
print_date_format
,
x_domain
;
const
x_domain
=
ContributorsGraph
.
prototype
.
x_domain
;
x_domain
=
ContributorsGraph
.
prototype
.
x_domain
;
const
formattedDateRange
=
sprintf
(
print_date_format
=
d3
.
time
.
format
(
"
%B %e %Y
"
);
s__
(
'
ContributorsPage|%{startDate} – %{endDate}
'
),
print
=
print_date_format
(
x_domain
[
0
])
+
"
-
"
+
print_date_format
(
x_domain
[
1
]);
{
return
$
(
"
#date_header
"
).
text
(
print
);
startDate
:
this
.
dateFormat
.
format
(
new
Date
(
x_domain
[
0
])),
endDate
:
this
.
dateFormat
.
format
(
new
Date
(
x_domain
[
1
])),
},
);
return
$
(
'
#date_header
'
).
text
(
formattedDateRange
);
};
};
ContributorsStatGraph
.
prototype
.
redraw_author_commit_info
=
function
(
author
)
{
ContributorsStatGraph
.
prototype
.
redraw_author_commit_info
=
function
(
author
)
{
...
...
spec/javascripts/graphs/stat_graph_contributors_spec.js
0 → 100644
View file @
e720e8b8
import
ContributorsStatGraph
from
'
~/graphs/stat_graph_contributors
'
;
import
{
ContributorsGraph
}
from
'
~/graphs/stat_graph_contributors_graph
'
;
import
{
setLanguage
}
from
'
../helpers/locale_helper
'
;
describe
(
'
ContributorsStatGraph
'
,
()
=>
{
describe
(
'
change_date_header
'
,
()
=>
{
beforeAll
(()
=>
{
setLanguage
(
'
de
'
);
});
afterAll
(()
=>
{
setLanguage
(
null
);
});
it
(
'
uses the locale to display date ranges
'
,
()
=>
{
ContributorsGraph
.
init_x_domain
([{
date
:
'
2013-01-31
'
},
{
date
:
'
2012-01-31
'
}]);
setFixtures
(
'
<div id="date_header"></div>
'
);
const
graph
=
new
ContributorsStatGraph
();
graph
.
change_date_header
();
expect
(
document
.
getElementById
(
'
date_header
'
).
innerText
).
toBe
(
'
31. Januar 2012 – 31. Januar 2013
'
);
});
});
});
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