Browse Source

angular localization and version fix

pull/216/head
Galip Tolga Erdem 3 years ago
parent
commit
90aa6e35e3
  1. 6
      apps/angular/angular.json
  2. 56
      apps/angular/package.json
  3. 2
      apps/angular/projects/catalog/src/pages/product/product.component.html
  4. 2
      apps/angular/projects/ordering/src/pages/orders/order-detail/order-detail.component.html
  5. 2
      apps/angular/projects/ordering/src/pages/orders/orders.component.html
  6. 7
      apps/angular/src/app/app.module.ts
  7. 2
      apps/angular/src/app/home/home.component.html
  8. 1
      services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/Localization/AdministrationService/de-DE.json
  9. 1
      services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/Localization/AdministrationService/en-GB.json
  10. 1
      services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/Localization/AdministrationService/sl.json
  11. 1
      services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/Localization/AdministrationService/tr.json
  12. 1
      services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/Localization/AdministrationService/zh-Hans.json
  13. 1
      services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/Localization/AdministrationService/zh-Hant.json

6
apps/angular/angular.json

@ -141,18 +141,18 @@
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "EShopOnAbp:build"
"buildTarget": "EShopOnAbp:build"
},
"configurations": {
"production": {
"browserTarget": "EShopOnAbp:build:production"
"buildTarget": "EShopOnAbp:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "EShopOnAbp:build"
"buildTarget": "EShopOnAbp:build"
}
},
"test": {

56
apps/angular/package.json

@ -12,35 +12,35 @@
},
"private": true,
"dependencies": {
"@abp/ng.account": "^8.0.0",
"@abp/ng.components": "^8.0.0",
"@abp/ng.core": "^8.0.0",
"@abp/ng.identity": "^8.0.0",
"@abp/ng.oauth": "^8.0.0",
"@abp/ng.setting-management": "^8.0.0",
"@abp/ng.tenant-management": "^8.0.0",
"@abp/ng.theme.basic": "^8.0.0",
"@abp/ng.theme.lepton-x": "~2.0.0",
"@abp/ng.theme.shared": "^8.0.0",
"@angular/animations": "~16.2.12",
"@angular/common": "~16.2.12",
"@angular/compiler": "~16.2.12",
"@angular/core": "~16.2.12",
"@angular/forms": "~16.2.12",
"@angular/localize": "~16.2.12",
"@angular/platform-browser": "~16.2.12",
"@angular/platform-browser-dynamic": "~16.2.12",
"@angular/router": "~16.2.12",
"rxjs": "7.5.6",
"@abp/ng.account": "~8.0.0",
"@abp/ng.components": "~8.0.0",
"@abp/ng.core": "~8.0.0",
"@abp/ng.identity": "~8.0.0",
"@abp/ng.oauth": "~8.0.0",
"@abp/ng.setting-management": "~8.0.0",
"@abp/ng.tenant-management": "~8.0.0",
"@abp/ng.theme.basic": "~8.0.0",
"@abp/ng.theme.lepton-x": "~3.0.0",
"@abp/ng.theme.shared": "~8.0.0",
"@angular/animations": "~17.0.0",
"@angular/common": "~17.0.0",
"@angular/compiler": "~17.0.0",
"@angular/core": "~17.0.0",
"@angular/forms": "~17.0.0",
"@angular/localize": "~17.0.0",
"@angular/platform-browser": "~17.0.0",
"@angular/platform-browser-dynamic": "~17.0.0",
"@angular/router": "~17.0.0",
"rxjs": "~7.8.0",
"tslib": "^2.3.0",
"zone.js": "~0.13.3"
"zone.js": "~0.14.2"
},
"devDependencies": {
"@abp/ng.schematics": "^8.0.0",
"@angular-devkit/build-angular": "~16.2.11",
"@angular/cli": "~16.2.11",
"@angular/compiler-cli": "~16.2.12",
"@angular/language-service": "~16.2.12",
"@abp/ng.schematics": "~8.0.0",
"@angular-devkit/build-angular": "~17.0.0",
"@angular/cli": "~17.0.0",
"@angular/compiler-cli": "~17.0.0",
"@angular/language-service": "~17.0.0",
"@types/jasmine": "~3.5.0",
"@types/jasminewd2": "~2.0.3",
"@types/node": "^12.11.1",
@ -52,11 +52,11 @@
"karma-coverage-istanbul-reporter": "~3.0.2",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.5.0",
"ng-packagr": "^16.2.3",
"ng-packagr": "^17.0.3",
"prettier": "^2.6.0",
"protractor": "~7.0.0",
"ts-node": "~8.3.0",
"tslint": "~6.1.0",
"typescript": "~5.1.6"
"typescript": "~5.2.2"
}
}

2
apps/angular/projects/catalog/src/pages/product/product.component.html

@ -4,7 +4,7 @@
<div class="col col-md-6">
<h5 class="card-title">{{ 'CatalogService::Products' | abpLocalization }}</h5>
</div>
<div class="text-right col col-md-6">
<div class="text-end col col-md-6">
<button class="btn btn-primary" (click)="onCreate()" *abpPermission="permissions.create">
{{ 'CatalogService::NewProduct' | abpLocalization }}
</button>

