Considered angular routing when calculating prefix used to load bundl…

…e files (#13)

src/app/systelab-translate/LocalizableTranslateStaticLoader.ts

@@ -1,20 +1,30 @@
 import { Observable } from 'rxjs/Rx';
 import { TranslateLoader } from '@ngx-translate/core';
 import { HttpClient } from '@angular/common/http';
+import { Location } from '@angular/common';
 
 export class LocalizableTranslateStaticLoader implements TranslateLoader {
 
 	protected prefix = '';
 
-	constructor(private http: HttpClient) {
+	constructor(private http: HttpClient,
+				private location: Location) {
 
 		if (!(window.location.pathname === '/' || window.location.pathname === '/context.html')) {
-			if (window.location.pathname.endsWith('index.html')) {
+			this.prefix = window.location.pathname;
+			if (this.prefix.endsWith('index.html')) {
 				// That's the case of Electron when starting from local file.
-				this.prefix = window.location.pathname.replace('index.html', '');
-			} else {
-				this.prefix = window.location.pathname + '/';
+				this.prefix = this.prefix.substr(0, this.prefix.length - 10);
 			}
+			if (this.prefix.endsWith('/')) {
+				this.prefix = this.prefix.substr(0, this.prefix.length - 1);
+			}
+			if (this.prefix.endsWith(this.location.path())) {
+				// When starting from an Angular application route
+				this.prefix = this.prefix.substr(0, this.prefix.length - this.location.path().length);
+			}
+
+			this.prefix = (this.prefix !== '') ? this.prefix + '/' : '';
 		}
 	}
 

src/app/systelab-translate/systelab-translate.module.ts

@@ -6,10 +6,11 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { HttpClient } from '@angular/common/http';
 import { NumberFormatPipe } from './number-format.pipe';
 import { DecimalPipe } from '@angular/common';
+import { Location, LocationStrategy, PathLocationStrategy } from '@angular/common';
 
 // AoT requires an exported function for factories
-export function HttpLoaderFactory(http: HttpClient) {
-	return new LocalizableTranslateStaticLoader(http);
+export function HttpLoaderFactory(http: HttpClient, location: Location) {
+	return new LocalizableTranslateStaticLoader(http, location);
 }
 
 @NgModule({
@@ -18,7 +19,7 @@ export function HttpLoaderFactory(http: HttpClient) {
 			loader: {
 				provide:    TranslateLoader,
 				useFactory: HttpLoaderFactory,
-				deps:       [HttpClient]
+				deps:       [HttpClient, Location]
 			}
 		})
 	],
@@ -30,7 +31,10 @@ export function HttpLoaderFactory(http: HttpClient) {
 		GeneralTranslatePipe,
 		NumberFormatPipe],
 	providers:    [
-		DecimalPipe]
+		DecimalPipe,
+		Location,
+		{provide: LocationStrategy, useClass: PathLocationStrategy}
+	]
 })
 export class SystelabTranslateModule {
 	public static forRoot(entryComponents?: Array<Type<any> | any[]>): ModuleWithProviders {