clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Setting to select your network tabs

This commit is contained in:
Michael 2023-09-09 17:38:09 +00:00
parent 113436afd5
commit d395de3aa1
9 changed files with 241 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Content/Conversation.php
View File

@ -495,6 +495,7 @@ class Conversation
. (!empty($_GET['cmin']) ? '&cmin=' . rawurlencode($_GET['cmin']) : '') . (!empty($_GET['cmin']) ? '&cmin=' . rawurlencode($_GET['cmin']) : '')
. (!empty($_GET['cmax']) ? '&cmax=' . rawurlencode($_GET['cmax']) : '') . (!empty($_GET['cmax']) ? '&cmax=' . rawurlencode($_GET['cmax']) : '')
. (!empty($_GET['file']) ? '&file=' . rawurlencode($_GET['file']) : '') . (!empty($_GET['file']) ? '&file=' . rawurlencode($_GET['file']) : '')
. (!empty($_GET['channel']) ? '&channel=' . rawurlencode($_GET['channel']) : '')
. (!empty($_GET['no_sharer']) ? '&no_sharer=' . rawurlencode($_GET['no_sharer']) : '') . (!empty($_GET['no_sharer']) ? '&no_sharer=' . rawurlencode($_GET['no_sharer']) : '')
. (!empty($_GET['accounttype']) ? '&accounttype=' . rawurlencode($_GET['accounttype']) : '') . (!empty($_GET['accounttype']) ? '&accounttype=' . rawurlencode($_GET['accounttype']) : '')
. "'; </script>\r\n"; . "'; </script>\r\n";

2
src/Module/BaseSettings.php
View File

@ -28,8 +28,6 @@ use Friendica\Content\Nav;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Core\Session\Capability\IHandleUserSessions; use Friendica\Core\Session\Capability\IHandleUserSessions;
use Friendica\Core\System;
use Friendica\Module\Security\Login;
use Friendica\Network\HTTPException\ForbiddenException; use Friendica\Network\HTTPException\ForbiddenException;
use Friendica\Util\Profiler; use Friendica\Util\Profiler;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;

21
src/Module/Conversation/Network.php
View File

