From aba4c8ef3e97d2d4b16e4fac8cca4435cd7a34aa Mon Sep 17 00:00:00 2001
From: Maurizio Vitale <maurizio.vitale@alfresco.com>
Date: Mon, 16 Jan 2017 11:50:23 +0000
Subject: [PATCH] Wrong grammar with single file uploaded (#1468)

#1449 Wrong grammar with single file upload
---
 .../src/components/file-uploading-dialog.component.html      | 2 +-
 .../src/components/file-uploading-dialog.component.ts        | 5 +++++
 ng2-components/ng2-alfresco-upload/src/i18n/en.json          | 1 +
 ng2-components/ng2-alfresco-upload/src/i18n/it.json          | 1 +
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.html b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.html
index 907ab94964..9f3fad5f45 100644
--- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.html
+++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.html
@@ -1,7 +1,7 @@
 <div class="file-dialog" [ngClass]="{show: isDialogActive}">
     <div class="header">
         <div class="title">
-            <span id="total-upload-completed">{{totalCompleted}}</span> {{'FILE_UPLOAD.MESSAGES.COMPLETED' | translate}}
+            <span id="total-upload-completed">{{totalCompleted}}</span> {{ totalCompletedMsg | translate}}
         </div>
         <div class="buttons">
             <div class="minimize-button" [ngClass]="{active: _isDialogMinimized}" (keyup.enter)="toggleDialogMinimize()" (click)="toggleDialogMinimize()" tabindex="0">
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 f2ce0642a7..85bdcb16c4 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
@@ -46,6 +46,8 @@ export class FileUploadingDialogComponent implements OnInit, OnDestroy {
 
     totalCompleted: number = 0;
 
+    totalCompletedMsg: string = 'FILE_UPLOAD.MESSAGES.SINGLE_COMPLETED';
+
     private _isDialogMinimized: boolean = false;
 
     private listSubscription: any;
@@ -72,6 +74,9 @@ export class FileUploadingDialogComponent implements OnInit, OnDestroy {
         if (this.uploadService.totalCompleted$) {
             this.counterSubscription = this.uploadService.totalCompleted$.subscribe((total: number) => {
                 this.totalCompleted = total;
+                if (this.totalCompleted > 1) {
+                    this.totalCompletedMsg = 'FILE_UPLOAD.MESSAGES.COMPLETED';
+                }
                 this.cd.detectChanges();
             });
         }
diff --git a/ng2-components/ng2-alfresco-upload/src/i18n/en.json b/ng2-components/ng2-alfresco-upload/src/i18n/en.json
index 9400e18911..54ec8a33ee 100644
--- a/ng2-components/ng2-alfresco-upload/src/i18n/en.json
+++ b/ng2-components/ng2-alfresco-upload/src/i18n/en.json
@@ -6,6 +6,7 @@
       "CANCEL": "CANCEL"
     },
     "MESSAGES": {
+      "SINGLE_COMPLETED": "upload complete",
       "COMPLETED": "uploads complete",
       "PROGRESS": "Upload in progress...",
       "FOLDER_ALREADY_EXIST": "The folder {0} already exist",
diff --git a/ng2-components/ng2-alfresco-upload/src/i18n/it.json b/ng2-components/ng2-alfresco-upload/src/i18n/it.json
index 0208da3079..53ed5ac488 100644
--- a/ng2-components/ng2-alfresco-upload/src/i18n/it.json
+++ b/ng2-components/ng2-alfresco-upload/src/i18n/it.json
@@ -6,6 +6,7 @@
       "CANCEL": "CANCELLA"
     },
     "MESSAGES": {
+      "SINGLE_COMPLETED": "caricamento completato",
       "COMPLETED": "caricamenti completati",
       "PROGRESS": "caricamento in corso...",
       "FOLDER_ALREADY_EXIST": "Cartella {0} già presente",