diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2018-02-08 06:49:06 +0300 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2018-02-08 06:49:06 +0300 |
commit | 66695ce23735281beeef8a4de889e97d117a6526 (patch) | |
tree | 3d4646d1fb76c82f364090e04e20901337bb593a | |
parent | 15762319e94457cc82dba8d15d5d9507ad527503 (diff) | |
parent | fc63d6c0af8173a24fa1894b4d1531dee286ab3a (diff) |
Merge branch 'internationalize-graph-page' into 'master'
Annotate graph page for internationalization
See merge request gitlab-org/gitlab-ce!16688
-rw-r--r-- | app/views/projects/network/_head.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/network/show.html.haml | 4 | ||||
-rw-r--r-- | changelogs/unreleased/internationalize-graph-page.yml | 5 | ||||
-rw-r--r-- | locale/gitlab.pot | 13 |
4 files changed, 19 insertions, 5 deletions
diff --git a/app/views/projects/network/_head.html.haml b/app/views/projects/network/_head.html.haml index 8f6805268d5..f08526f485e 100644 --- a/app/views/projects/network/_head.html.haml +++ b/app/views/projects/network/_head.html.haml @@ -6,4 +6,4 @@ = render partial: 'shared/ref_switcher', locals: {destination: 'graph'} .oneline - You can move around the graph by using the arrow keys. + = _("You can move around the graph by using the arrow keys.") diff --git a/app/views/projects/network/show.html.haml b/app/views/projects/network/show.html.haml index 8a19497c55b..2efb7fc719f 100644 --- a/app/views/projects/network/show.html.haml +++ b/app/views/projects/network/show.html.haml @@ -7,14 +7,14 @@ .project-network .controls = form_tag project_network_path(@project, @id), method: :get, class: 'form-inline network-form' do |f| - = text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: "Git revision", class: 'search-input form-control input-mx-250 search-sha' + = text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: _("Git revision"), class: 'search-input form-control input-mx-250 search-sha' = button_tag class: 'btn btn-success' do = icon('search') .inline.prepend-left-20 .checkbox.light = label_tag :filter_ref do = check_box_tag :filter_ref, 1, @options[:filter_ref] - %span Begin with the selected commit + %span= _("Begin with the selected commit") - if @commit .network-graph{ data: { url: @url, commit_url: @commit_url, ref: @ref, commit_id: @commit.id } } diff --git a/changelogs/unreleased/internationalize-graph-page.yml b/changelogs/unreleased/internationalize-graph-page.yml new file mode 100644 index 00000000000..904dbd606d7 --- /dev/null +++ b/changelogs/unreleased/internationalize-graph-page.yml @@ -0,0 +1,5 @@ +--- +title: Internationalize graph page selrahman +merge_request: 16688 +author: Shah El-Rahman +type: changed diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 501bcef93de..a51141d5360 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: gitlab 1.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-07 13:35+0100\n" -"PO-Revision-Date: 2018-02-07 13:35+0100\n" +"POT-Creation-Date: 2018-02-07 11:38-0600\n" +"PO-Revision-Date: 2018-02-07 11:38-0600\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: \n" @@ -294,6 +294,9 @@ msgstr "" msgid "Avatar will be removed. Are you sure?" msgstr "" +msgid "Begin with the selected commit" +msgstr "" + msgid "Branch" msgid_plural "Branches" msgstr[0] "" @@ -1325,6 +1328,9 @@ msgstr "" msgid "Generate a default set of labels" msgstr "" +msgid "Git revision" +msgstr "" + msgid "Git storage health information has been reset" msgstr "" @@ -3108,6 +3114,9 @@ msgstr "" msgid "You can also star a label to make it a priority label." msgstr "" +msgid "You can move around the graph by using the arrow keys." +msgstr "" + msgid "You can only add files when you are on a branch" msgstr "" |