Add L10n parameter to Pager classes

diff --git a/mod/common.php b/mod/common.php
index 6e923fd19b15e7517144f0a1b73240be3f693b7f..0ccad423878a3879edbfb1cb292ed64b7edad448 100644 (file)
--- a/mod/common.php
+++ b/mod/common.php
@@ -107,7 +107,7 @@ function common_content(App $a)
                return $o;
        }
 
-       $pager = new Pager(DI::args()->getQueryString());
+       $pager = new Pager(DI::l10n(), DI::args()->getQueryString());
 
        if ($cid) {
                $common_friends = Model\GContact::commonFriends($uid, $cid, $pager->getStart(), $pager->getItemsPerPage());

diff --git a/mod/message.php b/mod/message.php
index e871e22e3140eb533d9c66e9a40e2c03b4ae632f..c62a15eb233d21addfc03e86655097158dd3c4ce 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -296,7 +296,7 @@ function message_content(App $a)
                        $total = $r[0]['total'];
                }
 
-               $pager = new Pager(DI::args()->getQueryString());
+               $pager = new Pager(DI::l10n(), DI::args()->getQueryString());
 
                $r = get_messages(local_user(), $pager->getStart(), $pager->getItemsPerPage());
 

diff --git a/mod/network.php b/mod/network.php
index 037a16ebfde7230c04ba9bb422e929ba6f4f2017..31cafb5a86206b223f5b8b6fc4408d1b3fcd4cb5 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -377,7 +377,7 @@ function networkFlatView(App $a, $update = 0)
                }
        }
 
-       $pager = new Pager(DI::args()->getQueryString());
+       $pager = new Pager(DI::l10n(), DI::args()->getQueryString());
 
        networkPager($a, $pager, $update);
 
@@ -669,7 +669,7 @@ function networkThreadedView(App $a, $update, $parent)
                $sql_range = '';
        }
 
-       $pager = new Pager(DI::args()->getQueryString());
+       $pager = new Pager(DI::l10n(), DI::args()->getQueryString());
 
        $pager_sql = networkPager($a, $pager, $update);
 

diff --git a/mod/notes.php b/mod/notes.php
index 34cf404ca8b752efa3d892279125c830b1c0323e..602514a54ac2139bdafd094871cbcd10cf9703be 100644 (file)
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -69,7 +69,7 @@ function notes_content(App $a, $update = false)
        $condition = ['uid' => local_user(), 'post-type' => Item::PT_PERSONAL_NOTE, 'gravity' => GRAVITY_PARENT,
                'contact-id'=> $a->contact['id']];
 
-       $pager = new Pager(DI::args()->getQueryString(), 40);
+       $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), 40);
 
        $params = ['order' => ['created' => true],
                'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];

diff --git a/mod/photos.php b/mod/photos.php
index 5e5917452cae8df359e2dc4549916aedb5ded84c..03b78e0e19f6b6cb2316832efe85b91ad424c7da 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1023,7 +1023,7 @@ function photos_content(App $a)
                        $total = count($r);
                }
 
-               $pager = new Pager(DI::args()->getQueryString(), 20);
+               $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), 20);
 
                /// @TODO I have seen this many times, maybe generalize it script-wide and encapsulate it?
                $order_field = $_GET['order'] ?? '';
@@ -1299,7 +1299,7 @@ function photos_content(App $a)
                        $condition = ["`parent` = ? AND `parent` != `id`",  $link_item['parent']];
                        $total = DBA::count('item', $condition);
 
-                       $pager = new Pager(DI::args()->getQueryString());
+                       $pager = new Pager(DI::l10n(), DI::args()->getQueryString());
 
                        $params = ['order' => ['id'], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
                        $result = Item::selectForUser($link_item['uid'], Item::ITEM_FIELDLIST, $condition, $params);
@@ -1565,7 +1565,7 @@ function photos_content(App $a)
                $total = count($r);
        }
 
