Merge branch 'internationalize-charts-page' into 'master'2018-02-08-ce-cut-off-to-10-5-stable

Annotate charts page for internationalization

See merge request gitlab-org/gitlab-ce!16687

3 files changed, 50 insertions, 13 deletions

diff --git a/app/views/projects/graphs/charts.html.haml b/app/views/projects/graphs/charts.html.haml
index ffb9238a65a..300a39fe257 100644
--- a/app/views/projects/graphs/charts.html.haml
+++ b/app/views/projects/graphs/charts.html.haml
@@ -7,7 +7,7 @@
 
 .repo-charts{ class: container_class }
   %h4.sub-header
-    Programming languages used in this repository
+    = _("Programming languages used in this repository")
 
   .row
     .col-md-4
@@ -30,9 +30,11 @@
   .row.tree-ref-header
     .col-md-6
       %h4
-        Commit statistics for
-        %strong= @ref
-        #{@commits_graph.start_date.strftime('%b %d')} - #{@commits_graph.end_date.strftime('%b %d')}
+        - start_time = capture do
+          #{@commits_graph.start_date.strftime('%b %d')}
+        - end_time = capture do
+          #{@commits_graph.end_date.strftime('%b %d')}
+        = (_("Commit statistics for %{ref} %{start_time} - %{end_time}") % { ref: "<strong>#{@ref}</strong>", start_time: start_time, end_time: end_time }).html_safe
 
     .col-md-6
       .tree-ref-container
@@ -45,32 +47,35 @@
     .col-md-6
       %ul.commit-stats
         %li
-          Total:
-          %strong #{@commits_graph.commits.size} commits
+          - total = capture do
+            #{@commits_graph.commits.size}
+          = (_("Total: %{total}") % { total: "<strong>#{total} commits</strong>" }).html_safe
         %li
-          Average per day:
-          %strong #{@commits_graph.commit_per_day} commits
+          - average = capture do
+            #{@commits_graph.commit_per_day}
+          = (_("Average per day: %{average}") % { average: "<strong>#{average} commits</strong>" }).html_safe
         %li
-          Authors:
-          %strong= @commits_graph.authors
+          - authors = capture do
+            #{@commits_graph.authors}
+          = (_("Authors: %{authors}") % { authors: "<strong>#{authors}</strong>" }).html_safe
     .col-md-6
       %div
         %p.slead
-          Commits per day of month
+          = _("Commits per day of month")
         %canvas#month-chart
   .row
     .col-md-6
     .col-md-6
       %div
         %p.slead
-          Commits per weekday
+          = _("Commits per weekday")
         %canvas#weekday-chart
   .row
     .col-md-6
     .col-md-6
       %div
         %p.slead
-          Commits per day hour (UTC)
+          = _("Commits per day hour (UTC)")
         %canvas#hour-chart
 
 %script#projectChartData{ type: "application/json" }
diff --git a/changelogs/unreleased/internationalize-charts-page.yml b/changelogs/unreleased/internationalize-charts-page.yml
new file mode 100644
index 00000000000..481b83fb059
--- /dev/null
+++ b/changelogs/unreleased/internationalize-charts-page.yml
@@ -0,0 +1,5 @@
+---
+title: Internationalize charts page
+merge_request: 16687
+author: selrahman
+type: changed
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index a51141d5360..fadc17a659d 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -261,6 +261,9 @@ msgstr ""
 msgid "Author"
 msgstr ""
 
+msgid "Authors: %{authors}"
+msgstr ""
+
 msgid "Auto Review Apps and Auto Deploy need a %{kubernetes} to work correctly."
 msgstr ""
 
@@ -294,6 +297,9 @@ msgstr ""
 msgid "Avatar will be removed. Are you sure?"
 msgstr ""
 
+msgid "Average per day: %{average}"
+msgstr ""
+
 msgid "Begin with the selected commit"
 msgstr ""
 
@@ -725,6 +731,9 @@ msgstr ""
 msgid "ClusterIntegration|Make sure your account %{link_to_requirements} to create Kubernetes clusters"
 msgstr ""
 
+msgid "ClusterIntegration|Manage"
+msgstr ""
+
 msgid "ClusterIntegration|Manage your Kubernetes cluster by visiting %{link_gke}"
 msgstr ""
 
@@ -859,6 +868,9 @@ msgstr ""
 msgid "Commit message"
 msgstr ""
 
+msgid "Commit statistics for %{ref} %{start_time} - %{end_time}"
+msgstr ""
+
 msgid "CommitBoxTitle|Commit"
 msgstr ""
 
@@ -871,6 +883,15 @@ msgstr ""
 msgid "Commits feed"
 msgstr ""
 
+msgid "Commits per day hour (UTC)"
+msgstr ""
+
+msgid "Commits per day of month"
+msgstr ""
+
+msgid "Commits per weekday"
+msgstr ""
+
 msgid "Commits|An error occurred while fetching merge requests data."
 msgstr ""
 
@@ -2033,6 +2054,9 @@ msgstr ""
 msgid "Profiles|your account"
 msgstr ""
 
+msgid "Programming languages used in this repository"
+msgstr ""
+
 msgid "Project '%{project_name}' is in the process of being deleted."
 msgstr ""
 
@@ -2901,6 +2925,9 @@ msgstr ""
 msgid "Total test time for all commits/merges"
 msgstr ""
 
+msgid "Total: %{total}"
+msgstr ""
+
 msgid "Track time with quick actions"
 msgstr ""