@ -280,12 +280,30 @@ class Network extends Timeline
// @todo user confgurable selection of tabs // @todo user confgurable selection of tabs
$tabs = $this->getTabArray($this->timeline->getNetworkFeeds($this->args->getCommand()), 'network'); $tabs = $this->getTabArray($this->timeline->getNetworkFeeds($this->args->getCommand()), 'network');
$network_timelines = $this->pConfig->get($this->session->getLocalUserId(), 'system', 'network_timelines', []);
if (!empty($network_timelines)) {
$tabs = array_merge($tabs, $this->getTabArray($this->timeline->getChannelsForUser($this->session->getLocalUserId()), 'network', 'channel'));
$tabs = array_merge($tabs, $this->getTabArray($this->timeline->getCommunities(true), 'network', 'channel'));
}
$arr = ['tabs' => $tabs]; $arr = ['tabs' => $tabs];
Hook::callAll('network_tabs', $arr); Hook::callAll('network_tabs', $arr);
if (!empty($network_timelines)) {
$tabs = [];
foreach (array_keys($arr['tabs']) as $tab) {
if (in_array($tab, $network_timelines)) {
$tabs[] = $arr['tabs'][$tab];
}
}
} else {
$tabs = $arr['tabs'];
}
$tpl = Renderer::getMarkupTemplate('common_tabs.tpl'); $tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
return Renderer::replaceMacros($tpl, ['$tabs' => $arr['tabs']]); return Renderer::replaceMacros($tpl, ['$tabs' => $tabs]);
} }
protected function parseRequest(array $request) protected function parseRequest(array $request)
@ -302,7 +320,6 @@ class Network extends Timeline
throw new HTTPException\BadRequestException($this->l10n->t('Network feed not available.')); throw new HTTPException\BadRequestException($this->l10n->t('Network feed not available.'));
} }
if (!empty($request['star'])) { if (!empty($request['star'])) {
$this->selectedTab = TimelineEntity::STAR; $this->selectedTab = TimelineEntity::STAR;
$this->star = true; $this->star = true;

13
src/Module/Conversation/Timeline.php
View File

@ -97,7 +97,7 @@ class Timeline extends BaseModule
protected function parseRequest(array $request) protected function parseRequest(array $request)
{ {
$this->logger->debug('Got request', $request); $this->logger->debug('Got request', $request);
$this->selectedTab = $this->parameters['content'] ?? ''; $this->selectedTab = $this->parameters['content'] ?? $request['channel'] ?? '';
$this->accountTypeString = $request['accounttype'] ?? $this->parameters['accounttype'] ?? ''; $this->accountTypeString = $request['accounttype'] ?? $this->parameters['accounttype'] ?? '';
$this->accountType = User::getAccountTypeByString($this->accountTypeString); $this->accountType = User::getAccountTypeByString($this->accountTypeString);
@ -159,14 +159,19 @@ class Timeline extends BaseModule
]); ]);
} }
protected function getTabArray(Timelines $timelines, string $prefix): array protected function getTabArray(Timelines $timelines, string $prefix, string $parameter = ''): array
{ {
$tabs = []; $tabs = [];
foreach ($timelines as $tab) { foreach ($timelines as $tab) {
$tabs[] = [ if (is_null($tab->path) && !empty($parameter)) {
$path = $prefix . '?' . http_build_query([$parameter => $tab->code]);
} else {
$path = $tab->path ?? $prefix . '/' . $tab->code;
}
$tabs[$tab->code] = [
'label' => $tab->label, 'label' => $tab->label,
'url' => $tab->path ?? $prefix . '/' . $tab->code, 'url' => $path,
'sel' => $this->selectedTab == $tab->code ? 'active' : '', 'sel' => $this->selectedTab == $tab->code ? 'active' : '',
'title' => $tab->description, 'title' => $tab->description,
'id' => $prefix . '-' . $tab->code . '-tab', 'id' => $prefix . '-' . $tab->code . '-tab',

35
src/Module/Settings/Display.php
View File

@ -23,6 +23,7 @@ namespace Friendica\Module\Settings;
use Friendica\App; use Friendica\App;
use Friendica\Content\Text\BBCode; use Friendica\Content\Text\BBCode;
use Friendica\Content\Conversation\Factory\Timeline as TimelineFactory;
use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\Config\Capability\IManageConfigValues;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\L10n; use Friendica\Core\L10n;
@ -51,8 +52,10 @@ class Display extends BaseSettings
private $app; private $app;
/** @var SystemMessages */ /** @var SystemMessages */
private $systemMessages; private $systemMessages;
/** @var TimelineFactory */
protected $timeline;
public function __construct(SystemMessages $systemMessages, App $app, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, IHandleUserSessions $session, App\Page $page, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) public function __construct(TimelineFactory $timeline, SystemMessages $systemMessages, App $app, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, IHandleUserSessions $session, App\Page $page, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
{ {
parent::__construct($session, $page, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); parent::__construct($session, $page, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
@ -60,6 +63,7 @@ class Display extends BaseSettings
$this->pConfig = $pConfig; $this->pConfig = $pConfig;
$this->app = $app; $this->app = $app;
$this->systemMessages = $systemMessages; $this->systemMessages = $systemMessages;
$this->timeline = $timeline;
} }
protected function post(array $request = []) protected function post(array $request = [])
@ -76,6 +80,7 @@ class Display extends BaseSettings
$theme = !empty($request['theme']) ? trim($request['theme']) : $user['theme']; $theme = !empty($request['theme']) ? trim($request['theme']) : $user['theme'];
$mobile_theme = !empty($request['mobile_theme']) ? trim($request['mobile_theme']) : ''; $mobile_theme = !empty($request['mobile_theme']) ? trim($request['mobile_theme']) : '';
$enable_smile = !empty($request['enable_smile']) ? intval($request['enable_smile']) : 0; $enable_smile = !empty($request['enable_smile']) ? intval($request['enable_smile']) : 0;
$network_timelines = !empty($request['network_timelines']) ? $request['network_timelines'] : [];
$channel_languages = !empty($request['channel_languages']) ? $request['channel_languages'] : []; $channel_languages = !empty($request['channel_languages']) ? $request['channel_languages'] : [];
$first_day_of_week = !empty($request['first_day_of_week']) ? intval($request['first_day_of_week']) : 0; $first_day_of_week = !empty($request['first_day_of_week']) ? intval($request['first_day_of_week']) : 0;
$calendar_default_view = !empty($request['calendar_default_view']) ? trim($request['calendar_default_view']) : 'month'; $calendar_default_view = !empty($request['calendar_default_view']) ? trim($request['calendar_default_view']) : 'month';
@ -121,6 +126,7 @@ class Display extends BaseSettings
$this->pConfig->set($uid, 'system', 'stay_local' , $stay_local); $this->pConfig->set($uid, 'system', 'stay_local' , $stay_local);
$this->pConfig->set($uid, 'system', 'preview_mode' , $preview_mode); $this->pConfig->set($uid, 'system', 'preview_mode' , $preview_mode);
$this->pConfig->set($uid, 'system', 'network_timelines' , $network_timelines);
$this->pConfig->set($uid, 'channel', 'languages' , $channel_languages); $this->pConfig->set($uid, 'channel', 'languages' , $channel_languages);
$this->pConfig->set($uid, 'calendar', 'first_day_of_week' , $first_day_of_week); $this->pConfig->set($uid, 'calendar', 'first_day_of_week' , $first_day_of_week);
@ -218,8 +224,10 @@ class Display extends BaseSettings
BBCode::PREVIEW_LARGE => $this->t('Large Image'), BBCode::PREVIEW_LARGE => $this->t('Large Image'),
]; ];
$network_timelines = $this->pConfig->get($uid, 'system', 'network_timelines', array_keys($this->getAvailableTimelines($uid, true)));
$channel_languages = $this->pConfig->get($uid, 'channel', 'languages', [User::getLanguageCode($uid)]); $channel_languages = $this->pConfig->get($uid, 'channel', 'languages', [User::getLanguageCode($uid)]);
$languages = $this->l10n->getAvailableLanguages(true); $languages = $this->l10n->getAvailableLanguages(true);
$timelines = $this->getAvailableTimelines($uid);
$first_day_of_week = $this->pConfig->get($uid, 'calendar', 'first_day_of_week', 0); $first_day_of_week = $this->pConfig->get($uid, 'calendar', 'first_day_of_week', 0);
$weekdays = [ $weekdays = [
@ -254,6 +262,7 @@ class Display extends BaseSettings
'$d_ctset' => $this->t('Custom Theme Settings'), '$d_ctset' => $this->t('Custom Theme Settings'),
'$d_cset' => $this->t('Content Settings'), '$d_cset' => $this->t('Content Settings'),
'$stitle' => $this->t('Theme settings'), '$stitle' => $this->t('Theme settings'),
'$timeline_title' => $this->t('Timelines'),
'$channel_title' => $this->t('Channels'), '$channel_title' => $this->t('Channels'),
'$calendar_title' => $this->t('Calendar'), '$calendar_title' => $this->t('Calendar'),
@ -275,10 +284,34 @@ class Display extends BaseSettings
'$stay_local' => ['stay_local' , $this->t('Stay local'), $stay_local, $this->t("Don't go to a remote system when following a contact link.")], '$stay_local' => ['stay_local' , $this->t('Stay local'), $stay_local, $this->t("Don't go to a remote system when following a contact link.")],
'$preview_mode' => ['preview_mode' , $this->t('Link preview mode'), $preview_mode, $this->t('Appearance of the link preview that is added to each post with a link.'), $preview_modes, false], '$preview_mode' => ['preview_mode' , $this->t('Link preview mode'), $preview_mode, $this->t('Appearance of the link preview that is added to each post with a link.'), $preview_modes, false],
'$network_timelines' => ['network_timelines[]', $this->t('Timelines for the network page:'), $network_timelines, $this->t('Select all the timelines that you want to see on your network page.'), $timelines, 'multiple'],
'$channel_languages' => ['channel_languages[]', $this->t('Channel languages:'), $channel_languages, $this->t('Select all languages that you want to see in your channels.'), $languages, 'multiple'], '$channel_languages' => ['channel_languages[]', $this->t('Channel languages:'), $channel_languages, $this->t('Select all languages that you want to see in your channels.'), $languages, 'multiple'],
'$first_day_of_week' => ['first_day_of_week' , $this->t('Beginning of week:') , $first_day_of_week , '', $weekdays , false], '$first_day_of_week' => ['first_day_of_week' , $this->t('Beginning of week:') , $first_day_of_week , '', $weekdays , false],
'$calendar_default_view' => ['calendar_default_view', $this->t('Default calendar view:'), $calendar_default_view, '', $calendarViews, false], '$calendar_default_view' => ['calendar_default_view', $this->t('Default calendar view:'), $calendar_default_view, '', $calendarViews, false],
]); ]);
} }
private function getAvailableTimelines(int $uid, bool $only_network = false): array
{
$timelines = [];
foreach ($this->timeline->getNetworkFeeds('') as $channel) {
$timelines[$channel->code] = $this->t('%s: %s', $channel->label, $channel->description);
}
if ($only_network) {
return $timelines;
}
foreach ($this->timeline->getChannelsForUser($uid) as $channel) {
$timelines[$channel->code] = $this->t('%s: %s', $channel->label, $channel->description);
}
foreach ($this->timeline->getCommunities(true) as $community) {
$timelines[$community->code] = $this->t('%s: %s', $community->label, $community->description);
}
return $timelines;
}
} }

