From 324f3c4279ee0d1ff24e297535f5a62cc777ace1 Mon Sep 17 00:00:00 2001 From: rub Date: Sat, 1 Apr 2006 01:14:57 +0000 Subject: [NBM] Step 7: Add functionalities subscribe/unsubscribe: o reduce length of check_key o fix bugs o send mail on subscribe/unsubscribe o add and used $conf parameters o review keyword of languages o improve selection/check o can subscribe/unsubscribe with a link include on mail o fix bug mass_update collate git-svn-id: http://piwigo.org/svn/trunk@1116 68402e56-0260-453c-a942-63ccdbb3a9ee --- language/en_UK.iso-8859-1/admin.lang.php | 45 ++++++++++++++++++----------- language/en_UK.iso-8859-1/common.lang.php | 1 + language/fr_FR.iso-8859-1/admin.lang.php | 47 ++++++++++++++++++++----------- language/fr_FR.iso-8859-1/common.lang.php | 1 + 4 files changed, 61 insertions(+), 33 deletions(-) (limited to 'language') diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php index b5ed27c4c..81b1aeb20 100644 --- a/language/en_UK.iso-8859-1/admin.lang.php +++ b/language/en_UK.iso-8859-1/admin.lang.php @@ -238,21 +238,31 @@ $lang['metadata_basic'] = 'basic'; $lang['metadata_exif'] = 'EXIF'; $lang['metadata_iptc'] = 'IPTC'; $lang['name'] = 'name'; -$lang['nbm_%d mails were not sent.'] = '%d mails were not sent.'; -$lang['nbm_%d mails were sent.'] = '%d mails were sent.'; -$lang['nbm_Error when sending email to %s [%s].'] = 'Error when sending email to %s [%s].'; -$lang['nbm_Mail sent to %s [%s].'] = 'Mail sent to %s [%s].'; -$lang['nbm_ContentObject'] = 'New elements added'; -$lang['nbm_ContentHello'] = 'Hello %s'; -$lang['nbm_ContentNewElementsBetween'] = 'New elements were added between %s and %s'; -$lang['nbm_ContentNewElements'] = 'New elements were added on %s'; -$lang['nbm_ContentGoTo'] = 'Go to %s %s.'; -$lang['nbm_ContentByeBye'] = 'See you soon'; -$lang['nbm_ContentUnsubscribe'] = 'To unsubscribe send a message to %s.'; -$lang['nbm_No mail to send.'] = 'No mail to send.'; -$lang['nbm_No user to send notifications by mail.'] = 'No user to send notifications by mail.'; -$lang['nbm_Send mail to users'] = 'Send mail to users'; -$lang['nbm_User %s [%s] added.'] = 'User %s [%s] added.'; +$lang['nbm_break_list_user'] = 'List of users to send mail is limited to %d. Others users are not listed.'; +$lang['nbm_nbm_break_send_mail'] = 'Sent mail is limited to %d send by pass. Others mails are skipped.'; +$lang['nbm_msg_no_mail_to_send'] = '%d mails were not sent.'; +$lang['nbm_msg_n_mails_sent'] = '%d mails were sent.'; +$lang['nbm_msg_error_sending_email_to'] = 'Error when sending email to %s [%s].'; +$lang['nbm_msg_mail_sent_to'] = 'Mail sent to %s [%s].'; +$lang['nbm_object_news'] = 'New elements added'; +$lang['nbm_object_subcribe'] = 'Subcribe of notification by mail'; +$lang['nbm_object_unsubcribe'] = 'Unsubcribe of notification by mail'; +$lang['nbm_content_hello'] = 'Hello %s'; +$lang['nbm_content_new_elements_between'] = 'New elements were added between %s and %s'; +$lang['nbm_content_new_elements'] = 'New elements were added on %s'; +$lang['nbm_content_goto'] = 'Go to %s %s.'; +$lang['nbm_content_subscribe_by_admin'] = 'You are subcribed by webmaster for the notification by mail'; +$lang['nbm_content_unsubscribe_by_admin'] = 'You are unsubcribed by webmaster for the notification by mail'; +$lang['nbm_content_subscribe_by_himself'] = 'You are subcribed for the notification by mail'; +$lang['nbm_content_unsubscribe_by_himself'] = 'You are unsubcribed for the notification by mail'; +$lang['nbm_content_byebye'] = 'See you soon'; +$lang['nbm_content_unsubscribe_link'] = 'To unsubscribe, click on %s .'; +$lang['nbm_content_subscribe_link'] = 'To subscribe, click on %s .'; +$lang['nbm_content_subscribe_unsubscribe_contact'] = 'On problems or questions, send a message to %s.'; +$lang['nbm_no_mail_to_send'] = 'No mail to send.'; +$lang['nbm_no_user_to send_notifications_by_mail'] = 'No user to send notifications by mail.'; +$lang['nbm_send_mail_to_users'] = 'Send mail to users'; +$lang['nbm_user_x_added'] = 'User %s [%s] added.'; $lang['nbm_item_notification'] = 'Notification'; $lang['nbm_param_mode'] = 'Parameter'; $lang['nbm_subscribe_mode'] = 'Subscribe'; @@ -264,7 +274,7 @@ $lang['nbm_info_send_mail_as'] = 'With blank value, gallery title will be used'; $lang['nbm_send_detailed_content'] = 'Send detailed content'; $lang['nbm_complementary_mail_content'] = 'Complementary mail content'; $lang['nbm_title_subscribe'] = 'Subscribe/unscribe users'; -$lang['nbm_warning_subscribe_unsubcribe'] = 'Warning, subscribe or unscribe send mails to users [Not Implemented]'; +$lang['nbm_warning_subscribe_unsubcribe'] = 'Warning, subscribe or unscribe send mails to users'; $lang['nbm_subscribe_col'] = 'Subscribed'; $lang['nbm_unsubscribe_col'] = 'Unsubcribed'; $lang['nbm_no_user_available_to_send_L1'] = 'No user are available in order to send mail.'; @@ -281,7 +291,10 @@ $lang['nbm_send_check_all'] = 'Check All'; $lang['nbm_send_uncheck_all'] = 'Uncheck All'; $lang['nbm_user_change_enabled_true'] = 'User %s [%s] added to subscribe list.'; $lang['nbm_user_change_enabled_false'] = 'User %s [%s] removed of subscribe list.'; +$lang['nbm_user_not_change_enabled_true'] = 'User %s [%s] not added to subscribe list.'; +$lang['nbm_user_not_change_enabled_false'] = 'User %s [%s] not removed of subscribe list.'; $lang['nbm_user_change_enabled_updated_data_count'] = '%d user(s) are updated.'; +$lang['nbm_user_change_enabled_error_on_updated_data_count'] = '%d user(s) are not updated.'; $lang['no_write_access'] = 'no write access'; $lang['order_by'] = 'order by'; $lang['path'] = 'path'; diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php index f8dd99a22..abe3bc29b 100644 --- a/language/en_UK.iso-8859-1/common.lang.php +++ b/language/en_UK.iso-8859-1/common.lang.php @@ -105,6 +105,7 @@ $lang['Sort by'] = 'Sort by'; $lang['Sort order'] = 'Sort order'; $lang['The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'] = 'The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'; $lang['Unknown feed identifier'] = 'Unknown feed identifier'; +$lang['nbm_unknown_identifier'] = 'Unknown identifier'; $lang['User comments'] = 'User comments'; $lang['Username'] = 'Username'; $lang['Visits'] = 'Visits'; diff --git a/language/fr_FR.iso-8859-1/admin.lang.php b/language/fr_FR.iso-8859-1/admin.lang.php index 58d85a647..69a7c3523 100644 --- a/language/fr_FR.iso-8859-1/admin.lang.php +++ b/language/fr_FR.iso-8859-1/admin.lang.php @@ -238,21 +238,31 @@ $lang['metadata_basic'] = 'basique'; $lang['metadata_exif'] = 'EXIF'; $lang['metadata_iptc'] = 'IPTC'; $lang['name'] = 'nom'; -$lang['nbm_%d mails were not sent.'] = '%s mails n\'ont pas été envoyés.'; -$lang['nbm_%d mails were sent.'] = '%s mails ont été envoyés.'; -$lang['nbm_Error when sending email to %s [%s].'] = 'Erreur lors de l\'envoi du mail à %s [%s].'; -$lang['nbm_Mail sent to %s [%s].'] = 'Mail envoyé à %s [%s].'; -$lang['nbm_ContentObject'] = 'Nouveaux éléments ajoutés'; -$lang['nbm_ContentHello'] = 'Bonjour %s'; -$lang['nbm_ContentNewElementsBetween'] = 'Des nouveaux éléments ont été ajoutés entre le %s et le %s'; -$lang['nbm_ContentNewElements'] = 'Des nouveaux éléments ont été ajoutés le %s'; -$lang['nbm_ContentGoTo'] = 'Rendez-vous sur %s %s.'; -$lang['nbm_ContentByeBye'] = 'A bientôt'; -$lang['nbm_ContentUnsubscribe'] = 'Pour vous désinscrire, envoyer un mail à %s.'; -$lang['nbm_No mail to send.'] = 'Pas de mail à envoyer.'; -$lang['nbm_No user to send notifications by mail.'] = 'Pas d\'utilisateur pour envoyer des notifications par mails.'; -$lang['nbm_Send mail to users'] = 'Envoi de mail aux utilisateurs'; -$lang['nbm_User %s [%s] added.'] = 'Utilisateur %s [%s] ajouté.'; +$lang['nbm_break_list_user'] = 'La liste des utilisateurs pour l\'envoi est limitéé à %d. Les autres utilisateurs ne sont pas listés.'; +$lang['nbm_nbm_break_send_mail'] = 'Les mails envoyés sont limités à %d envois d\'une seule passe. Les autres envois de mail ont été ignorés.'; +$lang['nbm_msg_no_mail_to_send'] = '%s mails n\'ont pas été envoyés.'; +$lang['nbm_msg_n_mails_sent'] = '%s mails ont été envoyés.'; +$lang['nbm_msg_error_sending_email_to'] = 'Erreur lors de l\'envoi du mail à %s [%s].'; +$lang['nbm_msg_mail_sent_to'] = 'Mail envoyé à %s [%s].'; +$lang['nbm_object_news'] = 'Nouveaux éléments ajoutés'; +$lang['nbm_object_subcribe'] = 'Inscription à la notification par mail'; +$lang['nbm_object_unsubcribe'] = 'Désinscription à la notification par mail'; +$lang['nbm_content_hello'] = 'Bonjour %s'; +$lang['nbm_content_new_elements_between'] = 'Des nouveaux éléments ont été ajoutés entre le %s et le %s'; +$lang['nbm_content_new_elements'] = 'Des nouveaux éléments ont été ajoutés le %s'; +$lang['nbm_content_goto'] = 'Rendez-vous sur %s %s.'; +$lang['nbm_content_subscribe_by_admin'] = 'Vous venez d\'être inscrit par le webmestre du site pour revevoir la notification par mail.'; +$lang['nbm_content_unsubscribe_by_admin'] = 'Vous venez d\'être désinscrit par le webmestre du site pour revevoir la notification par mail.'; +$lang['nbm_content_subscribe_by_himself'] = 'Vous venez de vous inscrire pour revevoir la notification par mail.'; +$lang['nbm_content_unsubscribe_by_himself'] = 'Vous venez de vous désinscrire pour revevoir la notification par mail.'; +$lang['nbm_content_byebye'] = 'A bientôt'; +$lang['nbm_content_unsubscribe_link'] = 'Pour vous désinscrire, cliquez sur %s .'; +$lang['nbm_content_subscribe_link'] = 'Pour vous inscrire, cliquez sur %s .'; +$lang['nbm_content_subscribe_unsubscribe_contact'] = 'En cas de problèmes ou de questions, envoyer un mail à %s.'; +$lang['nbm_no_mail_to_send'] = 'Pas de mail à envoyer.'; +$lang['nbm_no_user_to send_notifications_by_mail'] = 'Pas d\'utilisateur pour envoyer des notifications par mails.'; +$lang['nbm_send_mail_to_users'] = 'Envoi de mail aux utilisateurs'; +$lang['nbm_user_x_added'] = 'Utilisateur %s [%s] ajouté.'; $lang['nbm_item_notification'] = 'Notification'; $lang['nbm_param_mode'] = 'Paramètrage'; $lang['nbm_subscribe_mode'] = 'Inscription'; @@ -264,7 +274,7 @@ $lang['nbm_info_send_mail_as'] = 'Sans valeur, le titre de la galerie sera utili $lang['nbm_send_detailed_content'] = 'Envoi d\'un contenu détaillé'; $lang['nbm_complementary_mail_content'] = 'Contenu complémentaire au mail'; $lang['nbm_title_subscribe'] = 'Inscrire/desinscrire les utilisateurs'; -$lang['nbm_warning_subscribe_unsubcribe'] = 'Attention, l\'inscription ou la desincription entraine l\'envoi de mails aux utilisateurs concernés [Fonction non implementée]'; +$lang['nbm_warning_subscribe_unsubcribe'] = 'Attention, l\'inscription ou la desincription entraine l\'envoi de mails aux utilisateurs concernés'; $lang['nbm_subscribe_col'] = 'Inscrits'; $lang['nbm_unsubscribe_col'] = 'Non Inscrits'; $lang['nbm_no_user_available_to_send_L1'] = 'Il n\'y a pas d\'utilisateur à notifier par mail.'; @@ -281,7 +291,10 @@ $lang['nbm_send_check_all'] = 'Tout cocher'; $lang['nbm_send_uncheck_all'] = 'Tout décocher'; $lang['nbm_user_change_enabled_true'] = 'L\'utilisateur %s [%s] a été ajouté à la liste des inscrits.'; $lang['nbm_user_change_enabled_false'] = 'L\'utilisateur %s [%s] a été supprimé de la liste des inscrits.'; -$lang['nbm_user_change_enabled_updated_data_count'] = '%d utilisateur(s) a(ont) été mis à jour.'; +$lang['nbm_user_not_change_enabled_true'] = 'L\'utilisateur %s [%s] n\'a pas été ajouté à la liste des inscrits.'; +$lang['nbm_user_not_change_enabled_false'] = 'L\'utilisateur %s [%s] n\'a pas été supprimé de la liste des inscrits.'; +$lang['nbm_user_change_enabled_updated_data_count'] = '%d utilisateurs ont été mis à jour.'; +$lang['nbm_user_change_enabled_error_on_updated_data_count'] = '%d utilisateurs n\'ont pas été mis à jour.'; $lang['no_write_access'] = 'pas d\'accès en écriture'; $lang['order_by'] = 'trier selon'; $lang['path'] = 'chemin'; diff --git a/language/fr_FR.iso-8859-1/common.lang.php b/language/fr_FR.iso-8859-1/common.lang.php index 13c2cb993..5a4ea1ac4 100644 --- a/language/fr_FR.iso-8859-1/common.lang.php +++ b/language/fr_FR.iso-8859-1/common.lang.php @@ -104,6 +104,7 @@ $lang['Sort by'] = 'Trier selon'; $lang['Sort order'] = 'Ordre de tri'; $lang['The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'] = 'Le flux RSS notifie les événements de la galerie : nouvelles images, catégories mises à jour, nouveaux commentaires utilisateur. À utiliser avec un lecteur de flux RSS.'; $lang['Unknown feed identifier'] = 'Identifiant de flux inconnu'; +$lang['nbm_unknown_identifier'] = 'Identifiants inconnus'; $lang['User comments'] = 'Commentaires utilisateur'; $lang['Username'] = 'Nom d\'utilisateur'; $lang['Visits'] = 'Visites'; -- cgit v1.2.3