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
Boxiang Sun
gitlab-ce
Commits
dad38b27
Commit
dad38b27
authored
Nov 02, 2017
by
Winnie Hellmann
Committed by
Phil Hughes
Nov 02, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make contributors page translatable
parent
8e263c98
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
8 deletions
+14
-8
app/assets/javascripts/graphs/stat_graph_contributors.js
app/assets/javascripts/graphs/stat_graph_contributors.js
+2
-1
app/views/projects/graphs/show.html.haml
app/views/projects/graphs/show.html.haml
+7
-7
changelogs/unreleased/winh-i18n-contributors-page.yml
changelogs/unreleased/winh-i18n-contributors-page.yml
+5
-0
No files found.
app/assets/javascripts/graphs/stat_graph_contributors.js
View file @
dad38b27
...
@@ -4,6 +4,7 @@ import _ from 'underscore';
...
@@ -4,6 +4,7 @@ import _ from 'underscore';
import
d3
from
'
d3
'
;
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
'
;
export
default
(
function
()
{
export
default
(
function
()
{
function
ContributorsStatGraph
()
{}
function
ContributorsStatGraph
()
{}
...
@@ -44,7 +45,7 @@ export default (function() {
...
@@ -44,7 +45,7 @@ export default (function() {
commits
=
$
(
'
<span/>
'
,
{
commits
=
$
(
'
<span/>
'
,
{
"
class
"
:
'
graph-author-commits-count
'
"
class
"
:
'
graph-author-commits-count
'
});
});
commits
.
text
(
author
.
commits
+
"
commits
"
);
commits
.
text
(
n__
(
'
%d commit
'
,
'
%d commits
'
,
author
.
commits
)
);
return
$
(
'
<span/>
'
).
append
(
commits
);
return
$
(
'
<span/>
'
).
append
(
commits
);
};
};
...
...
app/views/projects/graphs/show.html.haml
View file @
dad38b27
-
@no_container
=
true
-
@no_container
=
true
-
page_title
"Contributors"
-
page_title
_
(
'Contributors'
)
-
content_for
:page_specific_javascripts
do
-
content_for
:page_specific_javascripts
do
=
webpack_bundle_tag
(
'common_d3'
)
=
webpack_bundle_tag
(
'common_d3'
)
=
webpack_bundle_tag
(
'graphs'
)
=
webpack_bundle_tag
(
'graphs'
)
...
@@ -7,23 +7,23 @@
...
@@ -7,23 +7,23 @@
.js-graphs-show
{
class:
container_class
,
'data-project-graph-path'
:
project_graph_path
(
@project
,
current_ref
,
format: :json
)
}
.js-graphs-show
{
class:
container_class
,
'data-project-graph-path'
:
project_graph_path
(
@project
,
current_ref
,
format: :json
)
}
.sub-header-block
.sub-header-block
.tree-ref-holder
.tree-ref-holder
.inline.vertical-align-middle
=
render
'shared/ref_switcher'
,
destination:
'graphs'
=
render
'shared/ref_switcher'
,
destination:
'graphs'
%ul
.breadcrumb.repo-breadcrumb
=
link_to
s_
(
'Commits|History'
),
project_commits_path
(
@project
,
current_ref
),
class:
'btn'
=
commits_breadcrumbs
.loading-graph
.loading-graph
.center
.center
%h3
.page-title
%h3
.page-title
%i
.fa.fa-spinner.fa-spin
%i
.fa.fa-spinner.fa-spin
Building repository graph.
=
s_
(
'ContributorsPage|Building repository graph.'
)
%p
.slead
Please wait a moment, this page will automatically refresh when ready.
%p
.slead
=
s_
(
'ContributorsPage|Please wait a moment, this page will automatically refresh when ready.'
)
.stat-graph.hide
.stat-graph.hide
.header.clearfix
.header.clearfix
%h3
#date_header
.page-title
%h3
#date_header
.page-title
%p
.light
%p
.light
Commits to
#{
@ref
}
, excluding merge commits. Limited to 6,000 commits.
=
s_
(
'ContributorsPage|Commits to %{branch_name}, excluding merge commits. Limited to 6,000 commits.'
)
%
{
branch_name:
@ref
}
%input
#brush_change
{
:type
=>
"hidden"
}
%input
#brush_change
{
:type
=>
"hidden"
}
.graphs.row
.graphs.row
#contributors-master
#contributors-master
...
...
changelogs/unreleased/winh-i18n-contributors-page.yml
0 → 100644
View file @
dad38b27
---
title
:
Make contributors page translatable
merge_request
:
14915
author
:
type
:
other
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