-       $pager = new Pager(DI::args()->getQueryString(), 20);
+       $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), 20);
 
        $r = q("SELECT `resource-id`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`filename`) AS `filename`,
                ANY_VALUE(`type`) AS `type`, ANY_VALUE(`album`) AS `album`, max(`scale`) AS `scale`,

diff --git a/mod/videos.php b/mod/videos.php
index 3cb2b84bcdb092c90079b74cd41c85b3ce1d2717..49c64ef973589d6eccf75e569c93176078085e08 100644 (file)
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -225,7 +225,7 @@ function videos_content(App $a)
                $total = count($r);
        }
 
-       $pager = new Pager(DI::args()->getQueryString(), 20);
+       $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), 20);
 
        $r = q("SELECT hash, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`created`) AS `created`,
                ANY_VALUE(`filename`) AS `filename`, ANY_VALUE(`filetype`) as `filetype`

diff --git a/src/Content/BoundariesPager.php b/src/Content/BoundariesPager.php
index da296bd8cc95bda3a7e9c22c2aa3752717d1fca0..b8b7f67bbaaa54d9db0093112ca3f6eb761eec4a 100644 (file)
--- a/src/Content/BoundariesPager.php
+++ b/src/Content/BoundariesPager.php
@@ -21,17 +21,18 @@
 
 namespace Friendica\Content;
 
+use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
-use Friendica\DI;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
 /**
- * This pager should be used by lists using the since_id/max_id parameters
+ * This pager should be used by lists using the since_id†/max_id† parameters
  *
- * In this context, "id" refers to the value of the column that the list is ordered by.
- * This pager automatically identifies if the sorting is done increasingly or decreasingly if the first item id
- * and last item id are different. Otherwise it defaults to decreasingly like reverse chronological lists.
+ * This pager automatically identifies if the sorting is done increasingly or decreasingly if the first item id†
+ * and last item id† are different. Otherwise it defaults to decreasingly like reverse chronological lists.
+ *
+ * † In this context, "id" refers to the value of the column that the item list is ordered by.
  */
 class BoundariesPager extends Pager
 {
@@ -42,14 +43,15 @@ class BoundariesPager extends Pager
        /**
         * Instantiates a new Pager with the base parameters.
         *
+        * @param L10n    $l10n
         * @param string  $queryString   The query string of the current page
-        * @param string  $first_item_id The i
-        * @param string  $last_item_id
-        * @param integer $itemsPerPage An optional number of items per page to override the default value
+        * @param string  $first_item_id The id† of the first item in the displayed item list
+        * @param string  $last_item_id  The id† of the last item in the displayed item list
+        * @param integer $itemsPerPage  An optional number of items per page to override the default value
         */
-       public function __construct($queryString, $first_item_id = null, $last_item_id = null, $itemsPerPage = 50)
+       public function __construct(L10n $l10n, $queryString, $first_item_id = null, $last_item_id = null, $itemsPerPage = 50)
        {
-               parent::__construct($queryString, $itemsPerPage);
+               parent::__construct($l10n, $queryString, $itemsPerPage);
 
                $this->first_item_id = $first_item_id;
                $this->last_item_id = $last_item_id;
@@ -111,7 +113,7 @@ class BoundariesPager extends Pager
                                        ($this->first_item_id >= $this->last_item_id ?
                                                '&since_id=' . $this->first_item_id : '&max_id=' . $this->first_item_id)
                                ),
-                               'text'  => DI::l10n()->t('newer'),
+                               'text'  => $this->l10n->t('newer'),
                                'class' => 'previous' . ($this->first_page ? ' disabled' : '')
                        ],
                        'next'  => [
@@ -119,7 +121,7 @@ class BoundariesPager extends Pager
                                        ($this->first_item_id >= $this->last_item_id ?
                                        '&max_id=' . $this->last_item_id : '&since_id=' . $this->last_item_id)
                                ),
-                               'text'  => DI::l10n()->t('older'),
+                               'text'  => $this->l10n->t('older'),
                                'class' =>  'next' . ($displayedItemCount < $this->getItemsPerPage() ? ' disabled' : '')
                        ]
                ];

diff --git a/src/Content/Pager.php b/src/Content/Pager.php
index a7d7fe8f78461cac78b65ddbe3fe5ed78d540f3c..5b4345a4c8bc4a2140884e50b063c8893eb40c30 100644 (file)
--- a/src/Content/Pager.php
+++ b/src/Content/Pager.php
@@ -21,8 +21,8 @@
 
 namespace Friendica\Content;
 
