Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SG-590] Missing error messages #3514

Merged
merged 5 commits into from
Sep 15, 2022
Merged

[SG-590] Missing error messages #3514

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1be1b05
added removed locale keys on clients
gbubemismith Sep 13, 2022
8d07f1f
resolved comments
gbubemismith Sep 14, 2022
664dada
Merge branch 'master' into SG-590
gbubemismith Sep 14, 2022
30b0f32
Merge branch 'master' into SG-590
gbubemismith Sep 15, 2022
6dc5a64
Merge branch 'master' into SG-590
gbubemismith Sep 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/web/src/app/organizations/manage/reset-password.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export class ResetPasswordComponent implements OnInit {
this.platformUtilsService.showToast(
"error",
this.i18nService.t("errorOccurred"),
this.i18nService.t("masterPassRequired")
this.i18nService.t("masterPasswordRequired")
);
return false;
}
Expand All @@ -90,7 +90,7 @@ export class ResetPasswordComponent implements OnInit {
this.platformUtilsService.showToast(
"error",
this.i18nService.t("errorOccurred"),
this.i18nService.t("masterPassLength")
this.i18nService.t("masterPasswordMinlength")
);
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/app/settings/change-password.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ export class ChangePasswordComponent extends BaseChangePasswordComponent {
this.platformUtilsService.showToast(
"error",
this.i18nService.t("errorOccurred"),
this.i18nService.t("masterPassRequired")
this.i18nService.t("masterPasswordRequired")
);
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/app/settings/update-key.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export class UpdateKeyComponent {
this.platformUtilsService.showToast(
"error",
this.i18nService.t("errorOccurred"),
this.i18nService.t("masterPassRequired")
this.i18nService.t("masterPasswordRequired")
);
return;
}
Expand Down
4 changes: 2 additions & 2 deletions libs/angular/src/components/change-password.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,15 @@ export class ChangePasswordComponent implements OnInit {
this.platformUtilsService.showToast(
"error",
this.i18nService.t("errorOccurred"),
this.i18nService.t("masterPassRequired")
this.i18nService.t("masterPasswordRequired")
);
return false;
}
if (this.masterPassword.length < 8) {
this.platformUtilsService.showToast(
"error",
this.i18nService.t("errorOccurred"),
this.i18nService.t("masterPassLength")
this.i18nService.t("masterPasswordMinlength")
);
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion libs/angular/src/components/lock.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ export class LockComponent implements OnInit, OnDestroy {
this.platformUtilsService.showToast(
"error",
this.i18nService.t("errorOccurred"),
this.i18nService.t("masterPassRequired")
this.i18nService.t("masterPasswordRequired")
);
return;
}
Expand Down
2 changes: 1 addition & 1 deletion libs/angular/src/components/login.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export class LoginComponent extends CaptchaProtectedComponent implements OnInit
this.platformUtilsService.showToast(
"error",
this.i18nService.t("errorOccurred"),
this.i18nService.t("masterPassRequired")
this.i18nService.t("masterPasswordRequired")
);
return;
}
Expand Down
2 changes: 1 addition & 1 deletion libs/angular/src/components/update-password.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export class UpdatePasswordComponent extends BaseChangePasswordComponent {
this.platformUtilsService.showToast(
"error",
this.i18nService.t("errorOccurred"),
this.i18nService.t("masterPassRequired")
this.i18nService.t("masterPasswordRequired")
);
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion libs/common/src/services/userVerification/userVerification.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export class UserVerificationService implements UserVerificationServiceAbstracti
if (verification.type === VerificationType.OTP) {
throw new Error(this.i18nService.t("verificationCodeRequired"));
} else {
throw new Error(this.i18nService.t("masterPassRequired"));
throw new Error(this.i18nService.t("masterPasswordRequired"));
}
}
}
Expand Down