Skip to content

Commit

Permalink
Merge pull request #21 from bigBear713/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
bigBear713 committed Mar 12, 2023
2 parents 6c47f14 + 0fc5776 commit f1e0b1e
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion docs/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@

<body>
<app-root></app-root>
<script src="runtime.8eadfb7c426110f6.js" type="module"></script><script src="polyfills.10738b4fb809ada0.js" type="module"></script><script src="main.761eebdef9bc7806.js" type="module"></script>
<script src="runtime.8eadfb7c426110f6.js" type="module"></script><script src="polyfills.10738b4fb809ada0.js" type="module"></script><script src="main.de7ac6155bb0942f.js" type="module"></script>

</body></html>
2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@

<body>
<app-root></app-root>
<script src="runtime.8eadfb7c426110f6.js" type="module"></script><script src="polyfills.10738b4fb809ada0.js" type="module"></script><script src="main.761eebdef9bc7806.js" type="module"></script>
<script src="runtime.8eadfb7c426110f6.js" type="module"></script><script src="polyfills.10738b4fb809ada0.js" type="module"></script><script src="main.de7ac6155bb0942f.js" type="module"></script>

</body></html>
1 change: 0 additions & 1 deletion docs/main.761eebdef9bc7806.js

This file was deleted.

1 change: 1 addition & 0 deletions docs/main.de7ac6155bb0942f.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@angular/platform-browser-dynamic": "^15.0.4",
"@angular/platform-server": "^15.0.4",
"@angular/router": "^15.0.4",
"@bigbear713/nb-common": "^15.0.0",
"@bigbear713/nb-common": "^15.1.0",
"@nguniversal/express-engine": "^15.0.0",
"express": "^4.15.2",
"lodash-es": "^4.17.21",
Expand Down
24 changes: 12 additions & 12 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { NgModule } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { NbTransLang, NbTransModule, NB_TRANS_DEFAULT_LANG, NB_TRANS_LOADER } from 'nb-trans';
import { NbTransLang, NbTransModule, NB_TRANS_DEFAULT_LANG, NB_TRANS_LOADER, NB_TRANS_MAX_RETRY } from 'nb-trans';

import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component';
Expand All @@ -19,23 +19,23 @@ import { environment } from '../environments/environment';
],
providers: [
// {
// provide: NB_TRANS_MAX_RETRY_TOKEN,
// provide: NB_TRANS_MAX_RETRY,
// useValue: 0
// },
{
provide: NB_TRANS_DEFAULT_LANG,
useValue: NbTransLang.ZH_CN,
},
{
provide: NB_TRANS_LOADER,
useValue: {
// dyn load and the content is a ts file
[NbTransLang.EN]: () => import('./localization/en/translations').then(data => data.trans),
[NbTransLang.ZH_CN]: () => import('./localization/zh-CN/translations').then(data => data.trans),
// direct load
// [NbTransLang.ZH_CN]: trans,
},
},
// {
// provide: NB_TRANS_LOADER,
// useValue: {
// // dyn load and the content is a ts file
// [NbTransLang.EN]: () => import('./localization/en/translations').then(data => data.trans),
// [NbTransLang.ZH_CN]: () => import('./localization/zh-CN/translations').then(data => data.trans),
// // direct load
// // [NbTransLang.ZH_CN]: trans,
// },
// },
{
provide: NB_TRANS_LOADER,
useFactory: (http: HttpClient) => ({
Expand Down

0 comments on commit f1e0b1e

Please sign in to comment.