+use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
-use Friendica\DI;
 use Friendica\Util\Strings;
 
 /**
@@ -30,30 +30,29 @@ use Friendica\Util\Strings;
  */
 class Pager
 {
-       /**
-        * @var integer
-        */
+       /** @var integer */
        private $page = 1;
-       /**
-        * @var integer
-        */
+       /** @var integer */
        protected $itemsPerPage = 50;
-
-       /**
-        * @var string
-        */
+       /** @var string */
        protected $baseQueryString = '';
 
+       /** @var L10n */
+       protected $l10n;
+
        /**
         * Instantiates a new Pager with the base parameters.
         *
         * Guesses the page number from the GET parameter 'page'.
         *
+        * @param L10n    $l10n
         * @param string  $queryString  The query string of the current page
         * @param integer $itemsPerPage An optional number of items per page to override the default value
         */
-       public function __construct($queryString, $itemsPerPage = 50)
+       public function __construct(L10n $l10n, $queryString, $itemsPerPage = 50)
        {
+               $this->l10n = $l10n;
+
                $this->setQueryString($queryString);
                $this->setItemsPerPage($itemsPerPage);
                $this->setPage(($_GET['page'] ?? 0) ?: 1);
@@ -166,12 +165,12 @@ class Pager
                        'class' => 'pager',
                        'prev'  => [
                                'url'   => Strings::ensureQueryParameter($this->baseQueryString . '&page=' . ($this->getPage() - 1)),
-                               'text'  => DI::l10n()->t('newer'),
+                               'text'  => $this->l10n->t('newer'),
                                'class' => 'previous' . ($this->getPage() == 1 ? ' disabled' : '')
                        ],
                        'next'  => [
                                'url'   => Strings::ensureQueryParameter($this->baseQueryString . '&page=' . ($this->getPage() + 1)),
-                               'text'  => DI::l10n()->t('older'),
+                               'text'  => $this->l10n->t('older'),
                                'class' =>  'next' . ($displayedItemCount < $this->getItemsPerPage() ? ' disabled' : '')
                        ]
                ];
@@ -211,12 +210,12 @@ class Pager
                if ($totalItemCount > $this->getItemsPerPage()) {
                        $data['first'] = [
                                'url'   => Strings::ensureQueryParameter($this->baseQueryString . '&page=1'),
-                               'text'  => DI::l10n()->t('first'),
+                               'text'  => $this->l10n->t('first'),
                                'class' => $this->getPage() == 1 ? 'disabled' : ''
                        ];
                        $data['prev'] = [
                                'url'   => Strings::ensureQueryParameter($this->baseQueryString . '&page=' . ($this->getPage() - 1)),
-                               'text'  => DI::l10n()->t('prev'),
+                               'text'  => $this->l10n->t('prev'),
                                'class' => $this->getPage() == 1 ? 'disabled' : ''
                        ];
 
@@ -271,12 +270,12 @@ class Pager
 
                        $data['next'] = [
                                'url'   => Strings::ensureQueryParameter($this->baseQueryString . '&page=' . ($this->getPage() + 1)),
-                               'text'  => DI::l10n()->t('next'),
+                               'text'  => $this->l10n->t('next'),
                                'class' => $this->getPage() == $lastpage ? 'disabled' : ''
                        ];
                        $data['last'] = [
                                'url'   => Strings::ensureQueryParameter($this->baseQueryString . '&page=' . $lastpage),
-                               'text'  => DI::l10n()->t('last'),
+                               'text'  => $this->l10n->t('last'),
                                'class' => $this->getPage() == $lastpage ? 'disabled' : ''
                        ];
                }

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 789062403b3c8bbdd2cb25c1bf9cbb6fde705304..f1fec640a84e788ba419f8076d66048125c54b6f 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -1805,7 +1805,7 @@ class Contact
                                $cid, GRAVITY_PARENT, GRAVITY_COMMENT, local_user()];
                }
 
