From 15d24a77c7908bc8b562ca871dde0e1a0625ec04 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 24 Aug 2023 09:29:15 -0400 Subject: [PATCH 1/2] Replace author name by server host in Ignore Server labels --- src/Content/Item.php | 2 +- src/Object/Post.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Content/Item.php b/src/Content/Item.php index f2b4d9600b..163db89aa4 100644 --- a/src/Content/Item.php +++ b/src/Content/Item.php @@ -435,7 +435,7 @@ class Item $this->l10n->t('Block') => $block_link, $this->l10n->t('Ignore') => $ignore_link, $this->l10n->t('Collapse') => $collapse_link, - $this->l10n->t("Ignore %s's server", $item['author-name']) => $ignoreserver_link, + $this->l10n->t("Ignore %s server", $authorBaseUri->getHost()) => $ignoreserver_link, ]; if (!empty($item['language'])) { diff --git a/src/Object/Post.php b/src/Object/Post.php index 565dc0d10d..dd3074cfa3 100644 --- a/src/Object/Post.php +++ b/src/Object/Post.php @@ -285,7 +285,7 @@ class Post $authorBaseUri = new Uri($item['author-baseurl'] ?? ''); if ($authorBaseUri->getHost() && !DI::baseUrl()->isLocalUrl($authorBaseUri)) { $ignoreServer = [ - 'label' => DI::l10n()->t("Ignore %s's server", $item['author-name']), + 'label' => DI::l10n()->t("Ignore %s server", $authorBaseUri->getHost()), ]; } } From ba983274633e1cb4c9e70f961993e3a4fbc35bbb Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 24 Aug 2023 09:47:18 -0400 Subject: [PATCH 2/2] Update main translation file after updating a string --- view/lang/C/messages.po | 252 ++++++++++++++++++++-------------------- 1 file changed, 126 insertions(+), 126 deletions(-) diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 617d94ef0c..db4fe607b9 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2023.09-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-08-24 18:47+0000\n" +"POT-Creation-Date: 2023-08-25 08:35-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -294,7 +294,7 @@ msgstr "" #: mod/message.php:201 mod/message.php:357 mod/photos.php:1301 #: src/Content/Conversation.php:397 src/Content/Conversation.php:1528 #: src/Module/Item/Compose.php:206 src/Module/Post/Edit.php:145 -#: src/Module/Profile/UnkMail.php:154 src/Object/Post.php:579 +#: src/Module/Profile/UnkMail.php:154 src/Object/Post.php:578 msgid "Please wait" msgstr "" @@ -316,7 +316,7 @@ msgstr "" #: src/Module/Moderation/Report/Create.php:263 #: src/Module/Profile/Profile.php:274 src/Module/Profile/UnkMail.php:155 #: src/Module/Settings/Profile/Index.php:257 -#: src/Module/Settings/Server/Action.php:79 src/Object/Post.php:1096 +#: src/Module/Settings/Server/Action.php:79 src/Object/Post.php:1095 #: view/theme/duepuntozero/config.php:85 view/theme/frio/config.php:171 #: view/theme/quattro/config.php:87 view/theme/vier/config.php:135 msgid "Submit" @@ -601,29 +601,29 @@ msgstr "" #: mod/photos.php:1139 mod/photos.php:1195 mod/photos.php:1275 #: src/Module/Contact.php:619 src/Module/Item/Compose.php:188 -#: src/Object/Post.php:1093 +#: src/Object/Post.php:1092 msgid "This is you" msgstr "" #: mod/photos.php:1141 mod/photos.php:1197 mod/photos.php:1277 -#: src/Object/Post.php:573 src/Object/Post.php:1095 +#: src/Object/Post.php:572 src/Object/Post.php:1094 msgid "Comment" msgstr "" #: mod/photos.php:1143 mod/photos.php:1199 mod/photos.php:1279 #: src/Content/Conversation.php:412 src/Module/Calendar/Event/Form.php:248 #: src/Module/Item/Compose.php:201 src/Module/Post/Edit.php:165 -#: src/Object/Post.php:1109 +#: src/Object/Post.php:1108 msgid "Preview" msgstr "" #: mod/photos.php:1144 src/Content/Conversation.php:365 -#: src/Module/Post/Edit.php:130 src/Object/Post.php:1097 +#: src/Module/Post/Edit.php:130 src/Object/Post.php:1096 msgid "Loading..." msgstr "" #: mod/photos.php:1236 src/Content/Conversation.php:1443 -#: src/Object/Post.php:262 +#: src/Object/Post.php:260 msgid "Select" msgstr "" @@ -636,19 +636,19 @@ msgstr "" msgid "Delete" msgstr "" -#: mod/photos.php:1298 src/Object/Post.php:409 +#: mod/photos.php:1298 src/Object/Post.php:408 msgid "Like" msgstr "" -#: mod/photos.php:1299 src/Object/Post.php:409 +#: mod/photos.php:1299 src/Object/Post.php:408 msgid "I like this (toggle)" msgstr "" -#: mod/photos.php:1300 src/Object/Post.php:410 +#: mod/photos.php:1300 src/Object/Post.php:409 msgid "Dislike" msgstr "" -#: mod/photos.php:1302 src/Object/Post.php:410 +#: mod/photos.php:1302 src/Object/Post.php:409 msgid "I don't like this (toggle)" msgstr "" @@ -1239,7 +1239,7 @@ msgid "Visible to everybody" msgstr "" #: src/Content/Conversation.php:335 src/Module/Item/Compose.php:200 -#: src/Object/Post.php:1108 +#: src/Object/Post.php:1107 msgid "Please enter a image/video/audio/webpage URL:" msgstr "" @@ -1284,52 +1284,52 @@ msgid "attach file" msgstr "" #: src/Content/Conversation.php:370 src/Module/Item/Compose.php:190 -#: src/Module/Post/Edit.php:171 src/Object/Post.php:1098 +#: src/Module/Post/Edit.php:171 src/Object/Post.php:1097 msgid "Bold" msgstr "" #: src/Content/Conversation.php:371 src/Module/Item/Compose.php:191 -#: src/Module/Post/Edit.php:172 src/Object/Post.php:1099 +#: src/Module/Post/Edit.php:172 src/Object/Post.php:1098 msgid "Italic" msgstr "" #: src/Content/Conversation.php:372 src/Module/Item/Compose.php:192 -#: src/Module/Post/Edit.php:173 src/Object/Post.php:1100 +#: src/Module/Post/Edit.php:173 src/Object/Post.php:1099 msgid "Underline" msgstr "" #: src/Content/Conversation.php:373 src/Module/Item/Compose.php:193 -#: src/Module/Post/Edit.php:174 src/Object/Post.php:1102 +#: src/Module/Post/Edit.php:174 src/Object/Post.php:1101 msgid "Quote" msgstr "" #: src/Content/Conversation.php:374 src/Module/Item/Compose.php:194 -#: src/Module/Post/Edit.php:175 src/Object/Post.php:1103 +#: src/Module/Post/Edit.php:175 src/Object/Post.php:1102 msgid "Add emojis" msgstr "" #: src/Content/Conversation.php:375 src/Module/Item/Compose.php:195 -#: src/Object/Post.php:1101 +#: src/Object/Post.php:1100 msgid "Content Warning" msgstr "" #: src/Content/Conversation.php:376 src/Module/Item/Compose.php:196 -#: src/Module/Post/Edit.php:176 src/Object/Post.php:1104 +#: src/Module/Post/Edit.php:176 src/Object/Post.php:1103 msgid "Code" msgstr "" #: src/Content/Conversation.php:377 src/Module/Item/Compose.php:197 -#: src/Object/Post.php:1105 +#: src/Object/Post.php:1104 msgid "Image" msgstr "" #: src/Content/Conversation.php:378 src/Module/Item/Compose.php:198 -#: src/Module/Post/Edit.php:177 src/Object/Post.php:1106 +#: src/Module/Post/Edit.php:177 src/Object/Post.php:1105 msgid "Link" msgstr "" #: src/Content/Conversation.php:379 src/Module/Item/Compose.php:199 -#: src/Module/Post/Edit.php:178 src/Object/Post.php:1107 +#: src/Module/Post/Edit.php:178 src/Object/Post.php:1106 msgid "Link or Media" msgstr "" @@ -1480,25 +1480,25 @@ msgstr "" msgid "Pushed to us" msgstr "" -#: src/Content/Conversation.php:1471 src/Object/Post.php:249 +#: src/Content/Conversation.php:1471 src/Object/Post.php:247 msgid "Pinned item" msgstr "" -#: src/Content/Conversation.php:1488 src/Object/Post.php:522 -#: src/Object/Post.php:523 +#: src/Content/Conversation.php:1488 src/Object/Post.php:521 +#: src/Object/Post.php:522 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: src/Content/Conversation.php:1501 src/Object/Post.php:510 +#: src/Content/Conversation.php:1501 src/Object/Post.php:509 msgid "Categories:" msgstr "" -#: src/Content/Conversation.php:1502 src/Object/Post.php:511 +#: src/Content/Conversation.php:1502 src/Object/Post.php:510 msgid "Filed under:" msgstr "" -#: src/Content/Conversation.php:1510 src/Object/Post.php:536 +#: src/Content/Conversation.php:1510 src/Object/Post.php:535 #, php-format msgid "%s from %s" msgstr "" @@ -1642,57 +1642,57 @@ msgstr "" msgid "Create new group" msgstr "" -#: src/Content/Item.php:330 src/Model/Item.php:2998 +#: src/Content/Item.php:331 src/Model/Item.php:2998 msgid "event" msgstr "" -#: src/Content/Item.php:333 src/Content/Item.php:343 +#: src/Content/Item.php:334 src/Content/Item.php:344 msgid "status" msgstr "" -#: src/Content/Item.php:339 src/Model/Item.php:3000 +#: src/Content/Item.php:340 src/Model/Item.php:3000 #: src/Module/Post/Tag/Add.php:123 msgid "photo" msgstr "" -#: src/Content/Item.php:353 src/Module/Post/Tag/Add.php:141 +#: src/Content/Item.php:354 src/Module/Post/Tag/Add.php:141 #, php-format msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" -#: src/Content/Item.php:426 view/theme/frio/theme.php:262 +#: src/Content/Item.php:428 view/theme/frio/theme.php:262 msgid "Follow Thread" msgstr "" -#: src/Content/Item.php:427 src/Model/Contact.php:1211 +#: src/Content/Item.php:429 src/Model/Contact.php:1211 msgid "View Status" msgstr "" -#: src/Content/Item.php:428 src/Content/Item.php:449 src/Model/Contact.php:1160 +#: src/Content/Item.php:430 src/Content/Item.php:451 src/Model/Contact.php:1160 #: src/Model/Contact.php:1203 src/Model/Contact.php:1212 #: src/Module/Directory.php:157 src/Module/Settings/Profile/Index.php:259 msgid "View Profile" msgstr "" -#: src/Content/Item.php:429 src/Model/Contact.php:1213 +#: src/Content/Item.php:431 src/Model/Contact.php:1213 msgid "View Photos" msgstr "" -#: src/Content/Item.php:430 src/Model/Contact.php:1204 +#: src/Content/Item.php:432 src/Model/Contact.php:1204 #: src/Model/Contact.php:1214 msgid "Network Posts" msgstr "" -#: src/Content/Item.php:431 src/Model/Contact.php:1205 +#: src/Content/Item.php:433 src/Model/Contact.php:1205 #: src/Model/Contact.php:1215 msgid "View Contact" msgstr "" -#: src/Content/Item.php:432 src/Model/Contact.php:1216 +#: src/Content/Item.php:434 src/Model/Contact.php:1216 msgid "Send PM" msgstr "" -#: src/Content/Item.php:433 src/Module/Contact.php:468 +#: src/Content/Item.php:435 src/Module/Contact.php:468 #: src/Module/Contact/Profile.php:498 #: src/Module/Moderation/Blocklist/Contact.php:116 #: src/Module/Moderation/Users/Active.php:137 @@ -1700,7 +1700,7 @@ msgstr "" msgid "Block" msgstr "" -#: src/Content/Item.php:434 src/Module/Contact.php:469 +#: src/Content/Item.php:436 src/Module/Contact.php:469 #: src/Module/Contact/Profile.php:506 #: src/Module/Notifications/Introductions.php:134 #: src/Module/Notifications/Introductions.php:206 @@ -1708,27 +1708,27 @@ msgstr "" msgid "Ignore" msgstr "" -#: src/Content/Item.php:435 src/Module/Contact.php:470 +#: src/Content/Item.php:437 src/Module/Contact.php:470 #: src/Module/Contact/Profile.php:514 msgid "Collapse" msgstr "" -#: src/Content/Item.php:436 src/Object/Post.php:289 +#: src/Content/Item.php:438 src/Object/Post.php:288 #, php-format -msgid "Ignore %s's server" +msgid "Ignore %s server" msgstr "" -#: src/Content/Item.php:440 src/Object/Post.php:491 +#: src/Content/Item.php:442 src/Object/Post.php:490 msgid "Languages" msgstr "" -#: src/Content/Item.php:446 src/Content/Widget.php:80 +#: src/Content/Item.php:448 src/Content/Widget.php:80 #: src/Model/Contact.php:1206 src/Model/Contact.php:1217 #: src/Module/Contact/Follow.php:167 view/theme/vier/theme.php:195 msgid "Connect/Follow" msgstr "" -#: src/Content/Item.php:880 +#: src/Content/Item.php:882 msgid "Unable to fetch user." msgstr "" @@ -2577,8 +2577,8 @@ msgstr "" #: src/Core/Installer.php:511 msgid "" -"The web installer needs to be able to create a file called \"local.config.php" -"\" in the \"config\" folder of your web server and it is unable to do so." +"The web installer needs to be able to create a file called \"local.config." +"php\" in the \"config\" folder of your web server and it is unable to do so." msgstr "" #: src/Core/Installer.php:512 @@ -5203,9 +5203,9 @@ msgstr "" #: src/Module/Admin/Summary.php:98 msgid "" -"The last update failed. Please run \"php bin/console.php dbstructure update" -"\" from the command line and have a look at the errors that might appear. " -"(Some of the errors are possibly inside the logfile.)" +"The last update failed. Please run \"php bin/console.php dbstructure " +"update\" from the command line and have a look at the errors that might " +"appear. (Some of the errors are possibly inside the logfile.)" msgstr "" #: src/Module/Admin/Summary.php:102 @@ -5356,8 +5356,8 @@ msgstr "" #, php-format msgid "" "Show some informations regarding the needed information to operate the node " -"according e.g. to EU-GDPR." +"according e.g. to EU-GDPR." msgstr "" #: src/Module/Admin/Tos.php:81 @@ -5910,7 +5910,7 @@ msgid "Only show blocked contacts" msgstr "" #: src/Module/Contact.php:369 src/Module/Contact.php:441 -#: src/Module/Settings/Server/Index.php:107 src/Object/Post.php:369 +#: src/Module/Settings/Server/Index.php:107 src/Object/Post.php:368 msgid "Ignored" msgstr "" @@ -6602,7 +6602,7 @@ msgstr "" msgid "Posts that mention or involve you" msgstr "" -#: src/Module/Conversation/Network.php:289 src/Object/Post.php:381 +#: src/Module/Conversation/Network.php:289 src/Object/Post.php:380 msgid "Starred" msgstr "" @@ -8668,8 +8668,8 @@ msgstr "" #: src/Module/Profile/Profile.php:158 #, php-format msgid "" -"You're currently viewing your profile as %s Cancel" +"You're currently viewing your profile as %s Cancel" msgstr "" #: src/Module/Profile/Profile.php:167 @@ -9217,8 +9217,8 @@ msgstr "" #: src/Module/Security/TwoFactor/Verify.php:100 #, php-format msgid "" -"If you do not have access to your authentication code you can use a two-factor recovery code." +"If you do not have access to your authentication code you can use a two-factor recovery code." msgstr "" #: src/Module/Security/TwoFactor/Verify.php:101 @@ -10732,8 +10732,8 @@ msgstr "" #: src/Module/Settings/TwoFactor/Verify.php:149 #, php-format msgid "" -"

