Changeset 2265

Timestamp:

Mar 8, 2008, 2:38:37 AM (16 years ago)

Author:

rvelices

Message:

• upload.tpl goes smarty
• start some language cleanup and a small attempt to standardize a bit ...
• debug_language now calls trigger_error instead of echo when missing language key

Location:

trunk

Files:

• include/calendar_monthly.class.php (modified) (1 diff)
• include/functions.inc.php (modified) (1 diff)
• include/functions_category.inc.php (modified) (1 diff)
• include/functions_html.inc.php (modified) (6 diffs)
• language/en_UK/admin.lang.php (modified) (6 diffs)
• language/en_UK/common.lang.php (modified) (13 diffs)
• language/es_ES/admin.lang.php (modified) (6 diffs)
• language/es_ES/common.lang.php (modified) (11 diffs)
• language/fr_FR/admin.lang.php (modified) (6 diffs)
• language/fr_FR/common.lang.php (modified) (11 diffs)
• language/nl_NL/admin.lang.php (modified) (7 diffs)
• language/nl_NL/common.lang.php (modified) (12 diffs)
• picture.php (modified) (2 diffs)
• template/yoga/menubar.tpl (modified) (3 diffs)
• template/yoga/month_calendar.tpl (modified) (1 diff)
• template/yoga/picture.tpl (modified) (3 diffs)
• template/yoga/upload.tpl (modified) (2 diffs)
• upload.php (modified) (12 diffs)

trunk/include/calendar_monthly.class.php

@@ -481 +481 @@
             )
           );
-        $alt = $wday_labels[$dow] . ' ' . $day.
-               ' ('.sprintf("%d ".l10n('pictures'), $items[$day]['nb_images']).')';
 
         $tpl_crt_week[]   =
           array(
-              'DAY' => $day,
-              'IMAGE'     => $items[$day]['tn_url'],
-              'U_IMG_LINK'=> $url,
-              'IMAGE_STYLE'     => $css_style,
-              'IMAGE_ALT' => $alt,
+              'DAY'         => $day,
+              'DOW'         => $dow,
+              'NB_ELEMENTS' => $items[$day]['nb_images'],
+              'IMAGE'       => $items[$day]['tn_url'],
+              'U_IMG_LINK'  => $url,
+              'IMAGE_STYLE' => $css_style,
+              'IMAGE_ALT'   => $items[$day]['file'],
             );
       }

trunk/include/functions.inc.php

@@ -1085 +1085 @@
   if ($conf['debug_l10n'] and !isset($lang[$key]) and !empty($key))
   {
-    echo '[l10n] language key "'.$key.'" is not defined<br />';
+    trigger_error('[l10n] language key "'.$key.'" is not defined', E_USER_NOTICE);
   }
 

trunk/include/functions_category.inc.php

@@ -467 +467 @@
 
     //at least one image direct or indirect
-    $display_text.= l10n_dec('image_available', 'images_available', $cat_count_images);
+    $display_text.= l10n_dec('%d element', '%d elements', $cat_count_images);
 
     if ($cat_count_categories == 0 or $cat_nb_images == $cat_count_images)

trunk/include/functions_html.inc.php

