From 68970e1e656cc1b217b31d01a738bb9e3ca6db33 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Mon, 31 Jan 2005 23:22:29 +0000
Subject: - add information after metadata synchronization

git-svn-id: http://piwigo.org/svn/trunk@723 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/update.php                         | 29 ++++++++++++++++++++++++++++-
 language/en_UK.iso-8859-1/admin.lang.php |  8 +++++++-
 language/fr_FR.iso-8859-1/admin.lang.php | 10 ++++++++--
 template/default/admin/update.tpl        | 11 ++++++++++-
 4 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/admin/update.php b/admin/update.php
index c8ed1752a..56843d21a 100644
--- a/admin/update.php
+++ b/admin/update.php
@@ -466,6 +466,23 @@ if (isset($simulate) and $simulate)
 }
 $result_title.= $lang['update_part_research'];
 
+// used_metadata string is displayed to inform admin which metadata will be
+// used from files for synchronization
+$used_metadata = $lang['metadata_basic'].' (filesize, width, height)';
+
+if ($conf['use_exif'])
+{
+  $used_metadata.= ', '.$lang['metadata_exif'].' (date_creation)';
+}
+
+if ($conf['use_iptc'])
+{
+  $used_metadata.= ', '.$lang['metadata_iptc'];
+  $used_metadata.= '(';
+  $used_metadata.= implode(', ', array_keys($conf['use_iptc_mapping']));
+  $used_metadata.= ')';
+}
+
 $template->assign_vars(
   array(
     'L_SUBMIT'=>$lang['submit'],
@@ -492,7 +509,11 @@ $template->assign_vars(
     'L_UPDATE_ERRORS_CAPTION'=>$lang['update_errors_caption'],
     'L_UPDATE_DISPLAY_INFO'=>$lang['update_display_info'],
     'L_UPDATE_SIMULATE'=>$lang['update_simulate'],
-    'L_UPDATE_INFOS_TITLE'=>$lang['update_infos_title']
+    'L_UPDATE_INFOS_TITLE'=>$lang['update_infos_title'],
+    'L_RESULT_METADATA'=>$lang['update_result_metadata'],
+    'L_ELEMENTS_METADATA_SYNC'=>$lang['update_elements_metadata_sync'],
+    'L_USED_METADATA'=>$lang['update_used_metadata'],
+    'METADATA_LIST' => $used_metadata
     ));
 // +-----------------------------------------------------------------------+
 // |                        introduction : choices                         |
@@ -659,6 +680,12 @@ else if (isset($_POST['submit']) and preg_match('/^metadata/', $_POST['sync']))
   echo '<!-- metadata update : ';
   echo get_elapsed_time($start, get_moment());
   echo ' -->'."\n";
+  
+  $template->assign_block_vars(
+    'metadata_result',
+    array(
+      'NB_ELEMENTS' => count($files),
+      ));
 }
 // +-----------------------------------------------------------------------+
 // |                          sending html code                            |
diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index d47d6f319..7c6569eb5 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -121,7 +121,7 @@ $lang['admin_panel'] = 'Administration Panel';
 $lang['default_message'] = 'PhpWebGallery Administration Control Panel';
 $lang['title_liste_users'] = 'Users list';
 $lang['title_history'] = 'History';
-$lang['title_update'] = 'Database update';
+$lang['title_update'] = 'Database synchronization with files';
 $lang['title_configuration'] = 'PhpWebGallery configuration';
 $lang['title_instructions'] = 'Instructions';
 $lang['title_categories'] = 'Categories management';
@@ -303,6 +303,12 @@ $lang['update_simulation_title'] = '[Simulation]';
 $lang['update_wrong_dirname'] = 'The name of directories and files must be composed of letters, figures, "-", "_" or "."';
 $lang['update_wrong_dirname_short'] = 'wrong filename';
 $lang['update_wrong_dirname_info'] = 'The name of directories and files must be composed of letters, figures, "-", "_" or "."';
+$lang['update_result_metadata'] = 'Metadata synchronization results';
+$lang['update_elements_metadata_sync'] = 'elements informations synchronized with files metadata';
+$lang['update_used_metadata'] = 'Used metadata';
+$lang['metadata_basic'] = 'basic';
+$lang['metadata_exif'] = 'EXIF';
+$lang['metadata_iptc'] = 'IPTC';
 
 // History
 $lang['stats_title'] = 'Last year statistics';
