# Changed TranslationService

This commit is contained in:
mauriziovitale84
2016-06-08 17:46:40 +01:00
parent 9dec406dde
commit 441d65a0e1
16 changed files with 221 additions and 226 deletions

View File

@@ -61,7 +61,7 @@ export class AppComponent {
alfrescoSettingsService.host = 'http://192.168.99.100:8080';
this.translate = translate;
this.translate.translationInit(' ');
this.translate.addTranslationFolder();
}
isActive(instruction: any[]): boolean {

View File

@@ -1,7 +1,7 @@
{
"name": "ng2-alfresco-core",
"description": "Alfresco Angular 2 Components core",
"version": "0.1.26",
"version": "0.1.27",
"author": "Alfresco Software, Ltd.",
"scripts": {
"typings": "typings install",

View File

@@ -27,18 +27,13 @@ export class AlfrescoTranslationService extends TranslateService {
constructor(http: Http, currentLoader: AlfrescoTranslationLoader, @Optional() missingTranslationHandler: MissingTranslationHandler) {
super(http, currentLoader, missingTranslationHandler);
}
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.userLang = navigator.language.split('-')[0]; // use navigator lang if available
this.userLang = /(fr|en)/gi.test(this.userLang) ? this.userLang : 'en';
this.setDefaultLang(this.userLang);
this.addComponent(name);
}
addComponent(name: string) {
if (name && !this.currentLoader.existComponent(name)) {
addTranslationFolder(name: string = '') {
if (!this.currentLoader.existComponent(name)) {
this.currentLoader.addComponentList(name);
this.getTranslation(this.userLang);
}

View File

@@ -95,7 +95,7 @@ class DocumentListDemo implements OnInit {
documentActions: DocumentActionsService) {
settings.host = 'http://192.168.99.100:8080';
translation.translationInit();
translation.addTranslationFolder();
documentActions.setHandler('my-handler', this.myDocumentActionHandler.bind(this));
}

View File

@@ -160,7 +160,7 @@ class DocumentListDemo implements OnInit {
this.token = localStorage.getItem('token');
}
translation.translationInit(' ');
translation.addTranslationFolder();
documentActions.setHandler('my-handler', this.myDocumentActionHandler.bind(this));
}

View File

@@ -1,7 +1,7 @@
{
"name": "ng2-alfresco-documentlist",
"description": "Alfresco Angular2 Document List Component",
"version": "0.1.20",
"version": "0.1.21",
"author": "Alfresco Software, Ltd.",
"scripts": {
"typings": "typings install",

View File

@@ -1,7 +1,7 @@
{
"name": "ng2-alfresco-login",
"description": "Alfresco Angular2 Login Component",
"version": "0.1.14",
"version": "0.1.15",
"author": "Alfresco Software, Ltd.",
"scripts": {
"typings": "typings install",

View File

@@ -88,7 +88,7 @@ export class AlfrescoLoginComponent {
}
};
translate.addComponent('node_modules/ng2-alfresco-login');
translate.addTranslationFolder('node_modules/ng2-alfresco-login');
this.form.valueChanges.subscribe(data => this.onValueChanged(data));

View File

@@ -132,7 +132,7 @@ class SearchDemo implements OnInit {
translation: AlfrescoTranslationService) {
settings.host = this.host;
translation.translationInit();
translation.addTranslationFolder();
}
searchTermChange(event) {
@@ -281,7 +281,7 @@ class SearchDemo implements OnInit {
translation: AlfrescoTranslationService) {
settings.host = this.host;
translation.translationInit();
translation.addTranslationFolder();
}
searchTermChange(event) {

View File

@@ -76,7 +76,7 @@ class SearchDemo implements OnInit {
this.token = localStorage.getItem('token');
}
translation.translationInit();
translation.addTranslationFolder();
}
public updateToken(): void {

View File

@@ -1,7 +1,7 @@
{
"name": "ng2-alfresco-search",
"description": "Alfresco Angular2 Search Component",
"version": "0.1.14",
"version": "0.1.15",
"author": "Alfresco Software, Ltd.",
"scripts": {
"typings": "typings install",

View File

@@ -48,7 +48,7 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit {
private translate: AlfrescoTranslationService,
@Optional() params: RouteParams)
{
translate.addComponent('node_modules/ng2-alfresco-search');
translate.addTranslationFolder('node_modules/ng2-alfresco-search');
this.results = null;
if (params) {

View File

@@ -1,7 +1,7 @@
{
"name": "ng2-alfresco-upload",
"description": "Alfresco Angular2 Upload Component",
"version": "0.1.32",
"version": "0.1.33",
"author": "Alfresco Software, Ltd.",
"scripts": {
"typings": "typings install",

View File

@@ -35,7 +35,7 @@ export class TranslationMock {
console.log('mock');
}
addComponent() {
addTranslationFolder() {
}

View File

@@ -56,7 +56,7 @@ export class FileUploadingDialogComponent implements OnInit{
constructor(private cd: ChangeDetectorRef,
translate: AlfrescoTranslationService,
private _uploaderService: UploadService) {
translate.addComponent('node_modules/ng2-alfresco-upload');
translate.addTranslationFolder('node_modules/ng2-alfresco-upload');
}
ngOnInit() {

View File

@@ -95,7 +95,7 @@ export class UploadButtonComponent {
}
});
this.translate = translate;
this.translate.addComponent('node_modules/ng2-alfresco-upload');
this.translate.addTranslationFolder('node_modules/ng2-alfresco-upload');
}
/**
@@ -104,7 +104,7 @@ export class UploadButtonComponent {
* @param {File[]} files - files dropped in the drag area.
*/
onFilesAdded($event: any): void {
let files = $event.currentTarget.files;
let files = $event.currentTarget.files;alfres
this.printFileInfo(files);
this.uploadFiles(this.uploaddirectory, files);
// reset the value of the input file