From ad092ca11d37cf293ec452f6de0e2446b3a27895 Mon Sep 17 00:00:00 2001 From: TheDiaval Date: Tue, 6 Aug 2019 09:54:15 +0300 Subject: [PATCH 1/4] fix: translation keys --- templates/app/angular/src/app/app-routing.module.ts | 2 +- templates/app/angular/src/app/home/home.component.html | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/templates/app/angular/src/app/app-routing.module.ts b/templates/app/angular/src/app/app-routing.module.ts index 9890f33136..55a082d813 100644 --- a/templates/app/angular/src/app/app-routing.module.ts +++ b/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), data: { routes: { - name: 'Home', + name: '::Menu:Home', } as ABP.Route, }, }, diff --git a/templates/app/angular/src/app/home/home.component.html b/templates/app/angular/src/app/home/home.component.html index ca2ebda8c5..5f16712b31 100644 --- a/templates/app/angular/src/app/home/home.component.html +++ b/templates/app/angular/src/app/home/home.component.html @@ -1,9 +1,8 @@
-
Welcome
+
{{ '::Welcome' | abpLocalization }}

- Welcome to the application. This is a startup project based on the ABP framework. For more information, visit - abp.io. + {{ '::LongWelcomeMessage' | abpLocalization }}

Date: Tue, 6 Aug 2019 09:54:44 +0300 Subject: [PATCH 2/4] fix(theme-basic): translation keys --- .../layout-account/layout-account.component.html | 2 +- .../layout-application/layout-application.component.html | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/layout-account/layout-account.component.html b/npm/ng-packs/packages/theme-basic/src/lib/components/layout-account/layout-account.component.html index 2c3f3c1fd2..00d209e02a 100644 --- a/npm/ng-packs/packages/theme-basic/src/lib/components/layout-account/layout-account.component.html +++ b/npm/ng-packs/packages/theme-basic/src/lib/components/layout-account/layout-account.component.html @@ -2,7 +2,7 @@

diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/layout-application/layout-application.component.html b/npm/ng-packs/packages/theme-basic/src/lib/components/layout-application/layout-application.component.html index 51c30772b6..b1d5283246 100644 --- a/npm/ng-packs/packages/theme-basic/src/lib/components/layout-application/layout-application.component.html +++ b/npm/ng-packs/packages/theme-basic/src/lib/components/layout-application/layout-application.component.html @@ -115,9 +115,11 @@ {{ (currentUser$ | async)?.userName }}
- Change Password - My Profile - Logout + {{ + 'AbpUi::ChangePassword' | abpLocalization + }} + {{ 'AbpUi::PersonalInfo' | abpLocalization }} + {{ 'AbpUi::Logout' | abpLocalization }}
From a1bd2c54895fad4c6fbeb0ae97f406e270a43bf2 Mon Sep 17 00:00:00 2001 From: TheDiaval Date: Tue, 6 Aug 2019 09:55:47 +0300 Subject: [PATCH 3/4] feature(tenant-management): add route translations --- .../packages/tenant-management/src/lib/constants/routes.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/npm/ng-packs/packages/tenant-management/src/lib/constants/routes.ts b/npm/ng-packs/packages/tenant-management/src/lib/constants/routes.ts index d953984c71..2fcc7004bb 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/constants/routes.ts +++ b/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 = [ { - name: 'Tenant Management', + name: 'AbpTenantManagement::Menu:TenantManagement', path: 'tenant-management', - parentName: 'Administration', + parentName: 'AbpUiNavigation::Menu:Administration', layout: eLayoutType.application, iconClass: 'fa fa-users', children: [ { path: 'tenants', - name: 'Tenants', + name: 'AbpTenantManagement::Tenants', order: 1, requiredPolicy: 'AbpTenantManagement.Tenants', }, From b8520bf21c3d52b4f3fe2da3f20672ce41118ff5 Mon Sep 17 00:00:00 2001 From: TheDiaval Date: Tue, 6 Aug 2019 09:56:06 +0300 Subject: [PATCH 4/4] feature(identity): add route translations --- .../packages/identity/src/lib/constants/routes.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/npm/ng-packs/packages/identity/src/lib/constants/routes.ts b/npm/ng-packs/packages/identity/src/lib/constants/routes.ts index 57271e51e1..f8dbcc88df 100644 --- a/npm/ng-packs/packages/identity/src/lib/constants/routes.ts +++ b/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 = [ { - name: 'Administration', + name: 'AbpUiNavigation::Menu:Administration', path: '', order: 1, wrapper: true, }, { - name: 'Identity Management', + name: 'AbpIdentity::Menu:IdentityManagement', path: 'identity', order: 1, - parentName: 'Administration', + parentName: 'AbpUiNavigation::Menu:Administration', layout: eLayoutType.application, iconClass: 'fa fa-id-card-o', children: [ - { path: 'roles', name: 'Roles', order: 2, requiredPolicy: 'AbpIdentity.Roles' }, - { path: 'users', name: 'Users', order: 1, requiredPolicy: 'AbpIdentity.Users' }, + { path: 'roles', name: 'AbpIdentity::Roles', order: 2, requiredPolicy: 'AbpIdentity.Roles' }, + { path: 'users', name: 'AbpIdentity::Users', order: 1, requiredPolicy: 'AbpIdentity.Users' }, ], }, ] as ABP.FullRoute[];