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
5f78cbd9
Commit
5f78cbd9
authored
Jun 15, 2017
by
Bob Van Landuyt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add context to the `with_stage` strings
parent
86cd00b5
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
19 deletions
+22
-19
app/views/projects/commit/_commit_box.html.haml
app/views/projects/commit/_commit_box.html.haml
+1
-1
locale/en/gitlab.po
locale/en/gitlab.po
+6
-5
locale/es/gitlab.po
locale/es/gitlab.po
+7
-6
locale/gitlab.pot
locale/gitlab.pot
+8
-7
No files found.
app/views/projects/commit/_commit_box.html.haml
View file @
5f78cbd9
...
@@ -73,7 +73,7 @@
...
@@ -73,7 +73,7 @@
=
link_to
"#
#{
last_pipeline
.
id
}
"
,
namespace_project_pipeline_path
(
@project
.
namespace
,
@project
,
last_pipeline
.
id
)
=
link_to
"#
#{
last_pipeline
.
id
}
"
,
namespace_project_pipeline_path
(
@project
.
namespace
,
@project
,
last_pipeline
.
id
)
=
ci_label_for_status
(
last_pipeline
.
status
)
=
ci_label_for_status
(
last_pipeline
.
status
)
-
if
last_pipeline
.
stages_count
.
nonzero?
-
if
last_pipeline
.
stages_count
.
nonzero?
#{
n_
(
'with stage'
,
'with stages'
,
last_pipeline
.
stages_count
)
}
#{
n_
(
s_
(
'Pipeline|with stage'
),
s_
(
'Pipeline|with stages'
)
,
last_pipeline
.
stages_count
)
}
.mr-widget-pipeline-graph
.mr-widget-pipeline-graph
=
render
'shared/mini_pipeline_graph'
,
pipeline:
last_pipeline
,
klass:
'js-commit-pipeline-graph'
=
render
'shared/mini_pipeline_graph'
,
pipeline:
last_pipeline
,
klass:
'js-commit-pipeline-graph'
in
in
...
...
locale/en/gitlab.po
View file @
5f78cbd9
...
@@ -562,6 +562,12 @@ msgstr ""
...
@@ -562,6 +562,12 @@ msgstr ""
msgid "PipelineSheduleIntervalPattern|Custom"
msgid "PipelineSheduleIntervalPattern|Custom"
msgstr ""
msgstr ""
msgid "Pipeline|with stage"
msgstr ""
msgid "Pipeline|with stages"
msgstr ""
msgid "Project '%{project_name}' queued for deletion."
msgid "Project '%{project_name}' queued for deletion."
msgstr ""
msgstr ""
...
@@ -1020,8 +1026,3 @@ msgid "parent"
...
@@ -1020,8 +1026,3 @@ msgid "parent"
msgid_plural "parents"
msgid_plural "parents"
msgstr[0] ""
msgstr[0] ""
msgstr[1] ""
msgstr[1] ""
msgid "with stage"
msgid_plural "with stages"
msgstr[0] ""
msgstr[1] ""
locale/es/gitlab.po
View file @
5f78cbd9
...
@@ -7,7 +7,7 @@ msgid ""
...
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
msgstr ""
"Project-Id-Version: gitlab 1.0.0\n"
"Project-Id-Version: gitlab 1.0.0\n"
"Report-Msgid-Bugs-To: \n"
"Report-Msgid-Bugs-To: \n"
"PO-Revision-Date: 2017-06-15 1
3:46
+0200\n"
"PO-Revision-Date: 2017-06-15 1
4:00
+0200\n"
"Language-Team: Spanish\n"
"Language-Team: Spanish\n"
"Language: es\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"MIME-Version: 1.0\n"
...
@@ -562,6 +562,12 @@ msgstr "Destino"
...
@@ -562,6 +562,12 @@ msgstr "Destino"
msgid "PipelineSheduleIntervalPattern|Custom"
msgid "PipelineSheduleIntervalPattern|Custom"
msgstr "Personalzado"
msgstr "Personalzado"
msgid "Pipeline|with stage"
msgstr "con etapa"
msgid "Pipeline|with stages"
msgstr "con etapas"
msgid "Project '%{project_name}' queued for deletion."
msgid "Project '%{project_name}' queued for deletion."
msgstr "Proyecto ‘%{project_name}’ en cola para eliminación."
msgstr "Proyecto ‘%{project_name}’ en cola para eliminación."
...
@@ -1023,8 +1029,3 @@ msgid "parent"
...
@@ -1023,8 +1029,3 @@ msgid "parent"
msgid_plural "parents"
msgid_plural "parents"
msgstr[0] "padre"
msgstr[0] "padre"
msgstr[1] "padres"
msgstr[1] "padres"
msgid "with stage"
msgid_plural "with stages"
msgstr[0] "con etapa"
msgstr[1] "con etapas"
locale/gitlab.pot
View file @
5f78cbd9
...
@@ -8,8 +8,8 @@ msgid ""
...
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
msgstr ""
"Project-Id-Version: gitlab 1.0.0\n"
"Project-Id-Version: gitlab 1.0.0\n"
"Report-Msgid-Bugs-To: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-06-15 13:
42
+0200\n"
"POT-Creation-Date: 2017-06-15 13:
55
+0200\n"
"PO-Revision-Date: 2017-06-15 13:
42
+0200\n"
"PO-Revision-Date: 2017-06-15 13:
55
+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"Language: \n"
...
@@ -563,6 +563,12 @@ msgstr ""
...
@@ -563,6 +563,12 @@ msgstr ""
msgid "PipelineSheduleIntervalPattern|Custom"
msgid "PipelineSheduleIntervalPattern|Custom"
msgstr ""
msgstr ""
msgid "Pipeline|with stage"
msgstr ""
msgid "Pipeline|with stages"
msgstr ""
msgid "Project '%{project_name}' queued for deletion."
msgid "Project '%{project_name}' queued for deletion."
msgstr ""
msgstr ""
...
@@ -1021,8 +1027,3 @@ msgid "parent"
...
@@ -1021,8 +1027,3 @@ msgid "parent"
msgid_plural "parents"
msgid_plural "parents"
msgstr[0] ""
msgstr[0] ""
msgstr[1] ""
msgstr[1] ""
msgid "with stage"
msgid_plural "with stages"
msgstr[0] ""
msgstr[1] ""
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