10
src/Module/Update/Network.php
View File

@ -43,7 +43,15 @@ class Network extends NetworkModule
System::htmlUpdateExit($o); System::htmlUpdateExit($o);
} }
$o = $this->conversation->render($this->getItems(), Conversation::MODE_NETWORK, $profile_uid, false, $this->getOrder(), $this->session->getLocalUserId()); if ($this->timeline->isChannel($this->selectedTab)) {
$items = $this->getChannelItems();
} elseif ($this->timeline->isCommunity($this->selectedTab)) {
$items = $this->getCommunityItems();
} else {
$items = $this->getItems();
}
$o = $this->conversation->render($items, Conversation::MODE_NETWORK, $profile_uid, false, $this->getOrder(), $this->session->getLocalUserId());
System::htmlUpdateExit($o); System::htmlUpdateExit($o);
} }

278
view/lang/C/messages.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2023.09-dev\n" "Project-Id-Version: 2023.09-dev\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-09-09 09:30+0000\n" "POT-Creation-Date: 2023-09-09 17:26+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -47,7 +47,7 @@ msgstr ""
#: mod/item.php:452 mod/message.php:67 mod/message.php:113 mod/notes.php:45 #: mod/item.php:452 mod/message.php:67 mod/message.php:113 mod/notes.php:45
#: mod/photos.php:152 mod/photos.php:670 src/Model/Event.php:520 #: mod/photos.php:152 mod/photos.php:670 src/Model/Event.php:520
#: src/Module/Attach.php:55 src/Module/BaseApi.php:99 #: src/Module/Attach.php:55 src/Module/BaseApi.php:99
#: src/Module/BaseNotifications.php:98 src/Module/BaseSettings.php:52 #: src/Module/BaseNotifications.php:98 src/Module/BaseSettings.php:50
#: src/Module/Calendar/Event/API.php:88 src/Module/Calendar/Event/Form.php:84 #: src/Module/Calendar/Event/API.php:88 src/Module/Calendar/Event/Form.php:84
#: src/Module/Calendar/Export.php:82 src/Module/Calendar/Show.php:82 #: src/Module/Calendar/Export.php:82 src/Module/Calendar/Show.php:82
#: src/Module/Circle.php:41 src/Module/Circle.php:84 #: src/Module/Circle.php:41 src/Module/Circle.php:84
@ -69,7 +69,7 @@ msgstr ""
#: src/Module/Register.php:245 src/Module/Search/Directory.php:37 #: src/Module/Register.php:245 src/Module/Search/Directory.php:37
#: src/Module/Settings/Account.php:50 src/Module/Settings/Account.php:408 #: src/Module/Settings/Account.php:50 src/Module/Settings/Account.php:408
#: src/Module/Settings/Delegation.php:41 src/Module/Settings/Delegation.php:71 #: src/Module/Settings/Delegation.php:41 src/Module/Settings/Delegation.php:71
#: src/Module/Settings/Display.php:69 src/Module/Settings/Display.php:154 #: src/Module/Settings/Display.php:74 src/Module/Settings/Display.php:161
#: src/Module/Settings/Profile/Photo/Crop.php:165 #: src/Module/Settings/Profile/Photo/Crop.php:165
#: src/Module/Settings/Profile/Photo/Index.php:111 #: src/Module/Settings/Profile/Photo/Index.php:111
#: src/Module/Settings/RemoveMe.php:117 src/Module/Settings/UserExport.php:80 #: src/Module/Settings/RemoveMe.php:117 src/Module/Settings/UserExport.php:80
@ -292,7 +292,7 @@ msgid "Insert web link"
msgstr "" msgstr ""
#: mod/message.php:201 mod/message.php:357 mod/photos.php:1301 #: mod/message.php:201 mod/message.php:357 mod/photos.php:1301
#: src/Content/Conversation.php:399 src/Content/Conversation.php:1548 #: src/Content/Conversation.php:399 src/Content/Conversation.php:1549
#: src/Module/Item/Compose.php:206 src/Module/Post/Edit.php:145 #: src/Module/Item/Compose.php:206 src/Module/Post/Edit.php:145
#: src/Module/Profile/UnkMail.php:154 src/Object/Post.php:578 #: src/Module/Profile/UnkMail.php:154 src/Object/Post.php:578
msgid "Please wait" msgid "Please wait"
@ -415,7 +415,7 @@ msgstr ""
msgid "Upload New Photos" msgid "Upload New Photos"
msgstr "" msgstr ""
#: mod/photos.php:121 src/Module/BaseSettings.php:74 #: mod/photos.php:121 src/Module/BaseSettings.php:72
#: src/Module/Profile/Photos.php:363 #: src/Module/Profile/Photos.php:363
msgid "everybody" msgid "everybody"
msgstr "" msgstr ""
@ -449,7 +449,7 @@ msgstr ""
msgid "%1$s was tagged in %2$s by %3$s" msgid "%1$s was tagged in %2$s by %3$s"
msgstr "" msgstr ""
#: mod/photos.php:582 src/Module/Conversation/Community.php:160 #: mod/photos.php:582 src/Module/Conversation/Community.php:159
#: src/Module/Directory.php:48 src/Module/Profile/Photos.php:295 #: src/Module/Directory.php:48 src/Module/Profile/Photos.php:295
#: src/Module/Search/Index.php:65 #: src/Module/Search/Index.php:65
msgid "Public access denied." msgid "Public access denied."
@ -622,12 +622,12 @@ msgstr ""
msgid "Loading..." msgid "Loading..."
msgstr "" msgstr ""
#: mod/photos.php:1236 src/Content/Conversation.php:1463 #: mod/photos.php:1236 src/Content/Conversation.php:1464
#: src/Object/Post.php:260 #: src/Object/Post.php:260
msgid "Select" msgid "Select"
msgstr "" msgstr ""
#: mod/photos.php:1237 src/Content/Conversation.php:1464 #: mod/photos.php:1237 src/Content/Conversation.php:1465
#: src/Module/Moderation/Users/Active.php:136 #: src/Module/Moderation/Users/Active.php:136
#: src/Module/Moderation/Users/Blocked.php:136 #: src/Module/Moderation/Users/Blocked.php:136
#: src/Module/Moderation/Users/Index.php:151 #: src/Module/Moderation/Users/Index.php:151
@ -1391,124 +1391,124 @@ msgstr ""
msgid "Open Compose page" msgid "Open Compose page"
msgstr "" msgstr ""
#: src/Content/Conversation.php:594 #: src/Content/Conversation.php:595
msgid "remove" msgid "remove"
msgstr "" msgstr ""
#: src/Content/Conversation.php:598 #: src/Content/Conversation.php:599
msgid "Delete Selected Items" msgid "Delete Selected Items"
msgstr "" msgstr ""
#: src/Content/Conversation.php:753 src/Content/Conversation.php:756 #: src/Content/Conversation.php:754 src/Content/Conversation.php:757
#: src/Content/Conversation.php:759 src/Content/Conversation.php:762 #: src/Content/Conversation.php:760 src/Content/Conversation.php:763
#: src/Content/Conversation.php:765 #: src/Content/Conversation.php:766
#, php-format #, php-format
msgid "You had been addressed (%s)." msgid "You had been addressed (%s)."
msgstr "" msgstr ""
#: src/Content/Conversation.php:768 #: src/Content/Conversation.php:769
#, php-format #, php-format
msgid "You are following %s." msgid "You are following %s."
msgstr "" msgstr ""
#: src/Content/Conversation.php:773 #: src/Content/Conversation.php:774
#, php-format #, php-format
msgid "You subscribed to %s." msgid "You subscribed to %s."
msgstr "" msgstr ""
#: src/Content/Conversation.php:775 #: src/Content/Conversation.php:776
msgid "You subscribed to one or more tags in this post." msgid "You subscribed to one or more tags in this post."
msgstr "" msgstr ""
#: src/Content/Conversation.php:795 #: src/Content/Conversation.php:796
#, php-format #, php-format
msgid "%s reshared this." msgid "%s reshared this."
msgstr "" msgstr ""
#: src/Content/Conversation.php:797 #: src/Content/Conversation.php:798
msgid "Reshared" msgid "Reshared"
msgstr "" msgstr ""
#: src/Content/Conversation.php:797 #: src/Content/Conversation.php:798
#, php-format #, php-format
msgid "Reshared by %s <%s>" msgid "Reshared by %s <%s>"
msgstr "" msgstr ""
#: src/Content/Conversation.php:800 #: src/Content/Conversation.php:801
#, php-format #, php-format
msgid "%s is participating in this thread." msgid "%s is participating in this thread."
msgstr "" msgstr ""
#: src/Content/Conversation.php:803 #: src/Content/Conversation.php:804
msgid "Stored for general reasons" msgid "Stored for general reasons"
msgstr "" msgstr ""
#: src/Content/Conversation.php:806 #: src/Content/Conversation.php:807
msgid "Global post" msgid "Global post"
msgstr "" msgstr ""
#: src/Content/Conversation.php:809 #: src/Content/Conversation.php:810
msgid "Sent via an relay server" msgid "Sent via an relay server"
msgstr "" msgstr ""
#: src/Content/Conversation.php:809 #: src/Content/Conversation.php:810
#, php-format #, php-format
msgid "Sent via the relay server %s <%s>" msgid "Sent via the relay server %s <%s>"
msgstr "" msgstr ""
#: src/Content/Conversation.php:812 #: src/Content/Conversation.php:813
msgid "Fetched" msgid "Fetched"
msgstr "" msgstr ""
#: src/Content/Conversation.php:812 #: src/Content/Conversation.php:813
#, php-format #, php-format
msgid "Fetched because of %s <%s>" msgid "Fetched because of %s <%s>"
msgstr "" msgstr ""
#: src/Content/Conversation.php:815 #: src/Content/Conversation.php:816
msgid "Stored because of a child post to complete this thread." msgid "Stored because of a child post to complete this thread."
msgstr "" msgstr ""
#: src/Content/Conversation.php:818 #: src/Content/Conversation.php:819
msgid "Local delivery" msgid "Local delivery"
msgstr "" msgstr ""
#: src/Content/Conversation.php:821 #: src/Content/Conversation.php:822
msgid "Stored because of your activity (like, comment, star, ...)" msgid "Stored because of your activity (like, comment, star, ...)"
msgstr "" msgstr ""
#: src/Content/Conversation.php:824 #: src/Content/Conversation.php:825
msgid "Distributed" msgid "Distributed"
msgstr "" msgstr ""
#: src/Content/Conversation.php:827 #: src/Content/Conversation.php:828
msgid "Pushed to us" msgid "Pushed to us"
msgstr "" msgstr ""
#: src/Content/Conversation.php:1491 src/Object/Post.php:247 #: src/Content/Conversation.php:1492 src/Object/Post.php:247
msgid "Pinned item" msgid "Pinned item"
msgstr "" msgstr ""
#: src/Content/Conversation.php:1508 src/Object/Post.php:521 #: src/Content/Conversation.php:1509 src/Object/Post.php:521
#: src/Object/Post.php:522 #: src/Object/Post.php:522
#, php-format #, php-format
msgid "View %s's profile @ %s" msgid "View %s's profile @ %s"
msgstr "" msgstr ""
#: src/Content/Conversation.php:1521 src/Object/Post.php:509 #: src/Content/Conversation.php:1522 src/Object/Post.php:509
msgid "Categories:" msgid "Categories:"
msgstr "" msgstr ""
#: src/Content/Conversation.php:1522 src/Object/Post.php:510 #: src/Content/Conversation.php:1523 src/Object/Post.php:510
msgid "Filed under:" msgid "Filed under:"
msgstr "" msgstr ""
#: src/Content/Conversation.php:1530 src/Object/Post.php:535 #: src/Content/Conversation.php:1531 src/Object/Post.php:535
#, php-format #, php-format
msgid "%s from %s" msgid "%s from %s"
msgstr "" msgstr ""
#: src/Content/Conversation.php:1546 #: src/Content/Conversation.php:1547
msgid "View in context" msgid "View in context"
msgstr "" msgstr ""
@ -1569,60 +1569,60 @@ msgstr ""
msgid "Posts with videos" msgid "Posts with videos"
msgstr "" msgstr ""
#: src/Content/Conversation/Factory/Timeline.php:83 #: src/Content/Conversation/Factory/Timeline.php:84
msgid "Local Community" msgid "Local Community"
msgstr "" msgstr ""
#: src/Content/Conversation/Factory/Timeline.php:83 #: src/Content/Conversation/Factory/Timeline.php:84
msgid "Posts from local users on this server" msgid "Posts from local users on this server"
msgstr "" msgstr ""
#: src/Content/Conversation/Factory/Timeline.php:87 #: src/Content/Conversation/Factory/Timeline.php:88
msgid "Global Community" msgid "Global Community"
msgstr "" msgstr ""
#: src/Content/Conversation/Factory/Timeline.php:87 #: src/Content/Conversation/Factory/Timeline.php:88
msgid "Posts from users of the whole federated network" msgid "Posts from users of the whole federated network"
msgstr "" msgstr ""
#: src/Content/Conversation/Factory/Timeline.php:101 #: src/Content/Conversation/Factory/Timeline.php:102
msgid "Latest Activity" msgid "Latest Activity"
msgstr "" msgstr ""
#: src/Content/Conversation/Factory/Timeline.php:101 #: src/Content/Conversation/Factory/Timeline.php:102
msgid "Sort by latest activity" msgid "Sort by latest activity"
msgstr "" msgstr ""
#: src/Content/Conversation/Factory/Timeline.php:102 #: src/Content/Conversation/Factory/Timeline.php:103
msgid "Latest Posts" msgid "Latest Posts"
msgstr "" msgstr ""
#: src/Content/Conversation/Factory/Timeline.php:102 #: src/Content/Conversation/Factory/Timeline.php:103
msgid "Sort by post received date" msgid "Sort by post received date"
msgstr "" msgstr ""
#: src/Content/Conversation/Factory/Timeline.php:103 #: src/Content/Conversation/Factory/Timeline.php:104
msgid "Latest Creation" msgid "Latest Creation"
msgstr "" msgstr ""
#: src/Content/Conversation/Factory/Timeline.php:103 #: src/Content/Conversation/Factory/Timeline.php:104
msgid "Sort by post creation date" msgid "Sort by post creation date"
msgstr "" msgstr ""
#: src/Content/Conversation/Factory/Timeline.php:104 #: src/Content/Conversation/Factory/Timeline.php:105
#: src/Module/Settings/Profile/Index.php:260 #: src/Module/Settings/Profile/Index.php:260
msgid "Personal" msgid "Personal"
msgstr "" msgstr ""
#: src/Content/Conversation/Factory/Timeline.php:104 #: src/Content/Conversation/Factory/Timeline.php:105
msgid "Posts that mention or involve you" msgid "Posts that mention or involve you"
msgstr "" msgstr ""
#: src/Content/Conversation/Factory/Timeline.php:105 src/Object/Post.php:380 #: src/Content/Conversation/Factory/Timeline.php:106 src/Object/Post.php:380
msgid "Starred" msgid "Starred"
msgstr "" msgstr ""
#: src/Content/Conversation/Factory/Timeline.php:105 #: src/Content/Conversation/Factory/Timeline.php:106
msgid "Favourite Posts" msgid "Favourite Posts"
msgstr "" msgstr ""
@ -1894,7 +1894,7 @@ msgid "Conversations you started"
msgstr "" msgstr ""
#: src/Content/Nav.php:230 src/Module/BaseProfile.php:49 #: src/Content/Nav.php:230 src/Module/BaseProfile.php:49
#: src/Module/BaseSettings.php:100 src/Module/Contact.php:504 #: src/Module/BaseSettings.php:98 src/Module/Contact.php:504
#: src/Module/Contact/Profile.php:413 src/Module/Profile/Profile.php:268 #: src/Module/Contact/Profile.php:413 src/Module/Profile/Profile.php:268
#: src/Module/Welcome.php:57 view/theme/frio/theme.php:230 #: src/Module/Welcome.php:57 view/theme/frio/theme.php:230
msgid "Profile" msgid "Profile"
@ -1926,7 +1926,7 @@ msgstr ""
#: src/Content/Nav.php:233 src/Content/Nav.php:295 #: src/Content/Nav.php:233 src/Content/Nav.php:295
#: src/Module/BaseProfile.php:85 src/Module/BaseProfile.php:88 #: src/Module/BaseProfile.php:85 src/Module/BaseProfile.php:88
#: src/Module/BaseProfile.php:96 src/Module/BaseProfile.php:99 #: src/Module/BaseProfile.php:96 src/Module/BaseProfile.php:99
#: src/Module/Settings/Display.php:258 view/theme/frio/theme.php:236 #: src/Module/Settings/Display.php:268 view/theme/frio/theme.php:236
#: view/theme/frio/theme.php:240 #: view/theme/frio/theme.php:240
msgid "Calendar" msgid "Calendar"
msgstr "" msgstr ""
@ -2013,7 +2013,7 @@ msgstr ""
msgid "Conversations on this and other servers" msgid "Conversations on this and other servers"
msgstr "" msgstr ""
#: src/Content/Nav.php:294 src/Module/Settings/Display.php:257 #: src/Content/Nav.php:294 src/Module/Settings/Display.php:267
msgid "Channels" msgid "Channels"
msgstr "" msgstr ""
@ -2106,7 +2106,7 @@ msgid "Manage other pages"
msgstr "" msgstr ""
#: src/Content/Nav.php:329 src/Module/Admin/Addons/Details.php:114 #: src/Content/Nav.php:329 src/Module/Admin/Addons/Details.php:114
#: src/Module/Admin/Themes/Details.php:93 src/Module/BaseSettings.php:177 #: src/Module/Admin/Themes/Details.php:93 src/Module/BaseSettings.php:175
#: src/Module/Welcome.php:52 view/theme/frio/theme.php:242 #: src/Module/Welcome.php:52 view/theme/frio/theme.php:242
msgid "Settings" msgid "Settings"
msgstr "" msgstr ""
@ -2824,37 +2824,37 @@ msgid "Could not connect to database."
msgstr "" msgstr ""
#: src/Core/L10n.php:476 src/Model/Event.php:430 #: src/Core/L10n.php:476 src/Model/Event.php:430
#: src/Module/Settings/Display.php:227 #: src/Module/Settings/Display.php:236
msgid "Monday" msgid "Monday"
msgstr "" msgstr ""
#: src/Core/L10n.php:476 src/Model/Event.php:431 #: src/Core/L10n.php:476 src/Model/Event.php:431
#: src/Module/Settings/Display.php:228 #: src/Module/Settings/Display.php:237
msgid "Tuesday" msgid "Tuesday"
msgstr "" msgstr ""
#: src/Core/L10n.php:476 src/Model/Event.php:432 #: src/Core/L10n.php:476 src/Model/Event.php:432
#: src/Module/Settings/Display.php:229 #: src/Module/Settings/Display.php:238
msgid "Wednesday" msgid "Wednesday"
msgstr "" msgstr ""
#: src/Core/L10n.php:476 src/Model/Event.php:433 #: src/Core/L10n.php:476 src/Model/Event.php:433
#: src/Module/Settings/Display.php:230 #: src/Module/Settings/Display.php:239
msgid "Thursday" msgid "Thursday"
msgstr "" msgstr ""
#: src/Core/L10n.php:476 src/Model/Event.php:434 #: src/Core/L10n.php:476 src/Model/Event.php:434
#: src/Module/Settings/Display.php:231 #: src/Module/Settings/Display.php:240
msgid "Friday" msgid "Friday"
msgstr "" msgstr ""
#: src/Core/L10n.php:476 src/Model/Event.php:435 #: src/Core/L10n.php:476 src/Model/Event.php:435
#: src/Module/Settings/Display.php:232 #: src/Module/Settings/Display.php:241
msgid "Saturday" msgid "Saturday"
msgstr "" msgstr ""
#: src/Core/L10n.php:476 src/Model/Event.php:429 #: src/Core/L10n.php:476 src/Model/Event.php:429
#: src/Module/Settings/Display.php:226 #: src/Module/Settings/Display.php:235
msgid "Sunday" msgid "Sunday"
msgstr "" msgstr ""
@ -3299,17 +3299,17 @@ msgid "today"
msgstr "" msgstr ""
#: src/Model/Event.php:463 src/Module/Calendar/Show.php:129 #: src/Model/Event.php:463 src/Module/Calendar/Show.php:129
#: src/Module/Settings/Display.php:237 src/Util/Temporal.php:353 #: src/Module/Settings/Display.php:246 src/Util/Temporal.php:353
msgid "month" msgid "month"
msgstr "" msgstr ""
#: src/Model/Event.php:464 src/Module/Calendar/Show.php:130 #: src/Model/Event.php:464 src/Module/Calendar/Show.php:130
#: src/Module/Settings/Display.php:238 src/Util/Temporal.php:354 #: src/Module/Settings/Display.php:247 src/Util/Temporal.php:354
msgid "week" msgid "week"
msgstr "" msgstr ""
#: src/Model/Event.php:465 src/Module/Calendar/Show.php:131 #: src/Model/Event.php:465 src/Module/Calendar/Show.php:131
#: src/Module/Settings/Display.php:239 src/Util/Temporal.php:355 #: src/Module/Settings/Display.php:248 src/Util/Temporal.php:355
msgid "day" msgid "day"
msgstr "" msgstr ""
@ -3898,7 +3898,7 @@ msgid "Administration"
msgstr "" msgstr ""
#: src/Module/Admin/Addons/Details.php:112 src/Module/Admin/Addons/Index.php:68 #: src/Module/Admin/Addons/Details.php:112 src/Module/Admin/Addons/Index.php:68
#: src/Module/BaseAdmin.php:92 src/Module/BaseSettings.php:134 #: src/Module/BaseAdmin.php:92 src/Module/BaseSettings.php:132
msgid "Addons" msgid "Addons"
msgstr "" msgstr ""
@ -3932,7 +3932,7 @@ msgstr ""
#: src/Module/Settings/Account.php:561 src/Module/Settings/Addons.php:78 #: src/Module/Settings/Account.php:561 src/Module/Settings/Addons.php:78
#: src/Module/Settings/Connectors.php:160 #: src/Module/Settings/Connectors.php:160
#: src/Module/Settings/Connectors.php:246 #: src/Module/Settings/Connectors.php:246
#: src/Module/Settings/Delegation.php:171 src/Module/Settings/Display.php:252 #: src/Module/Settings/Delegation.php:171 src/Module/Settings/Display.php:261
#: src/Module/Settings/Features.php:76 #: src/Module/Settings/Features.php:76
msgid "Save Settings" msgid "Save Settings"
msgstr "" msgstr ""
@ -4292,11 +4292,11 @@ msgstr ""
msgid "%s is no valid input for maximum image size" msgid "%s is no valid input for maximum image size"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:313 src/Module/Settings/Display.php:172 #: src/Module/Admin/Site.php:313 src/Module/Settings/Display.php:179
msgid "No special theme for mobile devices" msgid "No special theme for mobile devices"
msgstr "" msgstr ""
#: src/Module/Admin/Site.php:330 src/Module/Settings/Display.php:182 #: src/Module/Admin/Site.php:330 src/Module/Settings/Display.php:189
#, php-format #, php-format
msgid "%s - (Experimental)" msgid "%s - (Experimental)"
msgstr "" msgstr ""
@ -5583,7 +5583,7 @@ msgstr ""
msgid "Configuration" msgid "Configuration"
msgstr "" msgstr ""
#: src/Module/BaseAdmin.php:94 src/Module/BaseSettings.php:112 #: src/Module/BaseAdmin.php:94 src/Module/BaseSettings.php:110
msgid "Additional features" msgid "Additional features"
msgstr "" msgstr ""
@ -5748,40 +5748,40 @@ msgid_plural ""
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Module/BaseSettings.php:80 #: src/Module/BaseSettings.php:78
msgid "Account" msgid "Account"
msgstr "" msgstr ""
#: src/Module/BaseSettings.php:87 src/Module/Security/TwoFactor/Verify.php:96 #: src/Module/BaseSettings.php:85 src/Module/Security/TwoFactor/Verify.php:96
#: src/Module/Settings/TwoFactor/Index.php:117 #: src/Module/Settings/TwoFactor/Index.php:117
msgid "Two-factor authentication" msgid "Two-factor authentication"
msgstr "" msgstr ""
#: src/Module/BaseSettings.php:120 #: src/Module/BaseSettings.php:118
msgid "Display" msgid "Display"
msgstr "" msgstr ""
#: src/Module/BaseSettings.php:127 src/Module/Settings/Connectors.php:204 #: src/Module/BaseSettings.php:125 src/Module/Settings/Connectors.php:204
msgid "Social Networks" msgid "Social Networks"
msgstr "" msgstr ""
#: src/Module/BaseSettings.php:141 src/Module/Settings/Delegation.php:172 #: src/Module/BaseSettings.php:139 src/Module/Settings/Delegation.php:172
msgid "Manage Accounts" msgid "Manage Accounts"
msgstr "" msgstr ""
#: src/Module/BaseSettings.php:148 #: src/Module/BaseSettings.php:146
msgid "Connected apps" msgid "Connected apps"
msgstr "" msgstr ""
#: src/Module/BaseSettings.php:155 #: src/Module/BaseSettings.php:153
msgid "Remote servers" msgid "Remote servers"
msgstr "" msgstr ""
#: src/Module/BaseSettings.php:162 src/Module/Settings/UserExport.php:98 #: src/Module/BaseSettings.php:160 src/Module/Settings/UserExport.php:98
msgid "Export personal data" msgid "Export personal data"
msgstr "" msgstr ""
#: src/Module/BaseSettings.php:169 #: src/Module/BaseSettings.php:167
msgid "Remove account" msgid "Remove account"
msgstr "" msgstr ""
@ -5901,7 +5901,7 @@ msgstr ""
msgid "Create New Event" msgid "Create New Event"
msgstr "" msgstr ""
#: src/Module/Calendar/Show.php:132 src/Module/Settings/Display.php:240 #: src/Module/Calendar/Show.php:132 src/Module/Settings/Display.php:249
msgid "list" msgid "list"
msgstr "" msgstr ""
@ -5935,7 +5935,7 @@ msgid "Contact not found."
msgstr "" msgstr ""
#: src/Module/Circle.php:102 src/Module/Contact/Contacts.php:66 #: src/Module/Circle.php:102 src/Module/Contact/Contacts.php:66
#: src/Module/Conversation/Network.php:238 #: src/Module/Conversation/Network.php:235
msgid "Invalid contact." msgid "Invalid contact."
msgstr "" msgstr ""
@ -6246,7 +6246,7 @@ msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Module/Contact/Follow.php:70 src/Module/Contact/Redir.php:62 #: src/Module/Contact/Follow.php:70 src/Module/Contact/Redir.php:62
#: src/Module/Contact/Redir.php:222 src/Module/Conversation/Community.php:166 #: src/Module/Contact/Redir.php:222 src/Module/Conversation/Community.php:165
#: src/Module/Debug/ItemBody.php:38 src/Module/Diaspora/Receive.php:57 #: src/Module/Debug/ItemBody.php:38 src/Module/Diaspora/Receive.php:57
#: src/Module/Item/Display.php:96 src/Module/Item/Feed.php:59 #: src/Module/Item/Display.php:96 src/Module/Item/Feed.php:59
#: src/Module/Item/Follow.php:41 src/Module/Item/Ignore.php:41 #: src/Module/Item/Follow.php:41 src/Module/Item/Ignore.php:41
@ -6640,52 +6640,52 @@ msgstr ""
msgid "Unable to unfollow this contact, please contact your administrator" msgid "Unable to unfollow this contact, please contact your administrator"
msgstr "" msgstr ""
#: src/Module/Conversation/Channel.php:122 #: src/Module/Conversation/Channel.php:121
#: src/Module/Conversation/Community.php:126 src/Module/Search/Index.php:152 #: src/Module/Conversation/Community.php:125 src/Module/Search/Index.php:152
#: src/Module/Search/Index.php:194 #: src/Module/Search/Index.php:194
msgid "No results." msgid "No results."
msgstr "" msgstr ""
#: src/Module/Conversation/Channel.php:160 #: src/Module/Conversation/Channel.php:159
msgid "Channel not available." msgid "Channel not available."
msgstr "" msgstr ""
#: src/Module/Conversation/Community.php:92 #: src/Module/Conversation/Community.php:91
msgid "" msgid ""
"This community stream shows all public posts received by this node. They may " "This community stream shows all public posts received by this node. They may "
"not reflect the opinions of this node’s users." "not reflect the opinions of this node’s users."
msgstr "" msgstr ""
#: src/Module/Conversation/Community.php:180 #: src/Module/Conversation/Community.php:179
msgid "Community option not available." msgid "Community option not available."
msgstr "" msgstr ""
#: src/Module/Conversation/Community.php:196 #: src/Module/Conversation/Community.php:195
msgid "Not available." msgid "Not available."
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:224 #: src/Module/Conversation/Network.php:221
msgid "No such circle" msgid "No such circle"
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:228 #: src/Module/Conversation/Network.php:225
#, php-format #, php-format
msgid "Circle: %s" msgid "Circle: %s"
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:322 #: src/Module/Conversation/Network.php:320
msgid "Network feed not available." msgid "Network feed not available."
msgstr "" msgstr ""
#: src/Module/Conversation/Timeline.php:143 #: src/Module/Conversation/Timeline.php:152
msgid "Own Contacts" msgid "Own Contacts"
msgstr "" msgstr ""
#: src/Module/Conversation/Timeline.php:147 #: src/Module/Conversation/Timeline.php:156
msgid "Include" msgid "Include"
msgstr "" msgstr ""
#: src/Module/Conversation/Timeline.php:148 #: src/Module/Conversation/Timeline.php:157
msgid "Hide" msgid "Hide"
msgstr "" msgstr ""
@ -10087,153 +10087,171 @@ msgstr ""
msgid "No entries." msgid "No entries."
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:140 #: src/Module/Settings/Display.php:147
msgid "The theme you chose isn't available." msgid "The theme you chose isn't available."
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:180 #: src/Module/Settings/Display.php:187
#, php-format #, php-format
msgid "%s - (Unsupported)" msgid "%s - (Unsupported)"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:215 #: src/Module/Settings/Display.php:222
msgid "No preview" msgid "No preview"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:216 #: src/Module/Settings/Display.php:223
msgid "No image" msgid "No image"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:217 #: src/Module/Settings/Display.php:224
msgid "Small Image" msgid "Small Image"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:218 #: src/Module/Settings/Display.php:225
msgid "Large Image" msgid "Large Image"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:251 #: src/Module/Settings/Display.php:260
msgid "Display Settings" msgid "Display Settings"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:253 #: src/Module/Settings/Display.php:262
msgid "General Theme Settings" msgid "General Theme Settings"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:254 #: src/Module/Settings/Display.php:263
msgid "Custom Theme Settings" msgid "Custom Theme Settings"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:255 #: src/Module/Settings/Display.php:264
msgid "Content Settings" msgid "Content Settings"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:256 view/theme/duepuntozero/config.php:86 #: src/Module/Settings/Display.php:265 view/theme/duepuntozero/config.php:86
#: view/theme/frio/config.php:172 view/theme/quattro/config.php:88 #: view/theme/frio/config.php:172 view/theme/quattro/config.php:88
#: view/theme/vier/config.php:136 #: view/theme/vier/config.php:136
msgid "Theme settings" msgid "Theme settings"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:263 #: src/Module/Settings/Display.php:266
msgid "Timelines"
msgstr ""
#: src/Module/Settings/Display.php:273
msgid "Display Theme:" msgid "Display Theme:"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:264 #: src/Module/Settings/Display.php:274
msgid "Mobile Theme:" msgid "Mobile Theme:"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:267 #: src/Module/Settings/Display.php:277
msgid "Number of items to display per page:" msgid "Number of items to display per page:"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:267 src/Module/Settings/Display.php:268 #: src/Module/Settings/Display.php:277 src/Module/Settings/Display.php:278
msgid "Maximum of 100 items" msgid "Maximum of 100 items"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:268 #: src/Module/Settings/Display.php:278
msgid "Number of items to display per page when viewed from mobile device:" msgid "Number of items to display per page when viewed from mobile device:"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:269 #: src/Module/Settings/Display.php:279
msgid "Update browser every xx seconds" msgid "Update browser every xx seconds"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:269 #: src/Module/Settings/Display.php:279
msgid "Minimum of 10 seconds. Enter -1 to disable it." msgid "Minimum of 10 seconds. Enter -1 to disable it."
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:270 #: src/Module/Settings/Display.php:280
msgid "Display emoticons" msgid "Display emoticons"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:270 #: src/Module/Settings/Display.php:280
msgid "When enabled, emoticons are replaced with matching symbols." msgid "When enabled, emoticons are replaced with matching symbols."
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:271 #: src/Module/Settings/Display.php:281
msgid "Infinite scroll" msgid "Infinite scroll"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:271 #: src/Module/Settings/Display.php:281
msgid "Automatic fetch new items when reaching the page end." msgid "Automatic fetch new items when reaching the page end."
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:272 #: src/Module/Settings/Display.php:282
msgid "Enable Smart Threading" msgid "Enable Smart Threading"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:272 #: src/Module/Settings/Display.php:282
msgid "Enable the automatic suppression of extraneous thread indentation." msgid "Enable the automatic suppression of extraneous thread indentation."
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:273 #: src/Module/Settings/Display.php:283
msgid "Display the Dislike feature" msgid "Display the Dislike feature"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:273 #: src/Module/Settings/Display.php:283
msgid "Display the Dislike button and dislike reactions on posts and comments." msgid "Display the Dislike button and dislike reactions on posts and comments."
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:274 #: src/Module/Settings/Display.php:284
msgid "Display the resharer" msgid "Display the resharer"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:274 #: src/Module/Settings/Display.php:284
msgid "Display the first resharer as icon and text on a reshared item." msgid "Display the first resharer as icon and text on a reshared item."
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:275 #: src/Module/Settings/Display.php:285
msgid "Stay local" msgid "Stay local"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:275 #: src/Module/Settings/Display.php:285
msgid "Don't go to a remote system when following a contact link." msgid "Don't go to a remote system when following a contact link."
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:276 #: src/Module/Settings/Display.php:286
msgid "Link preview mode" msgid "Link preview mode"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:276 #: src/Module/Settings/Display.php:286
msgid "Appearance of the link preview that is added to each post with a link." msgid "Appearance of the link preview that is added to each post with a link."
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:278 #: src/Module/Settings/Display.php:288
msgid "Timelines for the network page:"
msgstr ""
#: src/Module/Settings/Display.php:288
msgid "Select all the timelines that you want to see on your network page."
msgstr ""
#: src/Module/Settings/Display.php:289
msgid "Channel languages:" msgid "Channel languages:"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:278 #: src/Module/Settings/Display.php:289
msgid "Select all languages that you want to see in your channels." msgid "Select all languages that you want to see in your channels."
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:280 #: src/Module/Settings/Display.php:291
msgid "Beginning of week:" msgid "Beginning of week:"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:281 #: src/Module/Settings/Display.php:292
msgid "Default calendar view:" msgid "Default calendar view:"
msgstr "" msgstr ""
#: src/Module/Settings/Display.php:301 src/Module/Settings/Display.php:305
#: src/Module/Settings/Display.php:309
#, php-format
msgid "%s: %s"
msgstr ""
#: src/Module/Settings/Features.php:74 #: src/Module/Settings/Features.php:74
msgid "Additional Features" msgid "Additional Features"
msgstr "" msgstr ""

