aboutsummaryrefslogtreecommitdiffstats
path: root/upload.php
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2010-03-23 21:18:38 +0000
committerplegall <plg@piwigo.org>2010-03-23 21:18:38 +0000
commit8b816a18f45bb698c5a84eaca50f4de1dcb903c1 (patch)
treee19684e026cf46a255e9a3b019f7736fd1a262ba /upload.php
parent5d854048e956d182d4e9e468c659a1ff2f3c7c15 (diff)
bug fixed: the language keys used end with a whitespace, but it was removed
in the language file. git-svn-id: http://piwigo.org/svn/trunk@5292 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--upload.php18
1 files changed, 9 insertions, 9 deletions
diff --git a/upload.php b/upload.php
index 31a200778..cd94dbdff 100644
--- a/upload.php
+++ b/upload.php
@@ -72,7 +72,7 @@ function validate_upload( $temp_name, $my_max_file_size,
else if ( $_FILES['picture']['size'] > $my_max_file_size * 1024 )
{
array_push( $result['error'],
- l10n('the filesize of the picture must not exceed : ').$my_max_file_size.' KB' );
+ l10n('the filesize of the picture must not exceed :').$my_max_file_size.' KB' );
}
else
{
@@ -90,14 +90,14 @@ function validate_upload( $temp_name, $my_max_file_size,
and $size[0] > $image_max_width )
{
array_push( $result['error'],
- l10n('the width of the picture must not exceed : ').$image_max_width.' px' );
+ l10n('the width of the picture must not exceed :').$image_max_width.' px' );
}
if ( isset( $image_max_height )
and $image_max_height != ""
and $size[1] > $image_max_height )
{
array_push( $result['error'],
- l10n('the height of the picture must not exceed : ').$image_max_height.' px' );
+ l10n('the height of the picture must not exceed :').$image_max_height.' px' );
}
// $size[2] == 1 means GIF
// $size[2] == 2 means JPG
@@ -350,7 +350,7 @@ $u_form.= '&amp;waiting_id='.$page['waiting_id'];
if ( isset( $page['waiting_id'] ) )
{
- $advise_title = l10n('Optional, but recommended : choose a thumbnail to associate to ').$_FILES['picture']['name'];
+ $advise_title = l10n('Optional, but recommended : choose a thumbnail to associate to').' '.$_FILES['picture']['name'];
}
else
{
@@ -381,7 +381,7 @@ if ( !$page['upload_successful'] )
//--------------------------------------------------------------------- advises
if ( !empty($conf['upload_maxfilesize']) )
{
- $content = l10n('the filesize of the picture must not exceed : ');
+ $content = l10n('the filesize of the picture must not exceed :');
$content.= $conf['upload_maxfilesize'].' KB';
$template->append('advises', $content);
}
@@ -390,13 +390,13 @@ if ( !$page['upload_successful'] )
{
if ( $conf['upload_maxwidth_thumbnail'] != '' )
{
- $content = l10n('the width of the picture must not exceed : ');
+ $content = l10n('the width of the picture must not exceed :');
$content.= $conf['upload_maxwidth_thumbnail'].' px';
$template->append('advises', $content);
}
if ( $conf['upload_maxheight_thumbnail'] != '' )
{
- $content = l10n('the height of the picture must not exceed : ');
+ $content = l10n('the height of the picture must not exceed :');
$content.= $conf['upload_maxheight_thumbnail'].' px';
$template->append('advises', $content);
}
@@ -405,13 +405,13 @@ if ( !$page['upload_successful'] )
{
if ( $conf['upload_maxwidth'] != '' )
{
- $content = l10n('the width of the picture must not exceed : ');
+ $content = l10n('the width of the picture must not exceed :');
$content.= $conf['upload_maxwidth'].' px';
$template->append('advises', $content);
}
if ( $conf['upload_maxheight'] != '' )
{
- $content = l10n('the height of the picture must not exceed : ');
+ $content = l10n('the height of the picture must not exceed :');
$content.= $conf['upload_maxheight'].' px';
$template->append('advises', $content);
}