More accurate selection status messages

Author: ajmeese7

index.js

@@ -141,11 +141,18 @@ const formatStatusMessage = (core, files) => {
 
   return (path, files) => {
     const directoryCount = getDirectoryCount(files);
-	  const fileCount = getFileCount(files);
-	  const totalSize = getTotalSize(files);
-
-    // TODO: Copy over new label messages with translation
-    return __('LBL_STATUS', directoryCount, fileCount, totalSize);
+    const fileCount = getFileCount(files);
+    const totalSize = getTotalSize(files);
+    const directoryCountMessage = `${directoryCount} ${__(directoryCount === 1 ? 'SINGLE_DIR' : 'MULTI_DIR')}`;
+    const fileCountMessage = `${fileCount} ${__(fileCount === 1 ? 'SINGLE_FILE' : 'MULTI_FILE')}`;
+
+    if (directoryCount > 0 && fileCount > 0) {
+      return __('LBL_DIR_AND_FILE_STATUS', directoryCountMessage, fileCountMessage, totalSize);
+    } else if (directoryCount > 0) {
+      return __('LBL_DIR_OR_FILE_STATUS', directoryCountMessage, totalSize);
+    } else {
+      return __('LBL_DIR_OR_FILE_STATUS', fileCountMessage, totalSize);
+    }
   };
 };
 

locales.js