3
view/templates/settings/display.tpl
View File

@ -21,6 +21,9 @@
{{include file="field_checkbox.tpl" field=$stay_local}} {{include file="field_checkbox.tpl" field=$stay_local}}
{{include file="field_select.tpl" field=$preview_mode}} {{include file="field_select.tpl" field=$preview_mode}}
<h2>{{$timeline_title}}</h2>
{{include file="field_select.tpl" field=$network_timelines}}
<h2>{{$channel_title}}</h2> <h2>{{$channel_title}}</h2>
{{include file="field_select.tpl" field=$channel_languages}} {{include file="field_select.tpl" field=$channel_languages}}

18
view/theme/frio/templates/settings/display.tpl
View File

@ -74,6 +74,24 @@
</div> </div>
</div> </div>
<div class="panel">
<div class="section-subtitle-wrapper panel-heading" role="tab" id="timeline-settings-title">
<h2>
<button class="btn-link accordion-toggle collapsed" data-toggle="collapse" data-parent="#settings" href="#timeline-settings-content" aria-expanded="false" aria-controls="timeline-settings-content">
{{$timeline_title}}
</button>
</h2>
</div>
<div id="timeline-settings-content" class="panel-collapse collapse{{if !$theme && !$mobile_theme && !$theme_config}} in{{/if}}" role="tabpanel" aria-labelledby="timeline-settings">
<div class="panel-body">
{{include file="field_select.tpl" field=$network_timelines}}
</div>
<div class="panel-footer">
<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
</div>
</div>
</div>
<div class="panel"> <div class="panel">
<div class="section-subtitle-wrapper panel-heading" role="tab" id="channel-settings-title"> <div class="section-subtitle-wrapper panel-heading" role="tab" id="channel-settings-title">
<h2> <h2>