inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-31 17:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed translation service

Browse Source
This commit is contained in:
mauriziovitale84
2016-05-20 17:22:58 +01:00
parent 55c766e74b
commit 9c9c4fbba2
5 changed files with 53 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ng2-components/ng2-alfresco-core/services/AlfrescoTranslationLoader.service.ts
View File

@@ -50,7 +50,6 @@ export class AlfrescoTranslationLoader implements TranslateLoader {
multiLanguage += JSON.stringify(translate);
});
observer.next(JSON.parse(multiLanguage.replace(/}{/g, ',')));
observer.next(multiLanguage);
observer.complete();
});
});

16
ng2-components/ng2-alfresco-core/services/AlfrescoTranslationService.service.ts
View File

@@ -22,20 +22,24 @@ import { AlfrescoTranslationLoader } from './AlfrescoTranslationLoader.service';
@Injectable()
export class AlfrescoTranslationService extends TranslateService {
userLang: string;
currentLoader: AlfrescoTranslationLoader;
constructor(http: Http, currentLoader: AlfrescoTranslationLoader, @Optional() missingTranslationHandler: MissingTranslationHandler) {
super(http, currentLoader, missingTranslationHandler);
}
translationInit(path: string): void {
translationInit(name: string = ''): void {
let userLang = navigator.language.split('-')[0]; // use navigator lang if available
userLang = /(fr|en)/gi.test(userLang) ? userLang : 'en';
this.userLang = userLang;
this.setDefaultLang(this.userLang);
this.addComponent(name);
this.use(this.userLang);
}
this.setDefaultLang(userLang);
this.currentLoader.addComponentList(path);
this.getTranslation(userLang);
this.use(userLang);
addComponent(name: string) {
this.currentLoader.addComponentList(name);
this.getTranslation(this.userLang);
}
}