bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #9285 from annando/hide-sharer

Browse source 
We now have a sidebar on the community page to hide own contacts
This commit is contained in:
Hypolite Petovan 2020-09-26 15:40:27 -04:00 committed by GitHub
parent 59d16e13cb 3efbf1beb7
commit 014f95538c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 189 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/conversation.php
View file

@ -443,7 +443,9 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
if (!$update) { if (!$update) {
$live_update_div = '<div id="live-community"></div>' . "\r\n" $live_update_div = '<div id="live-community"></div>' . "\r\n"
. "<script> var profile_uid = -1; var netargs = '" . substr(DI::args()->getCommand(), 10) . "<script> var profile_uid = -1; var netargs = '" . substr(DI::args()->getCommand(), 10)
."/?f='; </script>\r\n"; . '?f='
. (!empty($_GET['no_sharer']) ? '&no_sharer=' . rawurlencode($_GET['no_sharer']) : '')
. "'; </script>\r\n";
} }
} elseif ($mode === 'contacts') { } elseif ($mode === 'contacts') {
$items = conversation_add_children($items, false, $order, $uid); $items = conversation_add_children($items, false, $order, $uid);

29
src/Module/Conversation/Community.php
View file

@ -116,7 +116,7 @@ class Community extends BaseModule
DI::page()['aside'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/community_accounts.tpl'), [ DI::page()['aside'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/community_accounts.tpl'), [
'$title' => DI::l10n()->t('Accounts'), '$title' => DI::l10n()->t('Accounts'),
'$content' => self::$content, '$content' => self::$content,
'$accounttype' => $parameters['accounttype'], '$accounttype' => ($parameters['accounttype'] ?? ''),
'$all' => DI::l10n()->t('All'), '$all' => DI::l10n()->t('All'),
'$person' => DI::l10n()->t('Persons'), '$person' => DI::l10n()->t('Persons'),
'$organisation' => DI::l10n()->t('Organisations'), '$organisation' => DI::l10n()->t('Organisations'),
@ -124,6 +124,29 @@ class Community extends BaseModule
'$community' => DI::l10n()->t('Forums'), '$community' => DI::l10n()->t('Forums'),
]); ]);
if (local_user() && DI::config()->get('system', 'community_no_sharer')) {
$path = self::$content . ($parameters['accounttype'] ? '/' . $parameters['accounttype'] : '');
$query_parameters = [];
if (!empty($_GET['since_id'])) {
$query_parameters['since_id'] = $_GET['since_id'];
}
if (!empty($_GET['max_id'])) {
$query_parameters['max_id'] = $_GET['max_id'];
}
$path_all = $path . (!empty($query_parameters) ? '?' . http_build_query($query_parameters) : '');
$path_no_sharer = $path . '?' . http_build_query(array_merge($query_parameters, ['no_sharer' => true]));
DI::page()['aside'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/community_sharer.tpl'), [
'$title' => DI::l10n()->t('Own Contacts'),
'$path_all' => $path_all,
'$path_no_sharer' => $path_no_sharer,
'$no_sharer' => !empty($_REQUEST['no_sharer']),
'$all' => DI::l10n()->t('Include'),
'$no_sharer_label' => DI::l10n()->t('Hide'),
]);
}
if (Feature::isEnabled(local_user(), 'trending_tags')) { if (Feature::isEnabled(local_user(), 'trending_tags')) {
DI::page()['aside'] .= TrendingTags::getHTML(self::$content); DI::page()['aside'] .= TrendingTags::getHTML(self::$content);
} }
@ -294,7 +317,7 @@ class Community extends BaseModule
if (!is_null(self::$accounttype)) { if (!is_null(self::$accounttype)) {
$condition = ["`wall` AND `origin` AND `private` = ? AND `owner`.`contact-type` = ?", Item::PUBLIC, self::$accounttype]; $condition = ["`wall` AND `origin` AND `private` = ? AND `owner`.`contact-type` = ?", Item::PUBLIC, self::$accounttype];
} else { } else {
$condition = ["`wall` AND `origin` AND `private` = ?", Item::PUBLIC]; $condition = ["`wall` AND `origin` AND `private` = ?", Item::PUBLIC];
} }
} elseif (self::$content == 'global') { } elseif (self::$content == 'global') {
if (!is_null(self::$accounttype)) { if (!is_null(self::$accounttype)) {
@ -306,7 +329,7 @@ class Community extends BaseModule
return []; return [];
} }
if (local_user() && DI::config()->get('system', 'community_no_followers')) { if (local_user() && !empty($_REQUEST['no_sharer'])) {
$condition[0] .= " AND NOT EXISTS (SELECT `uri-id` FROM `thread` AS t1 WHERE `t1`.`uri-id` = `thread`.`uri-id` AND `t1`.`uid` = ?)"; $condition[0] .= " AND NOT EXISTS (SELECT `uri-id` FROM `thread` AS t1 WHERE `t1`.`uri-id` = `thread`.`uri-id` AND `t1`.`uid` = ?)";
$condition[] = local_user(); $condition[] = local_user();
} }

6
static/defaults.config.php
View file

@ -122,9 +122,9 @@ return [
// Deny public access to the local user directory. // Deny public access to the local user directory.
'block_local_dir' => false, 'block_local_dir' => false,
// community_no_followers (Boolean) // community_no_sharer (Boolean)
// Don't display followers on the global community // Don't display sharing accounts on the global community
'community_no_followers' => false, 'community_no_sharer' => false,
// cron_interval (Integer) // cron_interval (Integer)
// Minimal period in minutes between two calls of the "Cron" worker job. // Minimal period in minutes between two calls of the "Cron" worker job.

259
view/lang/C/messages.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2020.12-dev\n" "Project-Id-Version: 2020.12-dev\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-09-22 15:48+0000\n" "POT-Creation-Date: 2020-09-26 18:36+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"
@ -144,7 +144,7 @@ msgstr ""
msgid "Enter name or interest" msgid "Enter name or interest"
msgstr "" msgstr ""
#: view/theme/vier/theme.php:171 include/conversation.php:920 #: view/theme/vier/theme.php:171 include/conversation.php:922
#: mod/follow.php:163 src/Model/Contact.php:960 src/Model/Contact.php:973 #: mod/follow.php:163 src/Model/Contact.php:960 src/Model/Contact.php:973
#: src/Content/Widget.php:79 #: src/Content/Widget.php:79
msgid "Connect/Follow" msgid "Connect/Follow"
@ -184,8 +184,9 @@ msgstr ""
msgid "Local Directory" msgid "Local Directory"
msgstr "" msgstr ""
#: view/theme/vier/theme.php:220 src/Content/Nav.php:229 #: view/theme/vier/theme.php:220 src/Module/Conversation/Community.php:124
#: src/Content/ForumManager.php:144 src/Content/Text/HTML.php:917 #: src/Content/Nav.php:229 src/Content/ForumManager.php:144
#: src/Content/Text/HTML.php:917
msgid "Forums" msgid "Forums"
msgstr "" msgstr ""
@ -422,7 +423,7 @@ msgstr ""
msgid "Manage/edit friends and contacts" msgid "Manage/edit friends and contacts"
msgstr "" msgstr ""
#: view/theme/frio/theme.php:321 include/conversation.php:903 #: view/theme/frio/theme.php:321 include/conversation.php:905
msgid "Follow Thread" msgid "Follow Thread"
msgstr "" msgstr ""
@ -481,7 +482,7 @@ msgstr ""
msgid "%1$s poked %2$s" msgid "%1$s poked %2$s"
msgstr "" msgstr ""
#: include/conversation.php:221 src/Model/Item.php:3405 #: include/conversation.php:221 src/Model/Item.php:3406
msgid "event" msgid "event"
msgstr "" msgstr ""
@ -489,7 +490,7 @@ msgstr ""
msgid "status" msgid "status"
msgstr "" msgstr ""
#: include/conversation.php:229 mod/tagger.php:89 src/Model/Item.php:3407 #: include/conversation.php:229 mod/tagger.php:89 src/Model/Item.php:3408
msgid "photo" msgid "photo"
msgstr "" msgstr ""
@ -498,391 +499,391 @@ msgstr ""
msgid "%1$s tagged %2$s's %3$s with %4$s" msgid "%1$s tagged %2$s's %3$s with %4$s"
msgstr "" msgstr ""
#: include/conversation.php:558 mod/photos.php:1488 src/Object/Post.php:229 #: include/conversation.php:560 mod/photos.php:1488 src/Object/Post.php:229
msgid "Select" msgid "Select"
msgstr "" msgstr ""
#: include/conversation.php:559 mod/settings.php:560 mod/settings.php:702 #: include/conversation.php:561 mod/settings.php:560 mod/settings.php:702
#: mod/photos.php:1489 src/Module/Contact.php:842 src/Module/Contact.php:1145 #: mod/photos.php:1489 src/Module/Contact.php:842 src/Module/Contact.php:1145
#: src/Module/Admin/Users.php:248 #: src/Module/Admin/Users.php:248
msgid "Delete" msgid "Delete"
msgstr "" msgstr ""
#: include/conversation.php:589 src/Object/Post.php:434 src/Object/Post.php:435 #: include/conversation.php:591 src/Object/Post.php:434 src/Object/Post.php:435
#, php-format #, php-format
msgid "View %s's profile @ %s" msgid "View %s's profile @ %s"
msgstr "" msgstr ""
#: include/conversation.php:602 src/Object/Post.php:422 #: include/conversation.php:604 src/Object/Post.php:422
msgid "Categories:" msgid "Categories:"
msgstr "" msgstr ""
#: include/conversation.php:603 src/Object/Post.php:423 #: include/conversation.php:605 src/Object/Post.php:423
msgid "Filed under:" msgid "Filed under:"
msgstr "" msgstr ""
#: include/conversation.php:610 src/Object/Post.php:448 #: include/conversation.php:612 src/Object/Post.php:448
#, php-format #, php-format
msgid "%s from %s" msgid "%s from %s"
msgstr "" msgstr ""
#: include/conversation.php:625 #: include/conversation.php:627
msgid "View in context" msgid "View in context"
msgstr "" msgstr ""
#: include/conversation.php:627 include/conversation.php:1173 #: include/conversation.php:629 include/conversation.php:1175
#: mod/wallmessage.php:155 mod/message.php:205 mod/message.php:376 #: mod/wallmessage.php:155 mod/message.php:205 mod/message.php:376
#: mod/editpost.php:104 mod/photos.php:1373 src/Object/Post.php:480 #: mod/editpost.php:104 mod/photos.php:1373 src/Object/Post.php:480
#: src/Module/Item/Compose.php:159 #: src/Module/Item/Compose.php:159
msgid "Please wait" msgid "Please wait"
msgstr "" msgstr ""
#: include/conversation.php:691 #: include/conversation.php:693
msgid "remove" msgid "remove"
msgstr "" msgstr ""
#: include/conversation.php:695 #: include/conversation.php:697
msgid "Delete Selected Items" msgid "Delete Selected Items"
msgstr "" msgstr ""
#: include/conversation.php:717 include/conversation.php:720 #: include/conversation.php:719 include/conversation.php:722
#: include/conversation.php:723 include/conversation.php:726 #: include/conversation.php:725 include/conversation.php:728
#, php-format #, php-format
msgid "You had been addressed (%s)." msgid "You had been addressed (%s)."
msgstr "" msgstr ""
#: include/conversation.php:729 #: include/conversation.php:731
#, php-format #, php-format
msgid "You are following %s." msgid "You are following %s."
msgstr "" msgstr ""
#: include/conversation.php:732 #: include/conversation.php:734
msgid "Tagged" msgid "Tagged"
msgstr "" msgstr ""
#: include/conversation.php:742 include/conversation.php:1061 #: include/conversation.php:744 include/conversation.php:1063
#: include/conversation.php:1104 #: include/conversation.php:1106
#, php-format #, php-format
msgid "%s reshared this." msgid "%s reshared this."
msgstr "" msgstr ""
#: include/conversation.php:744 #: include/conversation.php:746
msgid "Reshared" msgid "Reshared"
msgstr "" msgstr ""
#: include/conversation.php:744 #: include/conversation.php:746
#, php-format #, php-format
msgid "Reshared by %s" msgid "Reshared by %s"
msgstr "" msgstr ""
#: include/conversation.php:747 #: include/conversation.php:749
#, php-format #, php-format
msgid "%s is participating in this thread." msgid "%s is participating in this thread."
msgstr "" msgstr ""
#: include/conversation.php:750 #: include/conversation.php:752
msgid "Stored" msgid "Stored"
msgstr "" msgstr ""
#: include/conversation.php:753 #: include/conversation.php:755
msgid "Global" msgid "Global"
msgstr "" msgstr ""
#: include/conversation.php:756 #: include/conversation.php:758
msgid "Relayed" msgid "Relayed"
msgstr "" msgstr ""
#: include/conversation.php:756 #: include/conversation.php:758
#, php-format #, php-format
msgid "Relayed by %s." msgid "Relayed by %s."
msgstr "" msgstr ""
#: include/conversation.php:759 #: include/conversation.php:761
msgid "Fetched" msgid "Fetched"
msgstr "" msgstr ""
#: include/conversation.php:759 #: include/conversation.php:761
#, php-format #, php-format
msgid "Fetched because of %s" msgid "Fetched because of %s"
msgstr "" msgstr ""
#: include/conversation.php:904 src/Model/Contact.php:965 #: include/conversation.php:906 src/Model/Contact.php:965
msgid "View Status" msgid "View Status"
msgstr "" msgstr ""
#: include/conversation.php:905 include/conversation.php:923 #: include/conversation.php:907 include/conversation.php:925
#: src/Module/Directory.php:166 src/Module/Settings/Profile/Index.php:240 #: src/Module/Directory.php:166 src/Module/Settings/Profile/Index.php:240
#: src/Model/Contact.php:891 src/Model/Contact.php:957 #: src/Model/Contact.php:891 src/Model/Contact.php:957
#: src/Model/Contact.php:966 #: src/Model/Contact.php:966
msgid "View Profile" msgid "View Profile"
msgstr "" msgstr ""
#: include/conversation.php:906 src/Model/Contact.php:967 #: include/conversation.php:908 src/Model/Contact.php:967
msgid "View Photos" msgid "View Photos"
msgstr "" msgstr ""
#: include/conversation.php:907 src/Model/Contact.php:958 #: include/conversation.php:909 src/Model/Contact.php:958
#: src/Model/Contact.php:968 #: src/Model/Contact.php:968
msgid "Network Posts" msgid "Network Posts"
msgstr "" msgstr ""
#: include/conversation.php:908 src/Model/Contact.php:959 #: include/conversation.php:910 src/Model/Contact.php:959
#: src/Model/Contact.php:969 #: src/Model/Contact.php:969
msgid "View Contact" msgid "View Contact"
msgstr "" msgstr ""
#: include/conversation.php:909 src/Model/Contact.php:971 #: include/conversation.php:911 src/Model/Contact.php:971
msgid "Send PM" msgid "Send PM"
msgstr "" msgstr ""
#: include/conversation.php:910 src/Module/Contact.php:593 #: include/conversation.php:912 src/Module/Contact.php:593
#: src/Module/Contact.php:839 src/Module/Contact.php:1120 #: src/Module/Contact.php:839 src/Module/Contact.php:1120
#: src/Module/Admin/Users.php:249 src/Module/Admin/Blocklist/Contact.php:84 #: src/Module/Admin/Users.php:249 src/Module/Admin/Blocklist/Contact.php:84
msgid "Block" msgid "Block"
msgstr "" msgstr ""
#: include/conversation.php:911 src/Module/Notifications/Notification.php:59 #: include/conversation.php:913 src/Module/Notifications/Notification.php:59
#: src/Module/Notifications/Introductions.php:110 #: src/Module/Notifications/Introductions.php:110
#: src/Module/Notifications/Introductions.php:185 src/Module/Contact.php:594 #: src/Module/Notifications/Introductions.php:185 src/Module/Contact.php:594
#: src/Module/Contact.php:840 src/Module/Contact.php:1128 #: src/Module/Contact.php:840 src/Module/Contact.php:1128
msgid "Ignore" msgid "Ignore"
msgstr "" msgstr ""
#: include/conversation.php:915 src/Model/Contact.php:972 #: include/conversation.php:917 src/Model/Contact.php:972
msgid "Poke" msgid "Poke"
msgstr "" msgstr ""
#: include/conversation.php:1046 #: include/conversation.php:1048
#, php-format #, php-format
msgid "%s likes this." msgid "%s likes this."
msgstr "" msgstr ""
#: include/conversation.php:1049 #: include/conversation.php:1051
#, php-format #, php-format
msgid "%s doesn't like this." msgid "%s doesn't like this."
msgstr "" msgstr ""
#: include/conversation.php:1052 #: include/conversation.php:1054
#, php-format #, php-format
msgid "%s attends." msgid "%s attends."
msgstr "" msgstr ""
#: include/conversation.php:1055 #: include/conversation.php:1057
#, php-format #, php-format
msgid "%s doesn't attend." msgid "%s doesn't attend."
msgstr "" msgstr ""
#: include/conversation.php:1058 #: include/conversation.php:1060
#, php-format #, php-format
msgid "%s attends maybe." msgid "%s attends maybe."
msgstr "" msgstr ""
#: include/conversation.php:1069 #: include/conversation.php:1071
msgid "and" msgid "and"
msgstr "" msgstr ""
#: include/conversation.php:1075 #: include/conversation.php:1077
#, php-format #, php-format
msgid "and %d other people" msgid "and %d other people"
msgstr "" msgstr ""
#: include/conversation.php:1083 #: include/conversation.php:1085
#, php-format #, php-format
msgid "<span %1$s>%2$d people</span> like this" msgid "<span %1$s>%2$d people</span> like this"
msgstr "" msgstr ""
#: include/conversation.php:1084 #: include/conversation.php:1086
#, php-format #, php-format
msgid "%s like this." msgid "%s like this."
msgstr "" msgstr ""
#: include/conversation.php:1087 #: include/conversation.php:1089
#, php-format #, php-format
msgid "<span %1$s>%2$d people</span> don't like this" msgid "<span %1$s>%2$d people</span> don't like this"
msgstr "" msgstr ""
#: include/conversation.php:1088 #: include/conversation.php:1090
#, php-format #, php-format
msgid "%s don't like this." msgid "%s don't like this."
msgstr "" msgstr ""
#: include/conversation.php:1091 #: include/conversation.php:1093
#, php-format #, php-format
msgid "<span %1$s>%2$d people</span> attend" msgid "<span %1$s>%2$d people</span> attend"
msgstr "" msgstr ""
#: include/conversation.php:1092 #: include/conversation.php:1094
#, php-format #, php-format
msgid "%s attend." msgid "%s attend."
msgstr "" msgstr ""
#: include/conversation.php:1095 #: include/conversation.php:1097
#, php-format #, php-format
msgid "<span %1$s>%2$d people</span> don't attend" msgid "<span %1$s>%2$d people</span> don't attend"
msgstr "" msgstr ""
#: include/conversation.php:1096 #: include/conversation.php:1098
#, php-format #, php-format
msgid "%s don't attend." msgid "%s don't attend."
msgstr "" msgstr ""
#: include/conversation.php:1099 #: include/conversation.php:1101
#, php-format #, php-format
msgid "<span %1$s>%2$d people</span> attend maybe" msgid "<span %1$s>%2$d people</span> attend maybe"
msgstr "" msgstr ""
#: include/conversation.php:1100 #: include/conversation.php:1102
#, php-format #, php-format
msgid "%s attend maybe." msgid "%s attend maybe."
msgstr "" msgstr ""
#: include/conversation.php:1103 #: include/conversation.php:1105
#, php-format #, php-format
msgid "<span %1$s>%2$d people</span> reshared this" msgid "<span %1$s>%2$d people</span> reshared this"
msgstr "" msgstr ""
#: include/conversation.php:1133 #: include/conversation.php:1135
msgid "Visible to <strong>everybody</strong>" msgid "Visible to <strong>everybody</strong>"
msgstr "" msgstr ""
#: include/conversation.php:1134 src/Object/Post.php:947 #: include/conversation.php:1136 src/Object/Post.php:947
#: src/Module/Item/Compose.php:153 #: src/Module/Item/Compose.php:153
msgid "Please enter a image/video/audio/webpage URL:" msgid "Please enter a image/video/audio/webpage URL:"
msgstr "" msgstr ""
#: include/conversation.php:1135 #: include/conversation.php:1137
msgid "Tag term:" msgid "Tag term:"
msgstr "" msgstr ""
#: include/conversation.php:1136 src/Module/Filer/SaveTag.php:65 #: include/conversation.php:1138 src/Module/Filer/SaveTag.php:65
msgid "Save to Folder:" msgid "Save to Folder:"
msgstr "" msgstr ""
#: include/conversation.php:1137 #: include/conversation.php:1139
msgid "Where are you right now?" msgid "Where are you right now?"
msgstr "" msgstr ""
#: include/conversation.php:1138 #: include/conversation.php:1140
msgid "Delete item(s)?" msgid "Delete item(s)?"
msgstr "" msgstr ""
#: include/conversation.php:1148 #: include/conversation.php:1150
msgid "New Post" msgid "New Post"
msgstr "" msgstr ""
#: include/conversation.php:1151 #: include/conversation.php:1153
msgid "Share" msgid "Share"
msgstr "" msgstr ""
#: include/conversation.php:1152 mod/editpost.php:89 mod/photos.php:1402 #: include/conversation.php:1154 mod/editpost.php:89 mod/photos.php:1402
#: src/Object/Post.php:938 src/Module/Contact/Poke.php:155 #: src/Object/Post.php:938 src/Module/Contact/Poke.php:155
msgid "Loading..." msgid "Loading..."
msgstr "" msgstr ""
#: include/conversation.php:1153 mod/wallmessage.php:153 mod/message.php:203 #: include/conversation.php:1155 mod/wallmessage.php:153 mod/message.php:203
#: mod/message.php:373 mod/editpost.php:90 #: mod/message.php:373 mod/editpost.php:90
msgid "Upload photo" msgid "Upload photo"
msgstr "" msgstr ""
#: include/conversation.php:1154 mod/editpost.php:91 #: include/conversation.php:1156 mod/editpost.php:91
msgid "upload photo" msgid "upload photo"
msgstr "" msgstr ""
#: include/conversation.php:1155 mod/editpost.php:92 #: include/conversation.php:1157 mod/editpost.php:92
msgid "Attach file" msgid "Attach file"
msgstr "" msgstr ""
#: include/conversation.php:1156 mod/editpost.php:93 #: include/conversation.php:1158 mod/editpost.php:93
msgid "attach file" msgid "attach file"
msgstr "" msgstr ""
#: include/conversation.php:1157 src/Object/Post.php:939 #: include/conversation.php:1159 src/Object/Post.php:939
#: src/Module/Item/Compose.php:145 #: src/Module/Item/Compose.php:145
msgid "Bold" msgid "Bold"
msgstr "" msgstr ""
#: include/conversation.php:1158 src/Object/Post.php:940 #: include/conversation.php:1160 src/Object/Post.php:940
#: src/Module/Item/Compose.php:146 #: src/Module/Item/Compose.php:146
msgid "Italic" msgid "Italic"
msgstr "" msgstr ""
#: include/conversation.php:1159 src/Object/Post.php:941 #: include/conversation.php:1161 src/Object/Post.php:941
#: src/Module/Item/Compose.php:147 #: src/Module/Item/Compose.php:147
msgid "Underline" msgid "Underline"
msgstr "" msgstr ""
#: include/conversation.php:1160 src/Object/Post.php:942 #: include/conversation.php:1162 src/Object/Post.php:942
#: src/Module/Item/Compose.php:148 #: src/Module/Item/Compose.php:148
msgid "Quote" msgid "Quote"
msgstr "" msgstr ""
#: include/conversation.php:1161 src/Object/Post.php:943 #: include/conversation.php:1163 src/Object/Post.php:943
#: src/Module/Item/Compose.php:149 #: src/Module/Item/Compose.php:149
msgid "Code" msgid "Code"
msgstr "" msgstr ""
#: include/conversation.php:1162 src/Object/Post.php:944 #: include/conversation.php:1164 src/Object/Post.php:944
#: src/Module/Item/Compose.php:150 #: src/Module/Item/Compose.php:150
msgid "Image" msgid "Image"
msgstr "" msgstr ""
#: include/conversation.php:1163 src/Object/Post.php:945 #: include/conversation.php:1165 src/Object/Post.php:945
#: src/Module/Item/Compose.php:151 #: src/Module/Item/Compose.php:151
msgid "Link" msgid "Link"
msgstr "" msgstr ""
#: include/conversation.php:1164 src/Object/Post.php:946 #: include/conversation.php:1166 src/Object/Post.php:946
#: src/Module/Item/Compose.php:152 #: src/Module/Item/Compose.php:152
msgid "Link or Media" msgid "Link or Media"
msgstr "" msgstr ""
#: include/conversation.php:1165 mod/editpost.php:100 #: include/conversation.php:1167 mod/editpost.php:100
#: src/Module/Item/Compose.php:155 #: src/Module/Item/Compose.php:155
msgid "Set your location" msgid "Set your location"
msgstr "" msgstr ""
#: include/conversation.php:1166 mod/editpost.php:101 #: include/conversation.php:1168 mod/editpost.php:101
msgid "set location" msgid "set location"
msgstr "" msgstr ""
#: include/conversation.php:1167 mod/editpost.php:102 #: include/conversation.php:1169 mod/editpost.php:102
msgid "Clear browser location" msgid "Clear browser location"
msgstr "" msgstr ""
#: include/conversation.php:1168 mod/editpost.php:103 #: include/conversation.php:1170 mod/editpost.php:103
msgid "clear location" msgid "clear location"
msgstr "" msgstr ""
#: include/conversation.php:1170 mod/editpost.php:117 #: include/conversation.php:1172 mod/editpost.php:117
#: src/Module/Item/Compose.php:160 #: src/Module/Item/Compose.php:160
msgid "Set title" msgid "Set title"
msgstr "" msgstr ""
#: include/conversation.php:1172 mod/editpost.php:119 #: include/conversation.php:1174 mod/editpost.php:119
#: src/Module/Item/Compose.php:161 #: src/Module/Item/Compose.php:161
msgid "Categories (comma-separated list)" msgid "Categories (comma-separated list)"
msgstr "" msgstr ""
#: include/conversation.php:1174 mod/editpost.php:105 #: include/conversation.php:1176 mod/editpost.php:105
msgid "Permission settings" msgid "Permission settings"
msgstr "" msgstr ""
#: include/conversation.php:1175 mod/editpost.php:134 mod/events.php:575 #: include/conversation.php:1177 mod/editpost.php:134 mod/events.php:575
#: mod/photos.php:977 mod/photos.php:1344 #: mod/photos.php:977 mod/photos.php:1344
msgid "Permissions" msgid "Permissions"
msgstr "" msgstr ""
#: include/conversation.php:1184 mod/editpost.php:114 #: include/conversation.php:1186 mod/editpost.php:114
msgid "Public post" msgid "Public post"
msgstr "" msgstr ""
#: include/conversation.php:1188 mod/editpost.php:125 mod/events.php:570 #: include/conversation.php:1190 mod/editpost.php:125 mod/events.php:570
#: mod/photos.php:1401 mod/photos.php:1458 mod/photos.php:1531 #: mod/photos.php:1401 mod/photos.php:1458 mod/photos.php:1531
#: src/Object/Post.php:948 src/Module/Item/Compose.php:154 #: src/Object/Post.php:948 src/Module/Item/Compose.php:154
msgid "Preview" msgid "Preview"
msgstr "" msgstr ""
#: include/conversation.php:1192 mod/settings.php:500 mod/settings.php:526 #: include/conversation.php:1194 mod/settings.php:500 mod/settings.php:526
#: mod/unfollow.php:137 mod/tagrm.php:36 mod/tagrm.php:126 #: mod/unfollow.php:137 mod/tagrm.php:36 mod/tagrm.php:126
#: mod/dfrn_request.php:648 mod/editpost.php:128 mod/follow.php:169 #: mod/dfrn_request.php:648 mod/editpost.php:128 mod/follow.php:169
#: mod/fbrowser.php:105 mod/fbrowser.php:134 mod/photos.php:1045 #: mod/fbrowser.php:105 mod/fbrowser.php:134 mod/photos.php:1045
@ -891,16 +892,16 @@ msgstr ""
msgid "Cancel" msgid "Cancel"
msgstr "" msgstr ""
#: include/conversation.php:1199 mod/editpost.php:132 #: include/conversation.php:1201 mod/editpost.php:132
#: src/Module/Contact.php:336 src/Model/Profile.php:444 #: src/Module/Contact.php:336 src/Model/Profile.php:444
msgid "Message" msgid "Message"
msgstr "" msgstr ""
#: include/conversation.php:1200 mod/editpost.php:133 #: include/conversation.php:1202 mod/editpost.php:133
msgid "Browser" msgid "Browser"
msgstr "" msgstr ""
#: include/conversation.php:1202 mod/editpost.php:136 #: include/conversation.php:1204 mod/editpost.php:136
msgid "Open Compose page" msgid "Open Compose page"
msgstr "" msgstr ""
@ -1262,7 +1263,7 @@ msgstr ""
#: mod/redir.php:34 mod/redir.php:203 mod/cal.php:47 mod/cal.php:51 #: mod/redir.php:34 mod/redir.php:203 mod/cal.php:47 mod/cal.php:51
#: mod/follow.php:37 src/Module/Debug/ItemBody.php:37 #: mod/follow.php:37 src/Module/Debug/ItemBody.php:37
#: src/Module/Conversation/Community.php:145 src/Module/Item/Ignore.php:41 #: src/Module/Conversation/Community.php:179 src/Module/Item/Ignore.php:41
#: src/Module/Diaspora/Receive.php:51 #: src/Module/Diaspora/Receive.php:51
msgid "Access denied." msgid "Access denied."
msgstr "" msgstr ""
@ -1441,7 +1442,7 @@ msgstr ""
#: mod/videos.php:129 mod/display.php:179 mod/dfrn_request.php:606 #: mod/videos.php:129 mod/display.php:179 mod/dfrn_request.php:606
#: mod/photos.php:844 src/Module/Debug/WebFinger.php:38 #: mod/photos.php:844 src/Module/Debug/WebFinger.php:38
#: src/Module/Debug/Probe.php:39 src/Module/Conversation/Community.php:139 #: src/Module/Debug/Probe.php:39 src/Module/Conversation/Community.php:173
#: src/Module/Directory.php:49 src/Module/Search/Index.php:50 #: src/Module/Directory.php:49 src/Module/Search/Index.php:50
#: src/Module/Search/Index.php:55 #: src/Module/Search/Index.php:55
msgid "Public access denied." msgid "Public access denied."
@ -1455,7 +1456,7 @@ msgstr ""
msgid "Access to this item is restricted." msgid "Access to this item is restricted."
msgstr "" msgstr ""
#: mod/videos.php:252 src/Model/Item.php:3597 #: mod/videos.php:252 src/Model/Item.php:3598
msgid "View Video" msgid "View Video"
msgstr "" msgstr ""
@ -4327,7 +4328,7 @@ msgstr ""
msgid "Show fewer" msgid "Show fewer"
msgstr "" msgstr ""
#: src/Object/Post.php:533 src/Model/Item.php:3411 #: src/Object/Post.php:533 src/Model/Item.php:3412
msgid "comment" msgid "comment"
msgid_plural "comments" msgid_plural "comments"
msgstr[0] "" msgstr[0] ""
@ -5644,17 +5645,49 @@ msgstr ""
msgid "No results." msgid "No results."
msgstr "" msgstr ""
#: src/Module/Conversation/Community.php:125 #: src/Module/Conversation/Community.php:117 src/Content/Nav.php:279
msgid "Accounts"
msgstr ""
#: src/Module/Conversation/Community.php:120
msgid "All"
msgstr ""
#: src/Module/Conversation/Community.php:121
msgid "Persons"
msgstr ""
#: src/Module/Conversation/Community.php:122
msgid "Organisations"
msgstr ""
#: src/Module/Conversation/Community.php:123 src/Model/Contact.php:1371
msgid "News"
msgstr ""
#: src/Module/Conversation/Community.php:141
msgid "Own Contacts"
msgstr ""
#: src/Module/Conversation/Community.php:145
msgid "Include"
msgstr ""
#: src/Module/Conversation/Community.php:146
msgid "Hide"
msgstr ""
#: src/Module/Conversation/Community.php:159
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:178 #: src/Module/Conversation/Community.php:212
msgid "Community option not available." msgid "Community option not available."
msgstr "" msgstr ""
#: src/Module/Conversation/Community.php:194 #: src/Module/Conversation/Community.php:228
msgid "Not available." msgid "Not available."
msgstr "" msgstr ""
@ -9436,7 +9469,7 @@ msgstr ""
msgid "thanks" msgid "thanks"
msgstr "" msgstr ""
#: src/Util/EMailer/MailBuilder.php:229 #: src/Util/EMailer/MailBuilder.php:259
msgid "Friendica Notification" msgid "Friendica Notification"
msgstr "" msgstr ""
@ -9542,32 +9575,32 @@ msgstr ""
msgid "Enter a valid existing folder" msgid "Enter a valid existing folder"
msgstr "" msgstr ""
#: src/Model/Item.php:3409 #: src/Model/Item.php:3410
msgid "activity" msgid "activity"
msgstr "" msgstr ""
#: src/Model/Item.php:3414 #: src/Model/Item.php:3415
msgid "post" msgid "post"
msgstr "" msgstr ""
#: src/Model/Item.php:3537 #: src/Model/Item.php:3538
#, php-format #, php-format
msgid "Content warning: %s" msgid "Content warning: %s"
msgstr "" msgstr ""
#: src/Model/Item.php:3614 #: src/Model/Item.php:3615
msgid "bytes" msgid "bytes"
msgstr "" msgstr ""
#: src/Model/Item.php:3659 #: src/Model/Item.php:3660
msgid "View on separate page" msgid "View on separate page"
msgstr "" msgstr ""
#: src/Model/Item.php:3660 #: src/Model/Item.php:3661
msgid "view on separate page" msgid "view on separate page"
msgstr "" msgstr ""
#: src/Model/Item.php:3665 src/Model/Item.php:3671 #: src/Model/Item.php:3666 src/Model/Item.php:3672
#: src/Content/Text/BBCode.php:1071 #: src/Content/Text/BBCode.php:1071
msgid "link to source" msgid "link to source"
msgstr "" msgstr ""
@ -9588,10 +9621,6 @@ msgstr ""
msgid "Organisation" msgid "Organisation"
msgstr "" msgstr ""
#: src/Model/Contact.php:1371
msgid "News"
msgstr ""
#: src/Model/Contact.php:1375 #: src/Model/Contact.php:1375
msgid "Forum" msgid "Forum"
msgstr "" msgstr ""
@ -10388,10 +10417,6 @@ msgstr ""
msgid "Outbox" msgid "Outbox"
msgstr "" msgstr ""
#: src/Content/Nav.php:279
msgid "Accounts"
msgstr ""
#: src/Content/Nav.php:279 #: src/Content/Nav.php:279
msgid "Manage other pages" msgid "Manage other pages"
msgstr "" msgstr ""

15
view/templates/widget/community_sharer.tpl Normal file
View file

@ -0,0 +1,15 @@
<span id="sidebar-community-no-sharer-inflated" class="widget fakelink" onclick="openCloseWidget('sidebar-community-no-sharer', 'sidebar-community-no-sharer-inflated');">
<h3>{{$title}}</h3>
</span>
<div id="sidebar-community-no-sharer" class="widget">
<span class="fakelink" onclick="openCloseWidget('sidebar-community-no-sharer', 'sidebar-community-no-sharer-inflated');">
<h3>{{$title}}</h3>
</span>
<ul class="sidebar-community-no-sharer-ul">
<li role="menuitem" class="sidebar-community-no-sharer-li{{if !$no_sharer}} selected{{/if}}"><a href="community/{{$path_all}}">{{$all}}</a></li>
<li role="menuitem" class="sidebar-community-no-sharer-li{{if $no_sharer}} selected{{/if}}"><a href="community/{{$path_no_sharer}}">{{$no_sharer_label}}</a></li>
</ul>
</div>
<script>
initWidget('sidebar-community-no-sharer', 'sidebar-community-no-sharer-inflated');
</script>