From a055868bfa4c18a0c7b26e094d8eeeba387668bd Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Mon, 6 Mar 2023 18:17:30 +1300 Subject: [PATCH 1/2] ENH Update translations --- .tx/config | 5 +++-- lang/fi.yml | 16 ++++++++++++++++ lang/it.yml | 3 +++ lang/ru.yml | 16 ++++++++++++++++ 4 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 lang/fi.yml create mode 100644 lang/ru.yml diff --git a/.tx/config b/.tx/config index 360a807..bd9f019 100644 --- a/.tx/config +++ b/.tx/config @@ -1,8 +1,9 @@ [main] host = https://www.transifex.com -[silverstripe-externallinks.master] +[o:silverstripe:p:silverstripe-externallinks:r:master] file_filter = lang/.yml source_file = lang/en.yml source_lang = en -type = YML +type = YML + diff --git a/lang/fi.yml b/lang/fi.yml new file mode 100644 index 0000000..d35bbcc --- /dev/null +++ b/lang/fi.yml @@ -0,0 +1,16 @@ +fi: + SilverStripe\ExternalLinks\Jobs\CheckExternalLinksJob: + TITLE: 'Tarkastettaan rikkinäiset ulkoiset linkit' + SilverStripe\ExternalLinks\Model\BrokenExternalLink: + NOTAVAILABLE: 'Palvelin ei saatavilla' + PLURALNAME: 'Rikkinäiset ulkoiset linkit' + SINGULARNAME: 'Rikkinäinen ulkoinen linkki' + UNKNOWNRESPONSE: 'Tuntematon vastauskoodi' + SilverStripe\ExternalLinks\Model\BrokenExternalPageTrack: + PLURALNAME: 'Rikkinäiset ulkoisen sivun reitit' + SINGULARNAME: 'Rikkinäinen ulkoisen sivun reitti' + SilverStripe\ExternalLinks\Model\BrokenExternalPageTrackStatus: + SINGULARNAME: 'Rikkinäinen ulkoisen sivun reitin tila' + SilverStripe\ExternalLinks\Reports\BrokenExternalLinksReport: + EXTERNALBROKENLINKS: 'Raportti ulkoisista rikkinäisistä linkeistä' + RUNREPORT: 'Luo uusi raportti' diff --git a/lang/it.yml b/lang/it.yml index cd31c3a..cb66edb 100644 --- a/lang/it.yml +++ b/lang/it.yml @@ -7,6 +7,7 @@ it: PLURALS: one: 'Un Link Esterno Orfano' other: '{count} Link Esterni Orfani' + many: '{count} Link Esterni Orfani' SINGULARNAME: 'Link Esterno Orfano' UNKNOWNRESPONSE: 'Codice di Risposta Sconosciuto' SilverStripe\ExternalLinks\Model\BrokenExternalPageTrack: @@ -14,12 +15,14 @@ it: PLURALS: one: 'Una Traccia Pagina Esterna Orfana' other: '{count} Tracce Pagine Esterne Orfane' + many: '{count} Tracce Pagine Esterne Orfane' SINGULARNAME: 'Traccia Pagina Esterna Orfana' SilverStripe\ExternalLinks\Model\BrokenExternalPageTrackStatus: PLURALNAME: 'Stati Tracce Pagine Esterne Orfane' PLURALS: one: 'Uno Stato Traccia Pagina Esterna Orfana' other: '{count} Stati Tracce Pagine Esterne Orfane' + many: '{count} Stati Tracce Pagine Esterne Orfane' SINGULARNAME: 'Stato Traccia Pagina Esterna Orfana' SilverStripe\ExternalLinks\Reports\BrokenExternalLinksReport: EXTERNALBROKENLINKS: 'Report link esterni orfani' diff --git a/lang/ru.yml b/lang/ru.yml new file mode 100644 index 0000000..56dcebc --- /dev/null +++ b/lang/ru.yml @@ -0,0 +1,16 @@ +ru: + SilverStripe\ExternalLinks\Jobs\CheckExternalLinksJob: + TITLE: 'Проверяю внешние ссылки' + SilverStripe\ExternalLinks\Model\BrokenExternalLink: + NOTAVAILABLE: 'Сервер не доступен' + PLURALNAME: 'Недоступные внешние ссылки' + SINGULARNAME: 'Недоступная внешняя ссылка' + UNKNOWNRESPONSE: 'Неизвестный ответ сервера' + SilverStripe\ExternalLinks\Model\BrokenExternalPageTrack: + PLURALNAME: 'Внешнее отслеживание страниц нарушено' + SINGULARNAME: 'Внешнее отслеживание страниц нарушено' + SilverStripe\ExternalLinks\Model\BrokenExternalPageTrackStatus: + SINGULARNAME: 'Внешнее отслеживание страниц нарушено' + SilverStripe\ExternalLinks\Reports\BrokenExternalLinksReport: + EXTERNALBROKENLINKS: 'Отчёт о неработающих внешних ссылках' + RUNREPORT: 'Создать новый отчёт' From ef0ee302f60a3cfd8ba69afa978013a508106183 Mon Sep 17 00:00:00 2001 From: Sabina Talipova Date: Tue, 7 Mar 2023 09:56:04 +1300 Subject: [PATCH 2/2] FIX Reload External broken links report content when new report was generated --- client/dist/js/BrokenExternalLinksReport.js | 2 +- client/src/js/BrokenExternalLinksReport.js | 20 +++++++++++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/client/dist/js/BrokenExternalLinksReport.js b/client/dist/js/BrokenExternalLinksReport.js index 53105fb..455a72e 100644 --- a/client/dist/js/BrokenExternalLinksReport.js +++ b/client/dist/js/BrokenExternalLinksReport.js @@ -1 +1 @@ -!function(){"use strict";var t={311:function(t){t.exports=jQuery}},e={};function n(o){var r=e[o];if(void 0!==r)return r.exports;var s=e[o]={exports:{}};return t[o](s,s.exports,n),s.exports}!function(){var t=n(311);t.entwine("ss",(t=>{t(".external-links-report__create-report").entwine({PollTimeout:null,ButtonIsLoading:!1,onclick(t){t.preventDefault(),this.buttonLoading(),this.start()},onmatch(){this.poll()},start(){t(".external-links-report__report-progress").empty().text("Running report 0%"),t.ajax({url:"admin/externallinks/start",async:!0,timeout:3e3}),this.poll()},getButton(){return t(".external-links-report__create-report")},buttonLoading(){if(this.getButtonIsLoading())return;this.setButtonIsLoading(!0);const e=this.getButton();e.addClass("btn--loading loading"),e.attr("disabled",!0),e.is("button")&&(e.append(t('
')),e.css(`${e.outerWidth()}px`))},buttonReset(){this.setButtonIsLoading(!1);const t=this.getButton();t.removeClass("btn--loading loading"),t.attr("disabled",!1),t.find(".btn__loading-icon").remove(),t.css("width","auto")},poll(){const e=this;this.buttonLoading(),t.ajax({url:"admin/externallinks/getJobStatus",async:!0,success(n){if(!n)return void e.buttonReset();const o=n.Completed?n.Completed:0,r=n.Total?n.Total:0;if("Completed"===n.Status)return t(".external-links-report__report-progress").text(`Report finished ${o}/${r}`),void e.buttonReset();if(o{t(".external-links-report__create-report").poll()}),1e3))},error(t){"undefined"!=typeof console&&console.error(t)}})}})}))}()}(); \ No newline at end of file +!function(){"use strict";var t={311:function(t){t.exports=jQuery}},e={};function n(o){var r=e[o];if(void 0!==r)return r.exports;var s=e[o]={exports:{}};return t[o](s,s.exports,n),s.exports}!function(){var t=n(311);t.entwine("ss",(t=>{t(".external-links-report__create-report").entwine({PollTimeout:null,ButtonIsLoading:!1,ReloadContent:!1,onclick(t){t.preventDefault(),this.buttonLoading(),this.start()},onmatch(){this.poll()},start(){const e=this;t(".external-links-report__report-progress").empty().text("Running report 0%"),t.ajax({url:"admin/externallinks/start",async:!0,timeout:3e3,success(){e.setReloadContent(!0),e.poll()},error(t){"undefined"!=typeof console&&console.error(t)}})},getButton(){return t(".external-links-report__create-report")},buttonLoading(){if(this.getButtonIsLoading())return;this.setButtonIsLoading(!0);const e=this.getButton();e.addClass("btn--loading loading"),e.attr("disabled",!0),e.is("button")&&(e.append(t('
')),e.css(`${e.outerWidth()}px`))},buttonReset(){this.setButtonIsLoading(!1);const t=this.getButton();t.removeClass("btn--loading loading"),t.attr("disabled",!1),t.find(".btn__loading-icon").remove(),t.css("width","auto")},poll(){const e=this;this.buttonLoading(),t.ajax({url:"admin/externallinks/getJobStatus",async:!0,success(n){if(!n)return void e.buttonReset();const o=n.Completed?n.Completed:0,r=n.Total?n.Total:0;if("Completed"===n.Status)return e.getReloadContent()&&(t(".cms-container").loadPanel(document.location.href,null,{},!0,!1),e.setReloadContent(!1)),t(".external-links-report__report-progress").text(`Report finished ${o}/${r}`),void e.buttonReset();if(o{t(".external-links-report__create-report").poll()}),1e3))},error(t){"undefined"!=typeof console&&(console.error(t),e.buttonReset())}})}})}))}()}(); \ No newline at end of file diff --git a/client/src/js/BrokenExternalLinksReport.js b/client/src/js/BrokenExternalLinksReport.js index 80daf6a..7692420 100644 --- a/client/src/js/BrokenExternalLinksReport.js +++ b/client/src/js/BrokenExternalLinksReport.js @@ -5,6 +5,7 @@ $('.external-links-report__create-report').entwine({ PollTimeout: null, ButtonIsLoading: false, + ReloadContent: false, onclick(e) { e.preventDefault(); @@ -19,6 +20,7 @@ }, start() { + const self = this; // initiate a new job $('.external-links-report__report-progress') .empty() @@ -27,10 +29,17 @@ $.ajax({ url: 'admin/externallinks/start', async: true, - timeout: 3000 + timeout: 3000, + success() { + self.setReloadContent(true); + self.poll(); + }, + error(e) { + if (typeof console !== 'undefined') { + console.error(e); + } + } }); - - this.poll(); }, /** @@ -103,6 +112,10 @@ // If complete status if (data.Status === 'Completed') { + if (self.getReloadContent()) { + $('.cms-container').loadPanel(document.location.href, null, {}, true, false); + self.setReloadContent(false); + } $('.external-links-report__report-progress') .text(`Report finished ${completed}/${total}`); @@ -130,6 +143,7 @@ error(e) { if (typeof console !== 'undefined') { console.error(e); + self.buttonReset(); } } });