[cc-commits] [SCM] cc.engine: License chooser, public domain chooser, deeds (branch i18noverhaul) updated. 56b789e320302bc37cdcb0ab7b627fe7b827c8da

Gitosis User git at gandi0.creativecommons.org
Fri Jan 13 14:27:03 EST 2012


The branch, i18noverhaul has been updated
       via  56b789e320302bc37cdcb0ab7b627fe7b827c8da (commit)
      from  7c2c3ef26bf0de490eb7bd88ee718051c1362445 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes (followed by patch):
 cc/engine/tests/test_util.py |    5 +++++
 cc/engine/util.py            |    8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/cc/engine/tests/test_util.py b/cc/engine/tests/test_util.py
index cbe8297..239cb96 100644
--- a/cc/engine/tests/test_util.py
+++ b/cc/engine/tests/test_util.py
@@ -152,6 +152,11 @@ Tips for marking your work can be found at
 http://wiki.creativecommons.org/Marking.  Information on the supplied HTML and
 metadata can be found at http://wiki.creativecommons.org/CC_REL.
 
+This email and tech support has been brought to you by the nonprofit folks at
+Creative Commons. CC relies on donations to provide you with licenses and
+services like this. Please consider a donation to our annual fund:
+https://creativecommons.net/donate.
+
 Thank you!
 Creative Commons Support
 info at creativecommons.org"""
diff --git a/cc/engine/util.py b/cc/engine/util.py
index 1af93ed..2c40492 100644
--- a/cc/engine/util.py
+++ b/cc/engine/util.py
@@ -542,10 +542,10 @@ def send_license_info_email(license_title, license_html,
       A boolean specifying whether or not the email sent successfully
     """
 
-    email_body = string.Template(
-        translate(LICENSE_INFO_EMAIL_BODY, target_language=locale)).substitute(
-        {'license_title': license_title,
-         'license_html': license_html})
+    gettext = ugettext_for_locale(locale)
+    email_body = gettext(LICENSE_INFO_EMAIL_BODY) % {
+            'license_title': license_title,
+            'license_html': license_html}
 
     try:
         send_email(


hooks/post-receive
-- 
cc.engine: License chooser, public domain chooser, deeds


More information about the cc-commits mailing list