This commit is contained in:
2020-12-09 21:29:17 +00:00
parent 65fd98529c
commit 8f96103e67
4 changed files with 32 additions and 10 deletions

View File

@@ -57,7 +57,7 @@ function handleError(action, error, route) {
);
router.push(window.$gz.store.state.homePage);
throw new Error("[ErrorUserNotAuthorized]");
throw new Error("LT:ErrorUserNotAuthorized");
}
//Handle 401 not authenticated
@@ -73,7 +73,7 @@ function handleError(action, error, route) {
router.push("/login");
throw new Error("[ErrorUserNotAuthenticated]");
throw new Error("LT:ErrorUserNotAuthenticated");
}
//is it a network error?
@@ -111,11 +111,11 @@ export default {
status(response) {
//Handle expected api errors
if (response.status == 401) {
throw new Error("[ErrorUserNotAuthenticated]");
throw new Error("LT:ErrorUserNotAuthenticated");
}
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
@@ -150,11 +150,11 @@ export default {
statusEx(response) {
//Handle expected api errors
if (response.status == 401) {
throw new Error("[ErrorUserNotAuthenticated]");
throw new Error("LT:ErrorUserNotAuthenticated");
}
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

View File

@@ -284,12 +284,23 @@ export default {
////////////////////////////////////////////////////////
// Take in a string that contains one or more
//translation keys between square brackets
//translate each and return the string translated
//translation keys that start with LT:
//translate each and replace and return the string translated
//
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 pattern = /\[(.*?)\]/g;
let pattern = /\bLT:[a-zA-Z]*\b/g;
let match;
while ((match = pattern.exec(s)) != null) {
let foundMatch = match[0];
@@ -298,6 +309,9 @@ export default {
ret = ret.replace(foundMatch, newValue);
}
return ret;
// const regex = /\bLT:[a-zA-Z]*\b/g;
// const found = stringtosearch.match(regex);
// found=array of strings
},
////////////////////////////////////////////////////////