Improved messages

This commit is contained in:
Michael 2022-05-24 17:33:10 +00:00
parent f16cb13dc7
commit f764ab7429
2 changed files with 13 additions and 13 deletions

View File

@ -89,26 +89,26 @@ HELP;
echo ++$count . '/' . $total . "\t" . $contact['id'] . "\t" . $contact['url'] . "\t";
$resourceid = Photo::ridFromURI($contact['photo']);
if (empty($resourceid)) {
echo $this->l10n->t('no resource') . "\n";
echo $this->l10n->t('no resource in photo %1', $contact['photo']) . "\n";
continue;
}
echo '1';
$photo = Photo::selectFirst([], ['resource-id' => $resourceid], ['order' => ['scale']]);
if (empty($photo)) {
echo $this->l10n->t('no photo') . "\n";
echo $this->l10n->t('no photo with id %1', $resourceid) . "\n";
continue;
}
echo '2';
$imgdata = Photo::getImageDataForPhoto($photo);
if (empty($imgdata)) {
echo $this->l10n->t('no image data') . "\n";
echo $this->l10n->t('no image data for photo with id %1', $resourceid) . "\n";
continue;
}
echo '3';
$image = new Image($imgdata, Images::getMimeTypeByData($imgdata));
if (!$image->isValid()) {
echo $this->l10n->t('invalid image') . "\n";
echo $this->l10n->t('invalid image for id %1', $resourceid) . "\n";
continue;
}

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2022.05-rc\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-05-23 12:12+0000\n"
"POT-Creation-Date: 2022-05-24 17:32+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -1641,20 +1641,20 @@ msgstr ""
msgid "The contact has been blocked from the node"
msgstr ""
#: src/Console/MoveToAvatarCache.php:94
msgid "no resource"
#: src/Console/MoveToAvatarCache.php:92
msgid "no resource in photo %1"
msgstr ""
#: src/Console/MoveToAvatarCache.php:100
msgid "no photo"
#: src/Console/MoveToAvatarCache.php:98
msgid "no photo with id %1"
msgstr ""
#: src/Console/MoveToAvatarCache.php:107
msgid "no image data"
#: src/Console/MoveToAvatarCache.php:105
msgid "no image data for photo with id %1"
msgstr ""
#: src/Console/MoveToAvatarCache.php:113
msgid "invalid image"
#: src/Console/MoveToAvatarCache.php:111
msgid "invalid image for id %1"
msgstr ""
#: src/Console/PostUpdate.php:87