2
apps/angular/projects/ordering/src/pages/orders/order-detail/order-detail.component.html

@ -82,6 +82,6 @@
</ng-template>
<ng-template #abpFooter>
<button type="button" class="btn btn-secondary" abpClose>{{ 'AbpUi::Close' }}</button>
<button type="button" class="btn btn-secondary" abpClose>{{ 'AbpUi::Close'| abpLocalization }}</button>
</ng-template>
</abp-modal>

2
apps/angular/projects/ordering/src/pages/orders/orders.component.html

@ -2,7 +2,7 @@
<div class="card-header">
<div class="row">
<div class="col col-md-6">
<h5 class="card-title">{{ 'AbpOrdering::Orders' | abpLocalization }}</h5>
<h5 class="card-title">{{ 'OrderingService::Orders' | abpLocalization }}</h5>
</div>
</div>
</div>

7
apps/angular/src/app/app.module.ts

@ -27,16 +27,17 @@ import { AbpOAuthModule } from '@abp/ng.oauth';
CoreModule.forRoot({
environment,
registerLocaleFn: registerLocale(),
// localizations: [{}]
}),
AbpOAuthModule.forRoot(),
ThemeSharedModule.forRoot(),
AccountConfigModule.forRoot(),
// AccountConfigModule.forRoot(),
IdentityConfigModule.forRoot(),
TenantManagementConfigModule.forRoot(),
// TenantManagementConfigModule.forRoot(),
SettingManagementConfigModule.forRoot(),
ThemeLeptonXModule.forRoot(),
SideMenuLayoutModule.forRoot(),
AccountLayoutModule.forRoot(),
// AccountLayoutModule.forRoot(),
CatalogConfigModule.forRoot(),
OrderingConfigModule.forRoot(),
],

2
apps/angular/src/app/home/home.component.html

@ -11,7 +11,7 @@
<p class="lead px-lg-5 mx-lg-5">{{ '::LongWelcomeMessage' | abpLocalization }}</p>
<a *ngIf="!hasLoggedIn" (click)="login()" class="px-4 btn btn-primary ml-1" role="button"
><i class="fa fa-sign-in"></i> {{ 'AbpAccount::Login' | abpLocalization }}</a
><i class="fa fa-sign-in"></i> {{ 'AdministrationService::Login' | abpLocalization }}</a
>
</div>
<div class="my-3 text-center">

1
services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/Localization/AdministrationService/de-DE.json

@ -1,6 +1,7 @@
{
"culture": "de-DE",
"texts": {
"Login": "Anmeldung",
"Menu:Home": "Home",
"Welcome": "Willkommen",
"LongWelcomeMessage": "Willkommen bei der Anwendung. Dies ist ein Startup-Projekt, das auf dem ABP-Framework basiert. Weitere Informationen finden Sie unter abp.io."

1
services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/Localization/AdministrationService/en-GB.json

@ -1,6 +1,7 @@
{
"culture": "en-GB",
"texts": {
"Login": "Login",
"Menu:Home": "Home",
"Welcome": "Welcome",
"LongWelcomeMessage": "Welcome to the application. This is a startup project based on the ABP framework. For more information, visit abp.io."

1
services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/Localization/AdministrationService/sl.json

@ -1,6 +1,7 @@
{
"culture": "sl",
"texts": {
"Login": "Vpiši se",
"Menu:Home": "Domov",
"Welcome": "Dobrodošli",
"LongWelcomeMessage": "Dobrodošli v aplikaciji. To je začetni projekt na osnovi okolja ABP. Za več informacij obiščite abp.io."

1
services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/Localization/AdministrationService/tr.json

@ -1,6 +1,7 @@
{
"culture": "tr",
"texts": {
"Login": "Giriş",
"Menu:Home": "Ana sayfa",
"Welcome": "Hoşgeldiniz",
"LongWelcomeMessage": "Uygulamaya hoşgeldiniz. Bu, ABP framework'ü üzerine bina edilmiş bir başlangıç projesidir. Daha fazla bilgi için abp.io adresini ziyaret edebilirsiniz."

1
services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/Localization/AdministrationService/zh-Hans.json

@ -1,6 +1,7 @@
{
"culture": "zh-Hans",
"texts": {
"Login": "登录",
"Menu:Home": "首页",
"Welcome": "欢迎",
"LongWelcomeMessage": "欢迎来到该应用程序. 这是一个基于ABP框架的启动项目. 有关更多信息, 请访问 abp.io."

1
services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/Localization/AdministrationService/zh-Hant.json

@ -1,6 +1,7 @@
{
"culture": "zh-Hant",
"texts": {
"Login": "登入",
"Menu:Home": "首頁",
"Welcome": "歡迎",
"LongWelcomeMessage": "歡迎來到此應用程式. 這是一個基於ABP框架的起始專案. 有關更多訊息, 請瀏覽 abp.io."

Loading…
Cancel
Save