ali
/
jey_wizard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop 'cache' from user-visible strings 

User-facing reword only — server-side method names (cache_selected_
employees, clear_amas_cache) stay as-is since they're not visible.

ƏMAS done state: "Cached and ready" → "Ready to import",
"Employees cached" → "Employees found", body line dropped the
"cached on the server" lead-in.

ƏMAS error strings: "Failed to cache" / "Network error while
caching" → "Failed to save" / "Network error while saving".

Asan done state: "Cached datasets" → "Loaded datasets".
This commit is contained in:
Ali 2026-05-01 16:25:01 +00:00
parent 8c178524d9
commit 98681daf2f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jey_wizard/__init__.py
View File

@ -1 +1 @@
__version__ = "0.1.22" __version__ = "0.1.23"

14
jey_wizard/public/js/jey_setup.js
View File

@ -10,7 +10,7 @@ frappe.provide("jey_wizard");
// Bump this string in every commit that changes wizard code. Displayed in the badge so // 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 // 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. // sync with __version__ in jey_wizard/__init__.py.
const JEY_WIZARD_VERSION = "0.1.22"; const JEY_WIZARD_VERSION = "0.1.23";
// Wipe Frappe + ERPNext default slides so their `before_load`/`after_load` listeners // 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. // don't try to mutate a wizard that isn't slide-based anymore.
@ -306,7 +306,7 @@ frappe.setup.SetupWizard = class JeySetupWizard {
<li><b>${__("VÖEN")}:</b> ${frappe.utils.escape_html(this.data.asan_voen)}</li> <li><b>${__("VÖEN")}:</b> ${frappe.utils.escape_html(this.data.asan_voen)}</li>
</ul> </ul>
<div style="margin-top:16px;padding:12px;background:#f7f7f7;border-radius:6px"> <div style="margin-top:16px;padding:12px;background:#f7f7f7;border-radius:6px">
<div style="font-weight:600;margin-bottom:6px">${__("Cached datasets")}</div> <div style="font-weight:600;margin-bottom:6px">${__("Loaded datasets")}</div>
<ul style="line-height:1.6;margin:0;padding-left:20px">${rows}</ul> <ul style="line-height:1.6;margin:0;padding-left:20px">${rows}</ul>
</div> </div>
<div style="margin-top:16px;text-align:right"> <div style="margin-top:16px;text-align:right">
@ -412,12 +412,12 @@ frappe.setup.SetupWizard = class JeySetupWizard {
} else if (this.amas_state === "done") { } else if (this.amas_state === "done") {
const n = (this.data.amas_selected_employees || []).length; const n = (this.data.amas_selected_employees || []).length;
$body.html(` $body.html(`
<h3 style="margin-bottom:16px;color:#080">✓ ${__("Cached and ready")}</h3> <h3 style="margin-bottom:16px;color:#080">✓ ${__("Ready to import")}</h3>
<div style="padding:12px;background:#e8f5e9;border-radius:4px;margin-bottom:12px"> <div style="padding:12px;background:#e8f5e9;border-radius:4px;margin-bottom:12px">
${__("Organization:")} <b>${frappe.utils.escape_html(this.data.amas_organization_name || "")}</b><br> ${__("Organization:")} <b>${frappe.utils.escape_html(this.data.amas_organization_name || "")}</b><br>
${__("Employees cached:")} <b>${n}</b> ${__("Employees found:")} <b>${n}</b>
</div> </div>
<p style="color:#666">${__("Cached on the server. Actual import into Employee / ƏMAS Employees runs as a background job right after you click Finish — you can keep working in /app while it runs.")}</p> <p style="color:#666">${__("Employees will be imported as a background job right after you click Finish — you can keep working in /app while the import runs.")}</p>
<p style="color:#888;font-size:12px;margin-top:8px">${__("Click Next to continue, or Back to re-select.")}</p> <p style="color:#888;font-size:12px;margin-top:8px">${__("Click Next to continue, or Back to re-select.")}</p>
`); `);
// No extra buttons here — Back/Next in nav cover everything. // No extra buttons here — Back/Next in nav cover everything.
@ -1356,7 +1356,7 @@ frappe.setup.SetupWizard = class JeySetupWizard {
callback: (r) => { callback: (r) => {
const m = r.message || {}; const m = r.message || {};
if (!m.ok) { if (!m.ok) {
this.data.amas_last_error = __("Failed to cache employee selection on the server."); this.data.amas_last_error = __("Failed to save the employee selection on the server.");
this.amas_state = "intro"; this.amas_state = "intro";
this.show_current_step(); this.show_current_step();
return; return;
@ -1367,7 +1367,7 @@ frappe.setup.SetupWizard = class JeySetupWizard {
this.show_current_step(); this.show_current_step();
}, },
error: () => { error: () => {
this.data.amas_last_error = __("Network error while caching the employee selection."); this.data.amas_last_error = __("Network error while saving the employee selection.");
this.amas_state = "intro"; this.amas_state = "intro";
this.show_current_step(); this.show_current_step();
}, },