clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11610 from annando/issue-11602 

Issue 11602: Fix error during contact merhe
This commit is contained in:
Tobias Diekershoff 2022-06-05 20:27:47 +02:00 committed by GitHub
parent 9e37435ae6 1196df4895
commit e5802b7c30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Console/MergeContacts.php
View File

@ -73,6 +73,10 @@ HELP;
while ($duplicate = $this->dba->fetch($duplicates)) { while ($duplicate = $this->dba->fetch($duplicates)) {
$this->out($this->l10n->t('%d %s, %d duplicates.', $duplicate['uri-id'], $duplicate['url'], $duplicate['total'])); $this->out($this->l10n->t('%d %s, %d duplicates.', $duplicate['uri-id'], $duplicate['url'], $duplicate['total']));
if ($this->getOption(['e', 'execute'], false)) { if ($this->getOption(['e', 'execute'], false)) {
if (empty($duplicate['uri-id'])) {
$this->err($this->l10n->t('uri-id is empty for contact %s.', $duplicate['url']));
continue;
}
$this->mergeContacts($duplicate['uri-id']); $this->mergeContacts($duplicate['uri-id']);
} }
} }

29
view/lang/C/messages.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2022.05-rc\n" "Project-Id-Version: 2022.05-rc\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-06-05 11:15+0000\n" "POT-Creation-Date: 2022-06-05 18:14+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"
@ -1646,53 +1646,58 @@ msgstr ""
msgid "%d %s, %d duplicates." msgid "%d %s, %d duplicates."
msgstr "" msgstr ""
#: src/Console/MergeContacts.php:86 #: src/Console/MergeContacts.php:77
#, php-format
msgid "uri-id is empty for contact %s."
msgstr ""
#: src/Console/MergeContacts.php:90
#, php-format #, php-format
msgid "No valid first countact found for uri-id %d." msgid "No valid first countact found for uri-id %d."
msgstr "" msgstr ""
#: src/Console/MergeContacts.php:97 #: src/Console/MergeContacts.php:101
#, php-format #, php-format
msgid "Wrong duplicate found for uri-id %d in %d (url: %s != %s)." msgid "Wrong duplicate found for uri-id %d in %d (url: %s != %s)."
msgstr "" msgstr ""
#: src/Console/MergeContacts.php:101 #: src/Console/MergeContacts.php:105
#, php-format #, php-format
msgid "Wrong duplicate found for uri-id %d in %d (nurl: %s != %s)." msgid "Wrong duplicate found for uri-id %d in %d (nurl: %s != %s)."
msgstr "" msgstr ""
#: src/Console/MergeContacts.php:137 #: src/Console/MergeContacts.php:141
#, php-format #, php-format
msgid "Deletion of id %d failed" msgid "Deletion of id %d failed"
msgstr "" msgstr ""
#: src/Console/MergeContacts.php:139 #: src/Console/MergeContacts.php:143
#, php-format #, php-format
msgid "Deletion of id %d was successful" msgid "Deletion of id %d was successful"
msgstr "" msgstr ""
#: src/Console/MergeContacts.php:145 #: src/Console/MergeContacts.php:149
#, php-format #, php-format
msgid "Updating \"%s\" in \"%s\" from %d to %d" msgid "Updating \"%s\" in \"%s\" from %d to %d"
msgstr "" msgstr ""
#: src/Console/MergeContacts.php:147 #: src/Console/MergeContacts.php:151
msgid " - found" msgid " - found"
msgstr "" msgstr ""
#: src/Console/MergeContacts.php:154 #: src/Console/MergeContacts.php:158
msgid " - failed" msgid " - failed"
msgstr "" msgstr ""
#: src/Console/MergeContacts.php:156 #: src/Console/MergeContacts.php:160
msgid " - success" msgid " - success"
msgstr "" msgstr ""
#: src/Console/MergeContacts.php:160 #: src/Console/MergeContacts.php:164
msgid " - deleted" msgid " - deleted"
msgstr "" msgstr ""
#: src/Console/MergeContacts.php:163 #: src/Console/MergeContacts.php:167
msgid " - done" msgid " - done"
msgstr "" msgstr ""