Improved code / updated messages.po

This commit is contained in:
Michael 2024-01-06 22:04:30 +00:00
parent aba4a482f0
commit 4aedf7f650
2 changed files with 55 additions and 51 deletions

View File

@ -129,8 +129,12 @@ class Channels extends BaseSettings
$account_type = $user['account-type']; $account_type = $user['account-type'];
if ($account_type == User::ACCOUNT_TYPE_RELAY) { if ($account_type == User::ACCOUNT_TYPE_RELAY) {
$circles = [0 => $this->l10n->t('Global Community')]; $intro = $this->t('This page can be used to define the channels that will automatically be reshared by your account.');
$circles = [
0 => $this->l10n->t('Global Community')
];
} else { } else {
$intro = $this->t('This page can be used to define your own channels.');
$circles = [ $circles = [
0 => $this->l10n->t('Global Community'), 0 => $this->l10n->t('Global Community'),
-3 => $this->l10n->t('Network'), -3 => $this->l10n->t('Network'),
@ -174,12 +178,6 @@ class Channels extends BaseSettings
]; ];
} }
if ($account_type == User::ACCOUNT_TYPE_RELAY) {
$intro = $this->t('This page can be used to define the channels that will automatically be reshared by your account.');
} else {
$intro = $this->t('This page can be used to define your own channels.');
}
$t = Renderer::getMarkupTemplate('settings/channels.tpl'); $t = Renderer::getMarkupTemplate('settings/channels.tpl');
return Renderer::replaceMacros($t, [ return Renderer::replaceMacros($t, [
'open' => count($channels) == 0, 'open' => count($channels) == 0,

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2024.03-dev\n" "Project-Id-Version: 2024.03-dev\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-01-06 17:08+0000\n" "POT-Creation-Date: 2024-01-06 21:56+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"
@ -382,7 +382,7 @@ msgstr ""
#: mod/notes.php:57 src/Content/Text/HTML.php:859 #: mod/notes.php:57 src/Content/Text/HTML.php:859
#: src/Module/Admin/Storage.php:142 src/Module/Filer/SaveTag.php:74 #: src/Module/Admin/Storage.php:142 src/Module/Filer/SaveTag.php:74
#: src/Module/Post/Edit.php:129 src/Module/Settings/Channels.php:189 #: src/Module/Post/Edit.php:129 src/Module/Settings/Channels.php:200
msgid "Save" msgid "Save"
msgstr "" msgstr ""
@ -794,12 +794,12 @@ msgstr ""
#: src/BaseModule.php:439 src/Content/Conversation/Factory/Channel.php:45 #: src/BaseModule.php:439 src/Content/Conversation/Factory/Channel.php:45
#: src/Content/Widget.php:239 src/Core/ACL.php:195 src/Module/Contact.php:414 #: src/Content/Widget.php:239 src/Core/ACL.php:195 src/Module/Contact.php:414
#: src/Module/PermissionTooltip.php:141 src/Module/PermissionTooltip.php:163 #: src/Module/PermissionTooltip.php:141 src/Module/PermissionTooltip.php:163
#: src/Module/Settings/Channels.php:132 #: src/Module/Settings/Channels.php:142
msgid "Followers" msgid "Followers"
msgstr "" msgstr ""
#: src/BaseModule.php:444 src/Content/Widget.php:240 src/Module/Contact.php:417 #: src/BaseModule.php:444 src/Content/Widget.php:240 src/Module/Contact.php:417
#: src/Module/Settings/Channels.php:131 #: src/Module/Settings/Channels.php:141
msgid "Following" msgid "Following"
msgstr "" msgstr ""
@ -1547,7 +1547,7 @@ msgid "Posts from accounts that are followed by accounts that you follow"
msgstr "" msgstr ""
#: src/Content/Conversation/Factory/Channel.php:47 #: src/Content/Conversation/Factory/Channel.php:47
#: src/Module/Settings/Channels.php:162 src/Module/Settings/Channels.php:180 #: src/Module/Settings/Channels.php:173 src/Module/Settings/Channels.php:191
msgid "Images" msgid "Images"
msgstr "" msgstr ""
@ -1556,7 +1556,7 @@ msgid "Posts with images"
msgstr "" msgstr ""
#: src/Content/Conversation/Factory/Channel.php:48 #: src/Content/Conversation/Factory/Channel.php:48
#: src/Module/Settings/Channels.php:164 src/Module/Settings/Channels.php:182 #: src/Module/Settings/Channels.php:175 src/Module/Settings/Channels.php:193
msgid "Audio" msgid "Audio"
msgstr "" msgstr ""
@ -1565,7 +1565,7 @@ msgid "Posts with audio"
msgstr "" msgstr ""
#: src/Content/Conversation/Factory/Channel.php:49 #: src/Content/Conversation/Factory/Channel.php:49
#: src/Module/Settings/Channels.php:163 src/Module/Settings/Channels.php:181 #: src/Module/Settings/Channels.php:174 src/Module/Settings/Channels.php:192
msgid "Videos" msgid "Videos"
msgstr "" msgstr ""
@ -1582,7 +1582,7 @@ msgid "Posts from local users on this server"
msgstr "" msgstr ""
#: src/Content/Conversation/Factory/Community.php:47 #: src/Content/Conversation/Factory/Community.php:47
#: src/Module/Settings/Channels.php:129 #: src/Module/Settings/Channels.php:134 src/Module/Settings/Channels.php:139
msgid "Global Community" msgid "Global Community"
msgstr "" msgstr ""
@ -1842,8 +1842,8 @@ msgstr ""
msgid "Ignore %s server" msgid "Ignore %s server"
msgstr "" msgstr ""
#: src/Content/Item.php:443 src/Module/Settings/Channels.php:165 #: src/Content/Item.php:443 src/Module/Settings/Channels.php:176
#: src/Module/Settings/Channels.php:183 src/Object/Post.php:509 #: src/Module/Settings/Channels.php:194 src/Object/Post.php:509
msgid "Languages" msgid "Languages"
msgstr "" msgstr ""
@ -2046,7 +2046,7 @@ msgstr ""
msgid "Terms of Service of this Friendica instance" msgid "Terms of Service of this Friendica instance"
msgstr "" msgstr ""
#: src/Content/Nav.php:306 src/Module/Settings/Channels.php:130 #: src/Content/Nav.php:306 src/Module/Settings/Channels.php:140
#: view/theme/frio/theme.php:239 #: view/theme/frio/theme.php:239
msgid "Network" msgid "Network"
msgstr "" msgstr ""
@ -2369,7 +2369,7 @@ msgid "All"
msgstr "" msgstr ""
#: src/Content/Widget.php:591 src/Module/Admin/Site.php:466 #: src/Content/Widget.php:591 src/Module/Admin/Site.php:466
#: src/Module/BaseSettings.php:125 src/Module/Settings/Channels.php:185 #: src/Module/BaseSettings.php:125 src/Module/Settings/Channels.php:196
#: src/Module/Settings/Display.php:315 #: src/Module/Settings/Display.php:315
msgid "Channels" msgid "Channels"
msgstr "" msgstr ""
@ -6120,7 +6120,7 @@ msgstr ""
#: src/Module/Moderation/Blocklist/Server/Index.php:116 #: src/Module/Moderation/Blocklist/Server/Index.php:116
#: src/Module/Moderation/Item/Delete.php:67 src/Module/Register.php:148 #: src/Module/Moderation/Item/Delete.php:67 src/Module/Register.php:148
#: src/Module/Security/TwoFactor/Verify.php:101 #: src/Module/Security/TwoFactor/Verify.php:101
#: src/Module/Settings/Channels.php:155 src/Module/Settings/Channels.php:173 #: src/Module/Settings/Channels.php:166 src/Module/Settings/Channels.php:184
#: src/Module/Settings/TwoFactor/Index.php:161 #: src/Module/Settings/TwoFactor/Index.php:161
#: src/Module/Settings/TwoFactor/Verify.php:158 #: src/Module/Settings/TwoFactor/Verify.php:158
msgid "Required" msgid "Required"
@ -7373,7 +7373,7 @@ msgstr ""
#: src/Module/Friendica.php:102 #: src/Module/Friendica.php:102
#: src/Module/Moderation/Blocklist/Server/Index.php:87 #: src/Module/Moderation/Blocklist/Server/Index.php:87
#: src/Module/Moderation/Blocklist/Server/Index.php:111 #: src/Module/Moderation/Blocklist/Server/Index.php:111
#: src/Module/Settings/Channels.php:192 #: src/Module/Settings/Channels.php:203
msgid "Reason for the block" msgid "Reason for the block"
msgstr "" msgstr ""
@ -8121,7 +8121,7 @@ msgstr ""
#: src/Module/Moderation/Blocklist/Server/Index.php:86 #: src/Module/Moderation/Blocklist/Server/Index.php:86
#: src/Module/Moderation/Blocklist/Server/Index.php:110 #: src/Module/Moderation/Blocklist/Server/Index.php:110
#: src/Module/Settings/Channels.php:191 #: src/Module/Settings/Channels.php:202
msgid "Blocked server domain pattern" msgid "Blocked server domain pattern"
msgstr "" msgstr ""
@ -10119,80 +10119,90 @@ msgstr ""
msgid "No Addon settings configured" msgid "No Addon settings configured"
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:155 src/Module/Settings/Channels.php:173 #: src/Module/Settings/Channels.php:132
msgid ""
"This page can be used to define the channels that will automatically be "
"reshared by your account."
msgstr ""
#: src/Module/Settings/Channels.php:137
msgid "This page can be used to define your own channels."
msgstr ""
#: src/Module/Settings/Channels.php:166 src/Module/Settings/Channels.php:184
#: src/Module/Settings/Display.php:338 #: src/Module/Settings/Display.php:338
msgid "Label" msgid "Label"
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:156 src/Module/Settings/Channels.php:174 #: src/Module/Settings/Channels.php:167 src/Module/Settings/Channels.php:185
#: src/Module/Settings/Display.php:339 #: src/Module/Settings/Display.php:339
#: src/Module/Settings/TwoFactor/AppSpecific.php:137 #: src/Module/Settings/TwoFactor/AppSpecific.php:137
msgid "Description" msgid "Description"
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:157 src/Module/Settings/Channels.php:175 #: src/Module/Settings/Channels.php:168 src/Module/Settings/Channels.php:186
msgid "Access Key" msgid "Access Key"
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:158 src/Module/Settings/Channels.php:176 #: src/Module/Settings/Channels.php:169 src/Module/Settings/Channels.php:187
msgid "Circle/Channel" msgid "Circle/Channel"
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:159 src/Module/Settings/Channels.php:177 #: src/Module/Settings/Channels.php:170 src/Module/Settings/Channels.php:188
msgid "Include Tags" msgid "Include Tags"
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:160 src/Module/Settings/Channels.php:178 #: src/Module/Settings/Channels.php:171 src/Module/Settings/Channels.php:189
msgid "Exclude Tags" msgid "Exclude Tags"
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:161 src/Module/Settings/Channels.php:179 #: src/Module/Settings/Channels.php:172 src/Module/Settings/Channels.php:190
msgid "Full Text Search" msgid "Full Text Search"
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:165 src/Module/Settings/Channels.php:183 #: src/Module/Settings/Channels.php:176 src/Module/Settings/Channels.php:194
msgid "Select all languages that you want to see in this channel." msgid "Select all languages that you want to see in this channel."
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:166 #: src/Module/Settings/Channels.php:177
msgid "Delete channel" msgid "Delete channel"
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:166 #: src/Module/Settings/Channels.php:177
msgid "Check to delete this entry from the channel list" msgid "Check to delete this entry from the channel list"
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:173 #: src/Module/Settings/Channels.php:184
msgid "Short name for the channel. It is displayed on the channels widget." msgid "Short name for the channel. It is displayed on the channels widget."
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:174 #: src/Module/Settings/Channels.php:185
msgid "This should describe the content of the channel in a few word." msgid "This should describe the content of the channel in a few word."
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:175 #: src/Module/Settings/Channels.php:186
msgid "" msgid ""
"When you want to access this channel via an access key, you can define it " "When you want to access this channel via an access key, you can define it "
"here. Pay attention to not use an already used one." "here. Pay attention to not use an already used one."
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:176 #: src/Module/Settings/Channels.php:187
msgid "Select a circle or channel, that your channel should be based on." msgid "Select a circle or channel, that your channel should be based on."
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:177 #: src/Module/Settings/Channels.php:188
msgid "" msgid ""
"Comma separated list of tags. A post will be used when it contains any of " "Comma separated list of tags. A post will be used when it contains any of "
"the listed tags." "the listed tags."
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:178 #: src/Module/Settings/Channels.php:189
msgid "" msgid ""
"Comma separated list of tags. If a post contain any of these tags, then it " "Comma separated list of tags. If a post contain any of these tags, then it "
"will not be part of nthis channel." "will not be part of nthis channel."
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:179 #: src/Module/Settings/Channels.php:190
#, php-format #, php-format
msgid "" msgid ""
"Search terms for the body, supports the \"boolean mode\" operators from " "Search terms for the body, supports the \"boolean mode\" operators from "
@ -10200,39 +10210,35 @@ msgid ""
"keywords: %s" "keywords: %s"
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:180 #: src/Module/Settings/Channels.php:191
msgid "Check to display images in the channel." msgid "Check to display images in the channel."
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:181 #: src/Module/Settings/Channels.php:192
msgid "Check to display videos in the channel." msgid "Check to display videos in the channel."
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:182 #: src/Module/Settings/Channels.php:193
msgid "Check to display audio in the channel." msgid "Check to display audio in the channel."
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:186 #: src/Module/Settings/Channels.php:198
msgid "This page can be used to define your own channels."
msgstr ""
#: src/Module/Settings/Channels.php:187
msgid "Add new entry to the channel list" msgid "Add new entry to the channel list"
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:188 #: src/Module/Settings/Channels.php:199
msgid "Add" msgid "Add"
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:190 #: src/Module/Settings/Channels.php:201
msgid "Current Entries in the channel list" msgid "Current Entries in the channel list"
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:193 #: src/Module/Settings/Channels.php:204
msgid "Delete entry from the channel list" msgid "Delete entry from the channel list"
msgstr "" msgstr ""
#: src/Module/Settings/Channels.php:194 #: src/Module/Settings/Channels.php:205
msgid "Delete entry from the channel list?" msgid "Delete entry from the channel list?"
msgstr "" msgstr ""