Issue ID 0000342:

o Improved NBM messages

Merge BSF r1231:1232 into branch-1_6


git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1233 68402e56-0260-453c-a942-63ccdbb3a9ee

admin/notification_by_mail.php

@@ -193,7 +193,7 @@ order by
         $query = 'delete from '.USER_MAIL_NOTIFICATION_TABLE.' where check_key in ('.implode(",", $quoted_check_key_list).');';
         $result = pwg_query($query);
 
-        redirect($base_url.get_query_string_diff(array()));
+        redirect($base_url.get_query_string_diff(array()), l10n('nbm_redirect_msg'));
       }
     }
   }

language/en_UK.iso-8859-1/admin.lang.php

@@ -254,6 +254,7 @@ $lang['metadata_exif'] = 'EXIF';
 $lang['metadata_iptc'] = 'IPTC';
 $lang['name'] = 'name';
 $lang['nbm_background_treatment_redirect'] = 'Execution time is out, treatment must be continue [Estmated time: %d secondes].';
+$lang['nbm_redirect_msg'] = 'Processing treatment.'."\n\n".'Please wait...';
 $lang['nbm_repost_submit'] = 'Continue processing treatment';
 $lang['nbm_break_timeout_list_user'] = 'Prepared time for list of users to send mail is limited. Others users are not listed.';
 $lang['nbm_col_check_user_send_mail'] = 'To send ?';
@@ -282,7 +283,8 @@ $lang['nbm_msg_no_mail_to_send'] = '%d mails were not sent.';
 $lang['nbm_break_timeout_send_mail'] = 'Time to send mail is limited. Others mails are skipped.';
 $lang['nbm_no_mail_to_send'] = 'No mail to send.';
 $lang['nbm_no_user_available_to_send_L1'] = 'No user are available in order to send mail.';
-$lang['nbm_no_user_available_to_send_L2'] = 'A user is available, if there are new elements to notify';
+$lang['nbm_no_user_available_to_send_L2'] = 'A user is available, if there are new elements to notify.';
+$lang['nbm_no_user_available_to_send_L3'] = 'It\'s possible that the are no subscribed users (only webmaster can see this tab).';
 $lang['nbm_no_user_to send_notifications_by_mail'] = 'No user to send notifications by mail.';
 $lang['nbm_object_news'] = 'New elements added';
 $lang['nbm_object_subcribe'] = 'Subcribe to notification by mail';

language/fr_FR.iso-8859-1/admin.lang.php

@@ -257,6 +257,7 @@ $lang['metadata_exif'] = 'EXIF';
 $lang['metadata_iptc'] = 'IPTC';
 $lang['name'] = 'nom';
 $lang['nbm_background_treatment_redirect'] = 'Le temps d\'éxécution étant dépassé, le traitement doit continuer [Temps estimé: %d secondes].';
+$lang['nbm_redirect_msg'] = 'Traitement en cours.'."\n".'Veuillez patienter...';
 $lang['nbm_repost_submit'] = 'Continuer le traitement en cours...';
 $lang['nbm_break_timeout_list_user'] = 'Le temps de préparation de la liste des utilisateurs pour l\'envoi est limité. Les autres utilisateurs ne sont pas listés.';
 $lang['nbm_col_check_user_send_mail'] = 'A envoyer ?';
@@ -286,6 +287,7 @@ $lang['nbm_break_timeout_send_mail'] = 'Le temps d\'envoi des mails est limit
 $lang['nbm_no_mail_to_send'] = 'Pas de mail à envoyer.';
 $lang['nbm_no_user_available_to_send_L1'] = 'Il n\'y a pas d\'utilisateur à notifier par mail.';
 $lang['nbm_no_user_available_to_send_L2'] = 'Un utilisateur est à notifier si de nouveaux éléments sont disponibles pour cet utilisateur.';
+$lang['nbm_no_user_available_to_send_L3'] = 'Il se peut aussi qu\'il n\'y ai aucun utilisateur inscrit (seul le webmaster a accés à cet onglet).';
 $lang['nbm_no_user_to send_notifications_by_mail'] = 'Pas d\'utilisateur pour envoyer des notifications par mails.';
 $lang['nbm_object_news'] = 'Nouveaux éléments ajoutés';
 $lang['nbm_object_subcribe'] = 'Inscription à la notification par mail';

template/yoga/admin/notification_by_mail.tpl

@@ -70,7 +70,9 @@
     <!-- BEGIN send_empty -->
     <center>
       {lang:nbm_no_user_available_to_send_L1}<br>
+      <br>
       {lang:nbm_no_user_available_to_send_L2}<br>
+      {lang:nbm_no_user_available_to_send_L3}<br>
       <br>
     </center>
     <!-- END send_empty -->