bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #10874 from annando/profile-photo

Browse source 
Use a constant for the profile photo album
This commit is contained in:
Hypolite Petovan 2021-10-14 02:27:18 -04:00 committed by GitHub
commit ca1801a164
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 133 additions and 174 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/api.php
View file

@ -4408,7 +4408,7 @@ function api_account_update_profile_image($type)
$media = $_FILES['media']; $media = $_FILES['media'];
} }
// save new profile image // save new profile image
$data = save_media_to_database("profileimage", $media, $type, DI::l10n()->t('Profile Photos'), "", "", "", "", "", Photo::USER_AVATAR); $data = save_media_to_database("profileimage", $media, $type, DI::l10n()->t(Photo::PROFILE_PHOTOS), "", "", "", "", "", Photo::USER_AVATAR);
// get filetype // get filetype
if (is_array($media['type'])) { if (is_array($media['type'])) {

12
mod/photos.php
View file

@ -86,7 +86,7 @@ function photos_init(App $a) {
$ret['albums'] = []; $ret['albums'] = [];
foreach ($albums as $k => $album) { foreach ($albums as $k => $album) {
//hide profile photos to others //hide profile photos to others
if (!$is_owner && !Session::getRemoteContactID($owner['uid']) && ($album['album'] == DI::l10n()->t('Profile Photos'))) if (!$is_owner && !Session::getRemoteContactID($owner['uid']) && ($album['album'] == DI::l10n()->t(Photo::PROFILE_PHOTOS)))
continue; continue;
$entry = [ $entry = [
'text' => $album['album'], 'text' => $album['album'],
@ -195,7 +195,7 @@ function photos_post(App $a)
} }
$album = hex2bin(DI::args()->getArgv()[3]); $album = hex2bin(DI::args()->getArgv()[3]);
if ($album === DI::l10n()->t('Profile Photos') || $album === Photo::CONTACT_PHOTOS || $album === DI::l10n()->t(Photo::CONTACT_PHOTOS)) { if ($album === DI::l10n()->t(Photo::PROFILE_PHOTOS) || $album === Photo::CONTACT_PHOTOS || $album === DI::l10n()->t(Photo::CONTACT_PHOTOS)) {
DI::baseUrl()->redirect($_SESSION['photo_return']); DI::baseUrl()->redirect($_SESSION['photo_return']);
return; // NOTREACHED return; // NOTREACHED
} }
@ -614,7 +614,7 @@ function photos_post(App $a)
$r = Photo::selectToArray([], ['`album` = ? AND `uid` = ? AND `created` > UTC_TIMESTAMP() - INTERVAL 3 HOUR', $album, $page_owner_uid]); $r = Photo::selectToArray([], ['`album` = ? AND `uid` = ? AND `created` > UTC_TIMESTAMP() - INTERVAL 3 HOUR', $album, $page_owner_uid]);
if (!DBA::isResult($r) || ($album == DI::l10n()->t('Profile Photos'))) { if (!DBA::isResult($r) || ($album == DI::l10n()->t(Photo::PROFILE_PHOTOS))) {
$visible = 1; $visible = 1;
} else { } else {
$visible = 0; $visible = 0;
@ -1025,7 +1025,7 @@ function photos_content(App $a)
// edit album name // edit album name
if ($cmd === 'edit') { if ($cmd === 'edit') {
if (($album !== DI::l10n()->t('Profile Photos')) && ($album !== Photo::CONTACT_PHOTOS) && ($album !== DI::l10n()->t(Photo::CONTACT_PHOTOS))) { if (($album !== DI::l10n()->t(Photo::PROFILE_PHOTOS)) && ($album !== Photo::CONTACT_PHOTOS) && ($album !== DI::l10n()->t(Photo::CONTACT_PHOTOS))) {
if ($can_post) { if ($can_post) {
$edit_tpl = Renderer::getMarkupTemplate('album_edit.tpl'); $edit_tpl = Renderer::getMarkupTemplate('album_edit.tpl');
@ -1042,7 +1042,7 @@ function photos_content(App $a)
} }
} }
} else { } else {
if (($album !== DI::l10n()->t('Profile Photos')) && ($album !== Photo::CONTACT_PHOTOS) && ($album !== DI::l10n()->t(Photo::CONTACT_PHOTOS)) && $can_post) { if (($album !== DI::l10n()->t(Photo::PROFILE_PHOTOS)) && ($album !== Photo::CONTACT_PHOTOS) && ($album !== DI::l10n()->t(Photo::CONTACT_PHOTOS)) && $can_post) {
$edit = [DI::l10n()->t('Edit Album'), 'photos/' . $user['nickname'] . '/album/' . bin2hex($album) . '/edit']; $edit = [DI::l10n()->t('Edit Album'), 'photos/' . $user['nickname'] . '/album/' . bin2hex($album) . '/edit'];
$drop = [DI::l10n()->t('Drop Album'), 'photos/' . $user['nickname'] . '/album/' . bin2hex($album) . '/drop']; $drop = [DI::l10n()->t('Drop Album'), 'photos/' . $user['nickname'] . '/album/' . bin2hex($album) . '/drop'];
} }
@ -1576,7 +1576,7 @@ function photos_content(App $a)
$twist = false; $twist = false;
foreach ($r as $rr) { foreach ($r as $rr) {
//hide profile photos to others //hide profile photos to others
if (!$is_owner && !Session::getRemoteContactID($owner_uid) && ($rr['album'] == DI::l10n()->t('Profile Photos'))) { if (!$is_owner && !Session::getRemoteContactID($owner_uid) && ($rr['album'] == DI::l10n()->t(Photo::PROFILE_PHOTOS))) {
continue; continue;
} }

20
src/Model/Photo.php
View file

@ -45,6 +45,7 @@ use Friendica\Util\Strings;
class Photo class Photo
{ {
const CONTACT_PHOTOS = 'Contact Photos'; const CONTACT_PHOTOS = 'Contact Photos';
const PROFILE_PHOTOS = 'Profile Photos';
const DEFAULT = 0; const DEFAULT = 0;
const USER_AVATAR = 10; const USER_AVATAR = 10;
@ -563,25 +564,6 @@ class Photo
$image_url = DI::baseUrl() . "/photo/" . $resource_id . "-4." . $Image->getExt() . $suffix; $image_url = DI::baseUrl() . "/photo/" . $resource_id . "-4." . $Image->getExt() . $suffix;
$thumb = DI::baseUrl() . "/photo/" . $resource_id . "-5." . $Image->getExt() . $suffix; $thumb = DI::baseUrl() . "/photo/" . $resource_id . "-5." . $Image->getExt() . $suffix;
$micro = DI::baseUrl() . "/photo/" . $resource_id . "-6." . $Image->getExt() . $suffix; $micro = DI::baseUrl() . "/photo/" . $resource_id . "-6." . $Image->getExt() . $suffix;
// Remove the cached photo
$a = DI::app();
$basepath = $a->getBasePath();
if (is_dir($basepath . "/photo")) {
$filename = $basepath . "/photo/" . $resource_id . "-4." . $Image->getExt();
if (file_exists($filename)) {
unlink($filename);
}
$filename = $basepath . "/photo/" . $resource_id . "-5." . $Image->getExt();
if (file_exists($filename)) {
unlink($filename);
}
$filename = $basepath . "/photo/" . $resource_id . "-6." . $Image->getExt();
if (file_exists($filename)) {
unlink($filename);
}
}
} else { } else {
$photo_failure = true; $photo_failure = true;
} }

9
src/Model/User.php
View file

@ -1161,7 +1161,10 @@ class User
$resource_id = Photo::newResource(); $resource_id = Photo::newResource();
$r = Photo::store($Image, $uid, 0, $resource_id, $filename, DI::l10n()->t('Profile Photos'), 4); // Not using Photo::PROFILE_PHOTOS here, so that it is discovered as translateble string
$profile_album = DI::l10n()->t('Profile Photos');
$r = Photo::store($Image, $uid, 0, $resource_id, $filename, $profile_album, 4);
if ($r === false) { if ($r === false) {
$photo_failure = true; $photo_failure = true;
@ -1169,7 +1172,7 @@ class User
$Image->scaleDown(80); $Image->scaleDown(80);
$r = Photo::store($Image, $uid, 0, $resource_id, $filename, DI::l10n()->t('Profile Photos'), 5); $r = Photo::store($Image, $uid, 0, $resource_id, $filename, $profile_album, 5);
if ($r === false) { if ($r === false) {
$photo_failure = true; $photo_failure = true;
@ -1177,7 +1180,7 @@ class User
$Image->scaleDown(48); $Image->scaleDown(48);
$r = Photo::store($Image, $uid, 0, $resource_id, $filename, DI::l10n()->t('Profile Photos'), 6); $r = Photo::store($Image, $uid, 0, $resource_id, $filename, $profile_album, 6);
if ($r === false) { if ($r === false) {
$photo_failure = true; $photo_failure = true;

8
src/Module/Settings/Profile/Photo/Crop.php
View file

@ -98,7 +98,7 @@ class Crop extends BaseSettings
0, 0,
$resource_id, $resource_id,
$base_image['filename'], $base_image['filename'],
DI::l10n()->t('Profile Photos'), DI::l10n()->t(Photo::PROFILE_PHOTOS),
4, 4,
Photo::USER_AVATAR Photo::USER_AVATAR
); );
@ -114,7 +114,7 @@ class Crop extends BaseSettings
0, 0,
$resource_id, $resource_id,
$base_image['filename'], $base_image['filename'],
DI::l10n()->t('Profile Photos'), DI::l10n()->t(Photo::PROFILE_PHOTOS),
5, 5,
Photo::USER_AVATAR Photo::USER_AVATAR
); );
@ -130,7 +130,7 @@ class Crop extends BaseSettings
0, 0,
$resource_id, $resource_id,
$base_image['filename'], $base_image['filename'],
DI::l10n()->t('Profile Photos'), DI::l10n()->t(Photo::PROFILE_PHOTOS),
6, 6,
Photo::USER_AVATAR Photo::USER_AVATAR
); );
@ -176,7 +176,7 @@ class Crop extends BaseSettings
// set an already uloaded photo as profile photo // set an already uloaded photo as profile photo
// if photo is in 'Profile Photos', change it in db // if photo is in 'Profile Photos', change it in db
if ($photos[0]['album'] == DI::l10n()->t('Profile Photos') && $havescale) { if ($photos[0]['album'] == DI::l10n()->t(Photo::PROFILE_PHOTOS) && $havescale) {
Photo::update(['profile' => false], ['uid' => local_user()]); Photo::update(['profile' => false], ['uid' => local_user()]);
Photo::update(['profile' => true], ['resource-id' => $resource_id, 'uid' => local_user()]); Photo::update(['profile' => true], ['resource-id' => $resource_id, 'uid' => local_user()]);

4
src/Module/Settings/Profile/Photo/Index.php
View file

@ -92,13 +92,13 @@ class Index extends BaseSettings
$filename = ''; $filename = '';
if (!Photo::store($Image, local_user(), 0, $resource_id, $filename, DI::l10n()->t('Profile Photos'), 0)) { if (!Photo::store($Image, local_user(), 0, $resource_id, $filename, DI::l10n()->t(Photo::PROFILE_PHOTOS), 0)) {
notice(DI::l10n()->t('Image upload failed.')); notice(DI::l10n()->t('Image upload failed.'));
} }
if ($width > 640 || $height > 640) { if ($width > 640 || $height > 640) {
$Image->scaleDown(640); $Image->scaleDown(640);
if (!Photo::store($Image, local_user(), 0, $resource_id, $filename, DI::l10n()->t('Profile Photos'), 1)) { if (!Photo::store($Image, local_user(), 0, $resource_id, $filename, DI::l10n()->t(Photo::PROFILE_PHOTOS), 1)) {
notice(DI::l10n()->t('Image size reduction [%s] failed.', '640')); notice(DI::l10n()->t('Image size reduction [%s] failed.', '640'));
} }
} }

18
src/Object/Image.php
View file

@ -637,24 +637,6 @@ class Image
$this->height = imagesy($this->image); $this->height = imagesy($this->image);
} }
/**
* @param string $path file path
* @return mixed
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
public function saveToFilePath($path)
{
if (!$this->isValid()) {
return false;
}
$string = $this->asString();
DI::profiler()->stopRecording('file');
file_put_contents($path, $string);
DI::profiler()->stopRecording();
}
/** /**
* Magic method allowing string casting of an Image object * Magic method allowing string casting of an Image object
* *

234
view/lang/C/messages.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2021.12-dev\n" "Project-Id-Version: 2021.12-dev\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-10-09 21:14+0000\n" "POT-Creation-Date: 2021-10-14 06:20+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -37,18 +37,6 @@ msgstr[1] ""
msgid "Monthly posting limit of %d post reached. The post was rejected." msgid "Monthly posting limit of %d post reached. The post was rejected."
msgstr "" msgstr ""
#: include/api.php:4411 mod/photos.php:89 mod/photos.php:198 mod/photos.php:617
#: mod/photos.php:1028 mod/photos.php:1045 mod/photos.php:1579
#: src/Model/User.php:1164 src/Model/User.php:1172 src/Model/User.php:1180
#: src/Module/Settings/Profile/Photo/Crop.php:101
#: src/Module/Settings/Profile/Photo/Crop.php:117
#: src/Module/Settings/Profile/Photo/Crop.php:133
#: src/Module/Settings/Profile/Photo/Crop.php:179
#: src/Module/Settings/Profile/Photo/Index.php:95
#: src/Module/Settings/Profile/Photo/Index.php:101
msgid "Profile Photos"
msgstr ""
#: include/enotify.php:50 include/enotify.php:533 #: include/enotify.php:50 include/enotify.php:533
msgid "[Friendica:Notify]" msgid "[Friendica:Notify]"
msgstr "" msgstr ""
@ -359,8 +347,8 @@ msgstr ""
#: mod/cal.php:242 mod/events.php:377 src/Content/Nav.php:194 #: mod/cal.php:242 mod/events.php:377 src/Content/Nav.php:194
#: src/Content/Nav.php:258 src/Module/BaseProfile.php:84 #: src/Content/Nav.php:258 src/Module/BaseProfile.php:84
#: src/Module/BaseProfile.php:95 view/theme/frio/theme.php:230 #: src/Module/BaseProfile.php:95 view/theme/frio/theme.php:229
#: view/theme/frio/theme.php:234 #: view/theme/frio/theme.php:233
msgid "Events" msgid "Events"
msgstr "" msgstr ""
@ -669,7 +657,7 @@ msgstr ""
msgid "Basic" msgid "Basic"
msgstr "" msgstr ""
#: mod/events.php:521 src/Module/Admin/Site.php:505 src/Module/Contact.php:880 #: mod/events.php:521 src/Module/Admin/Site.php:505 src/Module/Contact.php:863
#: src/Module/Profile/Profile.php:249 #: src/Module/Profile/Profile.php:249
msgid "Advanced" msgid "Advanced"
msgstr "" msgstr ""
@ -679,7 +667,7 @@ msgid "Failed to remove event"
msgstr "" msgstr ""
#: mod/fbrowser.php:43 src/Content/Nav.php:192 src/Module/BaseProfile.php:64 #: mod/fbrowser.php:43 src/Content/Nav.php:192 src/Module/BaseProfile.php:64
#: view/theme/frio/theme.php:228 #: view/theme/frio/theme.php:227
msgid "Photos" msgid "Photos"
msgstr "" msgstr ""
@ -749,7 +737,7 @@ msgid "Add a personal note:"
msgstr "" msgstr ""
#: mod/follow.php:163 mod/unfollow.php:109 src/Module/BaseProfile.php:59 #: mod/follow.php:163 mod/unfollow.php:109 src/Module/BaseProfile.php:59
#: src/Module/Contact.php:850 #: src/Module/Contact.php:833
msgid "Status Messages and Posts" msgid "Status Messages and Posts"
msgstr "" msgstr ""
@ -959,7 +947,7 @@ msgstr ""
msgid "Discard" msgid "Discard"
msgstr "" msgstr ""
#: mod/message.php:133 src/Content/Nav.php:283 view/theme/frio/theme.php:235 #: mod/message.php:133 src/Content/Nav.php:283 view/theme/frio/theme.php:234
msgid "Messages" msgid "Messages"
msgstr "" msgstr ""
@ -1312,7 +1300,7 @@ msgid "Rotate CCW (left)"
msgstr "" msgstr ""
#: mod/photos.php:1350 mod/photos.php:1406 mod/photos.php:1480 #: mod/photos.php:1350 mod/photos.php:1406 mod/photos.php:1480
#: src/Module/Contact.php:1010 src/Module/Item/Compose.php:148 #: src/Module/Contact.php:993 src/Module/Item/Compose.php:148
#: src/Object/Post.php:960 #: src/Object/Post.php:960
msgid "This is you" msgid "This is you"
msgstr "" msgstr ""
@ -1699,7 +1687,7 @@ msgstr ""
msgid "Unable to find your profile. Please contact your admin." msgid "Unable to find your profile. Please contact your admin."
msgstr "" msgstr ""
#: mod/settings.php:616 src/Content/Widget.php:542 #: mod/settings.php:616 src/Content/Widget.php:526
msgid "Account Types" msgid "Account Types"
msgstr "" msgstr ""
@ -2321,7 +2309,7 @@ msgstr ""
msgid "File upload failed." msgid "File upload failed."
msgstr "" msgstr ""
#: mod/wall_upload.php:224 src/Model/Photo.php:996 #: mod/wall_upload.php:224 src/Model/Photo.php:985
msgid "Wall Photos" msgid "Wall Photos"
msgstr "" msgstr ""
@ -2386,17 +2374,17 @@ msgstr ""
msgid "All contacts" msgid "All contacts"
msgstr "" msgstr ""
#: src/BaseModule.php:212 src/Content/Widget.php:247 src/Core/ACL.php:195 #: src/BaseModule.php:212 src/Content/Widget.php:231 src/Core/ACL.php:195
#: src/Module/Contact.php:773 src/Module/PermissionTooltip.php:75 #: src/Module/Contact.php:756 src/Module/PermissionTooltip.php:75
#: src/Module/PermissionTooltip.php:97 #: src/Module/PermissionTooltip.php:97
msgid "Followers" msgid "Followers"
msgstr "" msgstr ""
#: src/BaseModule.php:217 src/Content/Widget.php:248 src/Module/Contact.php:774 #: src/BaseModule.php:217 src/Content/Widget.php:232 src/Module/Contact.php:757
msgid "Following" msgid "Following"
msgstr "" msgstr ""
#: src/BaseModule.php:222 src/Content/Widget.php:249 src/Module/Contact.php:775 #: src/BaseModule.php:222 src/Content/Widget.php:233 src/Module/Contact.php:758
msgid "Mutual friends" msgid "Mutual friends"
msgstr "" msgstr ""
@ -2964,7 +2952,7 @@ msgid "Display membership date in profile"
msgstr "" msgstr ""
#: src/Content/ForumManager.php:145 src/Content/Nav.php:239 #: src/Content/ForumManager.php:145 src/Content/Nav.php:239
#: src/Content/Text/HTML.php:906 src/Content/Widget.php:539 #: src/Content/Text/HTML.php:906 src/Content/Widget.php:523
msgid "Forums" msgid "Forums"
msgstr "" msgstr ""
@ -2972,12 +2960,12 @@ msgstr ""
msgid "External link to forum" msgid "External link to forum"
msgstr "" msgstr ""
#: src/Content/ForumManager.php:150 src/Content/Widget.php:518 #: src/Content/ForumManager.php:150 src/Content/Widget.php:502
msgid "show less" msgid "show less"
msgstr "" msgstr ""
#: src/Content/ForumManager.php:151 src/Content/Widget.php:420 #: src/Content/ForumManager.php:151 src/Content/Widget.php:404
#: src/Content/Widget.php:519 #: src/Content/Widget.php:503
msgid "show more" msgid "show more"
msgstr "" msgstr ""
@ -2990,7 +2978,7 @@ msgstr ""
msgid "event" msgid "event"
msgstr "" msgstr ""
#: src/Content/Item.php:442 view/theme/frio/theme.php:325 #: src/Content/Item.php:442 view/theme/frio/theme.php:254
msgid "Follow Thread" msgid "Follow Thread"
msgstr "" msgstr ""
@ -3024,13 +3012,13 @@ msgstr ""
#: src/Content/Item.php:449 src/Module/Admin/Blocklist/Contact.php:84 #: src/Content/Item.php:449 src/Module/Admin/Blocklist/Contact.php:84
#: src/Module/Admin/Users/Active.php:140 src/Module/Admin/Users/Index.php:154 #: src/Module/Admin/Users/Active.php:140 src/Module/Admin/Users/Index.php:154
#: src/Module/Contact.php:544 src/Module/Contact.php:804 #: src/Module/Contact.php:544 src/Module/Contact.php:787
#: src/Module/Contact.php:1081 #: src/Module/Contact.php:1064
msgid "Block" msgid "Block"
msgstr "" msgstr ""
#: src/Content/Item.php:450 src/Module/Contact.php:545 #: src/Content/Item.php:450 src/Module/Contact.php:545
#: src/Module/Contact.php:805 src/Module/Contact.php:1089 #: src/Module/Contact.php:788 src/Module/Contact.php:1072
#: src/Module/Notifications/Introductions.php:112 #: src/Module/Notifications/Introductions.php:112
#: src/Module/Notifications/Introductions.php:184 #: src/Module/Notifications/Introductions.php:184
#: src/Module/Notifications/Notification.php:59 #: src/Module/Notifications/Notification.php:59
@ -3079,40 +3067,40 @@ msgid "Sign in"
msgstr "" msgstr ""
#: src/Content/Nav.php:190 src/Module/BaseProfile.php:56 #: src/Content/Nav.php:190 src/Module/BaseProfile.php:56
#: src/Module/Contact.php:576 src/Module/Contact.php:839 #: src/Module/Contact.php:576 src/Module/Contact.php:822
#: src/Module/Settings/TwoFactor/Index.php:112 view/theme/frio/theme.php:226 #: src/Module/Settings/TwoFactor/Index.php:112 view/theme/frio/theme.php:225
msgid "Status" msgid "Status"
msgstr "" msgstr ""
#: src/Content/Nav.php:190 src/Content/Nav.php:273 #: src/Content/Nav.php:190 src/Content/Nav.php:273
#: view/theme/frio/theme.php:226 #: view/theme/frio/theme.php:225
msgid "Your posts and conversations" msgid "Your posts and conversations"
msgstr "" msgstr ""
#: src/Content/Nav.php:191 src/Module/BaseProfile.php:48 #: src/Content/Nav.php:191 src/Module/BaseProfile.php:48
#: src/Module/BaseSettings.php:57 src/Module/Contact.php:578 #: src/Module/BaseSettings.php:57 src/Module/Contact.php:578
#: src/Module/Contact.php:863 src/Module/Profile/Profile.php:241 #: src/Module/Contact.php:846 src/Module/Profile/Profile.php:241
#: src/Module/Welcome.php:57 view/theme/frio/theme.php:227 #: src/Module/Welcome.php:57 view/theme/frio/theme.php:226
msgid "Profile" msgid "Profile"
msgstr "" msgstr ""
#: src/Content/Nav.php:191 view/theme/frio/theme.php:227 #: src/Content/Nav.php:191 view/theme/frio/theme.php:226
msgid "Your profile page" msgid "Your profile page"
msgstr "" msgstr ""
#: src/Content/Nav.php:192 view/theme/frio/theme.php:228 #: src/Content/Nav.php:192 view/theme/frio/theme.php:227
msgid "Your photos" msgid "Your photos"
msgstr "" msgstr ""
#: src/Content/Nav.php:193 view/theme/frio/theme.php:229 #: src/Content/Nav.php:193 view/theme/frio/theme.php:228
msgid "Videos" msgid "Videos"
msgstr "" msgstr ""
#: src/Content/Nav.php:193 view/theme/frio/theme.php:229 #: src/Content/Nav.php:193 view/theme/frio/theme.php:228
msgid "Your videos" msgid "Your videos"
msgstr "" msgstr ""
#: src/Content/Nav.php:194 view/theme/frio/theme.php:230 #: src/Content/Nav.php:194 view/theme/frio/theme.php:229
msgid "Your events" msgid "Your events"
msgstr "" msgstr ""
@ -3177,8 +3165,8 @@ msgstr ""
#: src/Content/Nav.php:235 src/Content/Nav.php:294 #: src/Content/Nav.php:235 src/Content/Nav.php:294
#: src/Content/Text/HTML.php:902 src/Module/BaseProfile.php:125 #: src/Content/Text/HTML.php:902 src/Module/BaseProfile.php:125
#: src/Module/BaseProfile.php:128 src/Module/Contact.php:776 #: src/Module/BaseProfile.php:128 src/Module/Contact.php:759
#: src/Module/Contact.php:870 view/theme/frio/theme.php:237 #: src/Module/Contact.php:853 view/theme/frio/theme.php:236
msgid "Contacts" msgid "Contacts"
msgstr "" msgstr ""
@ -3191,7 +3179,7 @@ msgid "Conversations on this and other servers"
msgstr "" msgstr ""
#: src/Content/Nav.php:258 src/Module/BaseProfile.php:87 #: src/Content/Nav.php:258 src/Module/BaseProfile.php:87
#: src/Module/BaseProfile.php:98 view/theme/frio/theme.php:234 #: src/Module/BaseProfile.php:98 view/theme/frio/theme.php:233
msgid "Events and Calendar" msgid "Events and Calendar"
msgstr "" msgstr ""
@ -3221,11 +3209,11 @@ msgstr ""
msgid "Terms of Service of this Friendica instance" msgid "Terms of Service of this Friendica instance"
msgstr "" msgstr ""
#: src/Content/Nav.php:271 view/theme/frio/theme.php:233 #: src/Content/Nav.php:271 view/theme/frio/theme.php:232
msgid "Network" msgid "Network"
msgstr "" msgstr ""
#: src/Content/Nav.php:271 view/theme/frio/theme.php:233 #: src/Content/Nav.php:271 view/theme/frio/theme.php:232
msgid "Conversations from your friends" msgid "Conversations from your friends"
msgstr "" msgstr ""
@ -3250,7 +3238,7 @@ msgstr ""
msgid "Mark all system notifications seen" msgid "Mark all system notifications seen"
msgstr "" msgstr ""
#: src/Content/Nav.php:283 view/theme/frio/theme.php:235 #: src/Content/Nav.php:283 view/theme/frio/theme.php:234
msgid "Private mail" msgid "Private mail"
msgstr "" msgstr ""
@ -3272,15 +3260,15 @@ msgstr ""
#: src/Content/Nav.php:292 src/Module/Admin/Addons/Details.php:114 #: src/Content/Nav.php:292 src/Module/Admin/Addons/Details.php:114
#: src/Module/Admin/Themes/Details.php:93 src/Module/BaseSettings.php:124 #: src/Module/Admin/Themes/Details.php:93 src/Module/BaseSettings.php:124
#: src/Module/Welcome.php:52 view/theme/frio/theme.php:236 #: src/Module/Welcome.php:52 view/theme/frio/theme.php:235
msgid "Settings" msgid "Settings"
msgstr "" msgstr ""
#: src/Content/Nav.php:292 view/theme/frio/theme.php:236 #: src/Content/Nav.php:292 view/theme/frio/theme.php:235
msgid "Account settings" msgid "Account settings"
msgstr "" msgstr ""
#: src/Content/Nav.php:294 view/theme/frio/theme.php:237 #: src/Content/Nav.php:294 view/theme/frio/theme.php:236
msgid "Manage/edit friends and contacts" msgid "Manage/edit friends and contacts"
msgstr "" msgstr ""
@ -3408,7 +3396,7 @@ msgstr ""
msgid "Examples: Robert Morgenstein, Fishing" msgid "Examples: Robert Morgenstein, Fishing"
msgstr "" msgstr ""
#: src/Content/Widget.php:78 src/Module/Contact.php:797 #: src/Content/Widget.php:78 src/Module/Contact.php:780
#: src/Module/Directory.php:99 view/theme/vier/theme.php:174 #: src/Module/Directory.php:99 view/theme/vier/theme.php:174
msgid "Find" msgid "Find"
msgstr "" msgstr ""
@ -3434,68 +3422,68 @@ msgstr ""
msgid "Local Directory" msgid "Local Directory"
msgstr "" msgstr ""
#: src/Content/Widget.php:223 src/Model/Group.php:535 #: src/Content/Widget.php:207 src/Model/Group.php:535
#: src/Module/Contact.php:760 src/Module/Welcome.php:76 #: src/Module/Contact.php:743 src/Module/Welcome.php:76
msgid "Groups" msgid "Groups"
msgstr "" msgstr ""
#: src/Content/Widget.php:225 #: src/Content/Widget.php:209
msgid "Everyone" msgid "Everyone"
msgstr "" msgstr ""
#: src/Content/Widget.php:254 #: src/Content/Widget.php:238
msgid "Relationships" msgid "Relationships"
msgstr "" msgstr ""
#: src/Content/Widget.php:256 src/Module/Contact.php:712 #: src/Content/Widget.php:240 src/Module/Contact.php:695
#: src/Module/Group.php:292 #: src/Module/Group.php:292
msgid "All Contacts" msgid "All Contacts"
msgstr "" msgstr ""
#: src/Content/Widget.php:295 #: src/Content/Widget.php:279
msgid "Protocols" msgid "Protocols"
msgstr "" msgstr ""
#: src/Content/Widget.php:297 #: src/Content/Widget.php:281
msgid "All Protocols" msgid "All Protocols"
msgstr "" msgstr ""
#: src/Content/Widget.php:325 #: src/Content/Widget.php:309
msgid "Saved Folders" msgid "Saved Folders"
msgstr "" msgstr ""
#: src/Content/Widget.php:327 src/Content/Widget.php:361 #: src/Content/Widget.php:311 src/Content/Widget.php:345
msgid "Everything" msgid "Everything"
msgstr "" msgstr ""
#: src/Content/Widget.php:359 #: src/Content/Widget.php:343
msgid "Categories" msgid "Categories"
msgstr "" msgstr ""
#: src/Content/Widget.php:416 #: src/Content/Widget.php:400
#, php-format #, php-format
msgid "%d contact in common" msgid "%d contact in common"
msgid_plural "%d contacts in common" msgid_plural "%d contacts in common"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Content/Widget.php:512 #: src/Content/Widget.php:496
msgid "Archives" msgid "Archives"
msgstr "" msgstr ""
#: src/Content/Widget.php:536 #: src/Content/Widget.php:520
msgid "Persons" msgid "Persons"
msgstr "" msgstr ""
#: src/Content/Widget.php:537 #: src/Content/Widget.php:521
msgid "Organisations" msgid "Organisations"
msgstr "" msgstr ""
#: src/Content/Widget.php:538 src/Model/Contact.php:1503 #: src/Content/Widget.php:522 src/Model/Contact.php:1503
msgid "News" msgid "News"
msgstr "" msgstr ""
#: src/Content/Widget.php:543 src/Module/Admin/BaseUsers.php:50 #: src/Content/Widget.php:527 src/Module/Admin/BaseUsers.php:50
msgid "All" msgid "All"
msgstr "" msgstr ""
@ -4732,7 +4720,11 @@ msgid ""
"An error occurred creating your default contact group. Please try again." "An error occurred creating your default contact group. Please try again."
msgstr "" msgstr ""
#: src/Model/User.php:1356 #: src/Model/User.php:1165
msgid "Profile Photos"
msgstr ""
#: src/Model/User.php:1359
#, php-format #, php-format
msgid "" msgid ""
"\n" "\n"
@ -4740,7 +4732,7 @@ msgid ""
"\t\t\tthe administrator of %2$s has set up an account for you." "\t\t\tthe administrator of %2$s has set up an account for you."
msgstr "" msgstr ""
#: src/Model/User.php:1359 #: src/Model/User.php:1362
#, php-format #, php-format
msgid "" msgid ""
"\n" "\n"
@ -4777,12 +4769,12 @@ msgid ""
"\t\tThank you and welcome to %4$s." "\t\tThank you and welcome to %4$s."
msgstr "" msgstr ""
#: src/Model/User.php:1392 src/Model/User.php:1499 #: src/Model/User.php:1395 src/Model/User.php:1502
#, php-format #, php-format
msgid "Registration details for %s" msgid "Registration details for %s"
msgstr "" msgstr ""
#: src/Model/User.php:1412 #: src/Model/User.php:1415
#, php-format #, php-format
msgid "" msgid ""
"\n" "\n"
@ -4798,12 +4790,12 @@ msgid ""
"\t\t" "\t\t"
msgstr "" msgstr ""
#: src/Model/User.php:1431 #: src/Model/User.php:1434
#, php-format #, php-format
msgid "Registration at %s" msgid "Registration at %s"
msgstr "" msgstr ""
#: src/Model/User.php:1455 #: src/Model/User.php:1458
#, php-format #, php-format
msgid "" msgid ""
"\n" "\n"
@ -4812,7 +4804,7 @@ msgid ""
"\t\t\t" "\t\t\t"
msgstr "" msgstr ""
#: src/Model/User.php:1463 #: src/Model/User.php:1466
#, php-format #, php-format
msgid "" msgid ""
"\n" "\n"
@ -4942,8 +4934,8 @@ msgstr ""
msgid "List of active accounts" msgid "List of active accounts"
msgstr "" msgstr ""
#: src/Module/Admin/BaseUsers.php:66 src/Module/Contact.php:720 #: src/Module/Admin/BaseUsers.php:66 src/Module/Contact.php:703
#: src/Module/Contact.php:780 #: src/Module/Contact.php:763
msgid "Pending" msgid "Pending"
msgstr "" msgstr ""
@ -4951,8 +4943,8 @@ msgstr ""
msgid "List of pending registrations" msgid "List of pending registrations"
msgstr "" msgstr ""
#: src/Module/Admin/BaseUsers.php:74 src/Module/Contact.php:728 #: src/Module/Admin/BaseUsers.php:74 src/Module/Contact.php:711
#: src/Module/Contact.php:781 #: src/Module/Contact.php:764
msgid "Blocked" msgid "Blocked"
msgstr "" msgstr ""
@ -5009,8 +5001,8 @@ msgstr ""
#: src/Module/Admin/Blocklist/Contact.php:85 #: src/Module/Admin/Blocklist/Contact.php:85
#: src/Module/Admin/Users/Blocked.php:142 src/Module/Admin/Users/Index.php:156 #: src/Module/Admin/Users/Blocked.php:142 src/Module/Admin/Users/Index.php:156
#: src/Module/Contact.php:544 src/Module/Contact.php:804 #: src/Module/Contact.php:544 src/Module/Contact.php:787
#: src/Module/Contact.php:1081 #: src/Module/Contact.php:1064
msgid "Unblock" msgid "Unblock"
msgstr "" msgstr ""
@ -7049,12 +7041,12 @@ msgstr ""
msgid "Too Many Requests" msgid "Too Many Requests"
msgstr "" msgstr ""
#: src/Module/BaseProfile.php:51 src/Module/Contact.php:866 #: src/Module/BaseProfile.php:51 src/Module/Contact.php:849
msgid "Profile Details" msgid "Profile Details"
msgstr "" msgstr ""
#: src/Module/BaseProfile.php:72 src/Module/BaseProfile.php:75 #: src/Module/BaseProfile.php:72 src/Module/BaseProfile.php:75
#: src/Module/Contact.php:855 #: src/Module/Contact.php:838
msgid "Media" msgid "Media"
msgstr "" msgstr ""
@ -7191,7 +7183,7 @@ msgstr ""
msgid "(Update was successful)" msgid "(Update was successful)"
msgstr "" msgstr ""
#: src/Module/Contact.php:454 src/Module/Contact.php:1052 #: src/Module/Contact.php:454 src/Module/Contact.php:1035
msgid "Suggest friends" msgid "Suggest friends"
msgstr "" msgstr ""
@ -7265,7 +7257,7 @@ msgstr ""
msgid "Edit contact notes" msgid "Edit contact notes"
msgstr "" msgstr ""
#: src/Module/Contact.php:530 src/Module/Contact.php:1018 #: src/Module/Contact.php:530 src/Module/Contact.php:1001
#, php-format #, php-format
msgid "Visit %s's profile [%s]" msgid "Visit %s's profile [%s]"
msgstr "" msgstr ""
@ -7290,12 +7282,12 @@ msgstr ""
msgid "Update public posts" msgid "Update public posts"
msgstr "" msgstr ""
#: src/Module/Contact.php:542 src/Module/Contact.php:1062 #: src/Module/Contact.php:542 src/Module/Contact.php:1045
msgid "Update now" msgid "Update now"
msgstr "" msgstr ""
#: src/Module/Contact.php:545 src/Module/Contact.php:805 #: src/Module/Contact.php:545 src/Module/Contact.php:788
#: src/Module/Contact.php:1089 #: src/Module/Contact.php:1072
msgid "Unignore" msgid "Unignore"
msgstr "" msgstr ""
@ -7356,121 +7348,121 @@ msgid ""
"entries from this contact." "entries from this contact."
msgstr "" msgstr ""
#: src/Module/Contact.php:715 #: src/Module/Contact.php:698
msgid "Show all contacts" msgid "Show all contacts"
msgstr "" msgstr ""
#: src/Module/Contact.php:723 #: src/Module/Contact.php:706
msgid "Only show pending contacts" msgid "Only show pending contacts"
msgstr "" msgstr ""
#: src/Module/Contact.php:731 #: src/Module/Contact.php:714
msgid "Only show blocked contacts" msgid "Only show blocked contacts"
msgstr "" msgstr ""
#: src/Module/Contact.php:736 src/Module/Contact.php:783 #: src/Module/Contact.php:719 src/Module/Contact.php:766
#: src/Object/Post.php:309 #: src/Object/Post.php:309
msgid "Ignored" msgid "Ignored"
msgstr "" msgstr ""
#: src/Module/Contact.php:739 #: src/Module/Contact.php:722
msgid "Only show ignored contacts" msgid "Only show ignored contacts"
msgstr "" msgstr ""
#: src/Module/Contact.php:744 src/Module/Contact.php:784 #: src/Module/Contact.php:727 src/Module/Contact.php:767
msgid "Archived" msgid "Archived"
msgstr "" msgstr ""
#: src/Module/Contact.php:747 #: src/Module/Contact.php:730
msgid "Only show archived contacts" msgid "Only show archived contacts"
msgstr "" msgstr ""
#: src/Module/Contact.php:752 src/Module/Contact.php:782 #: src/Module/Contact.php:735 src/Module/Contact.php:765
msgid "Hidden" msgid "Hidden"
msgstr "" msgstr ""
#: src/Module/Contact.php:755 #: src/Module/Contact.php:738
msgid "Only show hidden contacts" msgid "Only show hidden contacts"
msgstr "" msgstr ""
#: src/Module/Contact.php:763 #: src/Module/Contact.php:746
msgid "Organize your contact groups" msgid "Organize your contact groups"
msgstr "" msgstr ""
#: src/Module/Contact.php:795 #: src/Module/Contact.php:778
msgid "Search your contacts" msgid "Search your contacts"
msgstr "" msgstr ""
#: src/Module/Contact.php:796 src/Module/Search/Index.php:194 #: src/Module/Contact.php:779 src/Module/Search/Index.php:194
#, php-format #, php-format
msgid "Results for: %s" msgid "Results for: %s"
msgstr "" msgstr ""
#: src/Module/Contact.php:803 #: src/Module/Contact.php:786
msgid "Update" msgid "Update"
msgstr "" msgstr ""
#: src/Module/Contact.php:807 #: src/Module/Contact.php:790
msgid "Batch Actions" msgid "Batch Actions"
msgstr "" msgstr ""
#: src/Module/Contact.php:842 #: src/Module/Contact.php:825
msgid "Conversations started by this contact" msgid "Conversations started by this contact"
msgstr "" msgstr ""
#: src/Module/Contact.php:847 #: src/Module/Contact.php:830
msgid "Posts and Comments" msgid "Posts and Comments"
msgstr "" msgstr ""
#: src/Module/Contact.php:858 #: src/Module/Contact.php:841
msgid "Posts containing media objects" msgid "Posts containing media objects"
msgstr "" msgstr ""
#: src/Module/Contact.php:873 #: src/Module/Contact.php:856
msgid "View all known contacts" msgid "View all known contacts"
msgstr "" msgstr ""
#: src/Module/Contact.php:883 #: src/Module/Contact.php:866
msgid "Advanced Contact Settings" msgid "Advanced Contact Settings"
msgstr "" msgstr ""
#: src/Module/Contact.php:977 #: src/Module/Contact.php:960
msgid "Mutual Friendship" msgid "Mutual Friendship"
msgstr "" msgstr ""
#: src/Module/Contact.php:981 #: src/Module/Contact.php:964
msgid "is a fan of yours" msgid "is a fan of yours"
msgstr "" msgstr ""
#: src/Module/Contact.php:985 #: src/Module/Contact.php:968
msgid "you are a fan of" msgid "you are a fan of"
msgstr "" msgstr ""
#: src/Module/Contact.php:1003 #: src/Module/Contact.php:986
msgid "Pending outgoing contact request" msgid "Pending outgoing contact request"
msgstr "" msgstr ""
#: src/Module/Contact.php:1005 #: src/Module/Contact.php:988
msgid "Pending incoming contact request" msgid "Pending incoming contact request"
msgstr "" msgstr ""
#: src/Module/Contact.php:1072 #: src/Module/Contact.php:1055
msgid "Refetch contact data" msgid "Refetch contact data"
msgstr "" msgstr ""
#: src/Module/Contact.php:1083 #: src/Module/Contact.php:1066
msgid "Toggle Blocked status" msgid "Toggle Blocked status"
msgstr "" msgstr ""
#: src/Module/Contact.php:1091 #: src/Module/Contact.php:1074
msgid "Toggle Ignored status" msgid "Toggle Ignored status"
msgstr "" msgstr ""
#: src/Module/Contact.php:1098 src/Module/Contact/Revoke.php:96 #: src/Module/Contact.php:1081 src/Module/Contact/Revoke.php:96
msgid "Revoke Follow" msgid "Revoke Follow"
msgstr "" msgstr ""
#: src/Module/Contact.php:1100 #: src/Module/Contact.php:1083
msgid "Revoke the follow from this contact" msgid "Revoke the follow from this contact"
msgstr "" msgstr ""
@ -10862,11 +10854,11 @@ msgstr ""
msgid "Back to top" msgid "Back to top"
msgstr "" msgstr ""
#: view/theme/frio/theme.php:208 #: view/theme/frio/theme.php:207
msgid "Guest" msgid "Guest"
msgstr "" msgstr ""
#: view/theme/frio/theme.php:211 #: view/theme/frio/theme.php:210
msgid "Visitor" msgid "Visitor"
msgstr "" msgstr ""