-
Notifications
You must be signed in to change notification settings - Fork 1.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
add invalid and error details to vcard import report #9605
base: master
Are you sure you want to change the base?
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for the contribution! I really appreciate your attention to issues related to "your" topic!
78e8d83
to
7eed125
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me, thank you!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Approved with some comments.
@@ -162,6 +162,8 @@ $messages['importwait'] = 'Importing, please wait...'; | |||
$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.'; | |||
$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>'; | |||
$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>'; | |||
$messages['importconfirminvalid'] = '<b>Skipped $invalid invalid entries</b>'; | |||
$messages['importconfirmerrors'] = '<b>Failed to import $errors valid contacts</b>'; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should probably get rid of HTML tags from all these three messages.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think removing the <b>
tags would be a breaking change because the formatting should be moved to the skin to do this properly. I can work on this in a separate PR.
@alecpl I'll merge this in one week if nothing happens until then, since you left your approval already and the only open topic is very minor. |
Feel free to merge, close the related ticket (assigning milestone) if appropriate and update the changelog. |
@johndoh Would you add a line to the Changelog? (I can do it as well but would prefer to have it as part of the PR.) |
/remind me to merge on Monday |
@pabzm set a reminder for 11/25/2024 |
1f1b533
to
8468d29
Compare
I've added a changelog entry. If you don't like the text or its in the wrong place its no problem. |
👋 @pabzm, merge |
for #9591
currently there are 2 silent error cases on vcard import, invalid (fails roundcube contact validation) and error (its valid but i didnt insert for some reason e.g. plugin prevented it) this adds messages about those to the screen.