Browse Source

fix: localizations

pull/1584/head
mehmet-erim 7 years ago
parent
commit
e5c1f2e00e
  1. 7
      npm/ng-packs/packages/account/src/lib/components/login/login.component.ts
  2. 2
      npm/ng-packs/packages/account/src/lib/components/register/register.component.html
  3. 14
      npm/ng-packs/packages/account/src/lib/components/register/register.component.ts
  4. 4
      npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts

7
npm/ng-packs/packages/account/src/lib/components/login/login.component.ts

@ -53,7 +53,12 @@ export class LoginComponent {
this.store.dispatch(new Navigate([redirectUrl])); this.store.dispatch(new Navigate([redirectUrl]));
}), }),
catchError(err => { catchError(err => {
this.toasterService.error(snq(() => err.error.error_description, 'An error occured.'), 'Error'); this.toasterService.error(
snq(() => err.error.error_description) ||
snq(() => err.error.error.message, 'AbpAccount::DefaultErrorMessage'),
'Error',
{ life: 7000 },
);
return throwError(err); return throwError(err);
}), }),
finalize(() => (this.inProgress = false)), finalize(() => (this.inProgress = false)),

2
npm/ng-packs/packages/account/src/lib/components/register/register.component.html

@ -8,7 +8,7 @@
<div class="form-group"> <div class="form-group">
<label for="input-user-name">{{ 'AbpAccount::UserName' | abpLocalization }}</label <label for="input-user-name">{{ 'AbpAccount::UserName' | abpLocalization }}</label
><span> * </span ><span> * </span
><input autofocus type="text" id="input-user-name" class="form-control" formControlName="username" autofocus/> ><input autofocus type="text" id="input-user-name" class="form-control" formControlName="username" />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="input-email-address">{{ 'AbpAccount::EmailAddress' | abpLocalization }}</label <label for="input-email-address">{{ 'AbpAccount::EmailAddress' | abpLocalization }}</label

14
npm/ng-packs/packages/account/src/lib/components/register/register.component.ts

@ -24,7 +24,12 @@ export class RegisterComponent {
username: ['', [required, maxLength(255)]], username: ['', [required, maxLength(255)]],
password: [ password: [
'', '',
[required, maxLength(32), minLength(6), validatePassword(['small', 'capital', 'number', 'special'])], [
required,
maxLength(32),
// minLength(6),
// validatePassword(['small', 'capital', 'number', 'special']),
],
], ],
email: ['', [required, email]], email: ['', [required, email]],
}); });
@ -47,7 +52,12 @@ export class RegisterComponent {
.pipe( .pipe(
take(1), take(1),
catchError(err => { catchError(err => {
this.toasterService.error(snq(() => err.error.error_description, 'An error occured.'), 'Error'); this.toasterService.error(
snq(() => err.error.error_description) ||
snq(() => err.error.error.message, 'AbpAccount::DefaultErrorMessage'),
'Error',
{ life: 7000 },
);
return throwError(err); return throwError(err);
}), }),
finalize(() => (this.inProgress = false)), finalize(() => (this.inProgress = false)),

4
npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts

@ -80,14 +80,14 @@ export class ErrorHandler {
case 500: case 500:
this.createErrorComponent({ this.createErrorComponent({
title: '500', title: '500',
details: 'Sorry, an error has occured.', details: 'AbpAccount::InternalServerErrorMessage',
}); });
break; break;
case 0: case 0:
if ((err as HttpErrorResponse).statusText === 'Unknown Error') { if ((err as HttpErrorResponse).statusText === 'Unknown Error') {
this.createErrorComponent({ this.createErrorComponent({
title: 'Unknown Error', title: 'Unknown Error',
details: 'Sorry, an error has occured.', details: 'AbpAccount::InternalServerErrorMessage',
}); });
} }
break; break;

Loading…
Cancel
Save