diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-09-26 12:39:36 +0300 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-09-26 12:39:36 +0300 |
commit | 485cb91c2f1a092504fe0b9540308424e76c5c42 (patch) | |
tree | 9ce2a5a06be3197d98471a641b1916696415b0fc /app/assets/javascripts/vue_shared | |
parent | 5ae54ca3eb98df665a243bf190a16e80e87c37f2 (diff) | |
parent | a7265abd6dc397017381763ea22250656105ae10 (diff) |
Merge branch 'master' into 31050-registry-image-lists
* master: (62 commits)
Fix a dash being rendered in the note's access role
Remove dead `Gitlab::Markdown::Pipeline` class
Add CHANGELOG entry
Fix locked shared runners problem
Document manual cleanup after background migration stealing
Removes cycle analytics service and store from global namespace
Fix PG::UniqueViolation external_email migration
Migrate Gitlab::Git::Repository#log to Gitaly
Check for exec permissions also in app/
Add check for exec permissions and refactor lint doc script
Update tests to reflect `user_avatar_without_link` helper changes
Change mode to 644 for all md and png files
Add instructions for upgrading from CE to EE using GitLab Omnibus chart - docs
Add `data-src` when image is to be lazy loaded, use `tag` helper instead of `image_tag` helper
Remove unnecessary use of `gsub`
Fixed few gitlab:check tasks that were failing with exception
Update CHANGELOG.md for 10.0.1
Remove Grit settings from default settings
Fix duplicate key errors in PostDeployMigrateUserExternalMailData migration
Improve list of sorting options
...
Diffstat (limited to 'app/assets/javascripts/vue_shared')
-rw-r--r-- | app/assets/javascripts/vue_shared/components/table_pagination.vue | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/app/assets/javascripts/vue_shared/components/table_pagination.vue b/app/assets/javascripts/vue_shared/components/table_pagination.vue index c9dbc048345..710452bb3d3 100644 --- a/app/assets/javascripts/vue_shared/components/table_pagination.vue +++ b/app/assets/javascripts/vue_shared/components/table_pagination.vue @@ -1,11 +1,13 @@ <script> +import { s__ } from '../../locale'; + const PAGINATION_UI_BUTTON_LIMIT = 4; const UI_LIMIT = 6; const SPREAD = '...'; -const PREV = 'Prev'; -const NEXT = 'Next'; -const FIRST = '« First'; -const LAST = 'Last »'; +const PREV = s__('Pagination|Prev'); +const NEXT = s__('Pagination|Next'); +const FIRST = s__('Pagination|« First'); +const LAST = s__('Pagination|Last »'); export default { props: { |