Changeset 1907 in subversion


Ignore:
Timestamp:
Oct 1, 2008 8:18:16 AM (5 years ago)
Author:
alec
Message:
  • Localized filesize units (#1485340) + small labels capitalization change in en.* (#1485407)
Location:
trunk/roundcubemail
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/roundcubemail/CHANGELOG

    r1906 r1907  
    66- Fix compose window width/height (#1485396) 
    77- Allow calling msgimport.sh/msgexport.sh from any directory (#1485431) 
     8- Localized filesize units (#1485340) 
    89 
    9102008/09/29 (alec) 

  • trunk/roundcubemail/program/include/rcube_shared.inc

    r1794 r1907  
    250250  { 
    251251    $gb = $bytes/1073741824; 
    252     $str = sprintf($gb>=10 ? "%d GB" : "%.1f GB", $gb); 
     252    $str = sprintf($gb>=10 ? "%d " : "%.1f ", $gb) . rcube_label('GB'); 
    253253  } 
    254254  else if ($bytes > 1048576) 
    255255  { 
    256256    $mb = $bytes/1048576; 
    257     $str = sprintf($mb>=10 ? "%d MB" : "%.1f MB", $mb); 
     257    $str = sprintf($mb>=10 ? "%d " : "%.1f ", $mb) . rcube_label('MB'); 
    258258  } 
    259259  else if ($bytes > 1024) 
    260     $str = sprintf("%d KB",  round($bytes/1024)); 
    261   else 
    262     $str = sprintf('%d B', $bytes); 
     260    $str = sprintf("%d ",  round($bytes/1024)) . rcube_label('KB'); 
     261  else 
     262    $str = sprintf('%d ', $bytes) . rcube_label('B'); 
    263263 
    264264  return $str; 

  • trunk/roundcubemail/program/localization/en_GB/labels.inc

    r1897 r1907  
    4747$labels['messagesfromto'] = 'Messages $from to $to of $count'; 
    4848$labels['messagenrof'] = 'Message $nr of $count'; 
    49 $labels['moveto'] = 'move to...'; 
    50 $labels['download'] = 'download'; 
     49$labels['moveto'] = 'Move to...'; 
     50$labels['download'] = 'Download'; 
    5151$labels['filename'] = 'File name'; 
    5252$labels['filesize'] = 'File size'; 
    … …  
    232232$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)'; 
    233233$labels['2047folding'] = 'Full RFC 2047 (other)'; 
    234 $labels['advancedoptions'] = 'advanced options'; 
    235 $labels['messagesdisplaying'] = 'Displaying messages'; 
    236 $labels['messagescomposition'] = 'Composing messages'; 
     234$labels['advancedoptions'] = 'Advanced options'; 
     235$labels['messagesdisplaying'] = 'Displaying Messages'; 
     236$labels['messagescomposition'] = 'Composing Messages'; 
    237237$labels['folder'] = 'Folder'; 
    238238$labels['folders'] = 'Folders'; 
    … …  
    246246$labels['deletefolder'] = 'Delete folder'; 
    247247$labels['managefolders'] = 'Manage folders'; 
    248 $labels['specialfolders'] = 'Special folders'; 
     248$labels['specialfolders'] = 'Special Folders'; 
    249249$labels['sortby'] = 'Sort by'; 
    250250$labels['sortasc'] = 'Sort ascending'; 
    251251$labels['sortdesc'] = 'Sort descending'; 
     252$labels['B'] = 'B'; 
     253$labels['KB'] = 'KB'; 
     254$labels['MB'] = 'MB'; 
     255$labels['GB'] = 'GB'; 
    252256 
    253257?> 

  • trunk/roundcubemail/program/localization/en_US/labels.inc

    r1897 r1907  
    5959$labels['messagenrof'] = 'Message $nr of $count'; 
    6060 
    61 $labels['moveto']   = 'move to...'; 
    62 $labels['download'] = 'download'; 
     61$labels['moveto']   = 'Move to...'; 
     62$labels['download'] = 'Download'; 
    6363 
    6464$labels['filename'] = 'File name'; 
    … …  
    283283$labels['everynminutes']  = 'every $n minutes'; 
    284284$labels['never']  = 'never'; 
    285 $labels['messagesdisplaying'] = 'Displaying messages'; 
    286 $labels['messagescomposition'] = 'Composing messages'; 
     285$labels['messagesdisplaying'] = 'Displaying Messages'; 
     286$labels['messagescomposition'] = 'Composing Messages'; 
    287287$labels['mimeparamfolding'] = 'Attachment names'; 
    288288$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)'; 
    289289$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)'; 
    290290$labels['2047folding'] = 'Full RFC 2047 (other)'; 
    291 $labels['advancedoptions'] = 'advanced options'; 
     291$labels['advancedoptions'] = 'Advanced options'; 
    292292 
    293293$labels['folder']  = 'Folder'; 
    … …  
    302302$labels['deletefolder']  = 'Delete folder'; 
    303303$labels['managefolders']  = 'Manage folders'; 
    304 $labels['specialfolders']  = 'Special folders'; 
     304$labels['specialfolders'] = 'Special Folders'; 
    305305 
    306306$labels['sortby'] = 'Sort by'; 
    … …  
    308308$labels['sortdesc'] = 'Sort descending'; 
    309309 
     310// units 
     311$labels['B'] = 'B'; 
     312$labels['KB'] = 'KB'; 
     313$labels['MB'] = 'MB'; 
     314$labels['GB'] = 'GB'; 
     315 
    310316?> 

  • trunk/roundcubemail/program/localization/pl_PL/labels.inc

    r1897 r1907  
    292292$labels['maxuploadsize'] = 'Maksymalny rozmiar pliku to $size'; 
    293293$labels['exportvcards'] = 'Eksport kontaktów w formacie vCard'; 
     294$labels['B'] = 'B'; 
     295$labels['KB'] = 'KB'; 
     296$labels['MB'] = 'MB'; 
     297$labels['GB'] = 'GB'; 
    294298 
    295299?> 

  • trunk/roundcubemail/program/localization/ru_RU/labels.inc

    r1845 r1907  
    261261$labels['sortasc'] = 'ВПзрастаМОю'; 
    262262$labels['sortdesc'] = 'УбываМОю'; 
     263$labels['B'] = 'Б'; 
     264$labels['KB'] = 'КБ'; 
     265$labels['MB'] = 'МБ'; 
     266$labels['GB'] = 'ГБ'; 
    263267 
    264268?> 
Note: See TracChangeset for help on using the changeset viewer.