Changeset 1233

Timestamp:

Apr 21, 2006, 7:27:22 PM (19 years ago)

Author:

rub

Message:

Issue ID 0000342:

o Improved NBM messages

Merge BSF r1231:1232 into branch-1_6

Location:

branches/branch-1_6

Files:

• admin/notification_by_mail.php (modified) (1 diff)
• language/en_UK.iso-8859-1/admin.lang.php (modified) (2 diffs)
• language/fr_FR.iso-8859-1/admin.lang.php (modified) (2 diffs)
• template/yoga/admin/notification_by_mail.tpl (modified) (1 diff)

branches/branch-1_6/admin/notification_by_mail.php

@@ -194 +194 @@
         $result = pwg_query($query);
 
-        redirect($base_url.get_query_string_diff(array()));
+        redirect($base_url.get_query_string_diff(array()), l10n('nbm_redirect_msg'));
       }
     }

branches/branch-1_6/language/en_UK.iso-8859-1/admin.lang.php

@@ -255 +255 @@
 $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.';
@@ -283 +284 @@
 $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';

branches/branch-1_6/language/fr_FR.iso-8859-1/admin.lang.php

@@ -258 +258 @@
 $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.';
@@ -287 +288 @@
 $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';

branches/branch-1_6/template/yoga/admin/notification_by_mail.tpl

@@ -71 +71 @@
     <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>