From 622cdeaad6b4d5dd5108cbb29648eeae0cd4be29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Mon, 9 Oct 2023 01:40:47 +0200 Subject: [PATCH 01/16] make reply-to link depending on screen-width * on small/smartphone-screens show "reply to" link above the posting and an eventual "shared by" link in a second line. * on middle/tablet-screens show "reply-to" and "shared-by" link in one line above the posting, divided by a dot. * on large screens show reply-to-link next to the time/date-link when posting was posted. the first to positions are better for users with thick fingers on smartphones. (like me) Change "in reply to" to "is reply to". Sounds better. --- src/Object/Post.php | 2 +- view/theme/frio/templates/wall_thread.tpl | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/Object/Post.php b/src/Object/Post.php index 4df953cab..9240079fb 100644 --- a/src/Object/Post.php +++ b/src/Object/Post.php @@ -502,7 +502,7 @@ class Post $tmp_item = [ 'parentguid' => $parent_guid, - 'isreplyto' => DI::l10n()->t('in reply to %s', $parent_username), + 'isreplyto' => DI::l10n()->t('is reply to %s', $parent_username), 'template' => $this->getTemplate(), 'type' => implode('', array_slice(explode('/', $item['verb']), -1)), 'comment_firstcollapsed' => false, diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl index 93abcd2fd..2deefeadc 100644 --- a/view/theme/frio/templates/wall_thread.tpl +++ b/view/theme/frio/templates/wall_thread.tpl @@ -60,9 +60,10 @@ as the value of $top_child_total (this is done at the end of this file) {{/if}}
{{if $item.parentguid}} - {{$item.isreplyto}} - {{if $item.reshared}}{{/if}} -
+ + {{$item.isreplyto}} + {{if $item.reshared}}{{/if}} + {{/if}} {{if $item.reshared}} {{$item.reshared nofilter}} @@ -220,6 +221,13 @@ as the value of $top_child_total (this is done at the end of this file) + {{if $item.parentguid}} + + {{/if}} From c5506577d0614d1e2e90058f035230b6781a1b34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Mon, 9 Oct 2023 01:55:19 +0200 Subject: [PATCH 02/16] make reply-to link depending on screen-width * on small/smartphone-screens show "reply to" link above the posting and an eventual "shared by" link in a second line. * on middle/tablet-screens show "reply-to" and "shared-by" link in one line above the posting, divided by a dot. * on large screens show reply-to-link next to the time/date-link when posting was posted. the first to positions are better for users with thick fingers on smartphones. (like me) Change "in reply to" to "is reply to". Sounds better. translations done --- view/lang/C/messages.po | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 47d726704..704e183bf 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2023.09-rc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-08 07:41+0000\n" +"POT-Creation-Date: 2023-10-09 01:51+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2724,8 +2724,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 @@ -5351,9 +5351,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 @@ -5504,8 +5504,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 @@ -8856,8 +8856,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 @@ -9405,8 +9405,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 @@ -11047,8 +11047,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 @@ -11157,9 +11157,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 "" @@ -12047,7 +12047,7 @@ msgstr "" #: src/Object/Post.php:505 #, php-format -msgid "in reply to %s" +msgid "is reply to %s" msgstr "" #: src/Object/Post.php:529 From 45efa4ec87fa36a7f7b41d6bba7ec0abbe515ba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Mon, 9 Oct 2023 09:23:10 +0200 Subject: [PATCH 03/16] set font-size of reply-to and shared-by to class time --- view/theme/frio/templates/wall_thread.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl index 2deefeadc..1eb459d9b 100644 --- a/view/theme/frio/templates/wall_thread.tpl +++ b/view/theme/frio/templates/wall_thread.tpl @@ -60,13 +60,13 @@ as the value of $top_child_total (this is done at the end of this file) {{/if}}
{{if $item.parentguid}} - + {{$item.isreplyto}} {{if $item.reshared}}{{/if}} {{/if}} {{if $item.reshared}} - {{$item.reshared nofilter}} + {{$item.reshared nofilter}} {{/if}}

{{* The avatar picture and the photo-menu *}} From 4b2e920957481d3a7b0acdf5eea054bd8bfd9638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Mon, 9 Oct 2023 20:10:02 +0200 Subject: [PATCH 04/16] show "parent unknown" when parent not federated in some cases (visibility is private of parent comment), there is no parent federated to my instance, and then the comment "hangs around" with no information, why there is no parent. For normal users this can be confusing, why all exept "this" comment have parents. So i added a simple text instead of link to parent with a "title" field with a small explanation, why parent is not viewable. translations done --- src/Object/Post.php | 3 + view/lang/C/messages.po | 114 ++++++++++++---------- view/theme/frio/templates/wall_thread.tpl | 21 +++- 3 files changed, 81 insertions(+), 57 deletions(-) diff --git a/src/Object/Post.php b/src/Object/Post.php index 9240079fb..91500cb99 100644 --- a/src/Object/Post.php +++ b/src/Object/Post.php @@ -499,10 +499,13 @@ class Post $parent_guid = $thread_parent[$item['thr-parent-id']]['guid'] ?? ''; $parent_username = $thread_parent[$item['thr-parent-id']]['name'] ?? ''; + $parent_unknown = $parent_username ? '' : DI::l10n()->t('parent unknown'); $tmp_item = [ 'parentguid' => $parent_guid, 'isreplyto' => DI::l10n()->t('is reply to %s', $parent_username), + 'isunknown' => $parent_unknown, + 'isunknown_label' => DI::l10n()->t('parent is probably private or not federated'), 'template' => $this->getTemplate(), 'type' => implode('', array_slice(explode('/', $item['verb']), -1)), 'comment_firstcollapsed' => false, diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 704e183bf..945d95bc3 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2023.09-rc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-09 01:51+0200\n" +"POT-Creation-Date: 2023-10-09 20:09+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -295,7 +295,7 @@ msgstr "" #: mod/message.php:201 mod/message.php:357 mod/photos.php:1301 #: src/Content/Conversation.php:399 src/Content/Conversation.php:1549 #: src/Module/Item/Compose.php:206 src/Module/Post/Edit.php:145 -#: src/Module/Profile/UnkMail.php:154 src/Object/Post.php:584 +#: src/Module/Profile/UnkMail.php:154 src/Object/Post.php:587 msgid "Please wait" msgstr "" @@ -317,7 +317,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:1103 +#: src/Module/Settings/Server/Action.php:79 src/Object/Post.php:1106 #: 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" @@ -602,25 +602,25 @@ 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:1100 +#: src/Object/Post.php:1103 msgid "This is you" msgstr "" #: mod/photos.php:1141 mod/photos.php:1197 mod/photos.php:1277 -#: src/Module/Moderation/Reports.php:95 src/Object/Post.php:578 -#: src/Object/Post.php:1102 +#: src/Module/Moderation/Reports.php:95 src/Object/Post.php:581 +#: src/Object/Post.php:1105 msgid "Comment" msgstr "" #: mod/photos.php:1143 mod/photos.php:1199 mod/photos.php:1279 #: src/Content/Conversation.php:414 src/Module/Calendar/Event/Form.php:248 #: src/Module/Item/Compose.php:201 src/Module/Post/Edit.php:165 -#: src/Object/Post.php:1116 +#: src/Object/Post.php:1119 msgid "Preview" msgstr "" #: mod/photos.php:1144 src/Content/Conversation.php:367 -#: src/Module/Post/Edit.php:130 src/Object/Post.php:1104 +#: src/Module/Post/Edit.php:130 src/Object/Post.php:1107 msgid "Loading..." msgstr "" @@ -1243,7 +1243,7 @@ msgid "Visible to everybody" msgstr "" #: src/Content/Conversation.php:337 src/Module/Item/Compose.php:200 -#: src/Object/Post.php:1115 +#: src/Object/Post.php:1118 msgid "Please enter a image/video/audio/webpage URL:" msgstr "" @@ -1288,52 +1288,52 @@ msgid "attach file" msgstr "" #: src/Content/Conversation.php:372 src/Module/Item/Compose.php:190 -#: src/Module/Post/Edit.php:171 src/Object/Post.php:1105 +#: src/Module/Post/Edit.php:171 src/Object/Post.php:1108 msgid "Bold" msgstr "" #: src/Content/Conversation.php:373 src/Module/Item/Compose.php:191 -#: src/Module/Post/Edit.php:172 src/Object/Post.php:1106 +#: src/Module/Post/Edit.php:172 src/Object/Post.php:1109 msgid "Italic" msgstr "" #: src/Content/Conversation.php:374 src/Module/Item/Compose.php:192 -#: src/Module/Post/Edit.php:173 src/Object/Post.php:1107 +#: src/Module/Post/Edit.php:173 src/Object/Post.php:1110 msgid "Underline" msgstr "" #: src/Content/Conversation.php:375 src/Module/Item/Compose.php:193 -#: src/Module/Post/Edit.php:174 src/Object/Post.php:1109 +#: src/Module/Post/Edit.php:174 src/Object/Post.php:1112 msgid "Quote" msgstr "" #: src/Content/Conversation.php:376 src/Module/Item/Compose.php:194 -#: src/Module/Post/Edit.php:175 src/Object/Post.php:1110 +#: src/Module/Post/Edit.php:175 src/Object/Post.php:1113 msgid "Add emojis" msgstr "" #: src/Content/Conversation.php:377 src/Module/Item/Compose.php:195 -#: src/Object/Post.php:1108 +#: src/Object/Post.php:1111 msgid "Content Warning" msgstr "" #: src/Content/Conversation.php:378 src/Module/Item/Compose.php:196 -#: src/Module/Post/Edit.php:176 src/Object/Post.php:1111 +#: src/Module/Post/Edit.php:176 src/Object/Post.php:1114 msgid "Code" msgstr "" #: src/Content/Conversation.php:379 src/Module/Item/Compose.php:197 -#: src/Object/Post.php:1112 +#: src/Object/Post.php:1115 msgid "Image" msgstr "" #: src/Content/Conversation.php:380 src/Module/Item/Compose.php:198 -#: src/Module/Post/Edit.php:177 src/Object/Post.php:1113 +#: src/Module/Post/Edit.php:177 src/Object/Post.php:1116 msgid "Link" msgstr "" #: src/Content/Conversation.php:381 src/Module/Item/Compose.php:199 -#: src/Module/Post/Edit.php:178 src/Object/Post.php:1114 +#: src/Module/Post/Edit.php:178 src/Object/Post.php:1117 msgid "Link or Media" msgstr "" @@ -1493,21 +1493,21 @@ msgstr "" msgid "Pinned item" msgstr "" -#: src/Content/Conversation.php:1509 src/Object/Post.php:527 -#: src/Object/Post.php:528 +#: src/Content/Conversation.php:1509 src/Object/Post.php:530 +#: src/Object/Post.php:531 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: src/Content/Conversation.php:1522 src/Object/Post.php:515 +#: src/Content/Conversation.php:1522 src/Object/Post.php:518 msgid "Categories:" msgstr "" -#: src/Content/Conversation.php:1523 src/Object/Post.php:516 +#: src/Content/Conversation.php:1523 src/Object/Post.php:519 msgid "Filed under:" msgstr "" -#: src/Content/Conversation.php:1531 src/Object/Post.php:541 +#: src/Content/Conversation.php:1531 src/Object/Post.php:544 #, php-format msgid "%s from %s" msgstr "" @@ -12045,107 +12045,115 @@ msgstr "" msgid "Share via external services" msgstr "" -#: src/Object/Post.php:505 +#: src/Object/Post.php:502 +msgid "parent unknown" +msgstr "" + +#: src/Object/Post.php:506 #, php-format msgid "is reply to %s" msgstr "" -#: src/Object/Post.php:529 -msgid "to" -msgstr "" - -#: src/Object/Post.php:530 -msgid "via" -msgstr "" - -#: src/Object/Post.php:531 -msgid "Wall-to-Wall" +#: src/Object/Post.php:508 +msgid "parent is probably private or not federated" msgstr "" #: src/Object/Post.php:532 +msgid "to" +msgstr "" + +#: src/Object/Post.php:533 +msgid "via" +msgstr "" + +#: src/Object/Post.php:534 +msgid "Wall-to-Wall" +msgstr "" + +#: src/Object/Post.php:535 msgid "via Wall-To-Wall:" msgstr "" -#: src/Object/Post.php:579 +#: src/Object/Post.php:582 #, php-format msgid "Reply to %s" msgstr "" -#: src/Object/Post.php:582 +#: src/Object/Post.php:585 msgid "More" msgstr "" -#: src/Object/Post.php:601 +#: src/Object/Post.php:604 msgid "Notifier task is pending" msgstr "" -#: src/Object/Post.php:602 +#: src/Object/Post.php:605 msgid "Delivery to remote servers is pending" msgstr "" -#: src/Object/Post.php:603 +#: src/Object/Post.php:606 msgid "Delivery to remote servers is underway" msgstr "" -#: src/Object/Post.php:604 +#: src/Object/Post.php:607 msgid "Delivery to remote servers is mostly done" msgstr "" -#: src/Object/Post.php:605 +#: src/Object/Post.php:608 msgid "Delivery to remote servers is done" msgstr "" -#: src/Object/Post.php:627 +#: src/Object/Post.php:630 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: src/Object/Post.php:628 +#: src/Object/Post.php:631 msgid "Show more" msgstr "" -#: src/Object/Post.php:629 +#: src/Object/Post.php:632 msgid "Show fewer" msgstr "" -#: src/Object/Post.php:665 +#: src/Object/Post.php:668 #, php-format msgid "Reshared by: %s" msgstr "" -#: src/Object/Post.php:670 +#: src/Object/Post.php:673 #, php-format msgid "Viewed by: %s" msgstr "" -#: src/Object/Post.php:675 +#: src/Object/Post.php:678 #, php-format msgid "Liked by: %s" msgstr "" -#: src/Object/Post.php:680 +#: src/Object/Post.php:683 #, php-format msgid "Disliked by: %s" msgstr "" -#: src/Object/Post.php:685 +#: src/Object/Post.php:688 #, php-format msgid "Attended by: %s" msgstr "" -#: src/Object/Post.php:690 +#: src/Object/Post.php:693 #, php-format msgid "Maybe attended by: %s" msgstr "" -#: src/Object/Post.php:695 +#: src/Object/Post.php:698 #, php-format msgid "Not attended by: %s" msgstr "" -#: src/Object/Post.php:700 +#: src/Object/Post.php:703 #, php-format msgid "Reacted with %s by: %s" msgstr "" diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl index 1eb459d9b..802fd8621 100644 --- a/view/theme/frio/templates/wall_thread.tpl +++ b/view/theme/frio/templates/wall_thread.tpl @@ -64,6 +64,13 @@ as the value of $top_child_total (this is done at the end of this file) {{$item.isreplyto}} {{if $item.reshared}}{{/if}} + {{else}} + {{if $item.thread_level!=1 && $item.isunknown}} + + {{$item.isunknown}} + {{if $item.reshared}}{{/if}} + + {{/if}} {{/if}} {{if $item.reshared}} {{$item.reshared nofilter}} @@ -222,11 +229,17 @@ as the value of $top_child_total (this is done at the end of this file) {{if $item.parentguid}} - + + + {{else}} + {{if $item.isunknown}} + + {{/if}} {{/if}} From 6736187be6c302643caac8fd2744a2c181192728 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 7 Oct 2023 22:06:47 -0400 Subject: [PATCH 05/16] Normalize template variables in Widget\VCard - Display new links in vier - Address https://github.com/friendica/friendica/issues/13157#issuecomment-1751750581 --- src/Content/Widget/VCard.php | 18 ++++++++++-------- view/templates/widget/vcard.tpl | 6 ++++++ view/theme/frio/templates/widget/vcard.tpl | 16 ++++++++-------- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/src/Content/Widget/VCard.php b/src/Content/Widget/VCard.php index d57f7130f..1d5cde87b 100644 --- a/src/Content/Widget/VCard.php +++ b/src/Content/Widget/VCard.php @@ -68,6 +68,8 @@ class VCard $follow_link = ''; $unfollow_link = ''; $wallmessage_link = ''; + $mention_label = ''; + $mention_link = ''; $showgroup_link = ''; $photo = Contact::getPhoto($contact); @@ -102,15 +104,13 @@ class VCard } if ($contact['contact-type'] == Contact::TYPE_COMMUNITY) { - $mention_label = DI::l10n()->t('Post to group'); - $mention_url = 'compose/0?body=!' . $contact['addr']; - $showgroup_label = DI::l10n()->t('View group'); - $showgroup_url = 'network/group/' . $id; + $mention_label = DI::l10n()->t('Post to group'); + $mention_link = 'compose/0?body=!' . $contact['addr']; + $showgroup_link = 'network/group/' . $id; } else { $mention_label = DI::l10n()->t('Mention'); - $mention_url = 'compose/0?body=@' . $contact['addr']; + $mention_link = 'compose/0?body=@' . $contact['addr']; } - } return Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/vcard.tpl'), [ @@ -131,8 +131,10 @@ class VCard '$unfollow_link' => $unfollow_link, '$wallmessage' => DI::l10n()->t('Message'), '$wallmessage_link' => $wallmessage_link, - '$mention' => [$mention_label, $mention_url], - '$showgroup' => [$showgroup_label, $showgroup_url] + '$mention' => $mention_label, + '$mention_link' => $mention_link, + '$showgroup' => DI::l10n()->t('View group'), + '$showgroup_link' => $showgroup_link, ]); } } diff --git a/view/templates/widget/vcard.tpl b/view/templates/widget/vcard.tpl index 9e38eebfc..2656be487 100644 --- a/view/templates/widget/vcard.tpl +++ b/view/templates/widget/vcard.tpl @@ -41,6 +41,12 @@ {{if $wallmessage_link}}

  • {{$wallmessage}}
    • {{/if}} + {{if $mention_link}} +
  • {{$mention}}
    • + {{/if}} + {{if $showgroup_link}} +
  • {{$showgroup}}
    • + {{/if}}
    diff --git a/view/theme/frio/templates/widget/vcard.tpl b/view/theme/frio/templates/widget/vcard.tpl index 814dec49e..9f030a8ef 100644 --- a/view/theme/frio/templates/widget/vcard.tpl +++ b/view/theme/frio/templates/widget/vcard.tpl @@ -56,22 +56,22 @@
    {{/if}} - {{if $contact.addr}} + {{if $mention_link}} - {{/if}} - {{if $contact.forum==1 || $contact.prv==1}} + {{/if}} + {{if $showgroup_link}}
    -
    - {{/if}} + {{/if}}
    From b4afb5fa5b73dadb0737f953e6dedeb05576694f Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 7 Oct 2023 22:29:06 -0400 Subject: [PATCH 06/16] Add callstack to log messages to better troubleshoot warning messages --- src/Core/Logger/Util/Introspection.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Core/Logger/Util/Introspection.php b/src/Core/Logger/Util/Introspection.php index 0b703da82..c154eec9f 100644 --- a/src/Core/Logger/Util/Introspection.php +++ b/src/Core/Logger/Util/Introspection.php @@ -23,6 +23,7 @@ namespace Friendica\Core\Logger\Util; use Friendica\App\Request; use Friendica\Core\Logger\Capability\IHaveCallIntrospections; +use Friendica\Core\System; /** * Get Introspection information about the current call @@ -86,6 +87,7 @@ class Introspection implements IHaveCallIntrospections 'line' => $trace[$i - 1]['line'] ?? null, 'function' => $trace[$i]['function'] ?? null, 'request-id' => $this->requestId, + 'stack' => System::callstack(10, 4), ]; } From 2673c667b5f4228056a2e2389a4db335d6924bc4 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 8 Oct 2023 08:55:48 -0400 Subject: [PATCH 07/16] Add a couple of missing fields in Content\Item->localize - Address "Undefined array key "author-alias"" in Content\Item->localize:323 --- src/Content/Item.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Content/Item.php b/src/Content/Item.php index c94ec1299..c604f2621 100644 --- a/src/Content/Item.php +++ b/src/Content/Item.php @@ -297,7 +297,7 @@ class Item if ($this->activity->match($item['verb'], Activity::TAG)) { $fields = [ - 'author-id', 'author-link', 'author-name', 'author-network', + 'author-id', 'author-link', 'author-name', 'author-network', 'author-link', 'author-alias', 'verb', 'object-type', 'resource-id', 'body', 'plink' ]; $obj = Post::selectFirst($fields, ['uri' => $item['parent-uri']]); From 19e3e49fdc728c2c8a3a6e3968de467879c2bdef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Mon, 9 Oct 2023 20:28:01 +0200 Subject: [PATCH 08/16] translations --- view/lang/C/messages.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 945d95bc3..d8b64be7d 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2023.09-rc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-09 20:09+0200\n" +"POT-Creation-Date: 2023-10-09 20:27+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2420,17 +2420,12 @@ msgstr[1] "" msgid "More Trending Tags" msgstr "" -#: src/Content/Widget/VCard.php:105 src/Model/Contact.php:1204 +#: src/Content/Widget/VCard.php:107 src/Model/Contact.php:1204 #: src/Model/Profile.php:457 msgid "Post to group" msgstr "" -#: src/Content/Widget/VCard.php:107 src/Model/Contact.php:1206 -#: src/Model/Profile.php:459 -msgid "View group" -msgstr "" - -#: src/Content/Widget/VCard.php:110 src/Model/Contact.php:1209 +#: src/Content/Widget/VCard.php:111 src/Model/Contact.php:1209 #: src/Model/Profile.php:462 src/Module/Moderation/Item/Source.php:85 msgid "Mention" msgstr "" @@ -2464,6 +2459,11 @@ msgstr "" msgid "Unfollow" msgstr "" +#: src/Content/Widget/VCard.php:136 src/Model/Contact.php:1206 +#: src/Model/Profile.php:459 +msgid "View group" +msgstr "" + #: src/Core/ACL.php:166 src/Module/Profile/Profile.php:269 msgid "Yourself" msgstr "" From 9898e5483a2b83f903599e9945d274bb1772abe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 11 Oct 2023 02:11:16 +0200 Subject: [PATCH 09/16] translations --- view/lang/C/messages.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index d8b64be7d..5cf73d91d 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2023.09-rc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-09 20:27+0200\n" +"POT-Creation-Date: 2023-10-11 02:08+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" From 4ce3b27e6563ee830bf91e47fba2bc110e07fa0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 11 Oct 2023 14:19:04 +0200 Subject: [PATCH 10/16] translation --- view/lang/C/messages.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 847de8655..03621bdb4 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2023.09-rc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-11 04:07+0200\n" +"POT-Creation-Date: 2023-10-11 14:16+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" From 035c9dbfa7320b36f2291e1d704fbcb0e20bb3d9 Mon Sep 17 00:00:00 2001 From: xundeenergie Date: Wed, 11 Oct 2023 15:55:02 +0200 Subject: [PATCH 11/16] Update src/Object/Post.php Sugfestion accepted Co-authored-by: Hypolite Petovan --- src/Object/Post.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Object/Post.php b/src/Object/Post.php index 91500cb99..c679880fb 100644 --- a/src/Object/Post.php +++ b/src/Object/Post.php @@ -505,7 +505,7 @@ class Post 'parentguid' => $parent_guid, 'isreplyto' => DI::l10n()->t('is reply to %s', $parent_username), 'isunknown' => $parent_unknown, - 'isunknown_label' => DI::l10n()->t('parent is probably private or not federated'), + 'isunknown_label' => DI::l10n()->t('Parent is probably private or not federated.'), 'template' => $this->getTemplate(), 'type' => implode('', array_slice(explode('/', $item['verb']), -1)), 'comment_firstcollapsed' => false, From 9526daa5b775fd120a9a995bde6d5bec34f1b286 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 11 Oct 2023 17:01:08 +0200 Subject: [PATCH 12/16] change isreplyto to inreplyto --- src/Object/Post.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Object/Post.php b/src/Object/Post.php index c679880fb..aab3d5fee 100644 --- a/src/Object/Post.php +++ b/src/Object/Post.php @@ -503,7 +503,7 @@ class Post $tmp_item = [ 'parentguid' => $parent_guid, - 'isreplyto' => DI::l10n()->t('is reply to %s', $parent_username), + 'inreplyto' => DI::l10n()->t('in reply to %s', $parent_username), 'isunknown' => $parent_unknown, 'isunknown_label' => DI::l10n()->t('Parent is probably private or not federated.'), 'template' => $this->getTemplate(), From b864d873446d4899083569bd15841df44e1a3b5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 11 Oct 2023 17:03:27 +0200 Subject: [PATCH 13/16] translations --- view/lang/C/messages.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 05a7818ac..67731ca37 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2023.09-rc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-11 14:20+0200\n" +"POT-Creation-Date: 2023-10-11 17:03+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -12051,11 +12051,11 @@ msgstr "" #: src/Object/Post.php:506 #, php-format -msgid "is reply to %s" +msgid "in reply to %s" msgstr "" #: src/Object/Post.php:508 -msgid "parent is probably private or not federated" +msgid "Parent is probably private or not federated." msgstr "" #: src/Object/Post.php:532 From 1031bc1801059e7229e40f3e9fb27ce578bfc775 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 11 Oct 2023 17:07:37 +0200 Subject: [PATCH 14/16] change last occurances isreplyto to inreplyto --- view/theme/frio/templates/wall_thread.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl index 802fd8621..1fa5ed845 100644 --- a/view/theme/frio/templates/wall_thread.tpl +++ b/view/theme/frio/templates/wall_thread.tpl @@ -61,7 +61,7 @@ as the value of $top_child_total (this is done at the end of this file)
    {{if $item.parentguid}} - {{$item.isreplyto}} + {{$item.inreplyto}} {{if $item.reshared}}{{/if}} {{else}} @@ -230,7 +230,7 @@ as the value of $top_child_total (this is done at the end of this file) {{if $item.parentguid}} {{else}} From c7f1c30f89100732b966d40a9767912febdfe432 Mon Sep 17 00:00:00 2001 From: xundeenergie Date: Wed, 11 Oct 2023 20:33:49 +0200 Subject: [PATCH 15/16] Update src/Object/Post.php Rename from 'parent unknown' to 'Unkknown parent" Co-authored-by: Hypolite Petovan --- src/Object/Post.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Object/Post.php b/src/Object/Post.php index aab3d5fee..8d7ff128d 100644 --- a/src/Object/Post.php +++ b/src/Object/Post.php @@ -499,7 +499,7 @@ class Post $parent_guid = $thread_parent[$item['thr-parent-id']]['guid'] ?? ''; $parent_username = $thread_parent[$item['thr-parent-id']]['name'] ?? ''; - $parent_unknown = $parent_username ? '' : DI::l10n()->t('parent unknown'); + $parent_unknown = $parent_username ? '' : DI::l10n()->t('Unknown parent'); $tmp_item = [ 'parentguid' => $parent_guid, From 62012286a03469f1bf10785c3d48acbbf9975e9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 11 Oct 2023 21:05:55 +0200 Subject: [PATCH 16/16] run gettext --- view/lang/C/messages.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 67731ca37..4ef37d120 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2023.09-rc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-11 17:03+0200\n" +"POT-Creation-Date: 2023-10-11 21:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -12046,7 +12046,7 @@ msgid "Share via external services" msgstr "" #: src/Object/Post.php:502 -msgid "parent unknown" +msgid "Unknown parent" msgstr "" #: src/Object/Post.php:506