- Localized filesize units (#1485340) + small labels capitalization change in en.* (#1485407)

6 files changed, 35 insertions, 16 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 8a5eaac0b..8cafa1790 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ CHANGELOG RoundCube Webmail
 - Fix spellchecking when switching to html editor (#1485362)
 - Fix compose window width/height (#1485396)
 - Allow calling msgimport.sh/msgexport.sh from any directory (#1485431)
+- Localized filesize units (#1485340)
 
 2008/09/29 (alec)
 ----------
diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc
index 4d35a4d9b..a9ade36db 100644
--- a/program/include/rcube_shared.inc
+++ b/program/include/rcube_shared.inc
@@ -249,17 +249,17 @@ function show_bytes($bytes)
   if ($bytes > 1073741824)
   {
     $gb = $bytes/1073741824;
-    $str = sprintf($gb>=10 ? "%d GB" : "%.1f GB", $gb);
+    $str = sprintf($gb>=10 ? "%d " : "%.1f ", $gb) . rcube_label('GB');
   }
   else if ($bytes > 1048576)
   {
     $mb = $bytes/1048576;
-    $str = sprintf($mb>=10 ? "%d MB" : "%.1f MB", $mb);
+    $str = sprintf($mb>=10 ? "%d " : "%.1f ", $mb) . rcube_label('MB');
   }
   else if ($bytes > 1024)
-    $str = sprintf("%d KB",  round($bytes/1024));
+    $str = sprintf("%d ",  round($bytes/1024)) . rcube_label('KB');
   else
-    $str = sprintf('%d B', $bytes);
+    $str = sprintf('%d ', $bytes) . rcube_label('B');
 
   return $str;
 }
diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc
index 064a6881c..f8f19d386 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -46,8 +46,8 @@ $labels['reply-to'] = 'Reply-To';
 $labels['mailboxlist'] = 'Folders';
 $labels['messagesfromto'] = 'Messages $from to $to of $count';
 $labels['messagenrof'] = 'Message $nr of $count';
-$labels['moveto'] = 'move to...';
-$labels['download'] = 'download';
+$labels['moveto'] = 'Move to...';
+$labels['download'] = 'Download';
 $labels['filename'] = 'File name';
 $labels['filesize'] = 'File size';
 $labels['preferhtml'] = 'Display HTML';
@@ -231,9 +231,9 @@ $labels['mimeparamfolding'] = 'Attachment names';
 $labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Full RFC 2047 (other)';
-$labels['advancedoptions'] = 'advanced options';
-$labels['messagesdisplaying'] = 'Displaying messages';
-$labels['messagescomposition'] = 'Composing messages';
+$labels['advancedoptions'] = 'Advanced options';
+$labels['messagesdisplaying'] = 'Displaying Messages';
+$labels['messagescomposition'] = 'Composing Messages';
 $labels['folder'] = 'Folder';
 $labels['folders'] = 'Folders';
 $labels['foldername'] = 'Folder name';
@@ -245,9 +245,13 @@ $labels['rename'] = 'Rename';
 $labels['renamefolder'] = 'Rename folder';
 $labels['deletefolder'] = 'Delete folder';
 $labels['managefolders'] = 'Manage folders';
-$labels['specialfolders'] = 'Special folders';
+$labels['specialfolders'] = 'Special Folders';
 $labels['sortby'] = 'Sort by';
 $labels['sortasc'] = 'Sort ascending';
 $labels['sortdesc'] = 'Sort descending';
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
 
 ?>
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index 28aab267d..64e2506ab 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -58,8 +58,8 @@ $labels['mailboxlist'] = 'Folders';
 $labels['messagesfromto'] = 'Messages $from to $to of $count';
 $labels['messagenrof'] = 'Message $nr of $count';
 
-$labels['moveto']   = 'move to...';
-$labels['download'] = 'download';
+$labels['moveto']   = 'Move to...';
+$labels['download'] = 'Download';
 
 $labels['filename'] = 'File name';
 $labels['filesize'] = 'File size';
@@ -282,13 +282,13 @@ $labels['showinlineimages'] = 'Display attached images below the message';
 $labels['autosavedraft']  = 'Automatically save draft';
 $labels['everynminutes']  = 'every $n minutes';
 $labels['never']  = 'never';
-$labels['messagesdisplaying'] = 'Displaying messages';
-$labels['messagescomposition'] = 'Composing messages';
+$labels['messagesdisplaying'] = 'Displaying Messages';
+$labels['messagescomposition'] = 'Composing Messages';
 $labels['mimeparamfolding'] = 'Attachment names';
 $labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Full RFC 2047 (other)';
-$labels['advancedoptions'] = 'advanced options';
+$labels['advancedoptions'] = 'Advanced options';
 
 $labels['folder']  = 'Folder';
 $labels['folders']  = 'Folders';
@@ -301,10 +301,16 @@ $labels['rename'] = 'Rename';
 $labels['renamefolder'] = 'Rename folder';
 $labels['deletefolder']  = 'Delete folder';
 $labels['managefolders']  = 'Manage folders';
-$labels['specialfolders']  = 'Special folders';
+$labels['specialfolders'] = 'Special Folders';
 
 $labels['sortby'] = 'Sort by';
 $labels['sortasc']  = 'Sort ascending';
 $labels['sortdesc'] = 'Sort descending';
 
+// units
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
+
 ?>
diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc
index de87be38d..f635c69ca 100644
--- a/program/localization/pl_PL/labels.inc
+++ b/program/localization/pl_PL/labels.inc
@@ -254,5 +254,9 @@ $labels['done'] = 'Wykonane';
 $labels['autodetect'] = '- wybór automatyczny -';
 $labels['maxuploadsize'] = 'Maksymalny rozmiar pliku to $size';
 $labels['exportvcards'] = 'Eksport kontaktów w formacie vCard';
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
 
 ?>
diff --git a/program/localization/ru_RU/labels.inc b/program/localization/ru_RU/labels.inc
index e724ba640..e4a3d5027 100644
--- a/program/localization/ru_RU/labels.inc
+++ b/program/localization/ru_RU/labels.inc
@@ -246,5 +246,9 @@ $labels['specialfolders'] = 'Особые папки';
 $labels['sortby'] = 'Сортировать по';
 $labels['sortasc'] = 'Возрастанию';
 $labels['sortdesc'] = 'Убыванию';
+$labels['B'] = 'Б';
+$labels['KB'] = 'КБ';
+$labels['MB'] = 'МБ';
+$labels['GB'] = 'ГБ';
 
 ?>