This commit is contained in:
@@ -20,6 +20,14 @@ todo: Client all LT: error and message processing:
|
|||||||
{"created":"2020-12-09T20:11:53.905044Z","statusText":"Error processing item 4: LT:Errors\r\nLT:ErrorAPI2208 ,LT:Customer\r\n","jobId":"3297acfa-cc30-403a-a6aa-f816a93213c9"},
|
{"created":"2020-12-09T20:11:53.905044Z","statusText":"Error processing item 4: LT:Errors\r\nLT:ErrorAPI2208 ,LT:Customer\r\n","jobId":"3297acfa-cc30-403a-a6aa-f816a93213c9"},
|
||||||
{"created":"2020-12-09T20:11:53.910072Z","statusText":"Bulk job Delete processed 2 of 2 with 2 failures","jobId":"3297acfa-cc30-403a-a6aa-f816a93213c9"}]}
|
{"created":"2020-12-09T20:11:53.910072Z","statusText":"Bulk job Delete processed 2 of 2 with 2 failures","jobId":"3297acfa-cc30-403a-a6aa-f816a93213c9"}]}
|
||||||
|
|
||||||
|
AREAS_TO_CHANGE:
|
||||||
|
gzform.js line 688 LT:
|
||||||
|
translation.js
|
||||||
|
|
||||||
|
const regex = /\bLT:[a-zA-Z]*\b/g;
|
||||||
|
const found = stringtosearch.match(regex);
|
||||||
|
found=array of strings
|
||||||
|
|
||||||
todo: Job logs should all process the status text through a LT: translator as the changes above will cause them to log as LT and no longer with english
|
todo: Job logs should all process the status text through a LT: translator as the changes above will cause them to log as LT and no longer with english
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ function handleError(action, error, route) {
|
|||||||
);
|
);
|
||||||
router.push(window.$gz.store.state.homePage);
|
router.push(window.$gz.store.state.homePage);
|
||||||
|
|
||||||
throw new Error("[ErrorUserNotAuthorized]");
|
throw new Error("LT:ErrorUserNotAuthorized");
|
||||||
}
|
}
|
||||||
|
|
||||||
//Handle 401 not authenticated
|
//Handle 401 not authenticated
|
||||||
@@ -73,7 +73,7 @@ function handleError(action, error, route) {
|
|||||||
|
|
||||||
router.push("/login");
|
router.push("/login");
|
||||||
|
|
||||||
throw new Error("[ErrorUserNotAuthenticated]");
|
throw new Error("LT:ErrorUserNotAuthenticated");
|
||||||
}
|
}
|
||||||
|
|
||||||
//is it a network error?
|
//is it a network error?
|
||||||
@@ -111,11 +111,11 @@ export default {
|
|||||||
status(response) {
|
status(response) {
|
||||||
//Handle expected api errors
|
//Handle expected api errors
|
||||||
if (response.status == 401) {
|
if (response.status == 401) {
|
||||||
throw new Error("[ErrorUserNotAuthenticated]");
|
throw new Error("LT:ErrorUserNotAuthenticated");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (response.status == 403) {
|
if (response.status == 403) {
|
||||||
throw new Error("[ErrorUserNotAuthorized]");
|
throw new Error("LT:ErrorUserNotAuthorized");
|
||||||
}
|
}
|
||||||
|
|
||||||
//404 not found is an expected status not worth logging allow to bubble up
|
//404 not found is an expected status not worth logging allow to bubble up
|
||||||
@@ -150,11 +150,11 @@ export default {
|
|||||||
statusEx(response) {
|
statusEx(response) {
|
||||||
//Handle expected api errors
|
//Handle expected api errors
|
||||||
if (response.status == 401) {
|
if (response.status == 401) {
|
||||||
throw new Error("[ErrorUserNotAuthenticated]");
|
throw new Error("LT:ErrorUserNotAuthenticated");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (response.status == 403) {
|
if (response.status == 403) {
|
||||||
throw new Error("[ErrorUserNotAuthorized]");
|
throw new Error("LT:ErrorUserNotAuthorized");
|
||||||
}
|
}
|
||||||
|
|
||||||
//404 not found is an expected status not worth logging allow to bubble up
|
//404 not found is an expected status not worth logging allow to bubble up
|
||||||
|
|||||||
@@ -284,12 +284,23 @@ export default {
|
|||||||
|
|
||||||
////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////
|
||||||
// Take in a string that contains one or more
|
// Take in a string that contains one or more
|
||||||
//translation keys between square brackets
|
//translation keys that start with LT:
|
||||||
//translate each and return the string translated
|
//translate each and replace and return the string translated
|
||||||
//
|
//
|
||||||
translateString(s) {
|
translateString(s) {
|
||||||
|
// let ret = s;
|
||||||
|
// let pattern = /\[(.*?)\]/g;
|
||||||
|
// let match;
|
||||||
|
// while ((match = pattern.exec(s)) != null) {
|
||||||
|
// let foundMatch = match[0];
|
||||||
|
// let tKey = match[1];
|
||||||
|
// let newValue = this.get(tKey);
|
||||||
|
// ret = ret.replace(foundMatch, newValue);
|
||||||
|
// }
|
||||||
|
// return ret;
|
||||||
|
|
||||||
let ret = s;
|
let ret = s;
|
||||||
let pattern = /\[(.*?)\]/g;
|
let pattern = /\bLT:[a-zA-Z]*\b/g;
|
||||||
let match;
|
let match;
|
||||||
while ((match = pattern.exec(s)) != null) {
|
while ((match = pattern.exec(s)) != null) {
|
||||||
let foundMatch = match[0];
|
let foundMatch = match[0];
|
||||||
@@ -298,6 +309,9 @@ export default {
|
|||||||
ret = ret.replace(foundMatch, newValue);
|
ret = ret.replace(foundMatch, newValue);
|
||||||
}
|
}
|
||||||
return ret;
|
return ret;
|
||||||
|
// const regex = /\bLT:[a-zA-Z]*\b/g;
|
||||||
|
// const found = stringtosearch.match(regex);
|
||||||
|
// found=array of strings
|
||||||
},
|
},
|
||||||
|
|
||||||
////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////
|
||||||
|
|||||||
@@ -104,7 +104,7 @@ export default {
|
|||||||
this.languageName,
|
this.languageName,
|
||||||
this.hour12
|
this.hour12
|
||||||
),
|
),
|
||||||
status: o.statusText, //todo: parse out LT:*text until non text character, replace that with localized
|
status: window.$gz.translation.translateString(o.statusText),
|
||||||
jobId:
|
jobId:
|
||||||
o.jobId == "00000000-0000-0000-0000-000000000000" ? "" : o.jobId
|
o.jobId == "00000000-0000-0000-0000-000000000000" ? "" : o.jobId
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user