diff --git a/jey_wizard/__init__.py b/jey_wizard/__init__.py index 57cc51c..c2e5539 100644 --- a/jey_wizard/__init__.py +++ b/jey_wizard/__init__.py @@ -1 +1 @@ -__version__ = "0.1.32" +__version__ = "0.1.33" diff --git a/jey_wizard/locale/az.po b/jey_wizard/locale/az.po index 2bae6d0..78df01f 100644 --- a/jey_wizard/locale/az.po +++ b/jey_wizard/locale/az.po @@ -735,10 +735,6 @@ msgstr "Ötürüldü" msgid "Start date" msgstr "Başlama tarixi" -#: jey_wizard/public/js/jey_setup.js:1433 -msgid "Starting..." -msgstr "Başlanır..." - #: jey_wizard/etaxes.py:376 msgid "State" msgstr "Vəziyyət" @@ -852,10 +848,6 @@ msgstr "VÖEN üzrə avtomatik uyğunlaşdırmaq mümkün olmadı. İşçiləri msgid "Wizard & site language" msgstr "Sihirbaz və sayt dili" -#: jey_wizard/public/js/jey_setup.js:1460 -msgid "Working..." -msgstr "İcra olunur..." - #: jey_wizard/public/js/jey_setup.js:318 msgid "Wrong company? Change" msgstr "Yanlış şirkət? Dəyişin" @@ -906,3 +898,6 @@ msgstr "ƏMAS işçiləri" msgid "Confirm the Asan Imza request" msgstr "Asan İmza sorğusunu təsdiqləyin" +msgid "This may take a minute, please wait..." +msgstr "Bu bir az çəkə bilər, gözləyin..." + diff --git a/jey_wizard/locale/main.pot b/jey_wizard/locale/main.pot index e44da11..cec0858 100644 --- a/jey_wizard/locale/main.pot +++ b/jey_wizard/locale/main.pot @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Jey Wizard VERSION\n" "Report-Msgid-Bugs-To: info@jeyerp.az\n" -"POT-Creation-Date: 2026-06-12 13:32+0000\n" -"PO-Revision-Date: 2026-06-12 13:32+0000\n" +"POT-Creation-Date: 2026-06-12 13:55+0000\n" +"PO-Revision-Date: 2026-06-12 13:55+0000\n" "Last-Translator: info@jeyerp.az\n" "Language-Team: info@jeyerp.az\n" "MIME-Version: 1.0\n" @@ -16,8 +16,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.16.0\n" -#: jey_wizard/public/js/jey_setup.js:1466 -#: jey_wizard/public/js/jey_setup.js:1508 +#: jey_wizard/public/js/jey_setup.js:1468 +#: jey_wizard/public/js/jey_setup.js:1510 msgid "(check server logs)" msgstr "" @@ -25,7 +25,7 @@ msgstr "" msgid "(click to preview)" msgstr "" -#: jey_wizard/public/js/jey_setup.js:1576 +#: jey_wizard/public/js/jey_setup.js:1578 msgid "(no details)" msgstr "" @@ -296,7 +296,7 @@ msgstr "" msgid "Failed to load certificates" msgstr "" -#: jey_wizard/public/js/jey_setup.js:1567 +#: jey_wizard/public/js/jey_setup.js:1569 msgid "Failed to load preview." msgstr "" @@ -328,7 +328,7 @@ msgstr "" msgid "Field" msgstr "" -#: jey_wizard/public/js/jey_setup.js:1442 +#: jey_wizard/public/js/jey_setup.js:1444 msgid "Finalizing" msgstr "" @@ -454,7 +454,7 @@ msgstr "" msgid "Loading employees..." msgstr "" -#: jey_wizard/public/js/jey_setup.js:1553 +#: jey_wizard/public/js/jey_setup.js:1555 msgid "Loading preview..." msgstr "" @@ -522,7 +522,7 @@ msgstr "" msgid "No organizations found in ƏMAS for this account." msgstr "" -#: jey_wizard/public/js/jey_setup.js:1559 +#: jey_wizard/public/js/jey_setup.js:1561 msgid "No preview data available." msgstr "" @@ -530,7 +530,7 @@ msgstr "" msgid "None" msgstr "" -#: jey_wizard/public/js/jey_setup.js:1520 +#: jey_wizard/public/js/jey_setup.js:1522 msgid "Nothing to preview." msgstr "" @@ -628,7 +628,7 @@ msgstr "" msgid "Presented certificates" msgstr "" -#: jey_wizard/public/js/jey_setup.js:1541 +#: jey_wizard/public/js/jey_setup.js:1543 msgid "Preview" msgstr "" @@ -660,7 +660,7 @@ msgstr "" msgid "Retrieving verification code..." msgstr "" -#: jey_wizard/public/js/jey_setup.js:1583 +#: jey_wizard/public/js/jey_setup.js:1585 msgid "Retry" msgstr "" @@ -702,24 +702,24 @@ msgstr "" msgid "Serial number" msgstr "" -#: jey_wizard/public/js/jey_setup.js:1432 +#: jey_wizard/public/js/jey_setup.js:1434 msgid "Setting up your system" msgstr "" -#: jey_wizard/public/js/jey_setup.js:1481 +#: jey_wizard/public/js/jey_setup.js:1483 msgid "Setup complete! Redirecting..." msgstr "" -#: jey_wizard/public/js/jey_setup.js:1465 -#: jey_wizard/public/js/jey_setup.js:1507 +#: jey_wizard/public/js/jey_setup.js:1467 +#: jey_wizard/public/js/jey_setup.js:1509 msgid "Setup failed" msgstr "" -#: jey_wizard/public/js/jey_setup.js:1489 +#: jey_wizard/public/js/jey_setup.js:1491 msgid "Setup is running in background mode, not supported by skeleton" msgstr "" -#: jey_wizard/public/js/jey_setup.js:1498 +#: jey_wizard/public/js/jey_setup.js:1500 msgid "Setup returned unexpected response" msgstr "" @@ -727,7 +727,7 @@ msgstr "" msgid "Short code suffixed to account names. Auto-suggested from the company name — you can edit it." msgstr "" -#: jey_wizard/public/js/jey_setup.js:1535 +#: jey_wizard/public/js/jey_setup.js:1537 msgid "Showing" msgstr "" @@ -739,10 +739,6 @@ msgstr "" msgid "Start date" msgstr "" -#: jey_wizard/public/js/jey_setup.js:1433 -msgid "Starting..." -msgstr "" - #: jey_wizard/etaxes.py:376 msgid "State" msgstr "" @@ -782,6 +778,11 @@ msgstr "" msgid "Tax rate" msgstr "" +#: jey_wizard/public/js/jey_setup.js:1435 +#: jey_wizard/public/js/jey_setup.js:1462 +msgid "This may take a minute, please wait..." +msgstr "" + #: jey_wizard/public/js/jey_setup.js:345 msgid "This step is optional. Use Next to skip if your company has no employees or is not registered with ƏMAS." msgstr "" @@ -856,10 +857,6 @@ msgstr "" msgid "Wizard & site language" msgstr "" -#: jey_wizard/public/js/jey_setup.js:1460 -msgid "Working..." -msgstr "" - #: jey_wizard/public/js/jey_setup.js:318 msgid "Wrong company? Change" msgstr "" @@ -884,7 +881,7 @@ msgstr "" msgid "liquidated" msgstr "" -#: jey_wizard/public/js/jey_setup.js:1535 +#: jey_wizard/public/js/jey_setup.js:1537 msgid "row(s)" msgstr "" diff --git a/jey_wizard/locale/ru.po b/jey_wizard/locale/ru.po index 181c442..4c7d096 100644 --- a/jey_wizard/locale/ru.po +++ b/jey_wizard/locale/ru.po @@ -735,10 +735,6 @@ msgstr "Пропущено" msgid "Start date" msgstr "Дата начала" -#: jey_wizard/public/js/jey_setup.js:1433 -msgid "Starting..." -msgstr "Запуск..." - #: jey_wizard/etaxes.py:376 msgid "State" msgstr "Состояние" @@ -852,10 +848,6 @@ msgstr "Не удалось сопоставить по ВÖЕН. Выберит msgid "Wizard & site language" msgstr "Язык мастера и сайта" -#: jey_wizard/public/js/jey_setup.js:1460 -msgid "Working..." -msgstr "Выполняется..." - #: jey_wizard/public/js/jey_setup.js:318 msgid "Wrong company? Change" msgstr "Не та компания? Сменить" @@ -906,3 +898,6 @@ msgstr "Сотрудники ƏMAS" msgid "Confirm the Asan Imza request" msgstr "Подтвердите запрос Asan İmza" +msgid "This may take a minute, please wait..." +msgstr "Это может занять минуту, подождите..." + diff --git a/jey_wizard/public/js/jey_setup.js b/jey_wizard/public/js/jey_setup.js index 785ead9..8f44e50 100644 --- a/jey_wizard/public/js/jey_setup.js +++ b/jey_wizard/public/js/jey_setup.js @@ -10,7 +10,7 @@ frappe.provide("jey_wizard"); // Bump this string in every commit that changes wizard code. Displayed in the badge so // we can tell at a glance which version is actually running on a given machine. Kept in // sync with __version__ in jey_wizard/__init__.py. -const JEY_WIZARD_VERSION = "0.1.32"; +const JEY_WIZARD_VERSION = "0.1.33"; // Wipe Frappe + ERPNext default slides so their `before_load`/`after_load` listeners // don't try to mutate a wizard that isn't slide-based anymore. @@ -1426,11 +1426,13 @@ frappe.setup.SetupWizard = class JeySetupWizard { // Render an inline progress UI in place of the wizard form. We don't // pass freeze:true to frappe.call — the freeze overlay would dim and // hide the bar. process_setup_stages publishes realtime "setup_task" - // events with {progress: [idx, total], stage_status: "..."}; we - // subscribe and translate those into bar width + status text. + // events with {progress: [idx, total], stage_status: "..."}; we use + // the progress tuple for the bar width. The raw stage_status strings + // come from frappe/erpnext core (untranslated, jargon-y), so we ignore + // them and keep one steady "please wait" line instead. this.$wrap.find(".jey-body").html(`

${__("Setting up your system")}

-
${__("Starting...")}
+
${__("This may take a minute, please wait...")}
@@ -1457,7 +1459,7 @@ frappe.setup.SetupWizard = class JeySetupWizard { const [done, total] = data.progress; if (total > 0) { const ratio = Math.min(done / total, 0.95); - setProgress(5 + ratio * 90, data.stage_status || __("Working...")); + setProgress(5 + ratio * 90, __("This may take a minute, please wait...")); } } if (data.status === "fail") {