* Mb -> MB (for megabyte)

* i18n for MB and kB

diff --git a/lib/designsettings.php b/lib/designsettings.php
index 5ce9ddedadf5529c516e94f372d06024f242b67c..99f44b5b7cb0262461a0ec5ebc6fa2c18eabb118 100644 (file)
--- a/lib/designsettings.php
+++ b/lib/designsettings.php
@@ -107,7 +107,7 @@ class DesignSettingsAction extends AccountSettingsAction
                                       'type' => 'file',
                                       'id' => 'design_background-image_file'));
         $this->element('p', 'form_guide', _('You can upload your personal ' .
-            'background image. The maximum file size is 2Mb.'));
+            'background image. The maximum file size is 2MB.'));
         $this->element('input', array('name' => 'MAX_FILE_SIZE',
                                       'type' => 'hidden',
                                       'id' => 'MAX_FILE_SIZE',

diff --git a/lib/imagefile.php b/lib/imagefile.php
index cf1668f20373a092c791e71a706608493d0848a8..6bc8e599b3022f7aa29d9c80045157989f627293 100644 (file)
--- a/lib/imagefile.php
+++ b/lib/imagefile.php
@@ -214,9 +214,9 @@ class ImageFile
         $value = ImageFile::maxFileSizeInt();
 
         if ($value > 1024 * 1024) {
-            return ($value/(1024*1024)).'Mb';
+            return ($value/(1024*1024)) . _('MB');
         } else if ($value > 1024) {
-            return ($value/(1024)).'kB';
+            return ($value/(1024)) . _('kB');
         } else {
             return $value;
         }