friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Replace remaining mentions of "Status" by "Conversations" or "Posts"

This commit is contained in:
Hypolite Petovan 2023-01-08 01:32:18 -05:00
parent d0648b10ef
commit 5c8cd8fdd6
9 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Content/Nav.php
View File

@ -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')];

6
src/Module/BaseProfile.php
View File

@ -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',
],

22
src/Module/Contact.php
View File

@ -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' : ''),

2
src/Module/Contact/Follow.php
View File

@ -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

2
src/Module/Contact/Unfollow.php
View File

@ -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']);

2
src/Module/Post/Tag/Add.php
View File

@ -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 = [

6
src/Module/Profile/Status.php → src/Module/Profile/Conversations.php
View File

@ -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'])) {

4
src/Module/Profile/Index.php
View File

@ -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();
}
}

22
static/routes.config.php
View File

@ -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 = [