Revision: 1498
http://mrbs.svn.sourceforge.net/mrbs/?rev=1498&view=rev
Author: cimorrison
Date: 2010-10-14 16:38:15 +0000 (Thu, 14 Oct 2010)
Log Message:
-----------
Created separate subject lines for new and changed emails, rather than having
the combined "added/changed" subject.
Modified Paths:
--------------
mrbs/branches/provisional_bookings_new_style/web/functions_mail.inc
mrbs/branches/provisional_bookings_new_style/web/lang.en
mrbs/branches/provisional_bookings_new_style/web/lang.es
mrbs/branches/provisional_bookings_new_style/web/lang.fi
mrbs/branches/provisional_bookings_new_style/web/lang.fr
mrbs/branches/provisional_bookings_new_style/web/lang.it
mrbs/branches/provisional_bookings_new_style/web/lang.ja
mrbs/branches/provisional_bookings_new_style/web/lang.nl
mrbs/branches/provisional_bookings_new_style/web/lang.pl
mrbs/branches/provisional_bookings_new_style/web/lang.sl
mrbs/branches/provisional_bookings_new_style/web/lang.tr
Modified: mrbs/branches/provisional_bookings_new_style/web/functions_mail.inc
===================================================================
--- mrbs/branches/provisional_bookings_new_style/web/functions_mail.inc
2010-10-14 16:01:19 UTC (rev 1497)
+++ mrbs/branches/provisional_bookings_new_style/web/functions_mail.inc
2010-10-14 16:38:15 UTC (rev 1498)
@@ -397,13 +397,14 @@
$body = get_mail_vocab("mail_body_reminder") . "\n\n";
break;
default:
- $subject = get_mail_vocab("mail_subject_entry");
if ($new_entry)
{
+ $subject = get_mail_vocab("mail_subject_new_entry");
$body = get_mail_vocab("mail_body_new_entry") . "\n\n";
}
else
{
+ $subject = get_mail_vocab("mail_subject_changed_entry");
$body = get_mail_vocab("mail_body_changed_entry") . "\n\n";
}
break;
Modified: mrbs/branches/provisional_bookings_new_style/web/lang.en
===================================================================
--- mrbs/branches/provisional_bookings_new_style/web/lang.en 2010-10-14
16:01:19 UTC (rev 1497)
+++ mrbs/branches/provisional_bookings_new_style/web/lang.en 2010-10-14
16:38:15 UTC (rev 1498)
@@ -147,11 +147,12 @@
$vocab["mail_body_rej_entry"] = "An entry has been rejected by the
administrators, here are the details:";
$vocab["mail_body_more_info"] = "The administrators require more
information about an entry; here are the details:";
$vocab["mail_body_reminder"] = "Reminder - an entry is awaiting approval;
here are the details:";
-$vocab["mail_subject_entry"] = "Entry added/changed for $mrbs_company MRBS";
-$vocab["mail_body_new_entry"] = "A new entry has been booked, here are the
details:";
-$vocab["mail_body_del_entry"] = "An entry has been deleted, here are the
details:";
+$vocab["mail_subject_new_entry"] = "Entry added for $mrbs_company MRBS";
+$vocab["mail_subject_changed_entry"] = "Entry changed for $mrbs_company MRBS";
+$vocab["mail_subject_delete"] = "Entry deleted for $mrbs_company MRBS";
+$vocab["mail_body_new_entry"] = "A new entry has been booked, here are the
details:";
$vocab["mail_body_changed_entry"] = "An entry has been modified, here are the
details:";
-$vocab["mail_subject_delete"] = "Entry deleted for $mrbs_company MRBS";
+$vocab["mail_body_del_entry"] = "An entry has been deleted, here are the
details:";
$vocab["deleted_by"] = "Deleted by";
$vocab["reason"] = "Reason";
$vocab["info_requested"] = "Information requested";
Modified: mrbs/branches/provisional_bookings_new_style/web/lang.es
===================================================================
--- mrbs/branches/provisional_bookings_new_style/web/lang.es 2010-10-14
16:01:19 UTC (rev 1497)
+++ mrbs/branches/provisional_bookings_new_style/web/lang.es 2010-10-14
16:38:15 UTC (rev 1498)
@@ -112,11 +112,12 @@
$vocab["failed_to_acquire"] = "Error al obtener acceso a la Base de Datos";
$vocab["invalid_booking"] = "Reserva Incorrecta";
$vocab["must_set_description"] = "Debes introducir una breve descripci\xF3n
para la Reserva. Por favor, vuelve atr\xE1s e introduce una.";
-$vocab["mail_subject_entry"] = "Reserva creada/modificada en el MRBS de tu
Compa\xF1\xEDa";
-$vocab["mail_body_new_entry"] = "Nueva Reserva a\xF1adida, aqu\xED est\xE1n
los detalles:";
-$vocab["mail_body_del_entry"] = "Reserva borrada, aqu\xED est\xE1n los
detalles:";
+$vocab["mail_subject_new_entry"] = "Reserva creada en el MRBS de tu
Compa\xF1\xEDa";
+$vocab["mail_subject_changed_entry"] = "Reserva modificada en el MRBS de tu
Compa\xF1\xEDa";
+$vocab["mail_subject_delete"] = "Reserva borrada en el MRBS de tu
Compa\xF1\xEDa";
+$vocab["mail_body_new_entry"] = "Nueva Reserva a\xF1adida, aqu\xED
est\xE1n los detalles:";
$vocab["mail_body_changed_entry"] = "Reserva modificada, aqu\xED est\xE1n los
detalles:";
-$vocab["mail_subject_delete"] = "Reserva borrada en el MRBS de tu
Compa\xF1\xEDa";
+$vocab["mail_body_del_entry"] = "Reserva borrada, aqu\xED est\xE1n los
detalles:";
// Authentication stuff
$vocab["accessdenied"] = "Acceso Denegado";
Modified: mrbs/branches/provisional_bookings_new_style/web/lang.fi
===================================================================
--- mrbs/branches/provisional_bookings_new_style/web/lang.fi 2010-10-14
16:01:19 UTC (rev 1497)
+++ mrbs/branches/provisional_bookings_new_style/web/lang.fi 2010-10-14
16:38:15 UTC (rev 1498)
@@ -116,11 +116,12 @@
$vocab["failed_to_acquire"] = "Tietokantaan ei saatu (varauksetonta)
yhteyttä.";
$vocab["invalid_booking"] = "Virheellinen varaus";
$vocab["must_set_description"] = "Varaukselle tulee asettaa kuvaus. Palaa
takaisin ja korjaa puutteet.";
-$vocab["mail_subject_entry"] = "Varaus lisätty/muutettu yritykselle
$mrbs_company MRBS-järjestelmässä";
-$vocab["mail_body_new_entry"] = "Uusi varaus lisätty:";
-$vocab["mail_body_del_entry"] = "Varaus poistettu:";
+$vocab["mail_subject_new_entry"] = "Varaus lisätty yritykselle
$mrbs_company MRBS-järjestelmässä";
+$vocab["mail_subject_changed_entry"] = "Varaus muutettu yritykselle
$mrbs_company MRBS-järjestelmässä";
+$vocab["mail_subject_delete"] = "Varaus poistettu yritykselle
$mrbs_company MRBS-järjestelmässä";
+$vocab["mail_body_new_entry"] = "Uusi varaus lisätty:";
$vocab["mail_body_changed_entry"] = "Varauksen tietoja muokattu:";
-$vocab["mail_subject_delete"] = "Varaus poistettu yritykselle $mrbs_company
MRBS-järjestelmässä";
+$vocab["mail_body_del_entry"] = "Varaus poistettu:";
// Authentication stuff
$vocab["accessdenied"] = "Pääsy kielletty";
Modified: mrbs/branches/provisional_bookings_new_style/web/lang.fr
===================================================================
--- mrbs/branches/provisional_bookings_new_style/web/lang.fr 2010-10-14
16:01:19 UTC (rev 1497)
+++ mrbs/branches/provisional_bookings_new_style/web/lang.fr 2010-10-14
16:38:15 UTC (rev 1498)
@@ -114,11 +114,12 @@
$vocab["failed_to_acquire"] = "Erreur, impossible d'obtenir l'accès exclusif
à la base de données";
$vocab["invalid_booking"] = "Réservation invalide";
$vocab["must_set_description"] = "Vous devez définir une brève description
pour la réservation. Veuillez revenir en arrière et en saisir une.";
-$vocab["mail_subject_entry"] = "Réservation ajoutée/modifiée dans le système
de réservation $mrbs_company";
-$vocab["mail_body_new_entry"] = "Une nouvelle réservation a été faite, voici
les détails:";
-$vocab["mail_body_del_entry"] = "Une réservation a été supprimée, voici les
détails :";
+$vocab["mail_subject_new_entry"] = "Réservation ajoutée dans le système de
réservation $mrbs_company";
+$vocab["mail_subject_changed_entry"] = "Réservation modifiée dans le système
de réservation $mrbs_company";
+$vocab["mail_subject_delete"] = "Réservation supprimée dans le système
de réservation $mrbs_company";
+$vocab["mail_body_new_entry"] = "Une nouvelle réservation a été faite,
voici les détails:";
$vocab["mail_body_changed_entry"] = "Une réservation a été modifiée, voici les
détails :";
-$vocab["mail_subject_delete"] = "Réservation supprimée dans le système de
réservation $mrbs_company";
+$vocab["mail_body_del_entry"] = "Une réservation a été supprimée, voici
les détails :";
// Authentication stuff
$vocab["accessdenied"] = "Accès refusé";
Modified: mrbs/branches/provisional_bookings_new_style/web/lang.it
===================================================================
--- mrbs/branches/provisional_bookings_new_style/web/lang.it 2010-10-14
16:01:19 UTC (rev 1497)
+++ mrbs/branches/provisional_bookings_new_style/web/lang.it 2010-10-14
16:38:15 UTC (rev 1498)
@@ -112,11 +112,12 @@
$vocab["failed_to_acquire"] = "Fallito accesso esclusivo sul DB";
$vocab["invalid_booking"] = "Prenotazione non valida";
$vocab["must_set_description"] = "Devi inserire una breve descrizione per la
prenotazione. Per favore torna indietro e inseriscine una.";
-$vocab["mail_subject_entry"] = "Prenotazione aggiunta/modificata per
$mrbs_company MRBS";
-$vocab["mail_body_new_entry"] = "E' stata registrata una nuova prenotazione,
questi i dettagli:";
-$vocab["mail_body_del_entry"] = "Una prenotazione e' stata cancellata, questi
i dettagli:";
+$vocab["mail_subject_new_entry"] = "Prenotazione aggiunta per
$mrbs_company MRBS";
+$vocab["mail_subject_changed_entry"] = "Prenotazione modificata per
$mrbs_company MRBS";
+$vocab["mail_subject_delete"] = "Prenotazione cancellata per
$mrbs_company MRBS";
+$vocab["mail_body_new_entry"] = "E' stata registrata una nuova
prenotazione, questi i dettagli:";
$vocab["mail_body_changed_entry"] = "Una prenotazione e' stata modificata,
questi i dettagli:";
-$vocab["mail_subject_delete"] = "Prenotazione cancellata per $mrbs_company
MRBS";
+$vocab["mail_body_del_entry"] = "Una prenotazione e' stata cancellata,
questi i dettagli:";
// Authentication stuff
$vocab["accessdenied"] = "Accesso Negato";
Modified: mrbs/branches/provisional_bookings_new_style/web/lang.ja
===================================================================
--- mrbs/branches/provisional_bookings_new_style/web/lang.ja 2010-10-14
16:01:19 UTC (rev 1497)
+++ mrbs/branches/provisional_bookings_new_style/web/lang.ja 2010-10-14
16:38:15 UTC (rev 1498)
@@ -136,11 +136,12 @@
$vocab["mail_body_rej_entry"] = "エントリは管理者に棄却されました。詳細は以下のとおりです:";
$vocab["mail_body_more_info"] = "管理者はエントリについて詳細情報を要求しています。詳細は以下のとおりです:";
$vocab["mail_body_reminder"] = "備忘通知 - エントリは承認待ちです。詳細は以下のとおりです:";
-$vocab["mail_subject_entry"] = "$mrbs_company MRBSエントリの追加/変更";
-$vocab["mail_body_new_entry"] = "新規エントリが予約されました。詳細は以下のとおりです:";
-$vocab["mail_body_del_entry"] = "エントリが削除されました。詳細は以下のとおりです:";
+$vocab["mail_subject_new_entry"] = "$mrbs_company MRBSエントリの追加/変更";
+$vocab["mail_subject_changed_entry"] = "$mrbs_company MRBSエントリの追加/変更";
+$vocab["mail_subject_delete"] = "$mrbs_company MRBSエントリの削除";
+$vocab["mail_body_new_entry"] = "新規エントリが予約されました。詳細は以下のとおりです:";
$vocab["mail_body_changed_entry"] = "エントリが変更されました。詳細は以下のとおりです:";
-$vocab["mail_subject_delete"] = "$mrbs_company MRBSエントリの削除";
+$vocab["mail_body_del_entry"] = "エントリが削除されました。詳細は以下のとおりです:";
$vocab["deleted_by"] = "削除者";
$vocab["reason"] = "理由";
$vocab["info_requested"] = "情報が必要です";
Modified: mrbs/branches/provisional_bookings_new_style/web/lang.nl
===================================================================
--- mrbs/branches/provisional_bookings_new_style/web/lang.nl 2010-10-14
16:01:19 UTC (rev 1497)
+++ mrbs/branches/provisional_bookings_new_style/web/lang.nl 2010-10-14
16:38:15 UTC (rev 1498)
@@ -112,11 +112,12 @@
$vocab["failed_to_acquire"] = "Het is niet gelukt om exclusive toegang tot de
database te verkrijgen";
$vocab["invalid_booking"] = "Verkeerde boeking";
$vocab["must_set_description"] = "Er moet een korte omschrijving worden
gegeven. Ga terug een en geef korte omschrijving.";
-$vocab["mail_subject_entry"] = "Boeking toegevoegd/aangepast voor Uw
Organisatie MRBS";
-$vocab["mail_body_new_entry"] = "Er is een nieuwe boeking geplaatst, dit zijn
de details:";
-$vocab["mail_body_del_entry"] = "Er is een boeking verdwijderd, dit zijn de
details:";
+$vocab["mail_subject_new_entry"] = "Boeking toegevoegd voor Uw Organisatie
MRBS";
+$vocab["mail_subject_changed_entry"] = "Boeking aangepast voor Uw Organisatie
MRBS";
+$vocab["mail_subject_delete"] = "Boeking gewist voor Uw Organisatie
MRBS";
+$vocab["mail_body_new_entry"] = "Er is een nieuwe boeking geplaatst, dit
zijn de details:";
$vocab["mail_body_changed_entry"] = "Een boeking is gewijzigd, dit zijn de
details:";
-$vocab["mail_subject_delete"] = "Boeking gewist voor Uw Organisatie MRBS";
+$vocab["mail_body_del_entry"] = "Er is een boeking verdwijderd, dit zijn
de details:";
// Authentication stuff
$vocab["accessdenied"] = "Geen Toegang";
Modified: mrbs/branches/provisional_bookings_new_style/web/lang.pl
===================================================================
--- mrbs/branches/provisional_bookings_new_style/web/lang.pl 2010-10-14
16:01:19 UTC (rev 1497)
+++ mrbs/branches/provisional_bookings_new_style/web/lang.pl 2010-10-14
16:38:15 UTC (rev 1498)
@@ -111,11 +111,12 @@
$vocab["failed_to_acquire"] = "Błąd podczas uzyskania wyłącznego dostępu do
bazy.";
$vocab["invalid_booking"] = "Niewłaściwa rezerwacja";
$vocab["must_set_description"] = "Musisz podać krótki opis rezerwacji. Proszę,
wróć i wprowadź go.";
-$vocab["mail_subject_entry"] = "Wpis wprowadzony/zmieniony w $mrbs_company
MRBS";
-$vocab["mail_body_new_entry"] = "Wpis został utworzony, oto szczegóły
operacji:";
-$vocab["mail_body_del_entry"] = "Wpis został usunięty, oto szczegóły
operacji:";
+$vocab["mail_subject_new_entry"] = "Wpis wprowadzony w $mrbs_company MRBS";
+$vocab["mail_subject_changed_entry"] = "Wpis zmieniony w $mrbs_company MRBS";
+$vocab["mail_subject_delete"] = "Wpis usunięty z $mrbs_company MRBS";
+$vocab["mail_body_new_entry"] = "Wpis został utworzony, oto szczegóły
operacji:";
$vocab["mail_body_changed_entry"] = "Wpis został zmieniony, oto szczegóły
operacji:";
-$vocab["mail_subject_delete"] = "Wpis usunięty z $mrbs_company MRBS";
+$vocab["mail_body_del_entry"] = "Wpis został usunięty, oto szczegóły
operacji:";
// Autentykacja
$vocab["accessdenied"] = "Dostęp Wzbroniony";
Modified: mrbs/branches/provisional_bookings_new_style/web/lang.sl
===================================================================
--- mrbs/branches/provisional_bookings_new_style/web/lang.sl 2010-10-14
16:01:19 UTC (rev 1497)
+++ mrbs/branches/provisional_bookings_new_style/web/lang.sl 2010-10-14
16:38:15 UTC (rev 1498)
@@ -112,11 +112,12 @@
$vocab["failed_to_acquire"] = "Napaka pri dostopu do baze";
$vocab["invalid_booking"] = "Napačna rezervacija";
$vocab["must_set_description"] = "Vnesti morate kratek opis rezervacije.
Prosimo vrnite se in jo vnesite.";
-$vocab["mail_subject_entry"] = "Vnos dodan/spremenjen za vaš MRBS";
-$vocab["mail_body_new_entry"] = "Dodan je bil nov vnos in tukaj so
podrobnosti:";
-$vocab["mail_body_del_entry"] = "Vnos je bil izbrisan in tukaj so
podrobnosti:";
+$vocab["mail_subject_new_entry"] = "Vnos dodan/spremenjen za vaš MRBS";
+$vocab["mail_subject_changed_entry"] = "Vnos dodan/spremenjen za vaš MRBS";
+$vocab["mail_subject_delete"] = "Vnos za vaš MRBS je bil izbrisan";
+$vocab["mail_body_new_entry"] = "Dodan je bil nov vnos in tukaj so
podrobnosti:";
$vocab["mail_body_changed_entry"] = "Vnos je bil spremenjen in tukaj so
podrobnosti:";
-$vocab["mail_subject_delete"] = "Vnos za vaš MRBS je bil izbrisan";
+$vocab["mail_body_del_entry"] = "Vnos je bil izbrisan in tukaj so
podrobnosti:";
// Authentication stuff
$vocab["accessdenied"] = "Dostop zavrnjen";
Modified: mrbs/branches/provisional_bookings_new_style/web/lang.tr
===================================================================
--- mrbs/branches/provisional_bookings_new_style/web/lang.tr 2010-10-14
16:01:19 UTC (rev 1497)
+++ mrbs/branches/provisional_bookings_new_style/web/lang.tr 2010-10-14
16:38:15 UTC (rev 1498)
@@ -113,11 +113,12 @@
$vocab["failed_to_acquire"] = "VeriTaban\xFDna eri\xFEim hatas\xFD";
$vocab["invalid_booking"] = "Ge\xE7ersiz YerAy\xFDrtma";
$vocab["must_set_description"] = "Yer ay\xFDrtma i\xE7in k\xFDsa tan\xFDmlama
yapmal\xFDs\xFDn\xFDz. Geri d\xF6n\xFCn ve bir kay\xFDt ekleyiniz.";
-$vocab["mail_subject_entry"] = "konu";
-$vocab["mail_body_new_entry"] = "yeni kay\xFDt";
-$vocab["mail_body_del_entry"] = "sil kay\xFDt";
+$vocab["mail_subject_new_entry"] = "konu";
+$vocab["mail_subject_changed_entry"] = "konu";
+$vocab["mail_subject_delete"] = "konu sil";
+$vocab["mail_body_new_entry"] = "yeni kay\xFDt";
$vocab["mail_body_changed_entry"] = "de\xF0i\xFEtir kay\xFDt";
-$vocab["mail_subject_delete"] = "konu sil";
+$vocab["mail_body_del_entry"] = "sil kay\xFDt";
// Authentication stuff
$vocab["accessdenied"] = "Eri\xFEim Engellendi";
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