-               $pager = new Pager(DI::args()->getQueryString());
+               $pager = new Pager(DI::l10n(), DI::args()->getQueryString());
 
                $params = ['order' => ['received' => true],
                        'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];

diff --git a/src/Module/Admin/Blocklist/Contact.php b/src/Module/Admin/Blocklist/Contact.php
index 5d87139df5498ed7f69ce33455e41bd4a48dc885..8893623234dfadc8af5d59646fb534a9e6f6f974 100644 (file)
--- a/src/Module/Admin/Blocklist/Contact.php
+++ b/src/Module/Admin/Blocklist/Contact.php
@@ -68,7 +68,7 @@ class Contact extends BaseAdmin
 
                $total = DBA::count('contact', $condition);
 
-               $pager = new Pager(DI::args()->getQueryString(), 30);
+               $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), 30);
 
                $contacts = Model\Contact::selectToArray([], $condition, ['limit' => [$pager->getStart(), $pager->getItemsPerPage()]]);
 

diff --git a/src/Module/Admin/Users.php b/src/Module/Admin/Users.php
index fbaab1ded297b3277af484bcc29a1e0cfa7c61af..b446a2c47ce0a9606f0c3f629918b04d028dd25b 100644 (file)
--- a/src/Module/Admin/Users.php
+++ b/src/Module/Admin/Users.php
@@ -194,7 +194,7 @@ class Users extends BaseAdmin
                /* get pending */
                $pending = Register::getPending();
 
-               $pager = new Pager(DI::args()->getQueryString(), 100);
+               $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), 100);
 
                // @TODO Move below block to Model\User::getUsers($start, $count, $order = 'contact.name', $order_direction = '+')
                $valid_orders = [

diff --git a/src/Module/AllFriends.php b/src/Module/AllFriends.php
index f916c167101d532fb00a200dd4224f3a4f2c06de..5d73f53cb525cd93e61b3c641a73c5c209583299 100644 (file)
--- a/src/Module/AllFriends.php
+++ b/src/Module/AllFriends.php
@@ -67,7 +67,7 @@ class AllFriends extends BaseModule
 
                $total = Model\GContact::countAllFriends(local_user(), $cid);
 
-               $pager = new Pager(DI::args()->getQueryString());
+               $pager = new Pager(DI::l10n(), DI::args()->getQueryString());
 
                $friends = Model\GContact::allFriends(local_user(), $cid, $pager->getStart(), $pager->getItemsPerPage());
                if (empty($friends)) {

diff --git a/src/Module/BaseNotifications.php b/src/Module/BaseNotifications.php
index 9e7b1cd9797ee828480272235408e9bfa1730138..4715641c2f59233258c583eb76efea50de60d85e 100644 (file)
--- a/src/Module/BaseNotifications.php
+++ b/src/Module/BaseNotifications.php
@@ -102,7 +102,7 @@ abstract class BaseNotifications extends BaseModule
                }
 
                // Set the pager
-               $pager = new Pager(DI::args()->getQueryString(), self::ITEMS_PER_PAGE);
+               $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), self::ITEMS_PER_PAGE);
 
                // Add additional informations (needed for json output)
                $notifications = [
@@ -132,7 +132,7 @@ abstract class BaseNotifications extends BaseModule
                $tabs = self::getTabs();
 
                // Set the pager
-               $pager = new Pager(DI::args()->getQueryString(), self::ITEMS_PER_PAGE);
+               $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), self::ITEMS_PER_PAGE);
 
                $notif_tpl = Renderer::getMarkupTemplate('notifications/notifications.tpl');
                return Renderer::replaceMacros($notif_tpl, [

diff --git a/src/Module/BaseSearch.php b/src/Module/BaseSearch.php
index ca940ae4ead916fd0258aa8026e0f98dcf0467da..e1bb3ebb0af1ea101cb970efcdeac73f577d764b 100644 (file)
--- a/src/Module/BaseSearch.php
+++ b/src/Module/BaseSearch.php
@@ -81,8 +81,7 @@ class BaseSearch extends BaseModule
                        $header = DI::l10n()->t('Forum Search - %s', $search);
                }
 
-               $args = DI::args();
-               $pager = new Pager($args->getQueryString());
+               $pager = new Pager(DI::l10n(), DI::args()->getQueryString());
 
                if ($localSearch && empty($results)) {
                        $pager->setItemsPerPage(80);

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index be6f16a5303725d4f87e5fb2ba0d41407a94cfb6..ee0ccce7ea16afd6ba4600b9420f9020727cf717 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -731,7 +731,7 @@ class Contact extends BaseModule
                }
                DBA::close($stmt);
 
-               $pager = new Pager(DI::args()->getQueryString());
+               $pager = new Pager(DI::l10n(), DI::args()->getQueryString());
 
                $sql_values[] = $pager->getStart();
                $sql_values[] = $pager->getItemsPerPage();

diff --git a/src/Module/Conversation/Community.php b/src/Module/Conversation/Community.php
index d14967283890d1aba2fe6f321dd7c236553ed9e6..ccd9554b8aa4a9051f9bcea2979bc5bccb210ee3 100644 (file)
--- a/src/Module/Conversation/Community.php
+++ b/src/Module/Conversation/Community.php
@@ -104,6 +104,7 @@ class Community extends BaseModule
                $o .= conversation(DI::app(), $items, 'community', false, false, 'commented', local_user());
 
                $pager = new BoundariesPager(
+                       DI::l10n(),
                        DI::args()->getQueryString(),
                        $items[0]['commented'],
                        $items[count($items) - 1]['commented'],

diff --git a/src/Module/Directory.php b/src/Module/Directory.php
index 6bf246a3701325694924403c6eea5c00c8edc340..0709aa39748f147b890a08711eaab2eec12f6e56 100644 (file)
--- a/src/Module/Directory.php
+++ b/src/Module/Directory.php
@@ -70,7 +70,7 @@ class Directory extends BaseModule
                        $gDirPath = Profile::zrl($dirURL, true);
                }
 
-               $pager = new Pager(DI::args()->getQueryString(), 60);
+               $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), 60);
 
                $profiles = Profile::searchProfiles($pager->getStart(), $pager->getItemsPerPage(), $search);
 

