From 5c8cd8fdd6fcea39d7ff56d11ecc75151487d0aa Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 8 Jan 2023 01:32:18 -0500 Subject: [PATCH] Replace remaining mentions of "Status" by "Conversations" or "Posts" --- src/Content/Nav.php | 2 +- src/Module/BaseProfile.php | 6 ++--- src/Module/Contact.php | 22 +++++++++---------- src/Module/Contact/Follow.php | 2 +- src/Module/Contact/Unfollow.php | 2 +- src/Module/Post/Tag/Add.php | 2 +- .../Profile/{Status.php => Conversations.php} | 6 ++--- src/Module/Profile/Index.php | 4 ++-- static/routes.config.php | 22 +++++++++---------- 9 files changed, 34 insertions(+), 34 deletions(-) rename src/Module/Profile/{Status.php => Conversations.php} (97%) diff --git a/src/Content/Nav.php b/src/Content/Nav.php index 9684b77ce..63eeede89 100644 --- a/src/Content/Nav.php +++ b/src/Content/Nav.php @@ -226,7 +226,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')]; diff --git a/src/Module/BaseProfile.php b/src/Module/BaseProfile.php index 28b824adb..b7584d9db 100644 --- a/src/Module/BaseProfile.php +++ b/src/Module/BaseProfile.php @@ -54,10 +54,10 @@ class BaseProfile extends BaseModule 'accesskey' => 'r', ], [ - 'label' => DI::l10n()->t('Status'), - 'url' => $baseProfileUrl . '/status', + 'label' => DI::l10n()->t('Conversations'), + 'url' => $baseProfileUrl . '/conversations', 'sel' => $current == 'status' ? 'active' : '', - 'title' => DI::l10n()->t('Status Messages and Posts'), + 'title' => DI::l10n()->t('Conversations started'), 'id' => 'status-tab', 'accesskey' => 'm', ], diff --git a/src/Module/Contact.php b/src/Module/Contact.php index 21b1793af..bc2f2f402 100644 --- a/src/Module/Contact.php +++ b/src/Module/Contact.php @@ -451,7 +451,7 @@ class Contact extends BaseModule /** * List of pages for the Contact TabBar * - * Available Pages are 'Status', 'Profile', 'Contacts' and 'Common Friends' + * Available Pages are 'Conversations', 'Profile', 'Contacts' and 'Common Friends' * * @param array $contact The contact array * @param int $active_tab 1 if tab should be marked as active @@ -473,7 +473,15 @@ class Contact extends BaseModule // tabs $tabs = [ [ - 'label' => DI::l10n()->t('Status'), + 'label' => DI::l10n()->t('Profile'), + 'url' => 'contact/' . $cid, + 'sel' => (($active_tab == self::TAB_PROFILE) ? 'active' : ''), + 'title' => DI::l10n()->t('Profile Details'), + 'id' => 'profile-tab', + 'accesskey' => 'o', + ], + [ + 'label' => DI::l10n()->t('Conversations'), 'url' => 'contact/' . $pcid . '/conversations', 'sel' => (($active_tab == self::TAB_CONVERSATIONS) ? 'active' : ''), 'title' => DI::l10n()->t('Conversations started by this contact'), @@ -484,7 +492,7 @@ class Contact extends BaseModule 'label' => DI::l10n()->t('Posts and Comments'), 'url' => 'contact/' . $pcid . '/posts', 'sel' => (($active_tab == self::TAB_POSTS) ? 'active' : ''), - 'title' => DI::l10n()->t('Status Messages and Posts'), + 'title' => DI::l10n()->t('Individual Posts and Replies'), 'id' => 'posts-tab', 'accesskey' => 'p', ], @@ -496,14 +504,6 @@ class Contact extends BaseModule 'id' => 'media-tab', 'accesskey' => 'd', ], - [ - 'label' => DI::l10n()->t('Profile'), - 'url' => 'contact/' . $cid, - 'sel' => (($active_tab == self::TAB_PROFILE) ? 'active' : ''), - 'title' => DI::l10n()->t('Profile Details'), - 'id' => 'profile-tab', - 'accesskey' => 'o', - ], ['label' => DI::l10n()->t('Contacts'), 'url' => 'contact/' . $pcid . '/contacts', 'sel' => (($active_tab == self::TAB_CONTACTS) ? 'active' : ''), diff --git a/src/Module/Contact/Follow.php b/src/Module/Contact/Follow.php index 5e648deac..57e9ff634 100644 --- a/src/Module/Contact/Follow.php +++ b/src/Module/Contact/Follow.php @@ -188,7 +188,7 @@ class Follow extends BaseModule $this->page['aside'] = VCard::getHTML($contact); $output .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), - ['$title' => $this->t('Status Messages and Posts')] + ['$title' => $this->t('Posts and Replies')] ); // Show last public posts diff --git a/src/Module/Contact/Unfollow.php b/src/Module/Contact/Unfollow.php index 36db68818..9bbc34eee 100644 --- a/src/Module/Contact/Unfollow.php +++ b/src/Module/Contact/Unfollow.php @@ -135,7 +135,7 @@ class Unfollow extends \Friendica\BaseModule $this->page['aside'] = Widget\VCard::getHTML(Contact::getByURL($contact['url'], false)); - $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), ['$title' => $this->t('Status Messages and Posts')]); + $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), ['$title' => $this->t('Posts and Replies')]); // Show last public posts $o .= Contact::getPostsFromUrl($contact['url']); diff --git a/src/Module/Post/Tag/Add.php b/src/Module/Post/Tag/Add.php index aea18aa64..8c4858794 100644 --- a/src/Module/Post/Tag/Add.php +++ b/src/Module/Post/Tag/Add.php @@ -120,7 +120,7 @@ EOT; $tagger_link = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]'; $aauthor_link = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]'; - $post_link = '[url=' . $item['plink'] . ']' . ($item['resource-id'] ? $this->t('photo') : $this->t('status')) . '[/url]'; + $post_link = '[url=' . $item['plink'] . ']' . ($item['resource-id'] ? $this->t('photo') : $this->t('post')) . '[/url]'; $term_link = '#[url=' . $tagid . ']' . $term . '[/url]'; $post = [ diff --git a/src/Module/Profile/Status.php b/src/Module/Profile/Conversations.php similarity index 97% rename from src/Module/Profile/Status.php rename to src/Module/Profile/Conversations.php index 38c9a6902..322cdc80e 100644 --- a/src/Module/Profile/Status.php +++ b/src/Module/Profile/Conversations.php @@ -51,7 +51,7 @@ use Friendica\Util\Profiler; use Friendica\Util\Strings; use Psr\Log\LoggerInterface; -class Status extends BaseProfile +class Conversations extends BaseProfile { /** @var App */ private $app; @@ -147,8 +147,8 @@ class Status extends BaseProfile $commpage = $profile['page-flags'] == User::PAGE_FLAGS_COMMUNITY; $commvisitor = $commpage && $remote_contact; - $this->page['aside'] .= Widget::postedByYear($this->baseUrl . '/profile/' . $profile['nickname'] . '/status', $profile['profile_uid'] ?? 0, true); - $this->page['aside'] .= Widget::categories($profile['uid'], $this->baseUrl . '/profile/' . $profile['nickname'] . '/status', $category); + $this->page['aside'] .= Widget::postedByYear($this->baseUrl . '/profile/' . $profile['nickname'] . '/conversations', $profile['profile_uid'] ?? 0, true); + $this->page['aside'] .= Widget::categories($profile['uid'], $this->baseUrl . '/profile/' . $profile['nickname'] . '/conversations', $category); $this->page['aside'] .= Widget::tagCloud($profile['uid']); if (Security::canWriteToUserWall($profile['uid'])) { diff --git a/src/Module/Profile/Index.php b/src/Module/Profile/Index.php index 149d16512..7a009739e 100644 --- a/src/Module/Profile/Index.php +++ b/src/Module/Profile/Index.php @@ -42,7 +42,7 @@ use Psr\Log\LoggerInterface; * ActivityPub endpoint, but it should show statuses to web users. * * Both these view have dedicated sub-paths, - * respectively https://domain.tld/profile/nickname/profile and https://domain.tld/profile/nickname/status + * respectively https://domain.tld/profile/nickname/profile and https://domain.tld/profile/nickname/conversations */ class Index extends BaseModule { @@ -90,6 +90,6 @@ class Index extends BaseModule protected function content(array $request = []): string { - return (new Status($this->mode, $this->pConfig, $this->conversation, $this->session, $this->config, $this->dateTimeFormat, $this->page, $this->app, $this->l10n, $this->baseUrl, $this->args, $this->logger, $this->profiler, $this->response, $this->server, $this->parameters))->content(); + return (new Conversations($this->mode, $this->pConfig, $this->conversation, $this->session, $this->config, $this->dateTimeFormat, $this->page, $this->app, $this->l10n, $this->baseUrl, $this->args, $this->logger, $this->profiler, $this->response, $this->server, $this->parameters))->content(); } } diff --git a/static/routes.config.php b/static/routes.config.php index bc10fdac0..2219ea454 100644 --- a/static/routes.config.php +++ b/static/routes.config.php @@ -31,17 +31,17 @@ use Friendica\App\Router as R; use Friendica\Module; $profileRoutes = [ - '' => [Module\Profile\Index::class, [R::GET]], - '/contacts/common' => [Module\Profile\Common::class, [R::GET]], - '/contacts[/{type}]' => [Module\Profile\Contacts::class, [R::GET]], - '/media' => [Module\Profile\Media::class, [R::GET]], - '/photos' => [Module\Profile\Photos::class, [R::GET, R::POST]], - '/profile' => [Module\Profile\Profile::class, [R::GET]], - '/remote_follow' => [Module\Profile\RemoteFollow::class, [R::GET, R::POST]], - '/restricted' => [Module\Profile\Restricted::class, [R::GET ]], - '/schedule' => [Module\Profile\Schedule::class, [R::GET, R::POST]], - '/status[/{category}[/{date1}[/{date2}]]]' => [Module\Profile\Status::class, [R::GET]], - '/unkmail' => [Module\Profile\UnkMail::class, [R::GET, R::POST]], + '' => [Module\Profile\Index::class, [R::GET]], + '/contacts/common' => [Module\Profile\Common::class, [R::GET]], + '/contacts[/{type}]' => [Module\Profile\Contacts::class, [R::GET]], + '/media' => [Module\Profile\Media::class, [R::GET]], + '/photos' => [Module\Profile\Photos::class, [R::GET, R::POST]], + '/profile' => [Module\Profile\Profile::class, [R::GET]], + '/remote_follow' => [Module\Profile\RemoteFollow::class, [R::GET, R::POST]], + '/restricted' => [Module\Profile\Restricted::class, [R::GET ]], + '/schedule' => [Module\Profile\Schedule::class, [R::GET, R::POST]], + '/conversations[/{category}[/{date1}[/{date2}]]]' => [Module\Profile\Conversations::class, [R::GET]], + '/unkmail' => [Module\Profile\UnkMail::class, [R::GET, R::POST]], ]; $apiRoutes = [