@@ -27 +27 @@
 function get_icon($date, $is_child_date = false)
 {
-  global $page, $user, $lang;
+  global $page, $user;
 
   if (empty($date))
@@ -55 +55 @@
     {
       $icons = array(false => 'recent', true => 'recent_by_child' );
-      $title = l10n('recent_image').' '.$user['recent_period']
-          .' '.l10n('days');
+      $title = sprintf(
+        l10n('elements posted during the last %d days'),
+        $user['recent_period']
+        );
       foreach ($icons as $key => $icon)
       {
@@ -79 +81 @@
   )
 {
-  global $lang, $conf;
+  global $conf;
 
   $pages_around = $conf['paginate_pages_around'];
@@ -375 +377 @@
 function get_html_menu_category($categories, $selected_category)
 {
-  global $lang;
-
   $ref_level = 0;
   $level = 0;
@@ -559 +559 @@
 function access_denied()
 {
-  global $user, $lang;
+  global $user;
 
   $login_url =
@@ -650 +650 @@
         )
       .'" title="'
-      .l10n('See pictures linked to this tag only')
+      .l10n('See elements linked to this tag only')
       .'">'
       .$page['tags'][$i]['name']

trunk/language/en_UK/admin.lang.php

@@ -35 +35 @@
 $lang['%d category moved'] = '%d category moved';
 $lang['%d categories moved'] = '%d categories moved';
-$lang['%d element'] = '%d element';
-$lang['%d elements'] = '%d elements';
 $lang['%d group'] = '%d group';
 $lang['%d groups'] = '%d groups';
@@ -80 +78 @@
 $lang['Comments for all'] = 'Comments for all';
 $lang['Controversy'] = 'Controversy';
-$lang['Creation date'] = 'Creation date';
 $lang['Current name'] = 'Current name';
 $lang['Database'] = 'Database';
@@ -134 +131 @@
 $lang['New tag'] = 'New tag';
 $lang['No tag defined. Use Administration>Pictures>Tags'] = 'No tag defined. Use Administration>Pictures>Tags';
-$lang['No'] = 'No';
 $lang['Number of comments per page'] = 'Number of comments per page';
 $lang['Number of rates'] = 'Number of rates';
@@ -183 +179 @@
 $lang['Statistics'] = 'Statistics';
 $lang['Storage category'] = 'Storage category';
-$lang['Submit'] = 'Submit';
 $lang['Sum of rates'] = 'Sum of rates';
 $lang['Tag "%s" already exists'] = 'Tag "%s" already exists';
@@ -204 +199 @@
 $lang['Virtual category name'] = 'Virtual category name';
 $lang['Webmaster cannot be deleted'] = 'Webmaster cannot be deleted';
-$lang['Yes'] = 'Yes';
 $lang['You are running on development sources, no check possible.'] = 'You are running on development sources, no check possible.';
 $lang['You are running the latest version of PhpWebGallery.'] = 'You are running the latest version of PhpWebGallery.';
@@ -401 +395 @@
 $lang['site_synchronize'] = 'synchronize';
 $lang['site_synchronize_hint'] = 'update the database from files';
-$lang['stats_addr'] = 'IP Address';
-$lang['stats_category'] = 'Category';
-$lang['stats_daily_graph_title'] = 'Pages seen by hour';
-$lang['stats_day_title'] = 'Daily statistics';
-$lang['stats_file'] = 'File';
-$lang['stats_global_graph_title'] = 'Pages seen by month';
-$lang['stats_hour'] = 'Hour';
-$lang['stats_login'] = 'Login';
-$lang['stats_month_title'] = 'Monthly statistics';
-$lang['stats_monthly_graph_title'] = 'Pages seen by day';
-$lang['stats_pages_seen'] = 'Pages seen';
-$lang['stats_picture'] = 'Picture';
-$lang['stats_title'] = 'Last year statistics';
 $lang['status'] = 'status';
 $lang['storage'] = 'Directory';

trunk/language/en_UK/common.lang.php

@@ -44 +44 @@
 $lang['%d hit'] = '%d hit';
 $lang['%d hits'] = '%d hits';
-$lang['%d new element'] = '%d new element';
-$lang['%d new elements'] = '%d new elements';
+$lang['%d new element'] = '%d new image';
+$lang['%d new elements'] = '%d new images';
 $lang['%d new user'] = '%d new user';
 $lang['%d new users'] = '%d new users';
-$lang['%d picture are also linked to current tags'] = '%d picture is also linked to current tags';
-$lang['%d pictures are also linked to current tags'] = '%d pictures are also linked to current tags';
 $lang['%d waiting element'] = '%d waiting element';
 $lang['%d waiting elements'] = '%d waiting elements';
@@ -119 +117 @@
 $lang['Search'] = 'Search';
 $lang['See available tags'] = 'See available tags';
-$lang['See pictures linked to this tag only'] = 'See pictures linked to this tag only';
 $lang['Send new password'] = 'Send new password';
 $lang['Since'] = 'Since';
@@ -136 +133 @@
 $lang['access_forbiden'] = 'You are not authorized to access the requested page';
 $lang['add to caddie'] = 'add to caddie';
-$lang['add_favorites_alt'] = 'Add to favorites';
-$lang['add_favorites_hint'] = 'Add this picture to your favorites';
+$lang['add_favorites_hint'] = 'add this image to your favorites';
 $lang['admin'] = 'Administration';
 $lang['adviser_mode_enabled'] = 'Adviser mode enabled';
@@ -184 +180 @@
 $lang['day'][5] = 'Friday';
 $lang['day'][6] = 'Saturday';
-$lang['days'] = 'days';
 $lang['default_sort'] = 'Default';
-$lang['del_favorites_alt'] = 'Delete from favorites';
-$lang['del_favorites_hint'] = 'Delete this picture from your favorites';
+$lang['del_favorites_hint'] = 'delete this image from your favorites';
 $lang['delete'] = 'Delete';
 $lang['descending'] = 'descending';
@@ -211 +205 @@
 $lang['home'] = 'Home';
 $lang['home_hint'] = 'Back to the home page';
-$lang['ident_title'] = 'ident_title';
 $lang['identification'] = 'Identification';
-$lang['image_available'] = '%d image';
-$lang['images_available'] = '%d images';
 $lang['images_available_cpl'] = 'in this category';
 $lang['images_available_cat'] = 'in %d sub-category';
@@ -257 +248 @@
 $lang['new_rate'] = 'Rate this picture';
 $lang['next_page'] = 'Next';
-$lang['no'] = 'No';
+/* DEPRECATED TO REMOVE AFTER ALL TEMPLATE CHANGE USE 'No' */ $lang['no'] = 'no';
 $lang['no_category'] = 'Home';
 $lang['no_rate'] = 'no rate';
-$lang['note_filter_day'] = 'Only displays elements posted within the last %s day.';
-$lang['note_filter_days'] = 'Only displays elements posted within the last %s days.';
+$lang['note_filter_day'] = 'Only displays elements posted within the last %d day.';
+$lang['note_filter_days'] = 'Only displays elements posted within the last %d days.';
 $lang['password updated'] = 'password updated';
 $lang['periods_error'] = 'Recent period must be a positive integer value';
-$lang['picture'] = 'picture';
+/* DEPRECATED USED IN comments.php FOR image_id ? */ $lang['picture'] = 'picture';
 $lang['picture_high'] = 'Click on the picture to see it in high definition';
 $lang['picture_show_metadata'] = 'Show file metadata';
-$lang['pictures'] = 'pictures';
 $lang['powered_by'] = 'Powered by';
 $lang['preferences'] = 'Preferences';
@@ -275 +265 @@
 $lang['recent_cats_cat'] = 'Recent categories';
 $lang['recent_cats_cat_hint'] = 'displays recently updated categories';
-$lang['recent_image'] = 'Images within the';
 $lang['recent_period'] = 'Recent period';
 $lang['recent_pics_cat'] = 'Recent pictures';
@@ -292 +281 @@
 $lang['remove this tag'] = 'remove this tag from the list';
 $lang['representative'] = 'representative';
-$lang['reset'] = 'Reset';
+/* DEPRECATED TO REMOVE AFTER ALL TEMPLATE CHANGE USE 'Reset' */ $lang['reset'] = 'reset';
 $lang['return to homepage'] = 'return to homepage';
 $lang['search'] = 'Search';
@@ -318 +307 @@
 $lang['special_categories'] = 'Specials';
 $lang['sql_queries_in'] = 'SQL queries in';
-$lang['start_filter_hint'] = 'displays only recently posted elements';
-$lang['stop_filter_hint'] = 'return to the display of all elements';
-$lang['submit'] = 'Submit';
+$lang['start_filter_hint'] = 'displays only recently posted images';
+$lang['stop_filter_hint'] = 'return to the display of all images';
+/* DEPRECATED TO REMOVE AFTER ALL TEMPLATE CHANGE USE 'Submit' */ $lang['submit'] = 'submit';
 $lang['the beginning'] = 'the beginning';
 $lang['theme'] = 'Interface theme';
@@ -328 +317 @@
 $lang['title_send_mail'] = 'A comment on your site';
 $lang['today'] = 'today';
-$lang['total'] = 'images';
 $lang['update_rate'] = 'Update your rating';
 $lang['update_wrong_dirname'] = 'wrong filename';
@@ -339 +327 @@
 $lang['upload_author'] = 'Author (eg "Pierrick LE GALL")';
 $lang['upload_cannot_upload'] = 'can\'t upload the picture on the server';
-$lang['upload_creation_date'] = 'Creation date (DD/MM/YYYY)';
 $lang['upload_err_username'] = 'the username must be given';
 $lang['upload_file_exists'] = 'A picture\'s name already used';
@@ -348 +335 @@
 $lang['upload_successful'] = 'Picture uploaded with success, an administrator will validate it as soon as possible';
 $lang['upload_title'] = 'Upload a picture';
-$lang['upload_username'] = 'Username';
 $lang['useful when password forgotten'] = 'useful when password forgotten';
-$lang['w_month'] = 'Month';
-$lang['yes'] = 'Yes';
+/* DEPRECATED TO REMOVE AFTER ALL TEMPLATE CHANGE USE 'Yes' */ $lang['yes'] = 'yes';
 $lang['page_end'] = 'Page bottom';
 $lang['qsearch'] = 'Quick search';
@@ -385 +370 @@
 $lang['inc_period'] = 'Increase waiting between pictures';
 $lang['dec_period'] = 'Decrease waiting between pictures';
-
+$lang['Submit'] = 'Submit';
+$lang['Yes'] = 'Yes';
+$lang['No'] = 'No';
+$lang['%d element']='%d image';
+$lang['%d elements']='%d images';
+$lang['%d element are also linked to current tags'] = '%d image is also linked to current tags';
+$lang['%d elements are also linked to current tags'] = '%d images are also linked to current tags';
+$lang['See elements linked to this tag only'] = 'See images linked to this tag only';
+$lang['elements posted during the last %d days'] = 'images posted during the last %d days';
 ?>

trunk/language/es_ES/admin.lang.php

@@ -35 +35 @@
 $lang['%d category moved'] = '%d categoría trasladada';
 $lang['%d categories moved'] = '%d categorías trasladadas';
-$lang['%d element'] = '%d elemento';
-$lang['%d elements'] = '%d elementos';
 $lang['%d group'] = '%d grupo';
 $lang['%d groups'] = '%d grupos';
@@ -79 +77 @@
 $lang['Comments for all'] = 'Comentarios para todos';
 $lang['Controversy'] = 'Controversia';
-$lang['Creation date'] = 'Fecha de creación';
 $lang['Current name'] = 'Nombre corriente';
 $lang['Database'] = 'Base de datos';
@@ -133 +130 @@
 $lang['New tag'] = 'Nuevo tag';
 $lang['No tag defined. Use Administration>Pictures>Tags'] = 'Ninguna tag definida. Utilizar la pantalla Adminstration> Imágenes> tags';
-$lang['No'] = 'No';
 $lang['Number of comments per page'] = 'Número de comentarios por página';
 $lang['Number of rates'] = 'Número de notas';
@@ -182 +178 @@
 $lang['Statistics'] = 'Estadísticas';
 $lang['Storage category'] = 'Categoría de almacenamiento';
-$lang['Submit'] = 'Validar';
 $lang['Sum of rates'] = 'Suma notas';
 $lang['Tag "%s" already exists'] = 'El tag "%s" ya existe';
@@ -203 +198 @@
 $lang['Virtual category name'] = 'Nombre de la categoría virtual';
 $lang['Webmaster cannot be deleted'] = 'El webmestre no puede ser suprimido';
-$lang['Yes'] = 'Si';
 $lang['You are running on development sources, no check possible.'] = 'Usted trabaja con las fuentes de desarrollo, imposible verificar la última versión.';
 $lang['You are running the latest version of PhpWebGallery.'] = 'Usted utiliza la última versión de PhpWebGallery.';
@@ -401 +395 @@
 $lang['site_synchronize'] = 'Sincronizar';
 $lang['site_synchronize_hint'] = 'pone al día la base de datos a partir de los ficheros';
-$lang['stats_addr'] = 'Envía a IP';
-$lang['stats_category'] = 'Categoría';
-$lang['stats_daily_graph_title'] = 'Páginas vistas por hora';
-$lang['stats_day_title'] = 'Estadísticas diarias';
-$lang['stats_file'] = 'Fichero';
-$lang['stats_global_graph_title'] = 'Páginas vistas este mes';
-$lang['stats_hour'] = 'Hora';
-$lang['stats_login'] = 'Identificando';
-$lang['stats_month_title'] = 'Estadísticas mensuales';
-$lang['stats_monthly_graph_title'] = 'Páginas vistas este día';
-$lang['stats_pages_seen'] = 'Páginas vistas';
-$lang['stats_picture'] = 'Imagen';
-$lang['stats_title'] = 'Estadísticas del último año';
 $lang['status'] = 'Estatuto';
 $lang['storage'] = 'Repertorio';

trunk/language/es_ES/common.lang.php

@@ -48 +48 @@
 $lang['%d new user'] = '%d nuevo usuario';
 $lang['%d new users'] = '%d nuevos usuarios';
-$lang['%d picture are also linked to current tags'] = '%d imagen es también vinculada a los tags corrientes';
-$lang['%d pictures are also linked to current tags'] = '%d imagenes son igualmente vinculadas a los tags corrientes';
 $lang['%d waiting element'] = '%d elemento en espera';
 $lang['%d waiting elements'] = '%d elementos en espera';
@@ -119 +117 @@
 $lang['Search'] = 'Buscar';
 $lang['See available tags'] = 'Ver los tags disponibles';
-$lang['See pictures linked to this tag only'] = 'Ver las imágenes relacionadas únicamente a este tag';
 $lang['Send new password'] = 'Enviar una nueva contraseña';
 $lang['Since'] = 'Desde';
@@ -136 +133 @@
 $lang['access_forbiden'] = 'Usted no esta autorizado a ver la pagina pedida';
 $lang['add to caddie'] = 'Agregar al carrito';
-$lang['add_favorites_alt'] = 'Agregar en los favoritos';
-$lang['add_favorites_hint'] = 'Agregar esta imagen en sus favoritos';
+$lang['add_favorites_hint'] = 'agregar esta imagen en sus favoritos';
 $lang['admin'] = 'Administración';
 $lang['adviser_mode_enabled'] = 'Modo consejero activo';
@@ -184 +180 @@
 $lang['day'][5] = 'Viernes';
 $lang['day'][6] = 'Sábado';
-$lang['days'] = 'días';
 $lang['default_sort'] = 'Por defecto';
-$lang['del_favorites_alt'] = 'Borrar favoritos';
-$lang['del_favorites_hint'] = 'Borrar esta imágen de sus favoritos';
+$lang['del_favorites_hint'] = 'borrar esta imágen de sus favoritos';
 $lang['delete'] = 'Suprimir';
 $lang['descending'] = 'Descendiente';
@@ -211 +205 @@
 $lang['home'] = 'Inicio';
 $lang['home_hint'] = 'Volver a la página de inicio';
-$lang['ident_title'] = 'Identificación (FIXME)';
 $lang['identification'] = 'Identificación';
-$lang['image_available'] = '%d Imágen';
-$lang['images_available'] = '%d Imágenes';
 $lang['images_available_cpl'] = 'en esta categoría';
 $lang['images_available_cat'] = 'en %d subcategoría';
@@ -267 +258 @@
 $lang['picture_high'] = 'Pulse sobre la imagen para ver en alta resolución';
 $lang['picture_show_metadata'] = 'Muestre los meta-datos del fichero';
-$lang['pictures'] = 'imágenes';
 $lang['powered_by'] = 'Distribuido por';
 $lang['preferences'] = 'Preferencias';
@@ -275 +265 @@
 $lang['recent_cats_cat'] = 'Últimas categorías';
 $lang['recent_cats_cat_hint'] = 'mostrar las categorías recientement actualizadas o creadas';
-$lang['recent_image'] = 'Esta imagen tiene menos de';
 $lang['recent_period'] = 'Período reciente';
 $lang['recent_pics_cat'] = 'Últimas imágenes';
@@ -328 +317 @@
 $lang['title_send_mail'] = 'Una opinión sobre esta pagina';
 $lang['today'] = 'hoy';
-$lang['total'] = 'imágenes';
 $lang['update_rate'] = 'Actualizar nota';
 $lang['update_wrong_dirname'] = 'Mal nombre de repertorio';
@@ -339 +327 @@
 $lang['upload_author'] = 'Autor';
 $lang['upload_cannot_upload'] = 'Imposible trasladar el fichero sobre el camarero(servidor)';
-$lang['upload_creation_date'] = 'Fecha de creación (DD/MM/AAAA)';
 $lang['upload_err_username'] = 'Falta el nombre de usuario';
 $lang['upload_file_exists'] = 'este fichero ya existe';
@@ -348 +335 @@
 $lang['upload_successful'] = 'Imagen agregada , un administrador la debe controlar para que esta sea visible';
 $lang['upload_title'] = 'Agregar una imagen';
-$lang['upload_username'] = 'Nombre de usuario';
 $lang['useful when password forgotten'] = 'Útil en caso de perdida de contraseña';
-$lang['w_month'] = 'Mes';
 $lang['yes'] = 'Si';
 $lang['page_end'] = 'Por la bajura de página';
@@ -385 +370 @@
 /* TODO */ $lang['inc_period'] = 'Increase waiting between pictures';
 /* TODO */ $lang['dec_period'] = 'Decrease waiting between pictures';
-
+$lang['Submit'] = 'Validar';
+$lang['Yes'] = 'Si';
+$lang['No'] = 'No';
+$lang['%d element']='%d imágen';
+$lang['%d elements']='%d imágenes';
+$lang['%d element are also linked to current tags'] = '%d imagen es también vinculada a los tags corrientes';
+$lang['%d elements are also linked to current tags'] = '%d imagenes son igualmente vinculadas a los tags corrientes';
+$lang['See elements linked to this tag only'] = 'Ver las imágenes relacionadas únicamente a este tag';
+$lang['elements posted during the last %d days'] = 'esta imagen tiene menos de %d dias';
 ?>

trunk/language/fr_FR/admin.lang.php

@@ -35 +35 @@
 $lang['%d category moved'] = '%d catégorie déplacée';
 $lang['%d categories moved'] = '%d catégories déplacées';
-$lang['%d element'] = '%d élément';
-$lang['%d elements'] = '%d éléments';
 $lang['%d group'] = '%d groupe';
 $lang['%d groups'] = '%d groupes';
@@ -80 +78 @@
 $lang['Comments for all'] = 'Commentaires pour tous';
 $lang['Controversy'] = 'Controverse';
-$lang['Creation date'] = 'Date de création';
 $lang['Current name'] = 'Nom courant';
 $lang['Database'] = 'Base de données';
@@ -134 +131 @@
 $lang['New tag'] = 'Nouveau tag';
 $lang['No tag defined. Use Administration>Pictures>Tags'] = 'Aucun tag défini. Utiliser l\'écran Adminstration>Images>Tags';
-$lang['No'] = 'Non';
 $lang['Number of comments per page'] = 'Nombre de commentaires par page';
 $lang['Number of rates'] = 'Nombre de notes';
@@ -183 +179 @@
 $lang['Statistics'] = 'Statistiques';
 $lang['Storage category'] = 'Catégorie de stockage';
-$lang['Submit'] = 'Valider';
 $lang['Sum of rates'] = 'Somme des notes';
 $lang['Tag "%s" already exists'] = 'Le tag "%s" existe déjà';
@@ -204 +199 @@
 $lang['Virtual category name'] = 'Nom de la catégorie virtuelle';
 $lang['Webmaster cannot be deleted'] = 'Le webmestre ne peut pas être supprimé';
-$lang['Yes'] = 'Oui';
 $lang['You are running on development sources, no check possible.'] = 'Vous travaillez avec les sources de développement, impossible de vérifier la dernière version.';
 $lang['You are running the latest version of PhpWebGallery.'] = 'Vous utilisez la dernière version de PhpWebGallery.';
@@ -401 +395 @@
 $lang['site_synchronize'] = 'synchroniser';
 $lang['site_synchronize_hint'] = 'met à jour la base de données à partir des fichiers';
-$lang['stats_addr'] = 'Adresse IP';
-$lang['stats_category'] = 'Catégorie';
-$lang['stats_daily_graph_title'] = 'Pages vues par heure';
-$lang['stats_day_title'] = 'Statistiques journalières';
-$lang['stats_file'] = 'Fichier';
-$lang['stats_global_graph_title'] = 'Pages vues par mois';
-$lang['stats_hour'] = 'Heure';
-$lang['stats_login'] = 'Identifiant';
-$lang['stats_month_title'] = 'Statistiques mensuelles';
-$lang['stats_monthly_graph_title'] = 'Pages vues par jour';
-$lang['stats_pages_seen'] = 'Pages vues';
-$lang['stats_picture'] = 'Image';
-$lang['stats_title'] = 'Statistiques de la dernière année';
 $lang['status'] = 'statut';
 $lang['storage'] = 'Répertoire';

trunk/language/fr_FR/common.lang.php

@@ -44 +44 @@
 $lang['%d hit'] = 'vue %d fois';
 $lang['%d hits'] = 'vue %d fois';
-$lang['%d new element'] = '%d nouvel élément';
-$lang['%d new elements'] = '%d nouveaux éléments';
+$lang['%d new element'] = '%d nouvelle image';
+$lang['%d new elements'] = '%d nouvelles images';
 $lang['%d new user'] = '%d nouvel utilisateur';
 $lang['%d new users'] = '%d nouveaux utilisateurs';
-$lang['%d picture are also linked to current tags'] = '%d image est également liée aux tags courants';
-$lang['%d pictures are also linked to current tags'] = '%d images sont également liées aux tags courants';
 $lang['%d waiting element'] = '%d élément en attente';
 $lang['%d waiting elements'] = '%d éléments en attente';
@@ -119 +117 @@
 $lang['Search'] = 'Rechercher';
 $lang['See available tags'] = 'Voir les tags disponibles';
-$lang['See pictures linked to this tag only'] = 'Voir les images liées uniquement à ce tag';
 $lang['Send new password'] = 'Envoyer le nouveau mot de passe';
 $lang['Since'] = 'Depuis';
@@ -136 +133 @@
 $lang['access_forbiden'] = 'Vous n\'êtes pas autorisé sur la page demandée';
 $lang['add to caddie'] = 'ajouter au panier';
-$lang['add_favorites_alt'] = 'Ajouter aux favoris';
-$lang['add_favorites_hint'] = 'Ajouter cette image à vos favoris';
+$lang['add_favorites_hint'] = 'ajouter cette image à vos favoris';
 $lang['admin'] = 'Administration';
 $lang['adviser_mode_enabled'] = 'Mode conseiller actif';
@@ -184 +180 @@
 $lang['day'][5] = 'Vendredi';
 $lang['day'][6] = 'Samedi';
-$lang['days'] = 'jours';
 $lang['default_sort'] = 'Par défaut';
-$lang['del_favorites_alt'] = 'Supprimer des favoris';
-$lang['del_favorites_hint'] = 'Supprimer cette image de vos favoris';
+$lang['del_favorites_hint'] = 'supprimer cette image de vos favoris';
 $lang['delete'] = 'Supprimer';
 $lang['descending'] = 'décroissant';
@@ -211 +205 @@
 $lang['home'] = 'Accueil';
 $lang['home_hint'] = 'Retour à la page d\'accueil';
-$lang['ident_title'] = 'Identification (FIXME)';
 $lang['identification'] = 'Identification';
-$lang['image_available'] = '%d image';
-$lang['images_available'] = '%d images';
 $lang['images_available_cpl'] = 'dans cette catégorie';
 $lang['images_available_cat'] = 'dans %d sous-catégorie';
@@ -267 +258 @@
 $lang['picture_high'] = 'Cliquer sur l\'image pour la visualiser en haute définition';
 $lang['picture_show_metadata'] = 'Montrer les méta-données du fichier';
-$lang['pictures'] = 'images';
 $lang['powered_by'] = 'Propulsé par';
 $lang['preferences'] = 'Préférences';
@@ -275 +265 @@
 $lang['recent_cats_cat'] = 'Catégories récentes';
 $lang['recent_cats_cat_hint'] = 'afficher les catégories récemment mises à jour ou créées';
-$lang['recent_image'] = 'Images de moins de';
 $lang['recent_period'] = 'Période récente';
 $lang['recent_pics_cat'] = 'Images récentes';
@@ -328 +317 @@
 $lang['title_send_mail'] = 'Un commentaire sur le site';
 $lang['today'] = 'aujourd\'hui';
-$lang['total'] = 'images';
 $lang['update_rate'] = 'Mettre à jour votre note';
 $lang['update_wrong_dirname'] = 'mauvais nom de répertoire';
@@ -339 +327 @@
 $lang['upload_author'] = 'Auteur';
 $lang['upload_cannot_upload'] = 'impossible de transférer le fichier sur le serveur';
-$lang['upload_creation_date'] = 'Date de création (JJ/MM/AAAA)';
 $lang['upload_err_username'] = 'nom d\'utilisateur manquant';
 $lang['upload_file_exists'] = 'ce fichier existe déjà';
@@ -348 +335 @@
 $lang['upload_successful'] = 'Image ajoutée avec succès, un administrateur doit valider l\'ajout pour le rendre visible';
 $lang['upload_title'] = 'Ajouter une image';
-$lang['upload_username'] = 'Nom d\'utilisateur';
 $lang['useful when password forgotten'] = 'utile en cas d\'oubli de mot de passe';
-$lang['w_month'] = 'Mois';
 $lang['yes'] = 'Oui';
 $lang['page_end'] = 'Bas de page';
@@ -385 +370 @@
 $lang['inc_period'] = 'Augmenter l\'attente entre les images';
 $lang['dec_period'] = 'Diminuer l\'attente entre les images';
-
+$lang['Submit'] = 'Valider';
+$lang['Yes'] = 'Oui';
+$lang['No'] = 'Non';
+$lang['%d element']='%d image';
+$lang['%d elements']='%d images';
+$lang['%d element are also linked to current tags'] = '%d image est également liée aux tags courants';
+$lang['%d elements are also linked to current tags'] = '%d images sont également liées aux tags courants';
+$lang['See elements linked to this tag only'] = 'Voir les images liées uniquement à ce tag';
+$lang['elements posted during the last %d days'] = 'images ajoutées au cours de %d derniers jours';
 ?>

trunk/language/nl_NL/admin.lang.php

@@ -36 +36 @@
 $lang['%d category moved'] = '%d categorie verplaatst';
 $lang['%d categories moved'] = '%d categorieën verplaatst';
-$lang['%d element'] = '%d element';
-$lang['%d elements'] = '%d elementen';
 $lang['%d group'] = '%d groep';
 $lang['%d groups'] = '%d groepen';
@@ -80 +78 @@
 $lang['Comments for all'] = 'Commentaar voor alles';
 $lang['Controversy'] = 'Controversieel';
-$lang['Creation date'] = 'Aanmaak datum';
 $lang['Current name'] = 'Huidige naam';
 $lang['Database'] = 'Database';
@@ -134 +131 @@
 $lang['New tag'] = 'Nieuwe tag';
 $lang['No tag defined. Use Administration>Pictures>Tags'] = 'Geen tag gedefineerd. Gebruik beheer>afbeeldingen>Tags';
-$lang['No'] = 'Nee';
 $lang['Number of comments per page'] = 'Aantal commentaren per pagina';
 $lang['Number of rates'] = 'Aantal beoordelingen';
@@ -183 +179 @@
 $lang['Statistics'] = 'Statistieken';
 $lang['Storage category'] = 'Storage category';
-$lang['Submit'] = 'Bevestig';
 $lang['Sum of rates'] = 'Eind oordeel';
 $lang['Tag "%s" already exists'] = 'Tag "%s" bestaat al';
@@ -204 +199 @@
 $lang['Virtual category name'] = 'Virtuele categorie naam';
 $lang['Webmaster cannot be deleted'] = 'Webmaster kan niet verwijderd worden';
-$lang['Yes'] = 'Ja';
 $lang['You are running on development sources, no check possible.'] = 'Je werkt op basis van ontwikkelins bronnen, geen controle mogelijk.';
 $lang['You are running the latest version of PhpWebGallery.'] = 'Je hebt de laatste versie van PhpWebGallery.';
@@ -402 +396 @@
 $lang['site_synchronize'] = 'synchronizeer';
 $lang['site_synchronize_hint'] = 'werk de database bij vanuit bestanden';
-$lang['stats_addr'] = 'IP Adres';
-$lang['stats_category'] = 'Categorie';
-$lang['stats_daily_graph_title'] = 'Pagina\'s bekeken per uur';
-$lang['stats_day_title'] = 'Dagelijkse statistieken';
-$lang['stats_file'] = 'Bestand';
-$lang['stats_global_graph_title'] = 'Pagina\'s bekeken per maand';
-$lang['stats_hour'] = 'Uur';
-$lang['stats_login'] = 'Login';
-$lang['stats_month_title'] = 'Maandelijkse statistieken';
-$lang['stats_monthly_graph_title'] = 'Pagina\'s bekeken per dag';
-$lang['stats_pages_seen'] = 'Pagina\'s bekeken';
-$lang['stats_picture'] = 'afbeeldingen';
-$lang['stats_title'] = 'Afgelopen jaar statistieken';
 $lang['status'] = 'status';
 $lang['storage'] = 'Map';
@@ -636 +617 @@
 $lang['c13y_user_created'] = 'Gebruiker "%s" gemaakt met wachtwoord "%s" ';
 $lang['c13y_user_status_updated'] = 'Status van de gebruiker "%s" is bijgewerkt';
+$lang['add new elements to caddie'] = 'Voeg nieuwe elementen toe ann caddie';
 // --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
 $lang['no_display_thumbnail'] = 'Geen weergave';

trunk/language/nl_NL/common.lang.php

@@ -48 +48 @@
 $lang['%d new user'] = '%d nieuwe gebruiker';
 $lang['%d new users'] = '%d nieuwe gebruikers';
-$lang['%d picture are also linked to current tags'] = '%d picture are also linked to current tags';
-$lang['%d pictures are also linked to current tags'] = '%d pictures are also linked to current tags';
 $lang['%d waiting element'] = '%d wachtende element';
 $lang['%d waiting elements'] = '%d wachtende elementen';
@@ -119 +117 @@
 $lang['Search'] = 'Zoeken';
 $lang['See available tags'] = 'Toon beschikbare tags';
-$lang['See pictures linked to this tag only'] = 'Toon afbeelding gelinkt met deze tag';
 $lang['Send new password'] = 'Stuur nieuw wachtwoord';
 $lang['Since'] = 'Sinds';
@@ -136 +133 @@
 $lang['access_forbiden'] = 'Je hebt geen rechten tot de opgevraagde pagina';
 $lang['add to caddie'] = 'Toevoegen aan caddie';
-$lang['add_favorites_alt'] = 'Toevoegen aan favorieten';
-$lang['add_favorites_hint'] = 'Voeg deze afbeelding toe aan jou favorieten';
+$lang['add_favorites_hint'] = 'voeg deze afbeelding toe aan jou favorieten';
 $lang['admin'] = 'Beheer';
 $lang['adviser_mode_enabled'] = 'Advies mode geactiveerd';
@@ -184 +180 @@
 $lang['day'][5] = 'Vrijdag';
 $lang['day'][6] = 'Zaterdag';
-$lang['days'] = 'dagen';
 $lang['default_sort'] = 'Standaard';
-$lang['del_favorites_alt'] = 'Verwijderen uit de favorieten';
-$lang['del_favorites_hint'] = 'Verwijder deze foto van je favorieten';
+$lang['del_favorites_hint'] = 'verwijder deze foto van je favorieten';
 $lang['delete'] = 'Verwijderen';
 $lang['descending'] = 'descending';
@@ -211 +205 @@
 $lang['home'] = 'Home';
 $lang['home_hint'] = 'Terug naar de home page';
-$lang['ident_title'] = 'ident_title';
 $lang['identification'] = 'Identificatie';
-$lang['image_available'] = '%d afbeeldingen';
-$lang['images_available'] = '%d afbeelding(en)';
 $lang['images_available_cpl'] = 'in deze categorie';
 $lang['images_available_cat'] = 'in %d sub-categorie';
@@ -267 +258 @@
 $lang['picture_high'] = 'Klik op de afbeelding om het te bekijken in een groter formaat';
 $lang['picture_show_metadata'] = 'Toon bestands metadata';
-$lang['pictures'] = 'afbeelding';
 $lang['powered_by'] = 'Powered by';
 $lang['preferences'] = 'Voorkeuren';
@@ -275 +265 @@
 $lang['recent_cats_cat'] = 'Recente categorieën';
 $lang['recent_cats_cat_hint'] = 'toon recentelijk bijgewerkte categorieën';
-$lang['recent_image'] = 'afbeelding binnen de';
 $lang['recent_period'] = 'Recente periode';
 $lang['recent_pics_cat'] = 'Recente afbeelding';
@@ -328 +317 @@
 $lang['title_send_mail'] = 'commentaar op je site';
 $lang['today'] = 'vandaag';
-$lang['total'] = 'afbeelding';
 $lang['update_rate'] = 'Werk je beoordeling bij';
 $lang['update_wrong_dirname'] = 'verkeerde bestandsnaam';
@@ -339 +327 @@
 $lang['upload_author'] = 'Auteur (eg "Pierrick LE GALL")';
 $lang['upload_cannot_upload'] = 'kan de afbeelding niet op de server plaatsen';
-$lang['upload_creation_date'] = 'Aanmaak datum (DD/MM/YYYY)';
 $lang['upload_err_username'] = 'de gebruikersnaam moet ingevuld zijn';
 $lang['upload_file_exists'] = 'De naam is al in gebruik';
@@ -348 +335 @@
 $lang['upload_successful'] = 'Afbeelding met succes ge-upload, een beheerder moet de afbeelding valideren, dit gebeurd zsm.';
 $lang['upload_title'] = 'Upload een afbeelding';
-$lang['upload_username'] = 'Gebruikersnaam';
 $lang['useful when password forgotten'] = 'handig bij het vergeten van je wachtwoord';
-$lang['w_month'] = 'Maand';
 $lang['yes'] = 'Ja';
 $lang['page_end'] = 'Pagina eind';
@@ -373 +358 @@
 // --------- Starting below: New or revised $lang ---- from version 1.7.1
 $lang['guest_must_be_guest'] = 'Foutieve status voor gebruiker "guest", gebruik standaard status. Waarschuw de webmaster.';
-$lang['add new elements to caddie'] = 'Voeg nieuwe elementen toe ann caddie';
 // --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrator, webmaster en speciale gebruiker kunnen deze methode niet gebruiken';
@@ -386 +370 @@
 /* TODO */ $lang['inc_period'] = 'Increase waiting between pictures';
 /* TODO */ $lang['dec_period'] = 'Decrease waiting between pictures';
-
+$lang['Submit'] = 'Bevestig';
+$lang['Yes'] = 'Ja';
+$lang['No'] = 'Nee';
+$lang['%d element']='%d afbeelding';
+$lang['%d elements']='%d afbeeldingen';
+$lang['%d element are also linked to current tags'] = '%d image are also linked to current tags';
+$lang['%d elements are also linked to current tags'] = '%d images are also linked to current tags';
+$lang['See elements linked to this tag only'] = 'Toon afbeelding gelinkt met deze tag';
+$lang['elements posted during the last %d days'] = 'afbeelding binnen de %d dagen';
 ?>

trunk/picture.php

@@ -673 +673 @@
           get_root_url().get_themeconf('icon_dir').'/favorite.png',
         'FAVORITE_HINT' => l10n('add_favorites_hint'),
-        'FAVORITE_ALT'  => l10n('add_favorites_alt'),
         'U_FAVORITE'    => add_url_params(
           $url_self,
@@ -689 +688 @@
           get_root_url().get_themeconf('icon_dir').'/del_favorite.png',
         'FAVORITE_HINT' => l10n('del_favorites_hint'),
-        'FAVORITE_ALT'  => l10n('del_favorites_alt'),
         'U_FAVORITE'    => add_url_params(
           $url_self,

trunk/template/yoga/menubar.tpl

@@ -37 +37 @@
   </li></ul>
   {/if}
-                <p class="totalImages">{$NB_PICTURE} {'total'|@translate}</p>
+                <p class="totalImages">{$pwg->l10n_dec('%d element', '%d elements', $NB_PICTURE)}</p>
   </dd>
 </dl>
@@ -51 +51 @@
                 {if !empty($tag.add) }
                         <a href="{$tag.add.URL}" 
-                                title="{$pwg->l10n_dec('%d picture are also linked to current tags', '%d pictures are also linked to current tags', $tag.add.COUNTER)}" 
+                                title="{$pwg->l10n_dec('%d element are also linked to current tags', '%d elements are also linked to current tags', $tag.add.COUNTER)}"
                                 rel="nofollow">
                                 <img src="{$ROOT_URL}{$themeconf.icon_dir}/add_tag.png" alt="+" />
                         </a>
                 {/if}
-                <a href="{$tag.U_TAG}" class="{$tag.CLASS}" title="{'See pictures linked to this tag only'|@translate}">{$tag.NAME}</a>
+                <a href="{$tag.U_TAG}" class="{$tag.CLASS}" title="{'See elements linked to this tag only'|@translate}">{$tag.NAME}</a>
                 </li>
                 {/foreach}
@@ -147 +147 @@
                 {/if}
                 <p>
-                 <input class="submit" type="submit" name="login" value="{'submit'|@translate}">
+                 <input class="submit" type="submit" name="login" value="{'Submit'|@translate}">
                 </p>
                 

trunk/template/yoga/month_calendar.tpl

@@ -47 +47 @@
                                 <div class="calImg" style="width:{$chronology_calendar.month_view.CELL_WIDTH}px;height:{$chronology_calendar.month_view.CELL_HEIGHT}px;">
                                         <a href="{$day.U_IMG_LINK}">
-                                                <img style="{$day.IMAGE_STYLE}" src="{$day.IMAGE}" alt="{$day.IMAGE_ALT}" title="{$day.IMAGE_ALT}" />
+                                                <img style="{$day.IMAGE_STYLE}" src="{$day.IMAGE}" alt="{$day.IMAGE_ALT}" title="{$pwg->l10n_dec('%d element','%d elements', $day.NB_ELEMENTS)}" />
                                         </a>
                                 </div>

trunk/template/yoga/picture.tpl

@@ -46 +46 @@
     {if isset($PLUGIN_PICTURE_ACTIONS)}{$PLUGIN_PICTURE_ACTIONS}{/if}
     {if isset($favorite) }
-      <a href="{$favorite.U_FAVORITE}" title="{$favorite.FAVORITE_HINT}"><img src="{$favorite.FAVORITE_IMG}" class="button" alt="{$favorite.FAVORITE_ALT}"></a>
+      <a href="{$favorite.U_FAVORITE}" title="{$favorite.FAVORITE_HINT}"><img src="{$favorite.FAVORITE_IMG}" class="button" alt="favorite" title="{$favorite.FAVORITE_HINT}"></a>
     {/if}
     {if !empty($U_SET_AS_REPRESENTATIVE) }
@@ -52 +52 @@
     {/if}
     {if isset($U_ADMIN) }
-      <a href="{$U_ADMIN}" title="{'link_info_image'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/preferences.png" class="button" alt="{'link_info_image'|@translate}"></a>
+      <a href="{$U_ADMIN}" title="{'link_info_image'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/preferences.png" class="button" alt="{'edit'|@translate}"></a>
     {/if}
     {if isset($U_CADDIE) }
@@ -221 +221 @@
       <label>{'comment'|@translate}<textarea name="content" rows="5" cols="80">{$comment_add.CONTENT}</textarea></label>
       <input type="hidden" name="key" value="{$comment_add.KEY}" />
-      <input class="submit" type="submit" value="{'submit'|@translate}">
+      <input class="submit" type="submit" value="{'Submit'|@translate}">
     </fieldset>
   </form>

trunk/template/yoga/upload.tpl

@@ -1 @@
-<!-- DEV TAG: not smarty migrated -->
+{* $Id$ *}
+
 <div id="content">
 
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
+      <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li>
     </ul>
-    <h2>{lang:upload_title}</h2>
+    <h2>{'upload_title'|@translate}</h2>
   </div>
 
-  <!-- BEGIN upload_not_successful -->
-  <form enctype="multipart/form-data" method="post" action="{F_ACTION}">
+  {if !empty($errors)}
+  <div class="errors">
+    <ul>
+      {foreach from=$errors item=error}
+      <li>{$error}</li>
+      {/foreach}
+    </ul>
+  </div>
+  {/if}
+
+  {if not $UPLOAD_SUCCESSFUL }
+  <form enctype="multipart/form-data" method="post" action="{$F_ACTION}">
     <table style="width:80%;margin-left:auto;margin-right:auto;">
-    <!-- BEGIN errors -->
-        <tr>
-        <td colspan="2">
-          <div class="errors">
-          <ul>
-            <!-- BEGIN error -->
-            <li>{upload_not_successful.errors.error.ERROR}</li>
-            <!-- END error -->
-          </ul>
-          </div>
-        </td>
-        </tr>
-    <!-- END errors -->
     <tr>
       <td colspan="2" class="menu">
-      <div style="text-align:center;">{ADVISE_TITLE}</div>
+      <div style="text-align:center;">{$ADVISE_TITLE}</div>
+      {if not empty($advises)}
       <ul>
-        <!-- BEGIN advise -->
-        <li>{upload_not_successful.advise.ADVISE}</li>
-        <!-- END advise -->
+        {foreach from=$advises item=advise}
+        <li>{$advise}</li>
+        {/foreach}
       </ul>
+      {/if}
       </td>
     </tr>
@@ -40 +40 @@
       </td>
     </tr>
-    <!-- BEGIN fields -->
+    {if isset($SHOW_FORM_FIELDS) and $SHOW_FORM_FIELDS}
     <!-- username  -->
     <tr>
-      <td class="menu">{lang:upload_username} <span style="color:red;">*</span></td>
+      <td class="menu">{'Username'|@translate} <span style="color:red;">*</span></td>
       <td align="left" style="padding:10px;">
-      <input name="username" type="text" value="{NAME}" />
+      <input name="username" type="text" value="{$NAME}" />
       </td>
     </tr>
     <!-- mail address  -->
     <tr>
-      <td class="menu">{lang:mail_address} <span style="color:red;">*</span></td>
+      <td class="menu">{'mail_address'|@translate} <span style="color:red;">*</span></td>
       <td align="left" style="padding:10px;">
-      <input name="mail_address" type="text" value="{EMAIL}" />
+      <input name="mail_address" type="text" value="{$EMAIL}" />
       </td>
     </tr>
     <!-- name of the picture  -->
     <tr>
-      <td class="menu">{lang:upload_name}</td>
+      <td class="menu">{'upload_name'|@translate}</td>
       <td align="left" style="padding:10px;">
-      <input name="name" type="text" value="{NAME_IMG}" />
+      <input name="name" type="text" value="{$NAME_IMG}" />
       </td>
     </tr>
     <!-- author  -->
     <tr>
-      <td class="menu">{lang:upload_author}</td>
+      <td class="menu">{'upload_author'|@translate}</td>
       <td align="left" style="padding:10px;">
-      <input name="author" type="text" value="{AUTHOR_IMG}" />
+      <input name="author" type="text" value="{$AUTHOR_IMG}" />
       </td>
     </tr>
     <!-- date of creation  -->
     <tr>
-      <td class="menu">{lang:upload_creation_date}</td>
+      <td class="menu">{'Creation date'|@translate} (DD/MM/YYYY)</td>
       <td align="left" style="padding:10px;">
-      <input name="date_creation" type="text" value="{DATE_IMG}" />
+      <input name="date_creation" type="text" value="{$DATE_IMG}" />
       </td>
     </tr>
     <!-- comment  -->
     <tr>
-      <td class="menu">{lang:comment}</td>
+      <td class="menu">{'comment'|@translate}</td>
       <td align="left" style="padding:10px;">
-       <textarea name="comment" rows="3" cols="40" style="overflow:auto">{COMMENT_IMG}</textarea>
+       <textarea name="comment" rows="3" cols="40" style="overflow:auto">{$COMMENT_IMG}</textarea>
       </td>
     </tr>
-    <!-- END fields -->
+    {/if}
     <tr>
       <td colspan="2" align="center">
-      <input class="submit" name="submit" type="submit" value="{lang:submit}" />
+      <input class="submit" name="submit" type="submit" value="{'Submit'|@translate}" />
       </td>
     </tr>
     </table>
   </form>
-  <!-- END upload_not_successful -->
-  <!-- BEGIN upload_successful -->
-  {lang:upload_successful}<br />
+  {else}
+  {'upload_successful'|@translate}<br />
   <div style="text-align:center;">
-    <a href="{U_RETURN}">[ {lang:home} ]</a>
+    <a href="{$U_RETURN}">[ {'home'|@translate} ]</a>
   </div>
-  <!-- END upload_successful -->
-  <!-- BEGIN note -->
-  <div style="text-align:left;"><span style="color:red;">*</span> : {lang:mandatory}</div>
-  <!-- END note -->
+  {/if}
+  
+  {if isset($SHOW_FORM_FIELDS) and $SHOW_FORM_FIELDS}
+  <div style="text-align:left;"><span style="color:red;">*</span> : {'mandatory'|@translate}</div>
+  {/if}
 </div> <!-- content -->

trunk/upload.php

@@ -3 +3 @@
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | file          : $Id$
@@ -104 +104 @@
       case 3 : $result['type'] = 'png'; break;
       default :
-        array_push( $result['error'], l10n('upload_advise_filetype') );  
+        array_push( $result['error'], l10n('upload_advise_filetype') );
       }
     }
@@ -135 +135 @@
   $category = get_cat_info( $page['category'] );
   $category['cat_dir'] = get_complete_dir( $page['category'] );
-  
+
   if (url_is_remote($category['cat_dir']) or !$category['uploadable'])
   {
-    die('Fatal: you take a wrong way, bye bye');
+    page_forbidden('upload not allowed');
   }
 }
 else { // $page['category'] may be set by a futur plugin but without it
-  die('Fatal: you take a wrong way, bye bye');
+  bad_request('invalid parameters');
 }
 
@@ -174 +174 @@
     array_push( $error, l10n('upload_err_username') );
   }
-  
+
   $date_creation = '';
   if ( !empty($_POST['date_creation']) )
@@ -203 +203 @@
     array_push( $error, l10n('update_wrong_dirname') );
   }
-  
+
   if ( sizeof( $error ) == 0 )
   {
@@ -316 +316 @@
 }
 
-$template->assign_vars(
+$template->assign(
   array(
-    'U_HOME' => make_index_url(),
-
     'ADVISE_TITLE' => $advise_title,
     'NAME' => $username,
@@ -333 +331 @@
     )
   );
-  
+
+$template->assign('errors', $error);
+$template->assign('UPLOAD_SUCCESSFUL', $page['upload_successful'] );
+
 if ( !$page['upload_successful'] )
 {
-  $template->assign_block_vars('upload_not_successful',array());
-//-------------------------------------------------------------- errors display
-if ( sizeof( $error ) != 0 )
-{
-  $template->assign_block_vars('upload_not_successful.errors',array());
-  for ( $i = 0; $i < sizeof( $error ); $i++ )
-  {
-    $template->assign_block_vars('upload_not_successful.errors.error',array('ERROR'=>$error[$i]));
-  }
-}
-
 //--------------------------------------------------------------------- advises
   if ( !empty($conf['upload_maxfilesize']) )
@@ -352 +342 @@
     $content = l10n('upload_advise_filesize');
     $content.= $conf['upload_maxfilesize'].' KB';
-    $template->assign_block_vars('upload_not_successful.advise',array('ADVISE'=>$content));
+    $template->append('advises', $content);
   }
 
@@ -361 +351 @@
       $content = l10n('upload_advise_width');
       $content.= $conf['upload_maxwidth_thumbnail'].' px';
-      $template->assign_block_vars('upload_not_successful.advise',array('ADVISE'=>$content));
+      $template->append('advises', $content);
     }
     if ( $conf['upload_maxheight_thumbnail'] != '' )
@@ -367 +357 @@
       $content = l10n('upload_advise_height');
       $content.= $conf['upload_maxheight_thumbnail'].' px';
-      $template->assign_block_vars('upload_not_successful.advise',array('ADVISE'=>$content));
+      $template->append('advises', $content);
     }
   }
@@ -376 +366 @@
       $content = l10n('upload_advise_width');
       $content.= $conf['upload_maxwidth'].' px';
-      $template->assign_block_vars('upload_not_successful.advise',array('ADVISE'=>$content));
+      $template->append('advises', $content);
     }
     if ( $conf['upload_maxheight'] != '' )
@@ -382 +372 @@
       $content = l10n('upload_advise_height');
       $content.= $conf['upload_maxheight'].' px';
-      $template->assign_block_vars('upload_not_successful.advise',array('ADVISE'=>$content));
-    }
-  }
-  $template->assign_block_vars('upload_not_successful.advise',array('ADVISE'=>l10n('upload_advise_filetype')));
-  
+      $template->append('advises', $content);
+    }
+  }
+  $template->append('advises', l10n('upload_advise_filetype'));
+
 //----------------------------------------- optionnal username and mail address
   if ( !isset( $page['waiting_id'] ) )
   {
-    $template->assign_block_vars('upload_not_successful.fields',array());
-    $template->assign_block_vars('note',array());
-  }
-}
-else
-{
-  $template->assign_block_vars('upload_successful',array());
+    $template->assign('SHOW_FORM_FIELDS', true);
+  }
 }