diff --git a/language/fr_FR.iso-8859-1/admin.lang.php b/language/fr_FR.iso-8859-1/admin.lang.php
index 1666b3301..64f3e7582 100644
--- a/language/fr_FR.iso-8859-1/admin.lang.php
+++ b/language/fr_FR.iso-8859-1/admin.lang.php
@@ -122,7 +122,7 @@ $lang['admin_panel'] = 'Panneau d\'administration';
 $lang['default_message'] = 'Zone d\'administration de PhpWebGallery';
 $lang['title_liste_users'] = 'Liste des utilisateurs';
 $lang['title_history'] = 'Historique';
-$lang['title_update'] = 'Mise à jour de la base de données';
+$lang['title_update'] = 'Synchronisation base de données avec fichiers';
 $lang['title_configuration'] = 'Configuration de PhpWebGallery';
 $lang['title_instructions'] = 'Instructions';
 $lang['title_categories'] = 'Gestion des catégories';
@@ -289,7 +289,7 @@ $lang['update_part_research'] = 'Recherche des nouvelles images dans les r
 $lang['update_research_added'] = 'ajouté';
 $lang['update_research_deleted'] = 'détruit';
 $lang['update_research_tn_ext'] = 'miniature en';
-$lang['update_default_title'] = 'Type de mise à jour';
+$lang['update_default_title'] = 'Type de synchronisation';
 $lang['update_nb_new_elements'] = 'élément(s) ajouté(s)';
 $lang['update_nb_del_elements'] = 'élément(s) effacé(s)';
 $lang['update_nb_new_categories'] = 'catégorie(s) ajoutée(s)';
@@ -311,6 +311,12 @@ $lang['update_simulation_title'] = '[Simulation]';
 $lang['update_wrong_dirname'] = 'Le nom du répertoire peut être composé de lettres et des signes "-", "_" or "."';
 $lang['update_wrong_dirname_short'] = 'Nom incorrect';
 $lang['update_wrong_dirname_info'] = 'Le nom du répertoire peut être composé de lettres et des signes "-", "_" or "."';
+$lang['update_result_metadata'] = 'Résultats de la synchronization avec les méta-données';
+$lang['update_elements_metadata_sync'] = 'éléments synchronisés avec les méta-données';
+$lang['update_used_metadata'] = 'Méta-données utilisées';
+$lang['metadata_basic'] = 'basique';
+$lang['metadata_exif'] = 'EXIF';
+$lang['metadata_iptc'] = 'IPTC';
 
 // History
 $lang['stats_title'] = 'Historique de l\'année écoulée';
diff --git a/template/default/admin/update.tpl b/template/default/admin/update.tpl
index 5b4136ca2..d1f3adf5a 100644
--- a/template/default/admin/update.tpl
+++ b/template/default/admin/update.tpl
@@ -29,6 +29,15 @@
 </ul>
 <!-- END infos -->
 <!-- END update -->
+
+<!-- BEGIN metadata_result -->
+<div class="admin">{L_RESULT_METADATA}</div>
+<ul style="text-align:left;">
+  <li>{metadata_result.NB_ELEMENTS} {L_ELEMENTS_METADATA_SYNC}</li>
+  <li>{L_USED_METADATA} : {METADATA_LIST}</li>
+</ul>
+<!-- END metadata_result -->
+
 <!-- BEGIN introduction -->
 <div class="admin">{L_UPDATE_TITLE}</div>
 <form action="{F_ACTION}" method="post">
@@ -43,7 +52,7 @@
       </ul>
     </li>
     <li>
-      {L_UPDATE_SYNC_METADATA}
+      {L_UPDATE_SYNC_METADATA}. {L_USED_METADATA} : {METADATA_LIST}.
       <ul class="menu">
         <li><input type="radio" name="sync" value="metadata_new" /> {L_UPDATE_SYNC_METADATA_NEW}</li>
         <li><input type="radio" name="sync" value="metadata_all" /> {L_UPDATE_SYNC_METADATA_ALL}</li>
-- 
cgit v1.2.3