Browse Source

Merge pull request #1590 from abpframework/fix/localization

Add Missing Localization Keys
pull/1591/head
Mehmet Erim 7 years ago
committed by GitHub
parent
commit
9bad9a3dbf
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      npm/ng-packs/packages/identity/src/lib/constants/routes.ts
  2. 6
      npm/ng-packs/packages/tenant-management/src/lib/constants/routes.ts
  3. 2
      npm/ng-packs/packages/theme-basic/src/lib/components/layout-account/layout-account.component.html
  4. 8
      npm/ng-packs/packages/theme-basic/src/lib/components/layout-application/layout-application.component.html
  5. 2
      templates/app/angular/src/app/app-routing.module.ts
  6. 5
      templates/app/angular/src/app/home/home.component.html

10
npm/ng-packs/packages/identity/src/lib/constants/routes.ts

@ -2,21 +2,21 @@ import { eLayoutType, ABP } from '@abp/ng.core';
export const IDENTITY_ROUTES = [ export const IDENTITY_ROUTES = [
{ {
name: 'Administration', name: 'AbpUiNavigation::Menu:Administration',
path: '', path: '',
order: 1, order: 1,
wrapper: true, wrapper: true,
}, },
{ {
name: 'Identity Management', name: 'AbpIdentity::Menu:IdentityManagement',
path: 'identity', path: 'identity',
order: 1, order: 1,
parentName: 'Administration', parentName: 'AbpUiNavigation::Menu:Administration',
layout: eLayoutType.application, layout: eLayoutType.application,
iconClass: 'fa fa-id-card-o', iconClass: 'fa fa-id-card-o',
children: [ children: [
{ path: 'roles', name: 'Roles', order: 2, requiredPolicy: 'AbpIdentity.Roles' }, { path: 'roles', name: 'AbpIdentity::Roles', order: 2, requiredPolicy: 'AbpIdentity.Roles' },
{ path: 'users', name: 'Users', order: 1, requiredPolicy: 'AbpIdentity.Users' }, { path: 'users', name: 'AbpIdentity::Users', order: 1, requiredPolicy: 'AbpIdentity.Users' },
], ],
}, },
] as ABP.FullRoute[]; ] as ABP.FullRoute[];

6
npm/ng-packs/packages/tenant-management/src/lib/constants/routes.ts

@ -2,15 +2,15 @@ import { ABP, eLayoutType } from '@abp/ng.core';
export const TENANT_MANAGEMENT_ROUTES = [ export const TENANT_MANAGEMENT_ROUTES = [
{ {
name: 'Tenant Management', name: 'AbpTenantManagement::Menu:TenantManagement',
path: 'tenant-management', path: 'tenant-management',
parentName: 'Administration', parentName: 'AbpUiNavigation::Menu:Administration',
layout: eLayoutType.application, layout: eLayoutType.application,
iconClass: 'fa fa-users', iconClass: 'fa fa-users',
children: [ children: [
{ {
path: 'tenants', path: 'tenants',
name: 'Tenants', name: 'AbpTenantManagement::Tenants',
order: 1, order: 1,
requiredPolicy: 'AbpTenantManagement.Tenants', requiredPolicy: 'AbpTenantManagement.Tenants',
}, },

2
npm/ng-packs/packages/theme-basic/src/lib/components/layout-account/layout-account.component.html

@ -2,7 +2,7 @@
<ul class="navbar-nav mr-auto"> <ul class="navbar-nav mr-auto">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="/"> <a class="nav-link" href="/">
Home {{ '::Menu:Home' | abpLocalization }}
</a> </a>
</li> </li>
</ul> </ul>

8
npm/ng-packs/packages/theme-basic/src/lib/components/layout-application/layout-application.component.html

@ -115,9 +115,11 @@
{{ (currentUser$ | async)?.userName }} {{ (currentUser$ | async)?.userName }}
</a> </a>
<div ngbDropdownMenu class="dropdown-menu dropdown-menu-right"> <div ngbDropdownMenu class="dropdown-menu dropdown-menu-right">
<a class="dropdown-item pointer" (click)="isOpenChangePassword = true">Change Password</a> <a class="dropdown-item pointer" (click)="isOpenChangePassword = true">{{
<a class="dropdown-item pointer" (click)="isOpenProfile = true">My Profile</a> 'AbpUi::ChangePassword' | abpLocalization
<a class="dropdown-item pointer" (click)="logout()">Logout</a> }}</a>
<a class="dropdown-item pointer" (click)="isOpenProfile = true">{{ 'AbpUi::PersonalInfo' | abpLocalization }}</a>
<a class="dropdown-item pointer" (click)="logout()">{{ 'AbpUi::Logout' | abpLocalization }}</a>
</div> </div>
</li> </li>

2
templates/app/angular/src/app/app-routing.module.ts

@ -11,7 +11,7 @@ const routes: Routes = [
loadChildren: () => import('./home/home.module').then(m => m.HomeModule), loadChildren: () => import('./home/home.module').then(m => m.HomeModule),
data: { data: {
routes: { routes: {
name: 'Home', name: '::Menu:Home',
} as ABP.Route, } as ABP.Route,
}, },
}, },

5
templates/app/angular/src/app/home/home.component.html

@ -1,9 +1,8 @@
<div class="card"> <div class="card">
<div class="card-header">Welcome</div> <div class="card-header">{{ '::Welcome' | abpLocalization }}</div>
<div class="card-body"> <div class="card-body">
<p> <p>
Welcome to the application. This is a startup project based on the ABP framework. For more information, visit {{ '::LongWelcomeMessage' | abpLocalization }}
abp.io.
</p> </p>
<p *ngIf="!hasLoggedIn"> <p *ngIf="!hasLoggedIn">
<a routerLink="/account/login" [state]="{ redirectUrl: '/home' }" class="btn btn-primary" role="button" <a routerLink="/account/login" [state]="{ redirectUrl: '/home' }" class="btn btn-primary" role="button"

Loading…
Cancel
Save