diff options
author | Christian Schmidt <github@chsc.dk> | 2019-03-12 23:17:30 +0300 |
---|---|---|
committer | diosmosis <diosmosis@users.noreply.github.com> | 2019-03-12 23:17:30 +0300 |
commit | f613456b253f2a5261dd6825ef14a7aaf0661ea0 (patch) | |
tree | 0d4f600c25ad3962abb8207496bddf14dfd27487 /plugins/SitesManager | |
parent | 7edf461477aa2f732c3e1fda506d7a476d93b62d (diff) |
Pagination localisation clean-up (#14157)
* Range start should be one-based, like the range end
* Clean up pagination translation
* Restore ScheduledReports translations
* Update screenshots
* Revert changes to non-English translations
* Update screenshots
* Update screenshot
* Replace UsersManager_XtoYofN with General_Pagination
* Only remove translation from en.json.
* Off by one
* Update screenshots
* Fix off-by-one in range end
* Update screenshots
* Updated screenshot
Diffstat (limited to 'plugins/SitesManager')
7 files changed, 14 insertions, 14 deletions
diff --git a/plugins/SitesManager/angularjs/sites-manager/sites-manager-admin-sites-model.js b/plugins/SitesManager/angularjs/sites-manager/sites-manager-admin-sites-model.js index 628de72e73..ce2c4aa24f 100644 --- a/plugins/SitesManager/angularjs/sites-manager/sites-manager-admin-sites-model.js +++ b/plugins/SitesManager/angularjs/sites-manager/sites-manager-admin-sites-model.js @@ -36,8 +36,8 @@ model.sites = sites; var numSites = sites.length; - model.offsetStart = model.currentPage * model.pageSize; - model.offsetEnd = model.offsetStart + numSites; + model.offsetStart = model.currentPage * model.pageSize + 1; + model.offsetEnd = model.offsetStart + numSites - 1; model.hasPrev = model.currentPage >= 1; model.hasNext = numSites === model.pageSize; } diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_loaded.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_loaded.png index 54053b2caa..4ebca6449a 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_loaded.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6579c30c31a28357fc4d69f1bf3b5284fc5f9a9ba7d4c57e3df310a1b4954655 -size 180919 +oid sha256:b3497758d0c7c1284f1ae67f85c30c25af6d5208b73b4b27f98e1d4d811810f6 +size 180718 diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1.png index 06378779f4..aad7c74fb2 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd57742a3a94d3ab4f5c47d78959ae84e34cb7e1e741fd968aa54210e908795b -size 186022 +oid sha256:36a8a43b3542fdeef8d4c238b9b28192b5fc1130fd979c05f5d7f91daa1a36af +size 185832 diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1_again.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1_again.png index 5f8482ff74..4ff88edcfc 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1_again.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1_again.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7d6eb4a27612289f11bb30d323e4cd7b21db78ae5d1762377aea42e7aacd61c0 -size 186041 +oid sha256:b83a016f0f4d53242f02d0b077dbbda663780b460ae5d79c8cbe3639bb58c088 +size 185845 diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_2.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_2.png index bd3ce81138..ed4963a612 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_2.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6b0c8468378d8261840ec6c7c2cf0438527529ddffd8cc50d8a57ddbdc8dcbc -size 188002 +oid sha256:b8805c0ee7c9c33b5ba5856e2fc2e960a365232965880e463af94214240d1afa +size 187799 diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search.png index 9dee4412a4..e6d1804357 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b294fdd184afee8fca634a9dd84cf5a533ca49ec2b52bff8c726f234001f8cd2 -size 178927 +oid sha256:e2d1cd3d110f616ec24900389d083ddaa00031769670d3455aa5626fbc6a57f2 +size 178750 diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search_page_1.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search_page_1.png index d9085aa12c..8507dadcf4 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search_page_1.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search_page_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61ad98f703804d44388847ef0acc631df1a8379167d9d1071196b9e114cfcba1 -size 184175 +oid sha256:1e00aee6453a3740e301c6aaee9b5ad5e2782dfc569d3de8b79813ab12fef397 +size 183881 |