From 7d91cc73de054c645df61f64ef72ff8aca9cfb4d Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 9 May 2023 20:44:58 +0000 Subject: [PATCH 01/10] Unifiy the creation of photo links --- mod/photos.php | 4 +--- src/Model/Post/Media.php | 10 +++------- src/Module/Media/Photo/Upload.php | 2 +- src/Module/Profile/Photos.php | 4 +--- src/Util/Images.php | 28 ++++++++++++++++++++++++++++ 5 files changed, 34 insertions(+), 14 deletions(-) diff --git a/mod/photos.php b/mod/photos.php index 3d6a1d405..18118bcd9 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -375,9 +375,7 @@ function photos_post(App $a) $arr['visible'] = 0; $arr['origin'] = 1; - $arr['body'] = '[url=' . DI::baseUrl() . '/photos/' . $user['nickname'] . '/image/' . $photo['resource-id'] . ']' - . '[img]' . DI::baseUrl() . '/photo/' . $photo['resource-id'] . '-' . $photo['scale'] . '.'. $ext . '[/img]' - . '[/url]'; + $arr['body'] = Images::getImageUrl($photo['resource-id'], $user['nickname'], $photo['scale'], $ext, ''); $item_id = Item::insert($arr); } diff --git a/src/Model/Post/Media.php b/src/Model/Post/Media.php index cc5b16d1e..5e867d26c 100644 --- a/src/Model/Post/Media.php +++ b/src/Model/Post/Media.php @@ -489,7 +489,7 @@ class Media if (preg_match_all("#\[url=([^\]]+?)\]\s*\[img=([^\[\]]*)\]([^\[\]]*)\[\/img\]\s*\[/url\]#ism", $body, $pictures, PREG_SET_ORDER)) { foreach ($pictures as $picture) { if (self::isLinkToImagePage($picture[1], $picture[2])) { - $body = str_replace($picture[0], '[url=' . str_replace(['-1.', '-2.'], '-0.', $picture[2]) . '][img=' . $picture[2] . ']' . $picture[3] . '[/img][/url]', $body); + $body = str_replace($picture[0], Images::getPictureUrl(str_replace(['-1.', '-2.'], '-0.', $picture[2]), $picture[2], $picture[3]), $body); } } } @@ -497,7 +497,7 @@ class Media if (preg_match_all("#\[url=([^\]]+?)\]\s*\[img\]([^\[]+?)\[/img\]\s*\[/url\]#ism", $body, $pictures, PREG_SET_ORDER)) { foreach ($pictures as $picture) { if (self::isLinkToImagePage($picture[1], $picture[2])) { - $body = str_replace($picture[0], '[url=' . str_replace(['-1.', '-2.'], '-0.', $picture[2]) . '][img]' . $picture[2] . '[/img][/url]', $body); + $body = str_replace($picture[0], Images::getPictureUrl(str_replace(['-1.', '-2.'], '-0.', $picture[2]), $picture[2], ''), $body); } } } @@ -1005,11 +1005,7 @@ class Media if ($media['type'] == self::IMAGE) { if (!empty($media['preview'])) { - if (!empty($media['description'])) { - $body .= "\n[url=" . $media['url'] . "][img=" . $media['preview'] . ']' . $media['description'] . '[/img][/url]'; - } else { - $body .= "\n[url=" . $media['url'] . "][img]" . $media['preview'] . '[/img][/url]'; - } + $body .= "\n" . Images::getPictureUrl($media['url'], $media['preview'], $media['description']); } else { if (!empty($media['description'])) { $body .= "\n[img=" . $media['url'] . ']' . $media['description'] . '[/img]'; diff --git a/src/Module/Media/Photo/Upload.php b/src/Module/Media/Photo/Upload.php index 09d31971a..8ea079c6c 100644 --- a/src/Module/Media/Photo/Upload.php +++ b/src/Module/Media/Photo/Upload.php @@ -180,7 +180,7 @@ class Upload extends \Friendica\BaseModule } $this->logger->info('upload done'); - $this->return(200, "\n\n" . '[url=' . $this->baseUrl . '/photos/' . $owner['nickname'] . '/image/' . $resource_id . '][img=' . $this->baseUrl . "/photo/$resource_id-$preview." . $image->getExt() . "][/img][/url]\n\n"); + $this->return(200, "\n\n" . Images::getImageUrl($resource_id, $owner['nickname'], $preview, $image->getExt(), '') . "\n\n"); } /** diff --git a/src/Module/Profile/Photos.php b/src/Module/Profile/Photos.php index 03937c655..720efa060 100644 --- a/src/Module/Profile/Photos.php +++ b/src/Module/Profile/Photos.php @@ -273,9 +273,7 @@ class Photos extends \Friendica\Module\BaseProfile $arr['visible'] = $visible; $arr['origin'] = 1; - $arr['body'] = '[url=' . $this->baseUrl . '/photos/' . $this->owner['nickname'] . '/image/' . $resource_id . ']' - . '[img]' . $this->baseUrl . "/photo/{$resource_id}-{$preview}.".$image->getExt() . '[/img]' - . '[/url]'; + $arr['body'] = Images::getImageUrl($resource_id, $this->owner['nickname'], $preview, $image->getExt(), ''); $item_id = Item::insert($arr); // Update the photo albums cache diff --git a/src/Util/Images.php b/src/Util/Images.php index 90d120081..08553a1a9 100644 --- a/src/Util/Images.php +++ b/src/Util/Images.php @@ -316,4 +316,32 @@ class Images return ['width' => $dest_width, 'height' => $dest_height]; } + + /** + * Get a link to a an image link with a preview + * + * @param string $resource_id + * @param string $nickname + * @param integer $preview + * @param string $ext + * @param string $description + * @return string + */ + public static function getImageUrl(string $resource_id, string $nickname, int $preview, string $ext, string $description): string + { + return '[url=' . DI::baseUrl() . '/photos/' . $nickname . '/image/' . $resource_id . '][img=' . DI::baseUrl() . '/photo/' . $resource_id . '-' . $preview. '.' . $ext . ']' . $description . '[/img][/url]'; + } + + /** + * Get a link to a picture with a preview + * + * @param string $photo + * @param string $preview + * @param string $description + * @return string + */ + public static function getPictureUrl(string $photo, string $preview, string $description): string + { + return '[url=' . $photo . '][img=' . $preview . ']' . $description . '[/img][/url]'; + } } From c5ca5bfdf84f6fb5e4ba4d8509df25c58aeb516a Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 10 May 2023 07:54:15 +0000 Subject: [PATCH 02/10] Function renamed --- mod/photos.php | 2 +- src/Model/Post/Media.php | 14 +++----------- src/Module/Media/Photo/Upload.php | 3 +-- src/Module/Profile/Photos.php | 2 +- src/Util/Images.php | 30 ++++++++++++++++++------------ 5 files changed, 24 insertions(+), 27 deletions(-) diff --git a/mod/photos.php b/mod/photos.php index 18118bcd9..0a8dc472d 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -375,7 +375,7 @@ function photos_post(App $a) $arr['visible'] = 0; $arr['origin'] = 1; - $arr['body'] = Images::getImageUrl($photo['resource-id'], $user['nickname'], $photo['scale'], $ext, ''); + $arr['body'] = Images::getBBCodeByResource($photo['resource-id'], $user['nickname'], $photo['scale'], $ext); $item_id = Item::insert($arr); } diff --git a/src/Model/Post/Media.php b/src/Model/Post/Media.php index 5e867d26c..e040f2b11 100644 --- a/src/Model/Post/Media.php +++ b/src/Model/Post/Media.php @@ -489,7 +489,7 @@ class Media if (preg_match_all("#\[url=([^\]]+?)\]\s*\[img=([^\[\]]*)\]([^\[\]]*)\[\/img\]\s*\[/url\]#ism", $body, $pictures, PREG_SET_ORDER)) { foreach ($pictures as $picture) { if (self::isLinkToImagePage($picture[1], $picture[2])) { - $body = str_replace($picture[0], Images::getPictureUrl(str_replace(['-1.', '-2.'], '-0.', $picture[2]), $picture[2], $picture[3]), $body); + $body = str_replace($picture[0], Images::getBBCodeByUrl(str_replace(['-1.', '-2.'], '-0.', $picture[2]), $picture[2], $picture[3]), $body); } } } @@ -497,7 +497,7 @@ class Media if (preg_match_all("#\[url=([^\]]+?)\]\s*\[img\]([^\[]+?)\[/img\]\s*\[/url\]#ism", $body, $pictures, PREG_SET_ORDER)) { foreach ($pictures as $picture) { if (self::isLinkToImagePage($picture[1], $picture[2])) { - $body = str_replace($picture[0], Images::getPictureUrl(str_replace(['-1.', '-2.'], '-0.', $picture[2]), $picture[2], ''), $body); + $body = str_replace($picture[0], Images::getBBCodeByUrl(str_replace(['-1.', '-2.'], '-0.', $picture[2]), $picture[2]), $body); } } } @@ -1004,15 +1004,7 @@ class Media } if ($media['type'] == self::IMAGE) { - if (!empty($media['preview'])) { - $body .= "\n" . Images::getPictureUrl($media['url'], $media['preview'], $media['description']); - } else { - if (!empty($media['description'])) { - $body .= "\n[img=" . $media['url'] . ']' . $media['description'] . '[/img]'; - } else { - $body .= "\n[img]" . $media['url'] . '[/img]'; - } - } + $body .= "\n" . Images::getBBCodeByUrl($media['url'], $media['preview'], $media['description']); } elseif ($media['type'] == self::AUDIO) { $body .= "\n[audio]" . $media['url'] . "[/audio]\n"; } elseif ($media['type'] == self::VIDEO) { diff --git a/src/Module/Media/Photo/Upload.php b/src/Module/Media/Photo/Upload.php index 8ea079c6c..e53ca35b8 100644 --- a/src/Module/Media/Photo/Upload.php +++ b/src/Module/Media/Photo/Upload.php @@ -34,7 +34,6 @@ use Friendica\Network\HTTPException\InternalServerErrorException; use Friendica\Object\Image; use Friendica\Util\Images; use Friendica\Util\Profiler; -use Friendica\Util\Strings; use Psr\Log\LoggerInterface; /** @@ -180,7 +179,7 @@ class Upload extends \Friendica\BaseModule } $this->logger->info('upload done'); - $this->return(200, "\n\n" . Images::getImageUrl($resource_id, $owner['nickname'], $preview, $image->getExt(), '') . "\n\n"); + $this->return(200, "\n\n" . Images::getBBCodeByResource($resource_id, $owner['nickname'], $preview, $image->getExt()) . "\n\n"); } /** diff --git a/src/Module/Profile/Photos.php b/src/Module/Profile/Photos.php index 720efa060..9d8b27592 100644 --- a/src/Module/Profile/Photos.php +++ b/src/Module/Profile/Photos.php @@ -273,7 +273,7 @@ class Photos extends \Friendica\Module\BaseProfile $arr['visible'] = $visible; $arr['origin'] = 1; - $arr['body'] = Images::getImageUrl($resource_id, $this->owner['nickname'], $preview, $image->getExt(), ''); + $arr['body'] = Images::getBBCodeByResource($resource_id, $this->owner['nickname'], $preview, $image->getExt()); $item_id = Item::insert($arr); // Update the photo albums cache diff --git a/src/Util/Images.php b/src/Util/Images.php index 08553a1a9..90c2aae9d 100644 --- a/src/Util/Images.php +++ b/src/Util/Images.php @@ -318,30 +318,36 @@ class Images } /** - * Get a link to a an image link with a preview + * Get a BBCode tag for an local photo page URL with a preview thumbnail and an image description * * @param string $resource_id - * @param string $nickname - * @param integer $preview - * @param string $ext + * @param string $nickname The local user owner of the resource + * @param int $preview Preview image size identifier, either 0, 1 or 2 in decreasing order of size + * @param string $ext Image file extension * @param string $description * @return string */ - public static function getImageUrl(string $resource_id, string $nickname, int $preview, string $ext, string $description): string + public static function getBBCodeByResource(string $resource_id, string $nickname, int $preview, string $ext, string $description = ''): string { - return '[url=' . DI::baseUrl() . '/photos/' . $nickname . '/image/' . $resource_id . '][img=' . DI::baseUrl() . '/photo/' . $resource_id . '-' . $preview. '.' . $ext . ']' . $description . '[/img][/url]'; + return self::getBBCodeByUrl( + DI::baseUrl() . '/photos/' . $nickname . '/image/' . $resource_id, + DI::baseUrl() . '/photo/' . $resource_id . '-' . $preview. '.' . $ext, + $description + ); } /** - * Get a link to a picture with a preview + * Get a BBCode tag for an image URL with a preview thumbnail and an image description * - * @param string $photo - * @param string $preview + * @param string $photo Full image URL + * @param string $preview Preview image URL * @param string $description * @return string - */ - public static function getPictureUrl(string $photo, string $preview, string $description): string + */ public static function getBBCodeByUrl(string $photo, string $preview = null, string $description = ''): string { - return '[url=' . $photo . '][img=' . $preview . ']' . $description . '[/img][/url]'; + if (!empty($preview)) { + return '[url=' . $photo . '][img=' . $preview . ']' . $description . '[/img][/url]'; + } + return '[img=' . $photo . ']' . $description . '[/img]'; } } From 3554b615084fd8704ee9b95aa538c47099d5bce5 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 10 May 2023 08:48:21 +0000 Subject: [PATCH 03/10] Fix tests --- src/Util/Images.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Util/Images.php b/src/Util/Images.php index 90c2aae9d..f468e69c2 100644 --- a/src/Util/Images.php +++ b/src/Util/Images.php @@ -343,7 +343,7 @@ class Images * @param string $preview Preview image URL * @param string $description * @return string - */ public static function getBBCodeByUrl(string $photo, string $preview = null, string $description = ''): string + */ public static function getBBCodeByUrl(string $photo, string $preview = null, string $description = null): string { if (!empty($preview)) { return '[url=' . $photo . '][img=' . $preview . ']' . $description . '[/img][/url]'; From 45dda2c0647a76093fc50b7f245b78d59ef90434 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Wed, 10 May 2023 17:06:16 +0200 Subject: [PATCH 04/10] Update src/Util/Images.php Co-authored-by: Hypolite Petovan --- src/Util/Images.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Util/Images.php b/src/Util/Images.php index f468e69c2..05b3573dd 100644 --- a/src/Util/Images.php +++ b/src/Util/Images.php @@ -343,7 +343,8 @@ class Images * @param string $preview Preview image URL * @param string $description * @return string - */ public static function getBBCodeByUrl(string $photo, string $preview = null, string $description = null): string + */ + public static function getBBCodeByUrl(string $photo, string $preview = null, string $description = ''): string { if (!empty($preview)) { return '[url=' . $photo . '][img=' . $preview . ']' . $description . '[/img][/url]'; From 992b6eed1d8bc0201ece8b9043ee70d76bc68a3e Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 10 May 2023 16:57:08 +0000 Subject: [PATCH 05/10] Fixed test - again --- src/Util/Images.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Util/Images.php b/src/Util/Images.php index 05b3573dd..269dbda19 100644 --- a/src/Util/Images.php +++ b/src/Util/Images.php @@ -344,7 +344,7 @@ class Images * @param string $description * @return string */ - public static function getBBCodeByUrl(string $photo, string $preview = null, string $description = ''): string + public static function getBBCodeByUrl(string $photo, string $preview = null, string $description = null): string { if (!empty($preview)) { return '[url=' . $photo . '][img=' . $preview . ']' . $description . '[/img][/url]'; From 2b3c1972db987ee2396e528476739f4cec4e8972 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 10 May 2023 17:59:25 +0000 Subject: [PATCH 06/10] Differentiate between no description or an empty description --- src/Module/Media/Photo/Upload.php | 2 +- src/Util/Images.php | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/Module/Media/Photo/Upload.php b/src/Module/Media/Photo/Upload.php index e53ca35b8..25f9af9bc 100644 --- a/src/Module/Media/Photo/Upload.php +++ b/src/Module/Media/Photo/Upload.php @@ -179,7 +179,7 @@ class Upload extends \Friendica\BaseModule } $this->logger->info('upload done'); - $this->return(200, "\n\n" . Images::getBBCodeByResource($resource_id, $owner['nickname'], $preview, $image->getExt()) . "\n\n"); + $this->return(200, "\n\n" . Images::getBBCodeByResource($resource_id, $owner['nickname'], $preview, $image->getExt(), '') . "\n\n"); } /** diff --git a/src/Util/Images.php b/src/Util/Images.php index 269dbda19..7f6d8720f 100644 --- a/src/Util/Images.php +++ b/src/Util/Images.php @@ -327,7 +327,7 @@ class Images * @param string $description * @return string */ - public static function getBBCodeByResource(string $resource_id, string $nickname, int $preview, string $ext, string $description = ''): string + public static function getBBCodeByResource(string $resource_id, string $nickname, int $preview, string $ext, string $description = null): string { return self::getBBCodeByUrl( DI::baseUrl() . '/photos/' . $nickname . '/image/' . $resource_id, @@ -347,8 +347,17 @@ class Images public static function getBBCodeByUrl(string $photo, string $preview = null, string $description = null): string { if (!empty($preview)) { - return '[url=' . $photo . '][img=' . $preview . ']' . $description . '[/img][/url]'; + if (!is_null($description)) { + return '[url=' . $photo . '][img=' . $preview . ']' . $description . '[/img][/url]'; + } else { + return '[url=' . $photo . '][img]' . $preview . '[/img][/url]'; + } + } + + if (!is_null($description)) { + return '[img=' . $photo . ']' . $description . '[/img]'; + } else { + return '[img]' . $photo . '[/img]'; } - return '[img=' . $photo . ']' . $description . '[/img]'; } } From 10104430313887e825db2f2e61b5bf46ffe95a60 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 17 May 2023 20:30:45 +0000 Subject: [PATCH 07/10] Simplify image url --- src/Content/Text/HTML.php | 1 - src/Model/Post/Media.php | 2 +- src/Module/Media/Photo/Upload.php | 2 +- src/Util/Images.php | 16 ++++------------ 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/Content/Text/HTML.php b/src/Content/Text/HTML.php index 3f9ef7c3b..988274f8d 100644 --- a/src/Content/Text/HTML.php +++ b/src/Content/Text/HTML.php @@ -24,7 +24,6 @@ namespace Friendica\Content\Text; use DOMDocument; use DOMXPath; use Friendica\Protocol\HTTP\MediaType; -use Friendica\Content\Widget\ContactBlock; use Friendica\Core\Hook; use Friendica\Core\Renderer; use Friendica\Core\Search; diff --git a/src/Model/Post/Media.php b/src/Model/Post/Media.php index e040f2b11..a0d55b6e0 100644 --- a/src/Model/Post/Media.php +++ b/src/Model/Post/Media.php @@ -1004,7 +1004,7 @@ class Media } if ($media['type'] == self::IMAGE) { - $body .= "\n" . Images::getBBCodeByUrl($media['url'], $media['preview'], $media['description']); + $body .= "\n" . Images::getBBCodeByUrl($media['url'], $media['preview'], $media['description'] ?? ''); } elseif ($media['type'] == self::AUDIO) { $body .= "\n[audio]" . $media['url'] . "[/audio]\n"; } elseif ($media['type'] == self::VIDEO) { diff --git a/src/Module/Media/Photo/Upload.php b/src/Module/Media/Photo/Upload.php index 25f9af9bc..e53ca35b8 100644 --- a/src/Module/Media/Photo/Upload.php +++ b/src/Module/Media/Photo/Upload.php @@ -179,7 +179,7 @@ class Upload extends \Friendica\BaseModule } $this->logger->info('upload done'); - $this->return(200, "\n\n" . Images::getBBCodeByResource($resource_id, $owner['nickname'], $preview, $image->getExt(), '') . "\n\n"); + $this->return(200, "\n\n" . Images::getBBCodeByResource($resource_id, $owner['nickname'], $preview, $image->getExt()) . "\n\n"); } /** diff --git a/src/Util/Images.php b/src/Util/Images.php index 7f6d8720f..aed72f065 100644 --- a/src/Util/Images.php +++ b/src/Util/Images.php @@ -327,7 +327,7 @@ class Images * @param string $description * @return string */ - public static function getBBCodeByResource(string $resource_id, string $nickname, int $preview, string $ext, string $description = null): string + public static function getBBCodeByResource(string $resource_id, string $nickname, int $preview, string $ext, string $description = ''): string { return self::getBBCodeByUrl( DI::baseUrl() . '/photos/' . $nickname . '/image/' . $resource_id, @@ -344,20 +344,12 @@ class Images * @param string $description * @return string */ - public static function getBBCodeByUrl(string $photo, string $preview = null, string $description = null): string + public static function getBBCodeByUrl(string $photo, string $preview = null, string $description = ''): string { if (!empty($preview)) { - if (!is_null($description)) { - return '[url=' . $photo . '][img=' . $preview . ']' . $description . '[/img][/url]'; - } else { - return '[url=' . $photo . '][img]' . $preview . '[/img][/url]'; - } + return '[url=' . $photo . '][img=' . $preview . ']' . $description . '[/img][/url]'; } - if (!is_null($description)) { - return '[img=' . $photo . ']' . $description . '[/img]'; - } else { - return '[img]' . $photo . '[/img]'; - } + return '[img=' . $photo . ']' . $description . '[/img]'; } } From ff80e46eb05554417d5fdef9ff5b14df1f10eb4a Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 17 May 2023 19:53:22 -0400 Subject: [PATCH 08/10] Fix magic links in contact photo menu - They were using a URL format obsolete for years --- src/Content/Item.php | 12 +++++------- src/Model/Contact.php | 13 ++++--------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/Content/Item.php b/src/Content/Item.php index cb805d5db..172729f26 100644 --- a/src/Content/Item.php +++ b/src/Content/Item.php @@ -378,7 +378,11 @@ class Item 'url' => $item['author-link'], ]; $profile_link = Contact::magicLinkByContact($author, $item['author-link']); - $sparkle = (strpos($profile_link, 'contact/redir/') === 0); + if (strpos($profile_link, 'contact/redir/') === 0) { + $status_link = $profile_link . '?' . http_build_query(['url' => $item['author-link'] . '/status']); + $photos_link = $profile_link . '?' . http_build_query(['url' => $item['author-link'] . '/photos']); + $profile_link = $profile_link . '?' . http_build_query(['url' => $item['author-link'] . '/profile']); + } $cid = 0; $pcid = $item['author-id']; @@ -392,12 +396,6 @@ class Item $rel = $contact['rel']; } - if ($sparkle) { - $status_link = $profile_link . '/status'; - $photos_link = $profile_link . '/photos'; - $profile_link = $profile_link . '/profile'; - } - if (!empty($pcid)) { $contact_url = 'contact/' . $pcid; $posts_link = $contact_url . '/posts'; diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 99edf3fe2..134bbc1e5 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -1152,10 +1152,11 @@ class Contact $status_link = ''; $photos_link = ''; - $sparkle = false; if (($contact['network'] === Protocol::DFRN) && !$contact['self'] && empty($contact['pending'])) { - $sparkle = true; $profile_link = 'contact/redir/' . $contact['id']; + $status_link = $profile_link . '?' . http_build_query(['url' => $contact['url'] . '/status']); + $photos_link = $profile_link . '?' . http_build_query(['url' => $contact['url'] . '/photos']); + $profile_link = $profile_link . '?' . http_build_query(['url' => $contact['url'] . '/profile']); } else { $profile_link = $contact['url']; } @@ -1164,12 +1165,6 @@ class Contact $profile_link = ''; } - if ($sparkle) { - $status_link = $profile_link . '/status'; - $photos_link = $profile_link . '/photos'; - $profile_link = $profile_link . '/profile'; - } - if (self::canReceivePrivateMessages($contact) && empty($contact['pending'])) { $pm_url = 'message/new/' . $contact['id']; } @@ -3444,7 +3439,7 @@ class Contact */ public static function magicLinkByContact(array $contact, string $url = ''): string { - $destination = $url ?: $contact['url']; // Equivalent to ($url != '') ? $url : $contact['url']; + $destination = $url ?: $contact['url']; if (!DI::userSession()->isAuthenticated()) { return $destination; From 7a098800c58eceea6a06352857a0fccaef26dfe1 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 18 May 2023 13:05:07 +0200 Subject: [PATCH 09/10] PL translation update THX tatonuta --- view/lang/pl/messages.po | 393 ++++++++++++++++++++------------------- view/lang/pl/strings.php | 2 +- 2 files changed, 200 insertions(+), 195 deletions(-) diff --git a/view/lang/pl/messages.po b/view/lang/pl/messages.po index c16aaa250..fb90459f1 100644 --- a/view/lang/pl/messages.po +++ b/view/lang/pl/messages.po @@ -59,7 +59,7 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-23 21:21+0000\n" +"POT-Creation-Date: 2023-05-12 07:57+0000\n" "PO-Revision-Date: 2011-05-05 10:19+0000\n" "Last-Translator: Piotr Strębski , 2022\n" "Language-Team: Polish (http://app.transifex.com/Friendica/friendica/language/pl/)\n" @@ -95,7 +95,7 @@ msgstr "Pusty wpis został odrzucony." msgid "Item not found." msgstr "Element nie znaleziony." -#: mod/item.php:435 mod/message.php:68 mod/message.php:114 mod/notes.php:45 +#: mod/item.php:435 mod/message.php:67 mod/message.php:113 mod/notes.php:45 #: mod/photos.php:152 mod/photos.php:669 src/Model/Event.php:522 #: src/Module/Attach.php:55 src/Module/BaseApi.php:99 #: src/Module/BaseNotifications.php:98 src/Module/BaseSettings.php:52 @@ -266,86 +266,86 @@ msgstr "\n\t\t\tDane logowania są następujące:\n\n\t\t\tLokalizacja witryny:\ msgid "Your password has been changed at %s" msgstr "Twoje hasło zostało zmienione na %s" -#: mod/message.php:46 mod/message.php:129 src/Content/Nav.php:319 +#: mod/message.php:46 mod/message.php:128 src/Content/Nav.php:319 msgid "New Message" msgstr "Nowa wiadomość" -#: mod/message.php:83 src/Module/Profile/UnkMail.php:100 +#: mod/message.php:82 src/Module/Profile/UnkMail.php:100 msgid "No recipient selected." msgstr "Nie wybrano odbiorcy." -#: mod/message.php:88 +#: mod/message.php:87 msgid "Unable to locate contact information." msgstr "Nie można znaleźć informacji kontaktowych." -#: mod/message.php:92 src/Module/Profile/UnkMail.php:106 +#: mod/message.php:91 src/Module/Profile/UnkMail.php:106 msgid "Message could not be sent." msgstr "Nie udało się wysłać wiadomości." -#: mod/message.php:96 src/Module/Profile/UnkMail.php:109 +#: mod/message.php:95 src/Module/Profile/UnkMail.php:109 msgid "Message collection failure." msgstr "Błąd zbierania komunikatów." -#: mod/message.php:123 src/Module/Notifications/Introductions.php:135 +#: mod/message.php:122 src/Module/Notifications/Introductions.php:135 #: src/Module/Notifications/Introductions.php:170 #: src/Module/Notifications/Notification.php:85 msgid "Discard" msgstr "Odrzuć" -#: mod/message.php:136 src/Content/Nav.php:316 view/theme/frio/theme.php:241 +#: mod/message.php:135 src/Content/Nav.php:316 view/theme/frio/theme.php:241 msgid "Messages" msgstr "Wiadomości" -#: mod/message.php:149 +#: mod/message.php:148 msgid "Conversation not found." msgstr "Nie znaleziono rozmowy." -#: mod/message.php:154 +#: mod/message.php:153 msgid "Message was not deleted." msgstr "Wiadomość nie została usunięta." -#: mod/message.php:169 +#: mod/message.php:168 msgid "Conversation was not removed." msgstr "Rozmowa nie została usunięta." -#: mod/message.php:182 mod/message.php:287 src/Module/Profile/UnkMail.php:145 +#: mod/message.php:181 mod/message.php:286 src/Module/Profile/UnkMail.php:145 msgid "Please enter a link URL:" msgstr "Proszę wpisać adres URL:" -#: mod/message.php:191 src/Module/Profile/UnkMail.php:151 +#: mod/message.php:190 src/Module/Profile/UnkMail.php:151 msgid "Send Private Message" msgstr "Wyślij prywatną wiadomość" -#: mod/message.php:192 mod/message.php:347 +#: mod/message.php:191 mod/message.php:346 msgid "To:" msgstr "Do:" -#: mod/message.php:193 mod/message.php:348 +#: mod/message.php:192 mod/message.php:347 msgid "Subject:" msgstr "Temat:" -#: mod/message.php:197 mod/message.php:351 src/Module/Invite.php:171 +#: mod/message.php:196 mod/message.php:350 src/Module/Invite.php:171 msgid "Your message:" msgstr "Twoja wiadomość:" -#: mod/message.php:200 mod/message.php:355 src/Content/Conversation.php:360 +#: mod/message.php:199 mod/message.php:354 src/Content/Conversation.php:360 #: src/Module/Post/Edit.php:131 msgid "Upload photo" msgstr "Wyślij zdjęcie" -#: mod/message.php:201 mod/message.php:356 src/Module/Post/Edit.php:135 +#: mod/message.php:200 mod/message.php:355 src/Module/Post/Edit.php:135 #: src/Module/Profile/UnkMail.php:153 msgid "Insert web link" msgstr "Wstaw link" -#: mod/message.php:202 mod/message.php:358 mod/photos.php:1291 -#: src/Content/Conversation.php:389 src/Content/Conversation.php:733 -#: src/Module/Item/Compose.php:204 src/Module/Post/Edit.php:145 +#: mod/message.php:201 mod/message.php:357 mod/photos.php:1291 +#: src/Content/Conversation.php:390 src/Content/Conversation.php:734 +#: src/Module/Item/Compose.php:205 src/Module/Post/Edit.php:145 #: src/Module/Profile/UnkMail.php:154 src/Object/Post.php:550 msgid "Please wait" msgstr "Proszę czekać" -#: mod/message.php:203 mod/message.php:357 mod/photos.php:702 +#: mod/message.php:202 mod/message.php:356 mod/photos.php:702 #: mod/photos.php:819 mod/photos.php:1097 mod/photos.php:1138 #: mod/photos.php:1194 mod/photos.php:1268 #: src/Module/Calendar/Event/Form.php:250 src/Module/Contact/Advanced.php:132 @@ -364,52 +364,52 @@ msgstr "Proszę czekać" msgid "Submit" msgstr "Potwierdź" -#: mod/message.php:224 +#: mod/message.php:223 msgid "No messages." msgstr "Brak wiadomości." -#: mod/message.php:280 +#: mod/message.php:279 msgid "Message not available." msgstr "Wiadomość nie jest dostępna." -#: mod/message.php:324 +#: mod/message.php:323 msgid "Delete message" msgstr "Usuń wiadomość" -#: mod/message.php:326 mod/message.php:457 +#: mod/message.php:325 mod/message.php:456 msgid "D, d M Y - g:i A" msgstr "D, d M Y - g:m A" -#: mod/message.php:341 mod/message.php:454 +#: mod/message.php:340 mod/message.php:453 msgid "Delete conversation" msgstr "Usuń rozmowę" -#: mod/message.php:343 +#: mod/message.php:342 msgid "" "No secure communications available. You may be able to " "respond from the sender's profile page." msgstr "Brak bezpiecznej komunikacji. Możesz odpowiedzieć na stronie profilu nadawcy." -#: mod/message.php:346 +#: mod/message.php:345 msgid "Send Reply" msgstr "Odpowiedz" -#: mod/message.php:428 +#: mod/message.php:427 #, php-format msgid "Unknown sender - %s" msgstr "Nieznany nadawca - %s" -#: mod/message.php:430 +#: mod/message.php:429 #, php-format msgid "You and %s" msgstr "Ty i %s" -#: mod/message.php:432 +#: mod/message.php:431 #, php-format msgid "%s and You" msgstr "%s i ty" -#: mod/message.php:460 +#: mod/message.php:459 #, php-format msgid "%d message" msgid_plural "%d messages" @@ -445,22 +445,22 @@ msgid "User not found." msgstr "Użytkownik nie znaleziony." #: mod/photos.php:106 src/Module/BaseProfile.php:68 -#: src/Module/Profile/Photos.php:399 +#: src/Module/Profile/Photos.php:381 msgid "Photo Albums" msgstr "Albumy zdjęć" -#: mod/photos.php:107 src/Module/Profile/Photos.php:400 -#: src/Module/Profile/Photos.php:420 +#: mod/photos.php:107 src/Module/Profile/Photos.php:382 +#: src/Module/Profile/Photos.php:402 msgid "Recent Photos" msgstr "Ostatnio dodane zdjęcia" -#: mod/photos.php:109 mod/photos.php:867 src/Module/Profile/Photos.php:402 -#: src/Module/Profile/Photos.php:422 +#: mod/photos.php:109 mod/photos.php:867 src/Module/Profile/Photos.php:384 +#: src/Module/Profile/Photos.php:404 msgid "Upload New Photos" msgstr "Wyślij nowe zdjęcie" #: mod/photos.php:121 src/Module/BaseSettings.php:74 -#: src/Module/Profile/Photos.php:383 +#: src/Module/Profile/Photos.php:365 msgid "everybody" msgstr "wszyscy" @@ -494,7 +494,7 @@ msgid "%1$s was tagged in %2$s by %3$s" msgstr "%1$szostał oznaczony znacznikiem %2$s przez %3$s" #: mod/photos.php:581 src/Module/Conversation/Community.php:188 -#: src/Module/Directory.php:48 src/Module/Profile/Photos.php:315 +#: src/Module/Directory.php:48 src/Module/Profile/Photos.php:297 #: src/Module/Search/Index.php:65 msgid "Public access denied." msgstr "Odmowa dostępu publicznego." @@ -524,8 +524,8 @@ msgstr "lub wybierz istniejący album:" msgid "Do not show a status post for this upload" msgstr "Nie pokazuj stanu wpisów dla tego wysłania" -#: mod/photos.php:733 mod/photos.php:1093 src/Content/Conversation.php:391 -#: src/Module/Calendar/Event/Form.php:253 src/Module/Post/Edit.php:182 +#: mod/photos.php:733 mod/photos.php:1093 src/Content/Conversation.php:392 +#: src/Module/Calendar/Event/Form.php:253 src/Module/Post/Edit.php:183 msgid "Permissions" msgstr "Uprawnienia" @@ -537,7 +537,7 @@ msgstr "Czy na pewno chcesz usunąć ten album i wszystkie zdjęcia z tego album msgid "Delete Album" msgstr "Usuń album" -#: mod/photos.php:798 mod/photos.php:899 src/Content/Conversation.php:407 +#: mod/photos.php:798 mod/photos.php:899 src/Content/Conversation.php:408 #: src/Module/Contact/Follow.php:173 src/Module/Contact/Revoke.php:109 #: src/Module/Contact/Unfollow.php:126 #: src/Module/Media/Attachment/Browser.php:77 @@ -563,7 +563,7 @@ msgstr "Pokaż najpierw najnowsze" msgid "Show Oldest First" msgstr "Pokaż najpierw najstarsze" -#: mod/photos.php:852 src/Module/Profile/Photos.php:370 +#: mod/photos.php:852 src/Module/Profile/Photos.php:352 msgid "View Photo" msgstr "Zobacz zdjęcie" @@ -656,9 +656,9 @@ msgid "Comment" msgstr "Komentarz" #: mod/photos.php:1139 mod/photos.php:1195 mod/photos.php:1269 -#: src/Content/Conversation.php:404 src/Module/Calendar/Event/Form.php:248 -#: src/Module/Item/Compose.php:199 src/Module/Post/Edit.php:165 -#: src/Object/Post.php:1074 +#: src/Content/Conversation.php:405 src/Module/Calendar/Event/Form.php:248 +#: src/Module/Item/Compose.php:200 src/Module/Post/Edit.php:165 +#: src/Object/Post.php:1075 msgid "Preview" msgstr "Podgląd" @@ -667,12 +667,12 @@ msgstr "Podgląd" msgid "Loading..." msgstr "Wczytywanie..." -#: mod/photos.php:1226 src/Content/Conversation.php:649 +#: mod/photos.php:1226 src/Content/Conversation.php:650 #: src/Object/Post.php:257 msgid "Select" msgstr "Wybierz" -#: mod/photos.php:1227 src/Content/Conversation.php:650 +#: mod/photos.php:1227 src/Content/Conversation.php:651 #: src/Module/Moderation/Users/Active.php:136 #: src/Module/Moderation/Users/Blocked.php:136 #: src/Module/Moderation/Users/Index.php:151 @@ -700,11 +700,11 @@ msgstr "Nie lubię tego (zmień)" msgid "Map" msgstr "Mapa" -#: src/App.php:470 +#: src/App.php:473 msgid "No system theme config value set." msgstr "Nie ustawiono wartości konfiguracyjnej zestawu tematycznego." -#: src/App.php:574 +#: src/App.php:577 msgid "Apologies but the website is unavailable at the moment." msgstr "Przepraszamy, ale strona jest w tej chwili niedostępna." @@ -1288,8 +1288,8 @@ msgstr[3] "" msgid "Visible to everybody" msgstr "Widoczne dla wszystkich" -#: src/Content/Conversation.php:329 src/Module/Item/Compose.php:198 -#: src/Object/Post.php:1073 +#: src/Content/Conversation.php:329 src/Module/Item/Compose.php:199 +#: src/Object/Post.php:1074 msgid "Please enter a image/video/audio/webpage URL:" msgstr "Wprowadź adres URL obrazu/wideo/audio/strony:" @@ -1355,195 +1355,200 @@ msgstr "Cytat" #: src/Content/Conversation.php:368 src/Module/Item/Compose.php:194 #: src/Module/Post/Edit.php:175 src/Object/Post.php:1069 +msgid "Add emojis" +msgstr "" + +#: src/Content/Conversation.php:369 src/Module/Item/Compose.php:195 +#: src/Module/Post/Edit.php:176 src/Object/Post.php:1070 msgid "Code" msgstr "Kod" -#: src/Content/Conversation.php:369 src/Module/Item/Compose.php:195 -#: src/Object/Post.php:1070 +#: src/Content/Conversation.php:370 src/Module/Item/Compose.php:196 +#: src/Object/Post.php:1071 msgid "Image" msgstr "Obraz" -#: src/Content/Conversation.php:370 src/Module/Item/Compose.php:196 -#: src/Module/Post/Edit.php:176 src/Object/Post.php:1071 +#: src/Content/Conversation.php:371 src/Module/Item/Compose.php:197 +#: src/Module/Post/Edit.php:177 src/Object/Post.php:1072 msgid "Link" msgstr "Odnośnik" -#: src/Content/Conversation.php:371 src/Module/Item/Compose.php:197 -#: src/Module/Post/Edit.php:177 src/Object/Post.php:1072 +#: src/Content/Conversation.php:372 src/Module/Item/Compose.php:198 +#: src/Module/Post/Edit.php:178 src/Object/Post.php:1073 msgid "Link or Media" msgstr "Odnośnik lub Media" -#: src/Content/Conversation.php:372 +#: src/Content/Conversation.php:373 msgid "Video" msgstr "Filmy" -#: src/Content/Conversation.php:373 src/Module/Item/Compose.php:200 +#: src/Content/Conversation.php:374 src/Module/Item/Compose.php:201 #: src/Module/Post/Edit.php:141 msgid "Set your location" msgstr "Ustaw swoją lokalizację" -#: src/Content/Conversation.php:374 src/Module/Post/Edit.php:142 +#: src/Content/Conversation.php:375 src/Module/Post/Edit.php:142 msgid "set location" msgstr "wybierz lokalizację" -#: src/Content/Conversation.php:375 src/Module/Post/Edit.php:143 +#: src/Content/Conversation.php:376 src/Module/Post/Edit.php:143 msgid "Clear browser location" msgstr "Wyczyść lokalizację przeglądarki" -#: src/Content/Conversation.php:376 src/Module/Post/Edit.php:144 +#: src/Content/Conversation.php:377 src/Module/Post/Edit.php:144 msgid "clear location" msgstr "wyczyść lokalizację" -#: src/Content/Conversation.php:378 src/Module/Item/Compose.php:205 +#: src/Content/Conversation.php:379 src/Module/Item/Compose.php:206 #: src/Module/Post/Edit.php:157 msgid "Set title" msgstr "Podaj tytuł" -#: src/Content/Conversation.php:380 src/Module/Item/Compose.php:206 +#: src/Content/Conversation.php:381 src/Module/Item/Compose.php:207 #: src/Module/Post/Edit.php:159 msgid "Categories (comma-separated list)" msgstr "Kategorie (lista słów oddzielonych przecinkiem)" -#: src/Content/Conversation.php:385 src/Module/Item/Compose.php:222 +#: src/Content/Conversation.php:386 src/Module/Item/Compose.php:223 msgid "Scheduled at" msgstr "Zaplanowane na" -#: src/Content/Conversation.php:390 src/Module/Post/Edit.php:146 +#: src/Content/Conversation.php:391 src/Module/Post/Edit.php:146 msgid "Permission settings" msgstr "Ustawienia uprawnień" -#: src/Content/Conversation.php:400 src/Module/Post/Edit.php:155 +#: src/Content/Conversation.php:401 src/Module/Post/Edit.php:155 msgid "Public post" msgstr "Wpis publiczny" -#: src/Content/Conversation.php:414 src/Content/Widget/VCard.php:113 +#: src/Content/Conversation.php:415 src/Content/Widget/VCard.php:113 #: src/Model/Profile.php:469 src/Module/Admin/Logs/View.php:92 -#: src/Module/Post/Edit.php:180 +#: src/Module/Post/Edit.php:181 msgid "Message" msgstr "Wiadomość" -#: src/Content/Conversation.php:415 src/Module/Post/Edit.php:181 +#: src/Content/Conversation.php:416 src/Module/Post/Edit.php:182 #: src/Module/Settings/TwoFactor/Trusted.php:140 msgid "Browser" msgstr "Przeglądarka" -#: src/Content/Conversation.php:417 src/Module/Post/Edit.php:184 +#: src/Content/Conversation.php:418 src/Module/Post/Edit.php:185 msgid "Open Compose page" msgstr "Otwórz stronę Redagowanie" -#: src/Content/Conversation.php:677 src/Object/Post.php:244 +#: src/Content/Conversation.php:678 src/Object/Post.php:244 msgid "Pinned item" msgstr "Przypięty element" -#: src/Content/Conversation.php:693 src/Object/Post.php:496 +#: src/Content/Conversation.php:694 src/Object/Post.php:496 #: src/Object/Post.php:497 #, php-format msgid "View %s's profile @ %s" msgstr "Pokaż profil %s @ %s" -#: src/Content/Conversation.php:706 src/Object/Post.php:484 +#: src/Content/Conversation.php:707 src/Object/Post.php:484 msgid "Categories:" msgstr "Kategorie:" -#: src/Content/Conversation.php:707 src/Object/Post.php:485 +#: src/Content/Conversation.php:708 src/Object/Post.php:485 msgid "Filed under:" msgstr "Umieszczono w:" -#: src/Content/Conversation.php:715 src/Object/Post.php:510 +#: src/Content/Conversation.php:716 src/Object/Post.php:510 #, php-format msgid "%s from %s" msgstr "%s od %s" -#: src/Content/Conversation.php:731 +#: src/Content/Conversation.php:732 msgid "View in context" msgstr "Zobacz w kontekście" -#: src/Content/Conversation.php:796 +#: src/Content/Conversation.php:797 msgid "remove" msgstr "usuń" -#: src/Content/Conversation.php:800 +#: src/Content/Conversation.php:801 msgid "Delete Selected Items" msgstr "Usuń zaznaczone elementy" -#: src/Content/Conversation.php:865 src/Content/Conversation.php:868 -#: src/Content/Conversation.php:871 src/Content/Conversation.php:874 -#: src/Content/Conversation.php:877 +#: src/Content/Conversation.php:866 src/Content/Conversation.php:869 +#: src/Content/Conversation.php:872 src/Content/Conversation.php:875 +#: src/Content/Conversation.php:878 #, php-format msgid "You had been addressed (%s)." msgstr "Zostałeś zaadresowany (%s)." -#: src/Content/Conversation.php:880 +#: src/Content/Conversation.php:881 #, php-format msgid "You are following %s." msgstr "Zacząłeś obserwować %s." -#: src/Content/Conversation.php:883 +#: src/Content/Conversation.php:884 msgid "You subscribed to one or more tags in this post." msgstr "Zasubskrybowałeś jeden lub więcej znaczników w tym wpisie." -#: src/Content/Conversation.php:896 +#: src/Content/Conversation.php:897 #, php-format msgid "%s reshared this." msgstr "%sudostępnił to. " -#: src/Content/Conversation.php:898 +#: src/Content/Conversation.php:899 msgid "Reshared" msgstr "Udostępnione" -#: src/Content/Conversation.php:898 +#: src/Content/Conversation.php:899 #, php-format msgid "Reshared by %s <%s>" msgstr "Udostępnione przez %s <%s>" -#: src/Content/Conversation.php:901 +#: src/Content/Conversation.php:902 #, php-format msgid "%s is participating in this thread." msgstr "%s bierze udział w tym wątku." -#: src/Content/Conversation.php:904 +#: src/Content/Conversation.php:905 msgid "Stored for general reasons" msgstr "Przechowywane z powodów ogólnych" -#: src/Content/Conversation.php:907 +#: src/Content/Conversation.php:908 msgid "Global post" msgstr "Wpis globalny" -#: src/Content/Conversation.php:910 +#: src/Content/Conversation.php:911 msgid "Sent via an relay server" msgstr "Wysłane przez serwer przekazujący" -#: src/Content/Conversation.php:910 +#: src/Content/Conversation.php:911 #, php-format msgid "Sent via the relay server %s <%s>" msgstr "" -#: src/Content/Conversation.php:913 +#: src/Content/Conversation.php:914 msgid "Fetched" msgstr "Pobrane" -#: src/Content/Conversation.php:913 +#: src/Content/Conversation.php:914 #, php-format msgid "Fetched because of %s <%s>" msgstr "Pobrano ponieważ %s <%s>" -#: src/Content/Conversation.php:916 +#: src/Content/Conversation.php:917 msgid "Stored because of a child post to complete this thread." msgstr "Zapisano z powodu wpisu podrzędnego, który miał zakończyć ten wątek." -#: src/Content/Conversation.php:919 +#: src/Content/Conversation.php:920 msgid "Local delivery" msgstr "Dostarczone lokalnie" -#: src/Content/Conversation.php:922 +#: src/Content/Conversation.php:923 msgid "Stored because of your activity (like, comment, star, ...)" msgstr "Przechowywane z powodu Twojej aktywności (polubienie, komentarz, gwiazdka, ...)" -#: src/Content/Conversation.php:925 +#: src/Content/Conversation.php:926 msgid "Distributed" msgstr "Rozpowszechniane" -#: src/Content/Conversation.php:928 +#: src/Content/Conversation.php:929 msgid "Pushed to us" msgstr "" @@ -1677,58 +1682,58 @@ msgstr "pokaż mniej" msgid "show more" msgstr "pokaż więcej" -#: src/Content/Item.php:326 src/Model/Item.php:2922 +#: src/Content/Item.php:327 src/Model/Item.php:2927 msgid "event" msgstr "wydarzenie" -#: src/Content/Item.php:329 src/Content/Item.php:339 +#: src/Content/Item.php:330 src/Content/Item.php:340 msgid "status" msgstr "stan" -#: src/Content/Item.php:335 src/Model/Item.php:2924 +#: src/Content/Item.php:336 src/Model/Item.php:2929 #: src/Module/Post/Tag/Add.php:123 msgid "photo" msgstr "zdjęcie" -#: src/Content/Item.php:349 src/Module/Post/Tag/Add.php:141 +#: src/Content/Item.php:350 src/Module/Post/Tag/Add.php:141 #, php-format msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "%1$s zaznaczył %2$s'go %3$s przy użyciu %4$s" -#: src/Content/Item.php:419 view/theme/frio/theme.php:262 +#: src/Content/Item.php:420 view/theme/frio/theme.php:262 msgid "Follow Thread" msgstr "Śledź wątek" -#: src/Content/Item.php:420 src/Model/Contact.php:1204 +#: src/Content/Item.php:421 src/Model/Contact.php:1204 msgid "View Status" msgstr "Zobacz status" -#: src/Content/Item.php:421 src/Content/Item.php:441 +#: src/Content/Item.php:422 src/Content/Item.php:442 #: src/Model/Contact.php:1148 src/Model/Contact.php:1196 #: src/Model/Contact.php:1205 src/Module/Directory.php:157 #: src/Module/Settings/Profile/Index.php:233 msgid "View Profile" msgstr "Zobacz profil" -#: src/Content/Item.php:422 src/Model/Contact.php:1206 +#: src/Content/Item.php:423 src/Model/Contact.php:1206 msgid "View Photos" msgstr "Zobacz zdjęcia" -#: src/Content/Item.php:423 src/Model/Contact.php:1197 +#: src/Content/Item.php:424 src/Model/Contact.php:1197 #: src/Model/Contact.php:1207 msgid "Network Posts" msgstr "Wiadomości sieciowe" -#: src/Content/Item.php:424 src/Model/Contact.php:1198 +#: src/Content/Item.php:425 src/Model/Contact.php:1198 #: src/Model/Contact.php:1208 msgid "View Contact" msgstr "Pokaż kontakt" -#: src/Content/Item.php:425 src/Model/Contact.php:1209 +#: src/Content/Item.php:426 src/Model/Contact.php:1209 msgid "Send PM" msgstr "Wyślij prywatną wiadomość" -#: src/Content/Item.php:426 src/Module/Contact.php:439 +#: src/Content/Item.php:427 src/Module/Contact.php:439 #: src/Module/Contact/Profile.php:477 #: src/Module/Moderation/Blocklist/Contact.php:116 #: src/Module/Moderation/Users/Active.php:137 @@ -1736,7 +1741,7 @@ msgstr "Wyślij prywatną wiadomość" msgid "Block" msgstr "Zablokuj" -#: src/Content/Item.php:427 src/Module/Contact.php:440 +#: src/Content/Item.php:428 src/Module/Contact.php:440 #: src/Module/Contact/Profile.php:485 #: src/Module/Notifications/Introductions.php:134 #: src/Module/Notifications/Introductions.php:206 @@ -1744,22 +1749,22 @@ msgstr "Zablokuj" msgid "Ignore" msgstr "Ignoruj" -#: src/Content/Item.php:428 src/Module/Contact.php:441 +#: src/Content/Item.php:429 src/Module/Contact.php:441 #: src/Module/Contact/Profile.php:493 msgid "Collapse" msgstr "" -#: src/Content/Item.php:432 src/Object/Post.php:465 +#: src/Content/Item.php:433 src/Object/Post.php:465 msgid "Languages" msgstr "Języki" -#: src/Content/Item.php:438 src/Content/Widget.php:80 +#: src/Content/Item.php:439 src/Content/Widget.php:80 #: src/Model/Contact.php:1199 src/Model/Contact.php:1210 -#: src/Module/Contact/Follow.php:167 view/theme/vier/theme.php:196 +#: src/Module/Contact/Follow.php:167 view/theme/vier/theme.php:195 msgid "Connect/Follow" msgstr "Połącz/Obserwuj" -#: src/Content/Item.php:863 +#: src/Content/Item.php:864 msgid "Unable to fetch user." msgstr "" @@ -1876,7 +1881,7 @@ msgstr "Załóż konto" #: src/Module/Settings/TwoFactor/AppSpecific.php:129 #: src/Module/Settings/TwoFactor/Index.php:118 #: src/Module/Settings/TwoFactor/Recovery.php:107 -#: src/Module/Settings/TwoFactor/Verify.php:146 view/theme/vier/theme.php:241 +#: src/Module/Settings/TwoFactor/Verify.php:146 view/theme/vier/theme.php:240 msgid "Help" msgstr "Pomoc" @@ -2091,8 +2096,8 @@ msgstr "Obrazek/zdjęcie" msgid "%2$s %3$s" msgstr "%2$s %3$s" -#: src/Content/Text/BBCode.php:956 src/Model/Item.php:3607 -#: src/Model/Item.php:3613 src/Model/Item.php:3614 +#: src/Content/Text/BBCode.php:956 src/Model/Item.php:3645 +#: src/Model/Item.php:3651 src/Model/Item.php:3652 msgid "Link to source" msgstr "Odnośnik do źródła" @@ -2154,50 +2159,50 @@ msgstr[1] "%d zaproszeń dostępnych" msgstr[2] "%d zaproszenia dostępne" msgstr[3] "%d zaproszenia dostępne" -#: src/Content/Widget.php:78 view/theme/vier/theme.php:194 +#: src/Content/Widget.php:78 view/theme/vier/theme.php:193 msgid "Find People" msgstr "Znajdź ludzi" -#: src/Content/Widget.php:79 view/theme/vier/theme.php:195 +#: src/Content/Widget.php:79 view/theme/vier/theme.php:194 msgid "Enter name or interest" msgstr "Wpisz nazwę lub zainteresowanie" -#: src/Content/Widget.php:81 view/theme/vier/theme.php:197 +#: src/Content/Widget.php:81 view/theme/vier/theme.php:196 msgid "Examples: Robert Morgenstein, Fishing" msgstr "Przykład: Jan Kowalski, Wędkarstwo" #: src/Content/Widget.php:82 src/Module/Contact.php:432 -#: src/Module/Directory.php:96 view/theme/vier/theme.php:198 +#: src/Module/Directory.php:96 view/theme/vier/theme.php:197 msgid "Find" msgstr "Znajdź" #: src/Content/Widget.php:83 src/Module/Contact/Suggestions.php:73 -#: view/theme/vier/theme.php:199 +#: view/theme/vier/theme.php:198 msgid "Friend Suggestions" msgstr "Osoby, które możesz znać" -#: src/Content/Widget.php:84 view/theme/vier/theme.php:200 +#: src/Content/Widget.php:84 view/theme/vier/theme.php:199 msgid "Similar Interests" msgstr "Podobne zainteresowania" -#: src/Content/Widget.php:85 view/theme/vier/theme.php:201 +#: src/Content/Widget.php:85 view/theme/vier/theme.php:200 msgid "Random Profile" msgstr "Domyślny profil" -#: src/Content/Widget.php:86 view/theme/vier/theme.php:202 +#: src/Content/Widget.php:86 view/theme/vier/theme.php:201 msgid "Invite Friends" msgstr "Zaproś znajomych" #: src/Content/Widget.php:87 src/Module/Directory.php:88 -#: view/theme/vier/theme.php:203 +#: view/theme/vier/theme.php:202 msgid "Global Directory" msgstr "Katalog globalny" -#: src/Content/Widget.php:89 view/theme/vier/theme.php:205 +#: src/Content/Widget.php:89 view/theme/vier/theme.php:204 msgid "Local Directory" msgstr "Katalog lokalny" -#: src/Content/Widget.php:215 src/Model/Group.php:587 +#: src/Content/Widget.php:215 src/Model/Group.php:596 #: src/Module/Contact.php:394 src/Module/Welcome.php:76 msgid "Groups" msgstr "Grupy" @@ -3059,68 +3064,68 @@ msgstr "Organizacja" msgid "Forum" msgstr "Forum" -#: src/Model/Contact.php:2947 +#: src/Model/Contact.php:2952 msgid "Disallowed profile URL." msgstr "Nie dozwolony adres URL profilu." -#: src/Model/Contact.php:2952 src/Module/Friendica.php:83 +#: src/Model/Contact.php:2957 src/Module/Friendica.php:83 msgid "Blocked domain" msgstr "Zablokowana domena" -#: src/Model/Contact.php:2957 +#: src/Model/Contact.php:2962 msgid "Connect URL missing." msgstr "Brak adresu URL połączenia." -#: src/Model/Contact.php:2966 +#: src/Model/Contact.php:2971 msgid "" "The contact could not be added. Please check the relevant network " "credentials in your Settings -> Social Networks page." msgstr "Nie można dodać kontaktu. Sprawdź odpowiednie poświadczenia sieciowe na stronie Ustawienia -> Sieci społecznościowe." -#: src/Model/Contact.php:2984 +#: src/Model/Contact.php:2989 #, php-format msgid "Expected network %s does not match actual network %s" msgstr "" -#: src/Model/Contact.php:3001 +#: src/Model/Contact.php:3006 msgid "The profile address specified does not provide adequate information." msgstr "Dany adres profilu nie dostarcza odpowiednich informacji." -#: src/Model/Contact.php:3003 +#: src/Model/Contact.php:3008 msgid "No compatible communication protocols or feeds were discovered." msgstr "Nie znaleziono żadnych kompatybilnych protokołów komunikacyjnych ani źródeł." -#: src/Model/Contact.php:3006 +#: src/Model/Contact.php:3011 msgid "An author or name was not found." msgstr "Autor lub nazwa nie zostało znalezione." -#: src/Model/Contact.php:3009 +#: src/Model/Contact.php:3014 msgid "No browser URL could be matched to this address." msgstr "Przeglądarka WWW nie może odnaleźć podanego adresu" -#: src/Model/Contact.php:3012 +#: src/Model/Contact.php:3017 msgid "" "Unable to match @-style Identity Address with a known protocol or email " "contact." msgstr "Nie można dopasować @-stylu Adres identyfikacyjny ze znanym protokołem lub kontaktem e-mail." -#: src/Model/Contact.php:3013 +#: src/Model/Contact.php:3018 msgid "Use mailto: in front of address to force email check." msgstr "Użyj mailto: przed adresem, aby wymusić sprawdzanie poczty e-mail." -#: src/Model/Contact.php:3019 +#: src/Model/Contact.php:3024 msgid "" "The profile address specified belongs to a network which has been disabled " "on this site." msgstr "Określony adres profilu należy do sieci, która została wyłączona na tej stronie." -#: src/Model/Contact.php:3024 +#: src/Model/Contact.php:3029 msgid "" "Limited profile. This person will be unable to receive direct/personal " "notifications from you." msgstr "Profil ograniczony. Ta osoba będzie niezdolna do odbierania osobistych powiadomień od ciebie." -#: src/Model/Contact.php:3089 +#: src/Model/Contact.php:3094 msgid "Unable to retrieve contact information." msgstr "Nie można otrzymać informacji kontaktowych" @@ -3232,40 +3237,40 @@ msgid "" "not what you intended, please create another group with a different name." msgstr "Skasowana grupa o tej nazwie została przywrócona. Istniejące uprawnienia do pozycji mogą dotyczyć tej grupy i wszystkich przyszłych członków. Jeśli nie jest to zamierzone, utwórz inną grupę o innej nazwie." -#: src/Model/Group.php:503 +#: src/Model/Group.php:512 msgid "Default privacy group for new contacts" msgstr "Domyślne ustawienia prywatności dla nowych kontaktów" -#: src/Model/Group.php:535 +#: src/Model/Group.php:544 msgid "Everybody" msgstr "Wszyscy" -#: src/Model/Group.php:554 +#: src/Model/Group.php:563 msgid "edit" msgstr "edytuj" -#: src/Model/Group.php:586 +#: src/Model/Group.php:595 msgid "add" msgstr "dodaj" -#: src/Model/Group.php:591 +#: src/Model/Group.php:600 msgid "Edit group" msgstr "Edytuj grupy" -#: src/Model/Group.php:592 src/Module/Group.php:192 +#: src/Model/Group.php:601 src/Module/Group.php:192 msgid "Contacts not in any group" msgstr "Kontakt nie jest w żadnej grupie" -#: src/Model/Group.php:594 +#: src/Model/Group.php:603 msgid "Create a new group" msgstr "Stwórz nową grupę" -#: src/Model/Group.php:595 src/Module/Group.php:177 src/Module/Group.php:200 +#: src/Model/Group.php:604 src/Module/Group.php:177 src/Module/Group.php:200 #: src/Module/Group.php:275 msgid "Group Name: " msgstr "Nazwa grupy: " -#: src/Model/Group.php:596 +#: src/Model/Group.php:605 msgid "Edit groups" msgstr "Edytuj grupy" @@ -3274,43 +3279,43 @@ msgstr "Edytuj grupy" msgid "Detected languages in this post:\\n%s" msgstr "Wykryte języki w tym wpisie:\\n%s" -#: src/Model/Item.php:2926 +#: src/Model/Item.php:2931 msgid "activity" msgstr "aktywność" -#: src/Model/Item.php:2928 +#: src/Model/Item.php:2933 msgid "comment" msgstr "komentarz" -#: src/Model/Item.php:2931 src/Module/Post/Tag/Add.php:123 +#: src/Model/Item.php:2936 src/Module/Post/Tag/Add.php:123 msgid "post" msgstr "wpis" -#: src/Model/Item.php:3093 +#: src/Model/Item.php:3105 #, php-format msgid "%s is blocked" msgstr "" -#: src/Model/Item.php:3095 +#: src/Model/Item.php:3107 #, php-format msgid "%s is ignored" msgstr "" -#: src/Model/Item.php:3097 +#: src/Model/Item.php:3109 #, php-format msgid "Content from %s is collapsed" msgstr "" -#: src/Model/Item.php:3101 +#: src/Model/Item.php:3113 #, php-format msgid "Content warning: %s" msgstr "Ostrzeżenie o treści: %s" -#: src/Model/Item.php:3519 +#: src/Model/Item.php:3557 msgid "bytes" msgstr "bajty" -#: src/Model/Item.php:3550 +#: src/Model/Item.php:3588 #, php-format msgid "%2$s (%3$d%%, %1$d vote)" msgid_plural "%2$s (%3$d%%, %1$d votes)" @@ -3319,7 +3324,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: src/Model/Item.php:3552 +#: src/Model/Item.php:3590 #, php-format msgid "%2$s (%1$d vote)" msgid_plural "%2$s (%1$d votes)" @@ -3328,7 +3333,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: src/Model/Item.php:3557 +#: src/Model/Item.php:3595 #, php-format msgid "%d voter. Poll end: %s" msgid_plural "%d voters. Poll end: %s" @@ -3337,7 +3342,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: src/Model/Item.php:3559 +#: src/Model/Item.php:3597 #, php-format msgid "%d voter." msgid_plural "%d voters." @@ -3346,12 +3351,12 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: src/Model/Item.php:3561 +#: src/Model/Item.php:3599 #, php-format msgid "Poll end: %s" msgstr "Koniec ankiety: %s" -#: src/Model/Item.php:3595 src/Model/Item.php:3596 +#: src/Model/Item.php:3633 src/Model/Item.php:3634 msgid "View on separate page" msgstr "Zobacz na oddzielnej stronie" @@ -3359,7 +3364,7 @@ msgstr "Zobacz na oddzielnej stronie" msgid "[no subject]" msgstr "[bez tematu]" -#: src/Model/Photo.php:1189 src/Module/Media/Photo/Upload.php:197 +#: src/Model/Photo.php:1184 src/Module/Media/Photo/Upload.php:171 msgid "Wall Photos" msgstr "Tablica zdjęć" @@ -5647,11 +5652,11 @@ msgstr "Szukaj osób - %s" msgid "Forum Search - %s" msgstr "Przeszukiwanie forum - %s" -#: src/Module/BaseSearch.php:121 src/Module/Contact/MatchInterests.php:139 +#: src/Module/BaseSearch.php:123 src/Module/Contact/MatchInterests.php:139 msgid "No matches" msgstr "Brak wyników" -#: src/Module/BaseSearch.php:147 +#: src/Module/BaseSearch.php:149 #, php-format msgid "" "%d result was filtered out because your node blocks the domain it is " @@ -7346,21 +7351,21 @@ msgstr "Utwórz nowy wpis" msgid "Visibility" msgstr "Widoczność" -#: src/Module/Item/Compose.php:201 +#: src/Module/Item/Compose.php:202 msgid "Clear the location" msgstr "Wyczyść lokalizację" -#: src/Module/Item/Compose.php:202 +#: src/Module/Item/Compose.php:203 msgid "Location services are unavailable on your device" msgstr "Usługi lokalizacyjne są niedostępne na twoim urządzeniu" -#: src/Module/Item/Compose.php:203 +#: src/Module/Item/Compose.php:204 msgid "" "Location services are disabled. Please check the website's permissions on " "your device" msgstr "Usługi lokalizacyjne są wyłączone. Sprawdź uprawnienia strony internetowej na swoim urządzeniu" -#: src/Module/Item/Compose.php:209 +#: src/Module/Item/Compose.php:210 msgid "" "You can make this page always open when you use the New Post button in the " "Theme Customization settings." @@ -7431,14 +7436,7 @@ msgstr "Przesyłanie pliku nie powiodło się." msgid "Unable to process image." msgstr "Przetwarzanie obrazu nie powiodło się." -#: src/Module/Media/Photo/Upload.php:187 src/Module/Profile/Photos.php:164 -#: src/Module/Profile/Photos.php:167 src/Module/Profile/Photos.php:194 -#: src/Module/Settings/Profile/Photo/Index.php:59 -#, php-format -msgid "Image exceeds size limit of %s" -msgstr "Obraz przekracza limit rozmiaru wynoszący %s" - -#: src/Module/Media/Photo/Upload.php:205 src/Module/Profile/Photos.php:243 +#: src/Module/Media/Photo/Upload.php:179 src/Module/Profile/Photos.php:237 #: src/Module/Settings/Profile/Photo/Index.php:95 msgid "Image upload failed." msgstr "Przesyłanie obrazu nie powiodło się." @@ -8491,24 +8489,31 @@ msgstr "Brak kontaktów." #: src/Module/Profile/Conversations.php:106 #: src/Module/Profile/Conversations.php:109 src/Module/Profile/Profile.php:351 -#: src/Module/Profile/Profile.php:354 src/Protocol/Feed.php:1032 +#: src/Module/Profile/Profile.php:354 src/Protocol/Feed.php:1090 #: src/Protocol/OStatus.php:1007 #, php-format msgid "%s's timeline" msgstr "oś czasu %s" #: src/Module/Profile/Conversations.php:107 src/Module/Profile/Profile.php:352 -#: src/Protocol/Feed.php:1036 src/Protocol/OStatus.php:1012 +#: src/Protocol/Feed.php:1094 src/Protocol/OStatus.php:1012 #, php-format msgid "%s's posts" msgstr "wpisy %s" #: src/Module/Profile/Conversations.php:108 src/Module/Profile/Profile.php:353 -#: src/Protocol/Feed.php:1039 src/Protocol/OStatus.php:1016 +#: src/Protocol/Feed.php:1097 src/Protocol/OStatus.php:1016 #, php-format msgid "%s's comments" msgstr "komentarze %s" +#: src/Module/Profile/Photos.php:164 src/Module/Profile/Photos.php:167 +#: src/Module/Profile/Photos.php:194 +#: src/Module/Settings/Profile/Photo/Index.php:59 +#, php-format +msgid "Image exceeds size limit of %s" +msgstr "Obraz przekracza limit rozmiaru wynoszący %s" + #: src/Module/Profile/Photos.php:170 msgid "Image upload didn't complete, please try again" msgstr "Przesyłanie zdjęć nie zostało zakończone, spróbuj ponownie" @@ -8527,7 +8532,7 @@ msgstr "Serwer nie może teraz przyjąć nowego pliku, skontaktuj się z adminis msgid "Image file is empty." msgstr "Plik obrazka jest pusty." -#: src/Module/Profile/Photos.php:376 +#: src/Module/Profile/Photos.php:358 msgid "View Album" msgstr "Zobacz album" @@ -12028,7 +12033,7 @@ msgstr "Ustaw styl" msgid "Community Pages" msgstr "Strony społeczności" -#: view/theme/vier/config.php:139 view/theme/vier/theme.php:149 +#: view/theme/vier/config.php:139 view/theme/vier/theme.php:148 msgid "Community Profiles" msgstr "Profile społeczności" @@ -12036,7 +12041,7 @@ msgstr "Profile społeczności" msgid "Help or @NewHere ?" msgstr "Pomóż lub @NowyTutaj ?" -#: view/theme/vier/config.php:141 view/theme/vier/theme.php:320 +#: view/theme/vier/config.php:141 view/theme/vier/theme.php:319 msgid "Connect Services" msgstr "Połączone serwisy" @@ -12044,10 +12049,10 @@ msgstr "Połączone serwisy" msgid "Find Friends" msgstr "Znajdź znajomych" -#: view/theme/vier/config.php:143 view/theme/vier/theme.php:176 +#: view/theme/vier/config.php:143 view/theme/vier/theme.php:175 msgid "Last users" msgstr "Ostatni użytkownicy" -#: view/theme/vier/theme.php:235 +#: view/theme/vier/theme.php:234 msgid "Quick Start" msgstr "Szybki start" diff --git a/view/lang/pl/strings.php b/view/lang/pl/strings.php index 86ec7d25b..ed93ce1fc 100644 --- a/view/lang/pl/strings.php +++ b/view/lang/pl/strings.php @@ -1626,7 +1626,6 @@ $a->strings['Or - did you try to upload an empty file?'] = 'Lub - czy próbował $a->strings['File exceeds size limit of %s'] = 'Plik przekracza limit rozmiaru wynoszący %s'; $a->strings['File upload failed.'] = 'Przesyłanie pliku nie powiodło się.'; $a->strings['Unable to process image.'] = 'Przetwarzanie obrazu nie powiodło się.'; -$a->strings['Image exceeds size limit of %s'] = 'Obraz przekracza limit rozmiaru wynoszący %s'; $a->strings['Image upload failed.'] = 'Przesyłanie obrazu nie powiodło się.'; $a->strings['List of all users'] = 'Lista wszystkich użytkowników'; $a->strings['Active'] = 'Aktywne'; @@ -1880,6 +1879,7 @@ $a->strings['No contacts.'] = 'Brak kontaktów.'; $a->strings['%s\'s timeline'] = 'oś czasu %s'; $a->strings['%s\'s posts'] = 'wpisy %s'; $a->strings['%s\'s comments'] = 'komentarze %s'; +$a->strings['Image exceeds size limit of %s'] = 'Obraz przekracza limit rozmiaru wynoszący %s'; $a->strings['Image upload didn\'t complete, please try again'] = 'Przesyłanie zdjęć nie zostało zakończone, spróbuj ponownie'; $a->strings['Image file is missing'] = 'Brak pliku obrazu'; $a->strings['Server can\'t accept new file upload at this time, please contact your administrator'] = 'Serwer nie może teraz przyjąć nowego pliku, skontaktuj się z administratorem'; From 14956244cce99e84554f2fc8cca57e6ab2992f0f Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 18 May 2023 15:55:42 +0200 Subject: [PATCH 10/10] bump version 2023.05-rc --- VERSION | 2 +- src/App.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 583a9757b..fc8ec5454 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2023.06-dev +2023.05-rc diff --git a/src/App.php b/src/App.php index 495cfb8b0..bd9039ad0 100644 --- a/src/App.php +++ b/src/App.php @@ -64,7 +64,7 @@ class App { const PLATFORM = 'Friendica'; const CODENAME = 'Giant Rhubarb'; - const VERSION = '2023.06-dev'; + const VERSION = '2023.05-rc'; // Allow themes to control internal parameters // by changing App values in theme.php