Or you can open the following URL in your mobile device:

%s

" +"

Or you can open the following URL in your mobile device:

%s

" msgstr "" #: src/Module/Settings/TwoFactor/Verify.php:156 @@ -10842,9 +10842,9 @@ msgstr "" msgid "" "At any point in time a logged in user can export their account data from the " "account settings. If the user wants " -"to delete their account they can do so at " -"%1$s/settings/removeme. The deletion of the account will be permanent. " -"Deletion of the data will also be requested from the nodes of the " +"to delete their account they can do so at %1$s/settings/removeme. The deletion of the account will be " +"permanent. Deletion of the data will also be requested from the nodes of the " "communication partners." msgstr "" @@ -11574,258 +11574,258 @@ msgstr "" msgid "%s posted an update." msgstr "" -#: src/Object/Post.php:140 +#: src/Object/Post.php:138 msgid "Private Message" msgstr "" -#: src/Object/Post.php:144 +#: src/Object/Post.php:142 msgid "Public Message" msgstr "" -#: src/Object/Post.php:148 +#: src/Object/Post.php:146 msgid "Unlisted Message" msgstr "" -#: src/Object/Post.php:183 +#: src/Object/Post.php:181 msgid "This entry was edited" msgstr "" -#: src/Object/Post.php:211 +#: src/Object/Post.php:209 msgid "Connector Message" msgstr "" -#: src/Object/Post.php:227 src/Object/Post.php:229 +#: src/Object/Post.php:225 src/Object/Post.php:227 msgid "Edit" msgstr "" -#: src/Object/Post.php:263 +#: src/Object/Post.php:261 msgid "Delete globally" msgstr "" -#: src/Object/Post.php:263 +#: src/Object/Post.php:261 msgid "Remove locally" msgstr "" -#: src/Object/Post.php:270 +#: src/Object/Post.php:268 #, php-format msgid "Block %s" msgstr "" -#: src/Object/Post.php:275 +#: src/Object/Post.php:273 #, php-format msgid "Ignore %s" msgstr "" -#: src/Object/Post.php:280 +#: src/Object/Post.php:278 #, php-format msgid "Collapse %s" msgstr "" -#: src/Object/Post.php:284 +#: src/Object/Post.php:282 msgid "Report post" msgstr "" -#: src/Object/Post.php:294 +#: src/Object/Post.php:293 msgid "Save to folder" msgstr "" -#: src/Object/Post.php:334 +#: src/Object/Post.php:333 msgid "I will attend" msgstr "" -#: src/Object/Post.php:334 +#: src/Object/Post.php:333 msgid "I will not attend" msgstr "" -#: src/Object/Post.php:334 +#: src/Object/Post.php:333 msgid "I might attend" msgstr "" -#: src/Object/Post.php:364 +#: src/Object/Post.php:363 msgid "Ignore thread" msgstr "" -#: src/Object/Post.php:365 +#: src/Object/Post.php:364 msgid "Unignore thread" msgstr "" -#: src/Object/Post.php:366 +#: src/Object/Post.php:365 msgid "Toggle ignore status" msgstr "" -#: src/Object/Post.php:376 +#: src/Object/Post.php:375 msgid "Add star" msgstr "" -#: src/Object/Post.php:377 +#: src/Object/Post.php:376 msgid "Remove star" msgstr "" -#: src/Object/Post.php:378 +#: src/Object/Post.php:377 msgid "Toggle star status" msgstr "" -#: src/Object/Post.php:389 +#: src/Object/Post.php:388 msgid "Pin" msgstr "" -#: src/Object/Post.php:390 +#: src/Object/Post.php:389 msgid "Unpin" msgstr "" -#: src/Object/Post.php:391 +#: src/Object/Post.php:390 msgid "Toggle pin status" msgstr "" -#: src/Object/Post.php:394 +#: src/Object/Post.php:393 msgid "Pinned" msgstr "" -#: src/Object/Post.php:399 +#: src/Object/Post.php:398 msgid "Add tag" msgstr "" -#: src/Object/Post.php:412 +#: src/Object/Post.php:411 msgid "Quote share this" msgstr "" -#: src/Object/Post.php:412 +#: src/Object/Post.php:411 msgid "Quote Share" msgstr "" -#: src/Object/Post.php:415 +#: src/Object/Post.php:414 msgid "Reshare this" msgstr "" -#: src/Object/Post.php:415 +#: src/Object/Post.php:414 msgid "Reshare" msgstr "" -#: src/Object/Post.php:416 +#: src/Object/Post.php:415 msgid "Cancel your Reshare" msgstr "" -#: src/Object/Post.php:416 +#: src/Object/Post.php:415 msgid "Unshare" msgstr "" -#: src/Object/Post.php:467 +#: src/Object/Post.php:466 #, php-format msgid "%s (Received %s)" msgstr "" -#: src/Object/Post.php:473 +#: src/Object/Post.php:472 msgid "Comment this item on your system" msgstr "" -#: src/Object/Post.php:473 +#: src/Object/Post.php:472 msgid "Remote comment" msgstr "" -#: src/Object/Post.php:495 +#: src/Object/Post.php:494 msgid "Share via ..." msgstr "" -#: src/Object/Post.php:495 +#: src/Object/Post.php:494 msgid "Share via external services" msgstr "" -#: src/Object/Post.php:524 +#: src/Object/Post.php:523 msgid "to" msgstr "" -#: src/Object/Post.php:525 +#: src/Object/Post.php:524 msgid "via" msgstr "" -#: src/Object/Post.php:526 +#: src/Object/Post.php:525 msgid "Wall-to-Wall" msgstr "" -#: src/Object/Post.php:527 +#: src/Object/Post.php:526 msgid "via Wall-To-Wall:" msgstr "" -#: src/Object/Post.php:574 +#: src/Object/Post.php:573 #, php-format msgid "Reply to %s" msgstr "" -#: src/Object/Post.php:577 +#: src/Object/Post.php:576 msgid "More" msgstr "" -#: src/Object/Post.php:596 +#: src/Object/Post.php:595 msgid "Notifier task is pending" msgstr "" -#: src/Object/Post.php:597 +#: src/Object/Post.php:596 msgid "Delivery to remote servers is pending" msgstr "" -#: src/Object/Post.php:598 +#: src/Object/Post.php:597 msgid "Delivery to remote servers is underway" msgstr "" -#: src/Object/Post.php:599 +#: src/Object/Post.php:598 msgid "Delivery to remote servers is mostly done" msgstr "" -#: src/Object/Post.php:600 +#: src/Object/Post.php:599 msgid "Delivery to remote servers is done" msgstr "" -#: src/Object/Post.php:620 +#: src/Object/Post.php:619 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: src/Object/Post.php:621 +#: src/Object/Post.php:620 msgid "Show more" msgstr "" -#: src/Object/Post.php:622 +#: src/Object/Post.php:621 msgid "Show fewer" msgstr "" -#: src/Object/Post.php:658 +#: src/Object/Post.php:657 #, php-format msgid "Reshared by: %s" msgstr "" -#: src/Object/Post.php:663 +#: src/Object/Post.php:662 #, php-format msgid "Viewed by: %s" msgstr "" -#: src/Object/Post.php:668 +#: src/Object/Post.php:667 #, php-format msgid "Liked by: %s" msgstr "" -#: src/Object/Post.php:673 +#: src/Object/Post.php:672 #, php-format msgid "Disliked by: %s" msgstr "" -#: src/Object/Post.php:678 +#: src/Object/Post.php:677 #, php-format msgid "Attended by: %s" msgstr "" -#: src/Object/Post.php:683 +#: src/Object/Post.php:682 #, php-format msgid "Maybe attended by: %s" msgstr "" -#: src/Object/Post.php:688 +#: src/Object/Post.php:687 #, php-format msgid "Not attended by: %s" msgstr "" -#: src/Object/Post.php:693 +#: src/Object/Post.php:692 #, php-format msgid "Reacted with %s by: %s" msgstr ""