@@ -3,7 +3,12 @@ export const en_EN = {
   LBL_MINIMALISTIC: 'Minimalistic',
   LBL_OPEN_WITH: 'Open with...',
   LBL_SHOW_DATE: 'Show date column',
-  LBL_STATUS: '{0} directories, {1} files, {2} bytes total',
+  LBL_DIR_AND_FILE_STATUS: '{0}, {1}, {2} bytes total',
+  LBL_DIR_OR_FILE_STATUS: '{0}, {1} bytes total',
+  SINGLE_DIR: 'directory',
+  MULTI_DIR: 'directories',
+  SINGLE_FILE: 'file',
+  MULTI_FILE: 'files',
   LBL_DATE: 'Date', // FIXME: Move to client
   LBL_LOADING: 'Loading {0}',
   DIALOG_MKDIR_MESSAGE: 'Create new directory',
@@ -25,7 +30,12 @@ export const sv_SE = {
   LBL_MINIMALISTIC: 'Minimalistic',
   LBL_OPEN_WITH: 'Öppna med...',
   LBL_SHOW_DATE: 'Visa datumkolumn',
-  LBL_STATUS: '{0} kataloger, {1} filer, {2} byte totalt',
+  LBL_DIR_AND_FILE_STATUS: '{0}, {1}, {2} byte totalt',
+  LBL_DIR_OR_FILE_STATUS: '{0}, {1} byte totalt',
+  SINGLE_DIR: 'katalog',
+  MULTI_DIR: 'kataloger',
+  SINGLE_FILE: 'fil',
+  MULTI_FILE: 'filer',
   LBL_DATE: 'Datum', // FIXME: Move to client
   LBL_LOADING: 'Laddar {0}',
   DIALOG_MKDIR_MESSAGE: 'Skapa ny katalog',
@@ -46,7 +56,12 @@ export const nb_NO = {
   LBL_MINIMALISTIC: 'Minimalistisk',
   LBL_OPEN_WITH: 'Åpne med...',
   LBL_SHOW_DATE: 'Vis dato kolonne',
-  LBL_STATUS: '{0} mapper, {1} filer, {2} bytes totalt',
+  LBL_DIR_AND_FILE_STATUS: '{0}, {1}, {2} bytes totalt',
+  LBL_DIR_OR_FILE_STATUS: '{0}, {1} bytes totalt',
+  SINGLE_DIR: 'mappe',
+  MULTI_DIR: 'mapper',
+  SINGLE_FILE: 'fil',
+  MULTI_FILE: 'filer',
   LBL_DATE: 'Dato',
   LBL_LOADING: 'Laster {0}',
   DIALOG_MKDIR_MESSAGE: 'Lag ny mappe',
@@ -67,7 +82,12 @@ export const vi_VN = {
   LBL_MINIMALISTIC: 'Tối giản',
   LBL_OPEN_WITH: 'Mở bằng...',
   LBL_SHOW_DATE: 'Hiện cột thời gian',
-  LBL_STATUS: '{0} thư mục, {1} tập tin, tổng dung lượng {2} bytes',
+  LBL_DIR_AND_FILE_STATUS: '{0}, {1}, tổng dung lượng {2} bytes',
+  LBL_DIR_OR_FILE_STATUS: '{0}, tổng dung lượng {1} bytes',
+  SINGLE_DIR: 'thư mục',
+  MULTI_DIR: 'thư mục',
+  SINGLE_FILE: 'tập tin',
+  MULTI_FILE: 'các tập tin',
   LBL_DATE: 'Thời gian',
   LBL_LOADING: 'Đang tải {0}',
   DIALOG_MKDIR_MESSAGE: 'Tạo thư mục mới',
@@ -88,7 +108,12 @@ export const pt_BR = {
   LBL_MINIMALISTIC: 'Minimalista',
   LBL_OPEN_WITH: 'Abrir com...',
   LBL_SHOW_DATE: 'Mostrar coluna Data',
-  LBL_STATUS: '{0} diretórios, {1} arquivos, {2} bytes no total',
+  LBL_DIR_AND_FILE_STATUS: '{0}, {1}, {2} bytes no total',
+  LBL_DIR_OR_FILE_STATUS: '{0}, {1} bytes no total',
+  SINGLE_DIR: 'diretório',
+  MULTI_DIR: 'diretórios',
+  SINGLE_FILE: 'arquivo',
+  MULTI_FILE: 'arquivos',
   LBL_DATE: 'Data', // FIXME: Move to client
   LBL_LOADING: 'Carregando {0}',
   DIALOG_MKDIR_MESSAGE: 'Criar novo diretório',
@@ -109,7 +134,12 @@ export const fr_FR = {
   LBL_MINIMALISTIC: 'Minimaliste',
   LBL_OPEN_WITH: 'Ouvrir avec...',
   LBL_SHOW_DATE: 'Affichier la colonne date',
-  LBL_STATUS: '{0} dossiers, {1} fichiers, {2} bytes au total',
+  LBL_DIR_AND_FILE_STATUS: '{0}, {1}, {2} bytes au total',
+  LBL_DIR_OR_FILE_STATUS: '{0}, {1} bytes au total',
+  SINGLE_DIR: 'dossier',
+  MULTI_DIR: 'dossiers',
+  SINGLE_FILE: 'dossier',
+  MULTI_FILE: 'des dossiers',
   LBL_DATE: 'Date', // FIXME: Move to client
   LBL_LOADING: 'Chargement en cours {0}',
   DIALOG_MKDIR_MESSAGE: 'Créer nouveau dossier',
@@ -130,7 +160,12 @@ export const tr_TR = {
   LBL_MINIMALISTIC: 'Minimalist',
   LBL_OPEN_WITH: 'Şununla aç:',
   LBL_SHOW_DATE: 'Tarih sütununu göster',
-  LBL_STATUS: 'toplamda {0} dizin, {1} dosya, {2} byte var',
+  LBL_DIR_AND_FILE_STATUS: 'toplamda {0}, {1}, {2} byte var',
+  LBL_DIR_OR_FILE_STATUS: 'toplamda {0}, {1} byte var',
+  SINGLE_DIR: 'dizin',
+  MULTI_DIR: 'dizinler',
+  SINGLE_FILE: 'dosya',
+  MULTI_FILE: 'dosyalar',
   LBL_DATE: 'Tarih', // FIXME: Move to client
   LBL_LOADING: 'Yükleniyor {0}',
   DIALOG_MKDIR_MESSAGE: 'Yeni dizin oluştur',