diff options
| author | Andrew Dolgov <fox@fakecake.org> | 2025-06-21 07:52:36 +0300 |
|---|---|---|
| committer | Andrew Dolgov <fox@fakecake.org> | 2025-06-21 07:52:36 +0300 |
| commit | 664f832aac3892ab925c1dc517bd2d9fd6e0e35c (patch) | |
| tree | c8ab3b6331e218de5f99b0e4ebbd6771ecad199d /js | |
| parent | 4e47a39c2a9325828db19e46155cdac32c4dc4b2 (diff) | |
| parent | 09c11df764a5485e2a6a670d3218f2f7dadaa9d1 (diff) | |
Merge branch 'feature/subscription-fail-info' into 'master'
Show more info when subscribing fails
See merge request tt-rss/tt-rss!153
Diffstat (limited to 'js')
| -rw-r--r-- | js/CommonDialogs.js | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js index 1dec1b6da..1215d567d 100644 --- a/js/CommonDialogs.js +++ b/js/CommonDialogs.js @@ -118,10 +118,10 @@ const CommonDialogs = { </footer> </form> `, - show_error: function (msg) { + show_error: function (msg, additional_info) { const elem = App.byId("fadd_error_message"); - elem.innerHTML = msg; + elem.innerHTML = `${msg}${additional_info ? `<br><br><h4>${__('Additional information')}</h4>${additional_info}` : ''}`; Element.show(elem); }, @@ -168,7 +168,7 @@ const CommonDialogs = { dialog.show_error(__("Specified URL seems to be invalid.")); break; case 3: - dialog.show_error(__("Specified URL doesn't seem to contain any feeds.")); + dialog.show_error(__("Specified URL doesn't seem to contain any feeds."), App.escapeHtml(rc['message'])); break; case 4: { @@ -193,10 +193,7 @@ const CommonDialogs = { } break; case 5: - dialog.show_error(__("Couldn't download the specified URL: %s").replace("%s", rc['message'])); - break; - case 6: - dialog.show_error(__("XML validation failed: %s").replace("%s", rc['message'])); + dialog.show_error(__("Couldn't download the specified URL."), App.escapeHtml(rc['message'])); break; case 7: dialog.show_error(__("Error while creating feed database entry.")); |