Merge pull request #8850 from annando/fix-follow

[friendica.git] / mod / suggest.php

diff --git a/mod/suggest.php b/mod/suggest.php
index 31f02fa4ce6640e04550a94d61237fe0a248359d..5fb9bdcff782756524b90d5caa76675e31585cc7 100644 (file)
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -1,12 +1,27 @@
 <?php
 /**
- * @file mod/suggest.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 use Friendica\App;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Widget;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -25,7 +40,7 @@ function suggest_post(App $a)
 {
        if (!empty($_POST['ignore']) && !empty($_POST['confirm'])) {
                DBA::insert('gcign', ['uid' => local_user(), 'gcid' => $_POST['ignore']]);
-               notice(L10n::t('Contact suggestion successfully ignored.'));
+               notice(DI::l10n()->t('Contact suggestion successfully ignored.'));
        }
 
        DI::baseUrl()->redirect('suggest');
@@ -36,7 +51,7 @@ function suggest_content(App $a)
        $o = '';
 
        if (! local_user()) {
-               notice(L10n::t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.') . EOL);
                return;
        }
 
@@ -49,7 +64,7 @@ function suggest_content(App $a)
        $r = GContact::suggestionQuery(local_user());
 
        if (! DBA::isResult($r)) {
-               $o .= L10n::t('No suggestions available. If this is a new site, please try again in 24 hours.');
+               $o .= DI::l10n()->t('No suggestions available. If this is a new site, please try again in 24 hours.');
                return $o;
        }
 
@@ -68,12 +83,12 @@ function suggest_content(App $a)
 
                return Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
                        '$method' => 'post',
-                       '$message' => L10n::t('Do you really want to delete this suggestion?'),
+                       '$message' => DI::l10n()->t('Do you really want to delete this suggestion?'),
                        '$extra_inputs' => $inputs,
-                       '$confirm' => L10n::t('Yes'),
+                       '$confirm' => DI::l10n()->t('Yes'),
                        '$confirm_url' => $query['base'],
                        '$confirm_name' => 'confirm',
-                       '$cancel' => L10n::t('Cancel'),
+                       '$cancel' => DI::l10n()->t('Cancel'),
                ]);
        }
 
@@ -84,9 +99,9 @@ function suggest_content(App $a)
                $connlnk = DI::baseUrl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
                $ignlnk = DI::baseUrl() . '/suggest?ignore=' . $rr['id'];
                $photo_menu = [
-                       'profile' => [L10n::t("View Profile"), Contact::magicLink($rr["url"])],
-                       'follow' => [L10n::t("Connect/Follow"), $connlnk],
-                       'hide' => [L10n::t('Ignore/Hide'), $ignlnk]
+                       'profile' => [DI::l10n()->t("View Profile"), Contact::magicLink($rr["url"])],
+                       'follow' => [DI::l10n()->t("Connect/Follow"), $connlnk],
+                       'hide' => [DI::l10n()->t('Ignore/Hide'), $ignlnk]
                ];
 
                $contact_details = Contact::getDetailsByURL($rr["url"], local_user(), $rr);
@@ -103,10 +118,10 @@ function suggest_content(App $a)
                        'account_type'  => Contact::getAccountType($contact_details),
                        'ignlnk' => $ignlnk,
                        'ignid' => $rr['id'],
-                       'conntxt' => L10n::t('Connect'),
+                       'conntxt' => DI::l10n()->t('Connect'),
                        'connlnk' => $connlnk,
                        'photo_menu' => $photo_menu,
-                       'ignore' => L10n::t('Ignore/Hide'),
+                       'ignore' => DI::l10n()->t('Ignore/Hide'),
                        'network' => ContactSelector::networkToName($rr['network'], $rr['url']),
                        'id' => ++$id,
                ];
@@ -116,7 +131,7 @@ function suggest_content(App $a)
        $tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
 
        $o .= Renderer::replaceMacros($tpl,[
-               '$title' => L10n::t('Friend Suggestions'),
+               '$title' => DI::l10n()->t('Friend Suggestions'),
                '$contacts' => $entries,
        ]);