Improved code / updated messages.po

diff --git a/src/Module/Settings/Channels.php b/src/Module/Settings/Channels.php
index ed16fa9e4cc21ef46c02d175be1d4f10cfcc85e0..f09e054981a9d49388a235daac584776fdf5c95b 100644 (file)
--- a/src/Module/Settings/Channels.php
+++ b/src/Module/Settings/Channels.php
@@ -129,8 +129,12 @@ class Channels extends BaseSettings
                $account_type = $user['account-type'];
 
                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 {
+                       $intro   = $this->t('This page can be used to define your own channels.');
                        $circles = [
                                0  => $this->l10n->t('Global Community'),
                                -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');
                return Renderer::replaceMacros($t, [
                        'open'         => count($channels) == 0,

diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po
index be43370c5941f09587b5e4ed1301fdc896ebf5d4..dc981765bf22788b989be3c778b2b976bbcec82b 100644 (file)
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@ -382,7 +382,7 @@ msgstr ""
 
 #: mod/notes.php:57 src/Content/Text/HTML.php:859
 #: 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"
 msgstr ""
 
@@ -794,12 +794,12 @@ msgstr ""
 #: 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/Module/PermissionTooltip.php:141 src/Module/PermissionTooltip.php:163
-#: src/Module/Settings/Channels.php:132
+#: src/Module/Settings/Channels.php:142
 msgid "Followers"
 msgstr ""
 
 #: 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"
 msgstr ""
 
@@ -1551,7 +1551,7 @@ msgid "Posts from accounts that are followed by accounts that you follow"
 msgstr ""
 
 #: 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"
 msgstr ""
 
@@ -1560,7 +1560,7 @@ msgid "Posts with images"
 msgstr ""
 
 #: 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"
 msgstr ""
 
@@ -1569,7 +1569,7 @@ msgid "Posts with audio"
 msgstr ""
 
 #: 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"
 msgstr ""
 
@@ -1586,7 +1586,7 @@ msgid "Posts from local users on this server"
 msgstr ""
 
 #: 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"
 msgstr ""
 
@@ -1846,8 +1846,8 @@ msgstr ""
 msgid "Ignore %s server"
 msgstr ""
 
-#: src/Content/Item.php:443 src/Module/Settings/Channels.php:165
-#: src/Module/Settings/Channels.php:183 src/Object/Post.php:509
+#: src/Content/Item.php:443 src/Module/Settings/Channels.php:176
+#: src/Module/Settings/Channels.php:194 src/Object/Post.php:509
 msgid "Languages"
 msgstr ""
 
@@ -2050,7 +2050,7 @@ msgstr ""
 msgid "Terms of Service of this Friendica instance"
 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
 msgid "Network"
 msgstr ""
@@ -2373,7 +2373,7 @@ msgid "All"
 msgstr ""
 
 #: 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
 msgid "Channels"
 msgstr ""
@@ -6124,7 +6124,7 @@ msgstr ""
 #: src/Module/Moderation/Blocklist/Server/Index.php:116
 #: src/Module/Moderation/Item/Delete.php:67 src/Module/Register.php:148
 #: 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/Verify.php:158
 msgid "Required"
@@ -7377,7 +7377,7 @@ msgstr ""
 #: src/Module/Friendica.php:102
 #: src/Module/Moderation/Blocklist/Server/Index.php:87
 #: 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"
 msgstr ""
 
@@ -8125,7 +8125,7 @@ msgstr ""
 
 #: src/Module/Moderation/Blocklist/Server/Index.php:86
 #: 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"
 msgstr ""
 
@@ -10123,80 +10123,90 @@ msgstr ""
 msgid "No Addon settings configured"
 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
 msgid "Label"
 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/TwoFactor/AppSpecific.php:137
 msgid "Description"
 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"
 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"
 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"
 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"
 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"
 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."
 msgstr ""
 
-#: src/Module/Settings/Channels.php:166
+#: src/Module/Settings/Channels.php:177
 msgid "Delete channel"
 msgstr ""
 
-#: src/Module/Settings/Channels.php:166
+#: src/Module/Settings/Channels.php:177
 msgid "Check to delete this entry from the channel list"
 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."
 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."
 msgstr ""
 
-#: src/Module/Settings/Channels.php:175
+#: src/Module/Settings/Channels.php:186
 msgid ""
 "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."
 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."
 msgstr ""
 
-#: src/Module/Settings/Channels.php:177
+#: src/Module/Settings/Channels.php:188
 msgid ""
 "Comma separated list of tags. A post will be used when it contains any of "
 "the listed tags."
 msgstr ""
 
-#: src/Module/Settings/Channels.php:178
+#: src/Module/Settings/Channels.php:189
 msgid ""
 "Comma separated list of tags. If a post contain any of these tags, then it "
 "will not be part of nthis channel."
 msgstr ""
 
-#: src/Module/Settings/Channels.php:179
+#: src/Module/Settings/Channels.php:190
 #, php-format
 msgid ""
 "Search terms for the body, supports the \"boolean mode\" operators from "
@@ -10204,39 +10214,35 @@ msgid ""
 "keywords: %s"
 msgstr ""
 
-#: src/Module/Settings/Channels.php:180
+#: src/Module/Settings/Channels.php:191
 msgid "Check to display images in the channel."
 msgstr ""
 
-#: src/Module/Settings/Channels.php:181
+#: src/Module/Settings/Channels.php:192
 msgid "Check to display videos in the channel."
 msgstr ""
 
-#: src/Module/Settings/Channels.php:182
+#: src/Module/Settings/Channels.php:193
 msgid "Check to display audio in the channel."
 msgstr ""
 
-#: src/Module/Settings/Channels.php:186
-msgid "This page can be used to define your own channels."
-msgstr ""
-
-#: src/Module/Settings/Channels.php:187
+#: src/Module/Settings/Channels.php:198
 msgid "Add new entry to the channel list"
 msgstr ""
 
-#: src/Module/Settings/Channels.php:188
+#: src/Module/Settings/Channels.php:199
 msgid "Add"
 msgstr ""
 
-#: src/Module/Settings/Channels.php:190
+#: src/Module/Settings/Channels.php:201
 msgid "Current Entries in the channel list"
 msgstr ""
 
-#: src/Module/Settings/Channels.php:193
+#: src/Module/Settings/Channels.php:204
 msgid "Delete entry from the channel list"
 msgstr ""
 
-#: src/Module/Settings/Channels.php:194
+#: src/Module/Settings/Channels.php:205
 msgid "Delete entry from the channel list?"
 msgstr ""