Unified BBCode conversion, improved proxy functionality

[friendica.git] / src / Content / Nav.php

diff --git a/src/Content/Nav.php b/src/Content/Nav.php
index 9684b77ce94b85dd50da3ce4159c6afffb11a424..c6634a95c44439ca0d9575a9e3dff4ea329ab0dd 100644 (file)
--- a/src/Content/Nav.php
+++ b/src/Content/Nav.php
@@ -123,7 +123,7 @@ class Nav
                        '$apps'         => $this->getAppMenu(),
                        '$home'         => $this->l10n->t('Go back'),
                        '$clear_notifs' => $this->l10n->t('Clear notifications'),
-                       '$search_hint'  => $this->l10n->t('@name, !forum, #tags, content')
+                       '$search_hint'  => $this->l10n->t('@name, !group, #tags, content')
                ]);
 
                Hook::callAll('page_header', $nav);
@@ -184,8 +184,6 @@ class Nav
         */
        private function getInfo(): array
        {
-               $ssl_state = (bool) $this->session->getLocalUserId();
-
                /*
                 * Our network is distributed, and as you visit friends some
                 * sites look exactly the same - it isn't always easy to know where you are.
@@ -194,7 +192,7 @@ class Nav
 
                $myident = !empty($this->session->getLocalUserNickname()) ? $this->session->getLocalUserNickname() . '@' : '';
 
-               $sitelocation = $myident . substr($this->baseUrl->get($ssl_state), strpos($this->baseUrl->get($ssl_state), '//') + 2);
+               $sitelocation = $myident . substr($this->baseUrl, strpos($this->baseUrl, '//') + 2);
 
                $nav = [
                        'admin'         => null,
@@ -226,7 +224,7 @@ class Nav
 
                if ($this->session->isAuthenticated()) {
                        // user menu
-                       $nav['usermenu'][] = ['profile/' . $this->session->getLocalUserNickname(), $this->l10n->t('Status'), '', $this->l10n->t('Your posts and conversations')];
+                       $nav['usermenu'][] = ['profile/' . $this->session->getLocalUserNickname(), $this->l10n->t('Conversations'), '', $this->l10n->t('Conversations you started')];
                        $nav['usermenu'][] = ['profile/' . $this->session->getLocalUserNickname() . '/profile', $this->l10n->t('Profile'), '', $this->l10n->t('Your profile page')];
                        $nav['usermenu'][] = ['profile/' . $this->session->getLocalUserNickname() . '/photos', $this->l10n->t('Photos'), '', $this->l10n->t('Your photos')];
                        $nav['usermenu'][] = ['profile/' . $this->session->getLocalUserNickname() . '/media', $this->l10n->t('Media'), '', $this->l10n->t('Your postings with media')];
@@ -275,7 +273,7 @@ class Nav
                        ];
 
                        if ($this->config->get('system', 'poco_local_search')) {
-                               $nav['searchoption'][] = $this->l10n->t('Forums');
+                               $nav['searchoption'][] = $this->l10n->t('Groups');
                        }
                }