aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_upload.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2011-09-20 01:33:33 +0200
committerOleg Pudeyev <oleg@bsdpower.com>2011-11-25 15:10:49 -0500
commit179662e949967090724c5e14ea4d4d399886a38a (patch)
treed0b584b66747a925966f521cc72ffd1824882439 /phpBB/includes/functions_upload.php
parent88ae40a4b19360645d5e5a614cc378e7cce4afe3 (diff)
downloadforums-179662e949967090724c5e14ea4d4d399886a38a.tar
forums-179662e949967090724c5e14ea4d4d399886a38a.tar.gz
forums-179662e949967090724c5e14ea4d4d399886a38a.tar.bz2
forums-179662e949967090724c5e14ea4d4d399886a38a.tar.xz
forums-179662e949967090724c5e14ea4d4d399886a38a.zip
[ticket/10345] Use the plural function in some more places.
I added two function avatar_explanation_string() and avatar_error_wrong_size() for easier handling of the "pixels"-languages, as they are used quite often. PHPBB3-10345
Diffstat (limited to 'phpBB/includes/functions_upload.php')
-rw-r--r--phpBB/includes/functions_upload.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php
index f648c585f6..2322aa77bf 100644
--- a/phpBB/includes/functions_upload.php
+++ b/phpBB/includes/functions_upload.php
@@ -427,7 +427,13 @@ class filespec
if (!$this->upload->valid_dimensions($this))
{
- $this->error[] = sprintf($user->lang[$this->upload->error_prefix . 'WRONG_SIZE'], $this->upload->min_width, $this->upload->min_height, $this->upload->max_width, $this->upload->max_height, $this->width, $this->height);
+ $this->error[] = $user->lang($this->upload->error_prefix . 'WRONG_SIZE',
+ $user->lang('PIXELS', (int) $this->upload->min_width),
+ $user->lang('PIXELS', (int) $this->upload->min_height),
+ $user->lang('PIXELS', (int) $this->upload->max_width),
+ $user->lang('PIXELS', (int) $this->upload->max_height),
+ $user->lang('PIXELS', (int) $this->width),
+ $user->lang('PIXELS', (int) $this->height));
return false;
}