Skip to content

Commit

Permalink
fix(i18n): environment based assets url (for dev and github pages dep…
Browse files Browse the repository at this point in the history
…loyment)
  • Loading branch information
tomastrajan committed Jul 31, 2018
1 parent 1b3e176 commit e1a8fbc
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/app/core/core.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,5 @@ export class CoreModule {
}

export function HttpLoaderFactory(http: HttpClient) {
return new TranslateHttpLoader(http, './assets/i18n/', '.json');
return new TranslateHttpLoader(http, `${environment.i18nPrefix}/assets/i18n/`, '.json');
}
3 changes: 2 additions & 1 deletion src/app/examples/examples.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import { ParentComponent } from './theming/parent/parent.component';
import { ChildComponent } from './theming/child/child.component';
import { AuthenticatedComponent } from './authenticated/authenticated.component';
import { HttpClient } from '@angular/common/http';
import { environment } from '@env/environment';

@NgModule({
imports: [
Expand Down Expand Up @@ -53,5 +54,5 @@ export class ExamplesModule {
}

export function HttpLoaderFactory(http: HttpClient) {
return new TranslateHttpLoader(http, './assets/i18n/examples/', '.json');
return new TranslateHttpLoader(http, `${environment.i18nPrefix}/assets/i18n/examples/`, '.json');
}
1 change: 1 addition & 0 deletions src/environments/environment.prod.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export const environment = {
envName: 'PROD',
production: true,
test: false,
i18nPrefix: '/angular-ngrx-material-starter',
versions: {
app: packageJson.version,
angular: packageJson.dependencies['@angular/core'],
Expand Down
1 change: 1 addition & 0 deletions src/environments/environment.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export const environment = {
envName: 'TEST',
production: false,
test: true,
i18nPrefix: '',
versions: {
app: packageJson.version,
angular: packageJson.dependencies['@angular/core'],
Expand Down
1 change: 1 addition & 0 deletions src/environments/environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export const environment = {
envName: 'DEV',
production: false,
test: false,
i18nPrefix: '',
versions: {
app: packageJson.version,
angular: packageJson.dependencies['@angular/core'],
Expand Down

0 comments on commit e1a8fbc

Please sign in to comment.