diff --git a/app/assets/javascripts/access_tokens/components/access_token_table_app.vue b/app/assets/javascripts/access_tokens/components/access_token_table_app.vue
index d21f94b736f438dfe59d66614bf291846d1ccfa6..f28893206da9b38121c1622f644e18beb09da929 100644
--- a/app/assets/javascripts/access_tokens/components/access_token_table_app.vue
+++ b/app/assets/javascripts/access_tokens/components/access_token_table_app.vue
@@ -172,10 +172,6 @@ export default {
v-model="currentPage"
:per-page="$options.PAGE_SIZE"
:total-items="activeAccessTokens.length"
- :prev-text="__('Prev')"
- :next-text="__('Next')"
- :label-next-page="__('Go to next page')"
- :label-prev-page="__('Go to previous page')"
align="center"
class="gl-mt-5"
/>
diff --git a/app/assets/javascripts/access_tokens/components/inactive_access_token_table_app.vue b/app/assets/javascripts/access_tokens/components/inactive_access_token_table_app.vue
index bfb4aac75e8bde63e07bfb0114f496a1b9a00da5..eb57b778e33aac90a2d622b79d528c1921736c89 100644
--- a/app/assets/javascripts/access_tokens/components/inactive_access_token_table_app.vue
+++ b/app/assets/javascripts/access_tokens/components/inactive_access_token_table_app.vue
@@ -114,10 +114,6 @@ export default {
v-model="currentPage"
:per-page="$options.PAGE_SIZE"
:total-items="inactiveAccessTokens.length"
- :prev-text="__('Prev')"
- :next-text="__('Next')"
- :label-next-page="__('Go to next page')"
- :label-prev-page="__('Go to previous page')"
align="center"
class="gl-mt-5"
/>
diff --git a/app/assets/javascripts/admin/abuse_reports/components/app.vue b/app/assets/javascripts/admin/abuse_reports/components/app.vue
index d42ae7c1ba946fd68254bc0db6846829d6200595..ce0972808a43ec46c3c16a4a9d2818622560d611 100644
--- a/app/assets/javascripts/admin/abuse_reports/components/app.vue
+++ b/app/assets/javascripts/admin/abuse_reports/components/app.vue
@@ -51,10 +51,6 @@ export default {
:per-page="pagination.perPage"
:total-items="pagination.totalItems"
:link-gen="paginationLinkGenerator"
- :prev-text="__('Prev')"
- :next-text="__('Next')"
- :label-next-page="__('Go to next page')"
- :label-prev-page="__('Go to previous page')"
align="center"
class="gl-mt-3"
/>
diff --git a/app/assets/javascripts/admin/deploy_keys/components/table.vue b/app/assets/javascripts/admin/deploy_keys/components/table.vue
index e045a19c97e27abca5c54a8bacfc24676ddc3cfd..bca50af547972d80ddd670a0965559b1ede715ea 100644
--- a/app/assets/javascripts/admin/deploy_keys/components/table.vue
+++ b/app/assets/javascripts/admin/deploy_keys/components/table.vue
@@ -30,10 +30,6 @@ export default {
),
delete: __('Delete deploy key'),
edit: __('Edit deploy key'),
- pagination: {
- next: __('Next'),
- prev: __('Prev'),
- },
modal: {
title: __('Are you sure?'),
body: __('Are you sure you want to delete this deploy key?'),
@@ -289,8 +285,6 @@ export default {
v-model="page"
:per-page="$options.DEFAULT_PER_PAGE"
:total-items="totalItems"
- :next-text="$options.i18n.pagination.next"
- :prev-text="$options.i18n.pagination.prev"
align="center"
class="gl-mt-5"
/>
diff --git a/app/assets/javascripts/badges/components/badge_list.vue b/app/assets/javascripts/badges/components/badge_list.vue
index 33257e78aa4698b59058dcaa8dc298676b4d25a3..adabbf39902d34a772398bfe6825e8c627047e3d 100644
--- a/app/assets/javascripts/badges/components/badge_list.vue
+++ b/app/assets/javascripts/badges/components/badge_list.vue
@@ -165,10 +165,6 @@ export default {
v-model="currentPage"
:per-page="$options.PAGE_SIZE"
:total-items="badges.length"
- :prev-text="__('Prev')"
- :next-text="__('Next')"
- :label-next-page="__('Go to next page')"
- :label-prev-page="__('Go to previous page')"
align="center"
class="gl-mt-5"
/>
diff --git a/app/assets/javascripts/ci_secure_files/components/secure_files_list.vue b/app/assets/javascripts/ci_secure_files/components/secure_files_list.vue
index 874a339ae126f7d1151f0acc4bc87b5a8a87b97f..57a325d454672dcc73d9ec4393f8939332c316db 100644
--- a/app/assets/javascripts/ci_secure_files/components/secure_files_list.vue
+++ b/app/assets/javascripts/ci_secure_files/components/secure_files_list.vue
@@ -49,10 +49,6 @@ export default {
uploadLabel: __('Upload File'),
uploadingLabel: __('Uploading...'),
noFilesMessage: __('There are no secure files yet.'),
- pagination: {
- next: __('Next'),
- prev: __('Prev'),
- },
uploadErrorMessages: {
duplicate: __('A file with this name already exists.'),
tooLarge: __('File too large. Secure Files must be less than %{limit} MB.'),
@@ -281,8 +277,6 @@ export default {
v-model="page"
:per-page="$options.DEFAULT_PER_PAGE"
:total-items="totalItems"
- :next-text="$options.i18n.pagination.next"
- :prev-text="$options.i18n.pagination.prev"
align="center"
class="gl-mt-5"
/>
diff --git a/app/assets/javascripts/clusters_list/components/clusters.vue b/app/assets/javascripts/clusters_list/components/clusters.vue
index 77c962e4056336fb681acca0175ee7b0c1bf0df7..e100d36fc80b36d07fedc272bb6e0161d0d9d317 100644
--- a/app/assets/javascripts/clusters_list/components/clusters.vue
+++ b/app/assets/javascripts/clusters_list/components/clusters.vue
@@ -334,8 +334,6 @@ export default {
v-model="currentPage"
:per-page="clustersPerPage"
:total-items="totalClusters"
- :prev-text="__('Prev')"
- :next-text="__('Next')"
align="center"
/>
</section>
diff --git a/app/assets/javascripts/commons/gitlab_ui.js b/app/assets/javascripts/commons/gitlab_ui.js
index e0637edd1117e6e37a571f50cb15aeae080467f0..29218c6424d0118f5d9902402a7f1f63ce52ee86 100644
--- a/app/assets/javascripts/commons/gitlab_ui.js
+++ b/app/assets/javascripts/commons/gitlab_ui.js
@@ -1,6 +1,13 @@
import applyGitLabUIConfig from '@gitlab/ui/dist/config';
import { __, s__, n__ } from '~/locale';
-import { NEXT, PREV } from '~/vue_shared/components/pagination/constants';
+import {
+ PREV,
+ NEXT,
+ LABEL_FIRST_PAGE,
+ LABEL_PREV_PAGE,
+ LABEL_NEXT_PAGE,
+ LABEL_LAST_PAGE,
+} from '~/vue_shared/components/pagination/constants';
applyGitLabUIConfig({
translations: {
@@ -12,7 +19,15 @@ applyGitLabUIConfig({
'GlKeysetPagination.prevText': PREV,
'GlKeysetPagination.navigationLabel': s__('Pagination|Pagination'),
'GlKeysetPagination.nextText': NEXT,
+
+ 'GlPagination.labelFirstPage': LABEL_FIRST_PAGE,
+ 'GlPagination.labelLastPage': LABEL_LAST_PAGE,
+ 'GlPagination.labelNextPage': LABEL_NEXT_PAGE,
'GlPagination.labelPage': s__('Pagination|Go to page %{page}'),
+ 'GlPagination.labelPrevPage': LABEL_PREV_PAGE,
+ 'GlPagination.nextText': NEXT,
+ 'GlPagination.prevText': PREV,
+
'GlCollapsibleListbox.srOnlyResultsLabel': (count) => n__('%d result', '%d results', count),
},
});
diff --git a/app/assets/javascripts/deploy_keys/components/app.vue b/app/assets/javascripts/deploy_keys/components/app.vue
index 256fdedc7abebf14f8be05b64ee5f4e0e7beb3da..93d7aed928989abd1f4f3e1fb4788f46b85caccc 100644
--- a/app/assets/javascripts/deploy_keys/components/app.vue
+++ b/app/assets/javascripts/deploy_keys/components/app.vue
@@ -1,7 +1,7 @@
<script>
import { GlIcon, GlLoadingIcon, GlPagination } from '@gitlab/ui';
import { createAlert } from '~/alert';
-import { s__, __ } from '~/locale';
+import { s__ } from '~/locale';
import { captureException } from '~/sentry/sentry_browser_wrapper';
import pageInfoQuery from '~/graphql_shared/client/page_info.query.graphql';
import NavigationTabs from '~/vue_shared/components/navigation_tabs.vue';
@@ -89,10 +89,6 @@ export default {
},
i18n: {
loading: s__('DeployKeys|Loading deploy keys'),
- prevPage: __('Go to previous page'),
- nextPage: __('Go to next page'),
- next: __('Next'),
- prev: __('Prev'),
},
computed: {
tabs() {
@@ -204,10 +200,6 @@ export default {
:total-items="pageInfo.total"
:per-page="pageInfo.perPage"
:value="currentPage"
- :next="$options.i18n.next"
- :prev="$options.i18n.prev"
- :label-previous-page="$options.i18n.prevPage"
- :label-next-page="$options.i18n.nextPage"
@next="moveNext()"
@previous="movePrevious()"
@input="moveToPage"
diff --git a/app/assets/javascripts/environments/components/environments_app.vue b/app/assets/javascripts/environments/components/environments_app.vue
index 24c6f545c03bc2737c01c7c98ce389a13afe6c55..a38079ae51c233d19cbfec86c1cd631b2faba5d8 100644
--- a/app/assets/javascripts/environments/components/environments_app.vue
+++ b/app/assets/javascripts/environments/components/environments_app.vue
@@ -85,10 +85,6 @@ export default {
cleanUpEnvsButtonLabel: s__('Environments|Clean up environments'),
active: __('Active'),
stopped: __('Stopped'),
- prevPage: __('Go to previous page'),
- nextPage: __('Go to next page'),
- next: __('Next'),
- prev: __('Prev'),
searchPlaceholder: s__('Environments|Search by environment name'),
},
modalId: 'enable-review-app-info',
@@ -339,10 +335,6 @@ export default {
:total-items="totalItems"
:per-page="itemsPerPage"
:value="page"
- :next="$options.i18n.next"
- :prev="$options.i18n.prev"
- :label-previous-page="$options.prevPage"
- :label-next-page="$options.nextPage"
@next="movePage('next')"
@previous="movePage('previous')"
@input="moveToPage"
diff --git a/app/assets/javascripts/members/components/table/members_pagination.vue b/app/assets/javascripts/members/components/table/members_pagination.vue
index ac5f78b89ffad5324acbb973540c4787125f8ee8..7761d89cf8c7775b16e4e63087eb193c5ba19ba2 100644
--- a/app/assets/javascripts/members/components/table/members_pagination.vue
+++ b/app/assets/javascripts/members/components/table/members_pagination.vue
@@ -46,10 +46,6 @@ export default {
:per-page="pagination.perPage"
:total-items="pagination.totalItems"
:link-gen="paginationLinkGenerator"
- :prev-text="__('Prev')"
- :next-text="__('Next')"
- :label-next-page="__('Go to next page')"
- :label-prev-page="__('Go to previous page')"
align="center"
/>
</template>
diff --git a/app/assets/javascripts/profile/components/follow.vue b/app/assets/javascripts/profile/components/follow.vue
index 4d010fd71327bed051810b48ae1fbd49e834418a..b130e985cb51ada99de551bc31646722a9b39c26 100644
--- a/app/assets/javascripts/profile/components/follow.vue
+++ b/app/assets/javascripts/profile/components/follow.vue
@@ -8,14 +8,9 @@ import {
GlEmptyState,
} from '@gitlab/ui';
import { DEFAULT_PER_PAGE } from '~/api';
-import { NEXT, PREV } from '~/vue_shared/components/pagination/constants';
import { isCurrentUser } from '~/lib/utils/common_utils';
export default {
- i18n: {
- prev: PREV,
- next: NEXT,
- },
components: {
GlAvatarLabeled,
GlAvatarLink,
@@ -112,8 +107,6 @@ export default {
:value="page"
:total-items="totalItems"
:per-page="perPage"
- :prev-text="$options.i18n.prev"
- :next-text="$options.i18n.next"
@input="$emit('pagination-input', $event)"
/>
</div>
diff --git a/app/assets/javascripts/vue_shared/components/pagination/table_pagination.vue b/app/assets/javascripts/vue_shared/components/pagination/table_pagination.vue
index 76bedc0feebda24ba758f8123b4a3f18cd9a1d50..a690dd1fec760266fca7131294cd599de25e1185 100644
--- a/app/assets/javascripts/vue_shared/components/pagination/table_pagination.vue
+++ b/app/assets/javascripts/vue_shared/components/pagination/table_pagination.vue
@@ -1,13 +1,5 @@
<script>
import { GlPagination } from '@gitlab/ui';
-import {
- PREV,
- NEXT,
- LABEL_FIRST_PAGE,
- LABEL_PREV_PAGE,
- LABEL_NEXT_PAGE,
- LABEL_LAST_PAGE,
-} from '~/vue_shared/components/pagination/constants';
export default {
components: {
@@ -53,12 +45,6 @@ export default {
return this.pageInfo.nextPage || this.pageInfo.previousPage;
},
},
- prevText: PREV,
- nextText: NEXT,
- labelFirstPage: LABEL_FIRST_PAGE,
- labelPrevPage: LABEL_PREV_PAGE,
- labelNextPage: LABEL_NEXT_PAGE,
- labelLastPage: LABEL_LAST_PAGE,
};
</script>
<template>
@@ -71,13 +57,7 @@ export default {
:per-page="pageInfo.perPage"
:total-items="pageInfo.total"
:prev-page="pageInfo.previousPage"
- :prev-text="$options.prevText"
:next-page="pageInfo.nextPage"
- :next-text="$options.nextText"
- :label-first-page="$options.labelFirstPage"
- :label-prev-page="$options.labelPrevPage"
- :label-next-page="$options.labelNextPage"
- :label-last-page="$options.labelLastPage"
@input="change"
/>
</template>
diff --git a/app/assets/javascripts/vue_shared/components/pagination_links.vue b/app/assets/javascripts/vue_shared/components/pagination_links.vue
index 5cfaf95f30095d1b973721c4b3fb7f9a552a169f..e6bbd9629450920ab41994023b6a54edc62b49db 100644
--- a/app/assets/javascripts/vue_shared/components/pagination_links.vue
+++ b/app/assets/javascripts/vue_shared/components/pagination_links.vue
@@ -1,13 +1,5 @@
<script>
import { GlPagination } from '@gitlab/ui';
-import {
- PREV,
- NEXT,
- LABEL_FIRST_PAGE,
- LABEL_PREV_PAGE,
- LABEL_NEXT_PAGE,
- LABEL_LAST_PAGE,
-} from '~/vue_shared/components/pagination/constants';
export default {
components: {
@@ -28,12 +20,6 @@ export default {
const baseProps = {
...this.$attrs,
value: this.pageInfo.page,
- prevText: PREV,
- nextText: NEXT,
- labelFirstPage: LABEL_FIRST_PAGE,
- labelPrevPage: LABEL_PREV_PAGE,
- labelNextPage: LABEL_NEXT_PAGE,
- labelLastPage: LABEL_LAST_PAGE,
};
if (this.pageInfo.total) {
diff --git a/ee/app/assets/javascripts/ci/secrets/components/secrets_table/secrets_table.vue b/ee/app/assets/javascripts/ci/secrets/components/secrets_table/secrets_table.vue
index e2d4f01dff8ffc42ab439ec1950ebb6d9513a8f8..4da700d17195f9ea17bb9073da8a57ddbbb53e6a 100644
--- a/ee/app/assets/javascripts/ci/secrets/components/secrets_table/secrets_table.vue
+++ b/ee/app/assets/javascripts/ci/secrets/components/secrets_table/secrets_table.vue
@@ -230,10 +230,6 @@ export default {
:value="page"
:per-page="$options.PAGE_SIZE"
:total-items="secretsCount"
- :prev-text="__('Prev')"
- :next-text="__('Next')"
- :label-next-page="__('Go to next page')"
- :label-prev-page="__('Go to previous page')"
align="center"
class="gl-mt-5"
@input="handlePageChange"
diff --git a/ee/app/assets/javascripts/security_dashboard/components/pipeline/security_dashboard_table.vue b/ee/app/assets/javascripts/security_dashboard/components/pipeline/security_dashboard_table.vue
index e7a953c43d255cae92296c76634a9c48cd973ff2..960d297d51ad5e8e84474f6e34cb2799945c599c 100644
--- a/ee/app/assets/javascripts/security_dashboard/components/pipeline/security_dashboard_table.vue
+++ b/ee/app/assets/javascripts/security_dashboard/components/pipeline/security_dashboard_table.vue
@@ -135,10 +135,6 @@ export default {
:value="currentPage"
:next-page="nextPage"
:prev-page="previousPage"
- :prev-text="__('Prev')"
- :next-text="__('Next')"
- :label-next-page="__('Go to next page')"
- :label-prev-page="__('Go to previous page')"
align="center"
class="gl-mt-3"
@input="fetchPage"
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 4df51ec65992cd1e966c998301a282e181d1249c..52a506c6587e84cca4bdfdcb814a9c59a1db3a1b 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -24527,9 +24527,6 @@ msgstr ""
msgid "Go to merge requests"
msgstr ""
-msgid "Go to next page"
-msgstr ""
-
msgid "Go to parent"
msgstr ""
@@ -24542,9 +24539,6 @@ msgstr ""
msgid "Go to pipelines"
msgstr ""
-msgid "Go to previous page"
-msgstr ""
-
msgid "Go to project"
msgstr ""
diff --git a/spec/frontend/admin/abuse_reports/components/app_spec.js b/spec/frontend/admin/abuse_reports/components/app_spec.js
index 41728baaf33e087bd0f8d899d1fbe0b524a45df8..2ed4fa8fbe743cb5418e63a7b3e431f4aa76586a 100644
--- a/spec/frontend/admin/abuse_reports/components/app_spec.js
+++ b/spec/frontend/admin/abuse_reports/components/app_spec.js
@@ -62,7 +62,7 @@ describe('AbuseReportsApp', () => {
value: pagination.currentPage,
perPage: pagination.perPage,
totalItems: pagination.totalItems,
- prevText: 'Prev',
+ prevText: 'Previous',
nextText: 'Next',
labelNextPage: 'Go to next page',
labelPrevPage: 'Go to previous page',
diff --git a/spec/frontend/admin/deploy_keys/components/table_spec.js b/spec/frontend/admin/deploy_keys/components/table_spec.js
index d30da4217a644fa3e50f1b7004eed38e0c4d5f84..95a999d5a6988ad29835701501263f401303c584 100644
--- a/spec/frontend/admin/deploy_keys/components/table_spec.js
+++ b/spec/frontend/admin/deploy_keys/components/table_spec.js
@@ -189,8 +189,6 @@ describe('DeployKeysTable', () => {
value: 1,
perPage: DEFAULT_PER_PAGE,
totalItems: responseBody.length,
- nextText: DeployKeysTable.i18n.pagination.next,
- prevText: DeployKeysTable.i18n.pagination.prev,
align: 'center',
});
});
diff --git a/spec/frontend/members/components/table/members_pagination_spec.js b/spec/frontend/members/components/table/members_pagination_spec.js
index e5d1619cde15218a016ac7285ac71b4ef23ecf9c..0ab1f0c7489bb5b6f144cd9bcc28933e6c33a81a 100644
--- a/spec/frontend/members/components/table/members_pagination_spec.js
+++ b/spec/frontend/members/components/table/members_pagination_spec.js
@@ -41,7 +41,7 @@ describe('MembersPagination', () => {
value: mockPagination.currentPage,
perPage: mockPagination.perPage,
totalItems: mockPagination.totalItems,
- prevText: 'Prev',
+ prevText: 'Previous',
nextText: 'Next',
labelNextPage: 'Go to next page',
labelPrevPage: 'Go to previous page',
diff --git a/spec/frontend/profile/components/follow_spec.js b/spec/frontend/profile/components/follow_spec.js
index dd7bc40f2cf21b63ed5a64d5a0308b8c008ac53c..260c9cd504bd3f41ac6bab477d000cea9c75dbf6 100644
--- a/spec/frontend/profile/components/follow_spec.js
+++ b/spec/frontend/profile/components/follow_spec.js
@@ -98,8 +98,6 @@ describe('FollowersTab', () => {
value: defaultPropsData.page,
totalItems: defaultPropsData.totalItems,
perPage: DEFAULT_PER_PAGE,
- prevText: Follow.i18n.prev,
- nextText: Follow.i18n.next,
});
});