From c6b1ca37658e69304af059e8048cdf22db375c3c Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Thu, 26 Nov 2009 23:28:16 +0100 Subject: [PATCH] * Mb -> MB (for megabyte) * i18n for MB and kB --- lib/designsettings.php | 2 +- lib/imagefile.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/designsettings.php b/lib/designsettings.php index 5ce9ddedad..99f44b5b7c 100644 --- 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 cf1668f203..6bc8e599b3 100644 --- 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; }