summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSiebrand Mazeland <s.mazeland@xs4all.nl>2009-11-26 23:28:16 +0100
committerSiebrand Mazeland <s.mazeland@xs4all.nl>2009-11-26 23:28:16 +0100
commitc6b1ca37658e69304af059e8048cdf22db375c3c (patch)
tree9db2600fb3906f17c18f12c8f26b2106566c77d1 /lib
parentb8052087330f90a0f864547d28d202e67fbab247 (diff)
* Mb -> MB (for megabyte)
* i18n for MB and kB
Diffstat (limited to 'lib')
-rw-r--r--lib/designsettings.php2
-rw-r--r--lib/imagefile.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/designsettings.php b/lib/designsettings.php
index 5ce9ddeda..99f44b5b7 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 cf1668f20..6bc8e599b 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;
}