From 4b33ff877cea82005d9f4b6793cadeb5698cda0f Mon Sep 17 00:00:00 2001
From: mauriziovitale84 <maurizio.vitale@alfresco.com>
Date: Fri, 3 Jun 2016 15:54:34 +0100
Subject: [PATCH] Fixed translation services

---
 demo-shell-ng2/app/app.component.ts                        | 1 +
 .../src/services/AlfrescoTranslationService.service.ts     | 6 +++---
 .../src/components/file-uploading-dialog.component.ts      | 7 +++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/demo-shell-ng2/app/app.component.ts b/demo-shell-ng2/app/app.component.ts
index 477111fdd3..1e09e7945f 100644
--- a/demo-shell-ng2/app/app.component.ts
+++ b/demo-shell-ng2/app/app.component.ts
@@ -63,6 +63,7 @@ export class AppComponent {
 
         this.translate = translate;
         this.translate.translationInit();
+        this.translate.addComponent('');
     }
 
     isActive(instruction: any[]): boolean {
diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslationService.service.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslationService.service.ts
index d10ae9e8e8..4f14711ea0 100644
--- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslationService.service.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslationService.service.ts
@@ -29,19 +29,19 @@ export class AlfrescoTranslationService extends TranslateService {
         super(http, currentLoader, missingTranslationHandler);
     }
 
-    translationInit(name: 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);
     }
 
     addComponent(name: string) {
-        if (!this.currentLoader.existComponent(name)) {
+        if (name && !this.currentLoader.existComponent(name)) {
             this.currentLoader.addComponentList(name);
             this.getTranslation(this.userLang);
         }
+        this.use(this.userLang);
     }
 }
diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts
index 21c1a49f04..0c110f2551 100644
--- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts
+++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts
@@ -18,7 +18,7 @@
 import { Component, ChangeDetectorRef, OnInit } from 'angular2/core';
 import { FileModel } from '../models/file.model';
 import { FileUploadingListComponent } from './file-uploading-list.component';
-import { AlfrescoPipeTranslate } from 'ng2-alfresco-core/dist/ng2-alfresco-core';
+import { AlfrescoTranslationService, AlfrescoPipeTranslate } from 'ng2-alfresco-core/dist/ng2-alfresco-core';
 import { UploadService } from '../services/upload.service';
 
 declare let __moduleName: string;
@@ -54,7 +54,10 @@ export class FileUploadingDialogComponent implements OnInit{
     private _isDialogMinimized: boolean = false;
 
     constructor(private cd: ChangeDetectorRef,
-                private _uploaderService: UploadService) {}
+                translate: AlfrescoTranslationService,
+                private _uploaderService: UploadService) {
+        translate.addComponent('node_modules/ng2-alfresco-upload');
+    }
 
     ngOnInit() {
         this._uploaderService.filesUpload$.subscribe((fileList: FileModel[]) => {