diff --git a/src/Module/Profile/Contacts.php b/src/Module/Profile/Contacts.php
index 5ea3e0684c6ff6c1ff40562629751aad1d110d4c..3a42b0d311b8463047e9514a569850770e50f551 100644 (file)
--- a/src/Module/Profile/Contacts.php
+++ b/src/Module/Profile/Contacts.php
@@ -85,7 +85,7 @@ class Contacts extends BaseProfile
 
                $total = DBA::count('contact', $condition);
 
-               $pager = new Pager(DI::args()->getQueryString());
+               $pager = new Pager(DI::l10n(), DI::args()->getQueryString());
 
                $params = ['order' => ['name' => false], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
 

diff --git a/src/Module/Profile/Status.php b/src/Module/Profile/Status.php
index 8da831405c0923c96f60fc9677f320a39d77a20e..bd2898fa632a624525847a6a35e34de351bd7bac 100644 (file)
--- a/src/Module/Profile/Status.php
+++ b/src/Module/Profile/Status.php
@@ -180,7 +180,7 @@ class Status extends BaseProfile
                        $itemspage_network = $a->force_max_items;
                }
 
-               $pager = new Pager($args->getQueryString(), $itemspage_network);
+               $pager = new Pager(DI::l10n(), $args->getQueryString(), $itemspage_network);
 
                $pager_sql = sprintf(" LIMIT %d, %d ", $pager->getStart(), $pager->getItemsPerPage());
 

diff --git a/src/Module/Search/Index.php b/src/Module/Search/Index.php
index 3e174c79055291dfbb84e1676f6f090e452cf525..2b7bb5c8a1be35fa639b14daf860db212559779b 100644 (file)
--- a/src/Module/Search/Index.php
+++ b/src/Module/Search/Index.php
@@ -137,7 +137,7 @@ class Index extends BaseSearch
                // OR your own posts if you are a logged in member
                // No items will be shown if the member has a blocked profile wall.
 
-               $pager = new Pager(DI::args()->getQueryString());
+               $pager = new Pager(DI::l10n(), DI::args()->getQueryString());
 
                if ($tag) {
                        Logger::info('Start tag search.', ['q' => $search]);