Allow $CPL_NAME etc. in KDM email subjects. Add de_DE translation of

default subject.

Suggested-by: Carsten Kurz

diff --git a/src/lib/config.cc b/src/lib/config.cc
index f7905b039cc3fa1d1729c2cab67a38927772aa25..24f9242ec259afdfb93ff3c04eef98b0b9738ca9 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -186,7 +186,7 @@ Config::read ()
        _mail_server = f.string_child ("MailServer");
        _mail_user = f.optional_string_child("MailUser").get_value_or ("");
        _mail_password = f.optional_string_child("MailPassword").get_value_or ("");
-       _kdm_subject = f.optional_string_child ("KDMSubject").get_value_or (_("KDM delivery"));
+       _kdm_subject = f.optional_string_child ("KDMSubject").get_value_or (_("KDM delivery: $CPL_NAME"));
        _kdm_from = f.string_child ("KDMFrom");
        _kdm_cc = f.optional_string_child ("KDMCC").get_value_or ("");
        _kdm_email = f.string_child ("KDMEmail");

diff --git a/src/lib/kdm.cc b/src/lib/kdm.cc
index 571e09b69200f58ff0c5ac310d5f233ac9154eb9..49f04724ac1c07ed2bddfb050a7139999c701c6b 100644 (file)
--- a/src/lib/kdm.cc
+++ b/src/lib/kdm.cc
@@ -232,20 +232,30 @@ email_kdms (
                /* Send email */
                
                quickmail_initialize ();
-               quickmail mail = quickmail_create (Config::instance()->kdm_from().c_str(), Config::instance()->kdm_subject().c_str ());
+
+               stringstream start;
+               start << from.date() << " " << from.time_of_day();
+               stringstream end;
+               end << to.date() << " " << to.time_of_day();
+               
+               string subject = Config::instance()->kdm_subject();
+               boost::algorithm::replace_all (subject, "$CPL_NAME", film->dcp_name ());
+               boost::algorithm::replace_all (subject, "$START_TIME", start.str ());
+               boost::algorithm::replace_all (subject, "$END_TIME", end.str ());
+               boost::algorithm::replace_all (subject, "$CINEMA_NAME", i->cinema->name);
+               quickmail mail = quickmail_create (Config::instance()->kdm_from().c_str(), subject.c_str ());
+               
                quickmail_add_to (mail, i->cinema->email.c_str ());
                if (!Config::instance()->kdm_cc().empty ()) {
                        quickmail_add_cc (mail, Config::instance()->kdm_cc().c_str ());
                }
+               
                string body = Config::instance()->kdm_email().c_str();
                boost::algorithm::replace_all (body, "$CPL_NAME", film->dcp_name ());
-               stringstream start;
-               start << from.date() << " " << from.time_of_day();
                boost::algorithm::replace_all (body, "$START_TIME", start.str ());
-               stringstream end;
-               end << to.date() << " " << to.time_of_day();
                boost::algorithm::replace_all (body, "$END_TIME", end.str ());
                boost::algorithm::replace_all (body, "$CINEMA_NAME", i->cinema->name);
+               
                stringstream screens;
                for (list<ScreenKDM>::const_iterator j = i->screen_kdms.begin(); j != i->screen_kdms.end(); ++j) {
                        screens << j->screen->name << ", ";

diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index 2e9a2ba13686a7ff8da647bf4343bfb0ee55af5c..d23c2bd82a4fdb2413f8d1f8a616f046a6335f02 100644 (file)
--- a/src/lib/po/de_DE.po
+++ b/src/lib/po/de_DE.po
@@ -345,8 +345,8 @@ msgstr ""
 "den DCP-o-matic Autor (carl@dcpomatic.com)."
 
 #: src/lib/config.cc:189
-msgid "KDM delivery"
-msgstr ""
+msgid "KDM delivery: $CPL_NAME"
+msgstr "KDM Zustellung: $CPL_NAME"
 
 #: src/lib/filter.cc:66
 msgid "Kernel deinterlacer"