summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKushal Pandya <kushalspandya@gmail.com>2019-06-24 05:52:28 +0000
committerKushal Pandya <kushalspandya@gmail.com>2019-06-24 05:52:28 +0000
commit97e8f494427582251af55056d25459bf038dabbc (patch)
treec4072d5a785f53732783bd7a8150ea699c427f8a
parentb2f0955b77eb260041f497642d4b31424970f987 (diff)
parent4e6d6877f7c984d742e5ccc6f9ccb92d6a9281ef (diff)
downloadgitlab-ce-97e8f494427582251af55056d25459bf038dabbc.tar.gz
Merge branch 'update-pagination-texts' into 'master'
Update pagination prev and next texts See merge request gitlab-org/gitlab-ce!29911
-rw-r--r--app/assets/javascripts/vue_shared/components/pagination/constants.js4
-rw-r--r--changelogs/unreleased/update-pagination-texts.yml5
-rw-r--r--locale/gitlab.pot6
-rw-r--r--spec/javascripts/vue_shared/components/table_pagination_spec.js4
4 files changed, 12 insertions, 7 deletions
diff --git a/app/assets/javascripts/vue_shared/components/pagination/constants.js b/app/assets/javascripts/vue_shared/components/pagination/constants.js
index 748ad178c70..229132c0e33 100644
--- a/app/assets/javascripts/vue_shared/components/pagination/constants.js
+++ b/app/assets/javascripts/vue_shared/components/pagination/constants.js
@@ -3,8 +3,8 @@ import { s__ } from '~/locale';
export const PAGINATION_UI_BUTTON_LIMIT = 4;
export const UI_LIMIT = 6;
export const SPREAD = '...';
-export const PREV = s__('Pagination|Prev');
-export const NEXT = s__('Pagination|Next');
+export const PREV = s__('Pagination|‹ Prev');
+export const NEXT = s__('Pagination|Next ›');
export const FIRST = s__('Pagination|« First');
export const LAST = s__('Pagination|Last »');
export const LABEL_FIRST_PAGE = s__('Pagination|Go to first page');
diff --git a/changelogs/unreleased/update-pagination-texts.yml b/changelogs/unreleased/update-pagination-texts.yml
new file mode 100644
index 00000000000..6a398e26242
--- /dev/null
+++ b/changelogs/unreleased/update-pagination-texts.yml
@@ -0,0 +1,5 @@
+---
+title: Update pagination prev and next texts
+merge_request: 29911
+author:
+type: other
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index ed06389cf05..b04cb999dc3 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -6943,13 +6943,13 @@ msgstr ""
msgid "Pagination|Last »"
msgstr ""
-msgid "Pagination|Next"
+msgid "Pagination|Next ›"
msgstr ""
-msgid "Pagination|Prev"
+msgid "Pagination|« First"
msgstr ""
-msgid "Pagination|« First"
+msgid "Pagination|‹ Prev"
msgstr ""
msgid "Parameter"
diff --git a/spec/javascripts/vue_shared/components/table_pagination_spec.js b/spec/javascripts/vue_shared/components/table_pagination_spec.js
index 42abb4d83f0..258530f32f7 100644
--- a/spec/javascripts/vue_shared/components/table_pagination_spec.js
+++ b/spec/javascripts/vue_shared/components/table_pagination_spec.js
@@ -217,7 +217,7 @@ describe('Pagination component', () => {
change: spy,
});
- expect(component.$el.querySelector('.js-next-button').textContent.trim()).toEqual('Next');
+ expect(component.$el.querySelector('.js-next-button').textContent.trim()).toEqual('Next ›');
component.$el.querySelector('.js-next-button .page-link').click();
@@ -237,7 +237,7 @@ describe('Pagination component', () => {
change: spy,
});
- expect(component.$el.querySelector('.js-next-button').textContent.trim()).toEqual('Next');
+ expect(component.$el.querySelector('.js-next-button').textContent.trim()).toEqual('Next ›');
component.$el.querySelector('.js-next-button .page-link').click();