Changeset 5021 for trunk/upload.php

Timestamp:

Mar 2, 2010, 3:54:22 PM (14 years ago)

Author:

nikrou

Message:

Feature 1451 : localization with gettext
Use php-gettext (developpement version rev43, because of php5.3) as fallback
Use native language (english) instead of key for translation
Keep directory en_UK for english customization
Need some refactoring for plurals

Todo : managing plugins in the same way

File:

• trunk/upload.php (modified) (16 diffs)

trunk/upload.php

@@ -62 +62 @@
   if (!in_array($extension, $conf['picture_ext']))
   {
-    array_push( $result['error'], l10n('upload_advise_filetype') );
+    array_push( $result['error'], l10n('the picture must be to the fileformat jpg, gif or png') );
     return $result;
   }
@@ -73 +73 @@
   {
     array_push( $result['error'],
-                l10n('upload_advise_filesize').$my_max_file_size.' KB' );
+                l10n('the filesize of the picture must not exceed : ').$my_max_file_size.' KB' );
   }
   else
@@ -81 +81 @@
     if ( !move_uploaded_file( $_FILES['picture']['tmp_name'], $temp_name ) )
     {
-      array_push( $result['error'], l10n('upload_cannot_upload') );
+      array_push( $result['error'], l10n('can\'t upload the picture on the server') );
     }
     else
@@ -91 +91 @@
       {
         array_push( $result['error'],
-                    l10n('upload_advise_width').$image_max_width.' px' );
+                    l10n('the width of the picture must not exceed : ').$image_max_width.' px' );
       }
       if ( isset( $image_max_height )
@@ -98 +98 @@
       {
         array_push( $result['error'],
-                    l10n('upload_advise_height').$image_max_height.' px' );
+                    l10n('the height of the picture must not exceed : ').$image_max_height.' px' );
       }
       // $size[2] == 1 means GIF
@@ -109 +109 @@
       case 3 : $result['type'] = 'png'; break;
       default :
-        array_push( $result['error'], l10n('upload_advise_filetype') );
+        array_push( $result['error'], l10n('the picture must be to the fileformat jpg, gif or png') );
       }
     }
@@ -182 +182 @@
   if ( @is_file( $path ) )
   {
-    array_push( $error, l10n('upload_file_exists') );
+    array_push( $error, l10n('A picture\'s name already used') );
   }
   // test de la présence des champs obligatoires
   if ( empty($_FILES['picture']['name']))
   {
-    array_push( $error, l10n('upload_filenotfound') );
+    array_push( $error, l10n('You must choose a picture fileformat for the image') );
   }
   if ( !preg_match( '/([_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)+)/',
              $_POST['mail_address'] ) )
   {
-    array_push( $error, l10n('reg_err_mail_address') );
+    array_push( $error, l10n('mail address must be like xxx@yyy.eee (example : jack@altern.org)') );
   }
   if ( empty($_POST['username']) )
   {
-    array_push( $error, l10n('upload_err_username') );
+    array_push( $error, l10n('the username must be given') );
   }
 
@@ -210 +210 @@
     else
     {
-      array_push( $error, l10n('err_date') );
+      array_push( $error, l10n('wrong date') );
     }
   }
@@ -225 +225 @@
   if ( !preg_match( '/^[a-zA-Z0-9-_.]+$/', $_FILES['picture']['name'] ) )
   {
-    array_push( $error, l10n('update_wrong_dirname') );
+    array_push( $error, l10n('wrong filename') );
   }
 
@@ -319 +319 @@
 // Start output of page
 //
-$title= l10n('upload_title');
+$title= l10n('Upload a picture');
 $page['body_id'] = 'theUploadPage';
 include(PHPWG_ROOT_PATH.'include/page_header.php');
@@ -351 +351 @@
 if ( isset( $page['waiting_id'] ) )
 {
-  $advise_title = l10n('upload_advise_thumbnail').$_FILES['picture']['name'];
+  $advise_title = l10n('Optional, but recommended : choose a thumbnail to associate to ').$_FILES['picture']['name'];
 }
 else
@@ -382 +382 @@
   if ( !empty($conf['upload_maxfilesize']) )
   {
-    $content = l10n('upload_advise_filesize');
+    $content = l10n('the filesize of the picture must not exceed : ');
     $content.= $conf['upload_maxfilesize'].' KB';
     $template->append('advises', $content);
@@ -391 +391 @@
     if ( $conf['upload_maxwidth_thumbnail'] != '' )
     {
-      $content = l10n('upload_advise_width');
+      $content = l10n('the width of the picture must not exceed : ');
       $content.= $conf['upload_maxwidth_thumbnail'].' px';
       $template->append('advises', $content);
@@ -397 +397 @@
     if ( $conf['upload_maxheight_thumbnail'] != '' )
     {
-      $content = l10n('upload_advise_height');
+      $content = l10n('the height of the picture must not exceed : ');
       $content.= $conf['upload_maxheight_thumbnail'].' px';
       $template->append('advises', $content);
@@ -406 +406 @@
     if ( $conf['upload_maxwidth'] != '' )
     {
-      $content = l10n('upload_advise_width');
+      $content = l10n('the width of the picture must not exceed : ');
       $content.= $conf['upload_maxwidth'].' px';
       $template->append('advises', $content);
@@ -412 +412 @@
     if ( $conf['upload_maxheight'] != '' )
     {
-      $content = l10n('upload_advise_height');
+      $content = l10n('the height of the picture must not exceed : ');
       $content.= $conf['upload_maxheight'].' px';
       $template->append('advises', $content);
     }
   }
-  $template->append('advises', l10n('upload_advise_filetype'));
+  $template->append('advises', l10n('the picture must be to the fileformat jpg, gif or png'));
 
 //----------------------------------------- optionnal username and mail address