From 8f2b109363ef551655a0a5210e5070d20c13c4b3 Mon Sep 17 00:00:00 2001 From: James Ramsay Date: Tue, 3 Oct 2017 16:07:52 -0400 Subject: Fix inconsistent use of sentence case --- .../javascripts/repo/components/repo_sidebar.vue | 4 ++-- .../projects/tree/_old_tree_content.html.haml | 2 +- locale/gitlab.pot | 22 ++++++++-------------- .../repo/components/repo_sidebar_spec.js | 4 ++-- 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/app/assets/javascripts/repo/components/repo_sidebar.vue b/app/assets/javascripts/repo/components/repo_sidebar.vue index 1e40814b95f..685f6ff806f 100644 --- a/app/assets/javascripts/repo/components/repo_sidebar.vue +++ b/app/assets/javascripts/repo/components/repo_sidebar.vue @@ -74,8 +74,8 @@ export default { Name - Last Commit - Last Update + Last commit + Last update diff --git a/app/views/projects/tree/_old_tree_content.html.haml b/app/views/projects/tree/_old_tree_content.html.haml index 820b947804e..6ea78851b8d 100644 --- a/app/views/projects/tree/_old_tree_content.html.haml +++ b/app/views/projects/tree/_old_tree_content.html.haml @@ -6,7 +6,7 @@ %th= s_('ProjectFileTree|Name') %th.hidden-xs .pull-left= _('Last commit') - %th.text-right= _('Last Update') + %th.text-right= _('Last update') - if @path.present? %tr.tree-item %td.tree-item-file-name diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 53e37c53377..99f773e6bca 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: 2017-09-28 13:28-0400\n" -"PO-Revision-Date: 2017-09-28 13:28-0400\n" +"POT-Creation-Date: 2017-10-03 16:06-0400\n" +"PO-Revision-Date: 2017-10-03 16:06-0400\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "Language: \n" @@ -420,9 +420,6 @@ msgstr "" msgid "Create New Directory" msgstr "" -msgid "Create a new branch" -msgstr "" - msgid "Create a personal access token on your account to pull or push via %{protocol}." msgstr "" @@ -729,9 +726,6 @@ msgstr[1] "" msgid "Last Pipeline" msgstr "" -msgid "Last Update" -msgstr "" - msgid "Last commit" msgstr "" @@ -741,6 +735,9 @@ msgstr "" msgid "Last edited by %{name}" msgstr "" +msgid "Last update" +msgstr "" + msgid "Last updated" msgstr "" @@ -1189,9 +1186,6 @@ msgstr "" msgid "Select a timezone" msgstr "" -msgid "Select existing branch" -msgstr "" - msgid "Select target branch" msgstr "" @@ -1493,9 +1487,6 @@ msgstr "" msgid "Timeago|a week ago" msgstr "" -msgid "Timeago|a while" -msgstr "" - msgid "Timeago|a year ago" msgstr "" @@ -1547,6 +1538,9 @@ msgstr "" msgid "Timeago|in 1 year" msgstr "" +msgid "Timeago|in a while" +msgstr "" + msgid "Timeago|less than a minute ago" msgstr "" diff --git a/spec/javascripts/repo/components/repo_sidebar_spec.js b/spec/javascripts/repo/components/repo_sidebar_spec.js index db9911c7a2c..23c10ea022e 100644 --- a/spec/javascripts/repo/components/repo_sidebar_spec.js +++ b/spec/javascripts/repo/components/repo_sidebar_spec.js @@ -23,8 +23,8 @@ describe('RepoSidebar', () => { expect(vm.$el.id).toEqual('sidebar'); expect(vm.$el.classList.contains('sidebar-mini')).toBeFalsy(); expect(thead.querySelector('.name').textContent).toEqual('Name'); - expect(thead.querySelector('.last-commit').textContent).toEqual('Last Commit'); - expect(thead.querySelector('.last-update').textContent).toEqual('Last Update'); + expect(thead.querySelector('.last-commit').textContent).toEqual('Last commit'); + expect(thead.querySelector('.last-update').textContent).toEqual('Last update'); expect(tbody.querySelector('.repo-file-options')).toBeFalsy(); expect(tbody.querySelector('.prev-directory')).toBeFalsy(); expect(tbody.querySelector('.loading-file')).toBeFalsy(); -- cgit v1.2.1