[cc-commits] [SCM] cc.engine: License chooser, public domain chooser, deeds (branch master) updated. 7dabb3aaecdaa78acb6bede3b77fd970d73fce86
Gitosis User
git at gandi0.creativecommons.org
Tue Jan 24 16:36:03 EST 2012
The branch, master has been updated
via 7dabb3aaecdaa78acb6bede3b77fd970d73fce86 (commit)
via 6cee9a97c537f2a366da2e8745ef90fddf3a5c0a (commit)
via dc142f6930bf882a608f46aa6202f717dfc3b0bd (commit)
via e871cfa87e2b374a4ecaeeb170776cbb81b77b7c (commit)
via 2b8b479ae44817a0a16eac742ff87309863abcf5 (commit)
via 523f94d536c270e3b46a1836a409500ccc8c6d6e (commit)
via 9851b574470597e9df3d85563c7d3a9399b35759 (commit)
via 979a8095a3a6c01e4be24ad8ba9f5b7a430336ca (commit)
via 1e269ab31782ed41b9ca1fd2f29eb95b9fc2dc05 (commit)
via b09aadfb1887f3b64366ae097a287e0c7ab59e16 (commit)
via 903d85a87a4551277c3b1b2145e47776c9dda9d3 (commit)
via 8bc4c4e5363c365243492410f388ba1e276e2b67 (commit)
via 106df0de8f99ee28fd969d2fd9ac14e0d2ccedc6 (commit)
via d4e00d5e271fe8228aa1beec61a6a5d5cf115892 (commit)
via 56b789e320302bc37cdcb0ab7b627fe7b827c8da (commit)
via 638632e9c06d4ae6d99d97a937530fb1f749f9b4 (commit)
via 7c2c3ef26bf0de490eb7bd88ee718051c1362445 (commit)
via 66dd14ef9d24b6418f9085d10c5b0a776afb8fe4 (commit)
via 8de86022aee3b871afe87a5cfd6db8115fa76c36 (commit)
via 4fc564b292432450304e6ab2809ac6d250b2e25a (commit)
via d8d3216371c74d22dbeda641cf6b3283df889a10 (commit)
via 554df7e5d65967ee9db002142d7352331fc465d6 (commit)
via eb322a2ad27e9a92fd357150655d566c8425b87b (commit)
via d962fc83ca7c2aff0225771b65bddeda5c383878 (commit)
from a4cc8cdd3f4cd7e4757f353eeadb968e90bd58b2 (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 -----------------------------------------------------------------
commit 7dabb3aaecdaa78acb6bede3b77fd970d73fce86
Author: Jonathan Palecek <jonathan at creativecommons.org>
Date: Tue Jan 24 14:34:22 2012 -0600
removed attempts to convert unicode to unicode
commit 6cee9a97c537f2a366da2e8745ef90fddf3a5c0a
Merge: dc142f6 2b8b479
Author: Jonathan Palecek <jonathan at creativecommons.org>
Date: Tue Jan 24 14:12:45 2012 -0600
Merge branch 'next' of code.creativecommons.org:cc.engine into next
commit dc142f6930bf882a608f46aa6202f717dfc3b0bd
Author: Jonathan Palecek <jonathan at creativecommons.org>
Date: Tue Jan 24 14:11:51 2012 -0600
minor adjustment to util.get_target_lang_from_request
commit e871cfa87e2b374a4ecaeeb170776cbb81b77b7c
Author: Jonathan Palecek <jonathan at creativecommons.org>
Date: Tue Jan 24 14:11:32 2012 -0600
wrote a test for util.get_target_lang_from_request
commit 2b8b479ae44817a0a16eac742ff87309863abcf5
Author: Christopher Allan Webber <cwebber at dustycloud.org>
Date: Tue Jan 24 13:12:37 2012 -0600
Removing garbage dependencies from cc.engine
commit 523f94d536c270e3b46a1836a409500ccc8c6d6e
Merge: 9851b57 1e269ab
Author: Christopher Allan Webber <cwebber at dustycloud.org>
Date: Tue Jan 24 10:56:03 2012 -0600
Merge branch 'i18nconverttest' into next
commit 9851b574470597e9df3d85563c7d3a9399b35759
Merge: 979a809 a4cc8cd
Author: Jonathan Palecek <jonathan at creativecommons.org>
Date: Tue Jan 24 10:54:26 2012 -0600
Merge branch 'next' of code.creativecommons.org:cc.engine into next
commit 979a8095a3a6c01e4be24ad8ba9f5b7a430336ca
Author: Jonathan Palecek <jonathan at creativecommons.org>
Date: Mon Jan 23 18:03:49 2012 -0600
Corrected the input to request.accept_language.best_match
-----------------------------------------------------------------------
Summary of changes (followed by patch):
cc/engine/chooser/views.py | 18 ++--
cc/engine/chooser/xmp_template.py | 17 ++--
cc/engine/templates/catalog_pages/404.html | 2 +-
.../templates/catalog_pages/license_catcher.html | 2 +-
.../templates/catalog_pages/licenses-index.html | 78 ++++++++--------
cc/engine/templates/characteristic/by.html | 9 +-
cc/engine/templates/characteristic/nc.html | 8 +-
cc/engine/templates/characteristic/nd.html | 8 +-
cc/engine/templates/characteristic/sa.html | 8 +-
cc/engine/templates/chooser_pages/emailhtml.html | 9 ++-
cc/engine/templates/chooser_pages/htmlpopup.html | 12 ++--
cc/engine/templates/chooser_pages/index.html | 71 ++++++++-------
.../templates/chooser_pages/nonweb_popup.html | 11 +--
.../templates/chooser_pages/partner/index.html | 42 +++++----
.../templates/chooser_pages/partner/results.html | 12 ++--
.../templates/chooser_pages/pdmark/details.html | 36 ++++----
.../templates/chooser_pages/pdmark/index.html | 12 ++--
.../templates/chooser_pages/pdmark/partner.html | 14 ++--
.../templates/chooser_pages/pdmark/results.html | 22 ++---
.../chooser_pages/publicdomain/publicdomain-2.html | 28 ++++--
.../chooser_pages/publicdomain/publicdomain-3.html | 21 +++--
.../chooser_pages/publicdomain/publicdomain-4.html | 15 ++--
cc/engine/templates/chooser_pages/results.html | 31 +++----
.../templates/chooser_pages/zero/confirm.html | 12 ++--
cc/engine/templates/chooser_pages/zero/index.html | 23 ++++--
.../templates/chooser_pages/zero/partner.html | 21 +++--
.../templates/chooser_pages/zero/results.html | 30 +++----
cc/engine/templates/chooser_pages/zero/waiver.html | 46 ++++++----
cc/engine/templates/includes/engine_languages.html | 2 +-
cc/engine/templates/includes/more_metadata.html | 77 +++++++++-------
cc/engine/templates/includes/translations.html | 2 +-
cc/engine/templates/licenses/devnations_deed.html | 22 +++---
cc/engine/templates/licenses/pdmark_deed.html | 64 +++++++-------
.../templates/licenses/publicdomain_deed.html | 21 +++--
cc/engine/templates/licenses/sampling_deed.html | 28 +++---
cc/engine/templates/licenses/standard_deed.html | 93 +++++++++++---------
cc/engine/templates/licenses/zero_deed.html | 56 ++++++------
cc/engine/templates/macros_templates/deed.html | 30 +++++--
cc/engine/templates/macros_templates/partner.html | 2 +-
cc/engine/templates/publicdomain/index.html | 18 ++--
cc/engine/tests/test_cc_org_i18n.py | 10 --
cc/engine/tests/test_util.py | 36 ++++++++
cc/engine/util.py | 72 ++++++++--------
cc/engine/views.py | 3 -
setup.py | 3 -
45 files changed, 636 insertions(+), 521 deletions(-)
delete mode 100644 cc/engine/tests/test_cc_org_i18n.py
diff --git a/cc/engine/chooser/views.py b/cc/engine/chooser/views.py
index 235e154..225e9a2 100644
--- a/cc/engine/chooser/views.py
+++ b/cc/engine/chooser/views.py
@@ -4,13 +4,13 @@ from urllib import quote, unquote_plus, urlencode
from StringIO import StringIO
from webob import Response, exc
-from zope.i18n import translate
from cc.engine import util
from cc.engine.decorators import RestrictHttpMethods
import cc.engine.chooser.xmp_template as xmp_template
from cc.license._lib.functions import get_selector_jurisdictions
-from cc.i18n import ccorg_i18n_setup
+from cc.i18n.gettext_i18n import ugettext_for_locale
+from cc.i18n import mappers
from cc.i18n.util import get_well_translated_langs, negotiate_locale
from cc.license.util import CODE_COUNTRY_LIST
@@ -34,6 +34,7 @@ def _base_context(request, target_lang=None):
'target_lang': (
target_lang
or util.get_target_lang_from_request(request)),
+ 'gettext': ugettext_for_locale(target_lang),
'active_languages': get_well_translated_langs(),
}
@@ -279,6 +280,7 @@ def _work_rdf(work_info, license):
def chooser_view(request):
target_lang = util.get_target_lang_from_request(request)
context = _base_context(request, target_lang)
+ gettext = context['gettext']
available_jurisdiction_codes = [
j.code for j in get_selector_jurisdictions('standard')
@@ -291,11 +293,7 @@ def chooser_view(request):
# Sort the jurisdictions for the dropdown via the translated name
jurisdictions_names = [
- (juris,
- util.unicode_cleaner(
- translate("country.%s" % juris,
- domain=ccorg_i18n_setup.I18N_DOMAIN,
- target_language=negotiate_locale(target_lang))))
+ (juris, gettext(mappers.COUNTRY_MAP[juris]))
for juris in available_jurisdiction_codes]
jurisdictions_names = sorted(
jurisdictions_names, key=lambda juris: juris[1])
@@ -498,9 +496,9 @@ def work_email_send(request):
target_lang = util.get_target_lang_from_request(request)
request_form = request.GET or request.POST
- email_addr = request_form.get('to_email', '').decode('utf-8')
- license_name = request_form.get('license_name').decode('utf-8')
- license_html = request_form.get('license_html').decode('utf-8')
+ email_addr = request_form.get('to_email', '')
+ license_name = request_form.get('license_name')
+ license_html = request_form.get('license_html')
util.send_license_info_email(
license_name, license_html,
diff --git a/cc/engine/chooser/xmp_template.py b/cc/engine/chooser/xmp_template.py
index b18afd3..a56703b 100644
--- a/cc/engine/chooser/xmp_template.py
+++ b/cc/engine/chooser/xmp_template.py
@@ -1,4 +1,3 @@
-import string
import re
from cc.i18n.gettext_i18n import ugettext_for_locale
@@ -57,13 +56,15 @@ def get_xmp_info(request_form, license, locale):
else:
notice = ""
- i18n_work = ugettext('util.work')
- work_notice_template = string.Template(
- ugettext('license.work_type_licensed'))
- work_notice = work_notice_template.substitute(
- {'license_name': license.title(locale_to_lower_lower(locale)),
- 'license_url': license.uri,
- 'work_type': i18n_work})
+ i18n_work = ugettext('work')
+ work_notice_template = ugettext(
+ u'This %(work_type)s is licensed under a '
+ u'<a rel="license" href="%(license_url)s">Creative Commons '
+ u'%(license_name)s License</a>.')
+ work_notice = work_notice_template % {
+ 'license_name': license.title(locale_to_lower_lower(locale)),
+ 'license_url': license.uri,
+ 'work_type': i18n_work}
notice = notice + work_notice
diff --git a/cc/engine/templates/catalog_pages/404.html b/cc/engine/templates/catalog_pages/404.html
index 1d7d19c..b5f06e0 100644
--- a/cc/engine/templates/catalog_pages/404.html
+++ b/cc/engine/templates/catalog_pages/404.html
@@ -1,6 +1,6 @@
{% extends "macros_templates/engine.html" %}
-{% block title %}{{ cctrans(locale, "util.Creative_Commons")|safe }}{% endblock %}
+{% block title %}{% trans %}Creative Commons{% endtrans %}{% endblock %}
{% block page_header_title %}
Sorry...
diff --git a/cc/engine/templates/catalog_pages/license_catcher.html b/cc/engine/templates/catalog_pages/license_catcher.html
index f5e3b57..436a54f 100644
--- a/cc/engine/templates/catalog_pages/license_catcher.html
+++ b/cc/engine/templates/catalog_pages/license_catcher.html
@@ -1,6 +1,6 @@
{% extends "macros_templates/engine.html" %}
-{% block title %}{{ cctrans(locale, "util.Creative_Commons")|safe }}{% endblock %}
+{% block title %}{% trans %}Creative Commons{% endtrans %}{% endblock %}
{% block page_header_title %}
Sorry...
diff --git a/cc/engine/templates/catalog_pages/licenses-index.html b/cc/engine/templates/catalog_pages/licenses-index.html
index 5e43416..e8d49e7 100644
--- a/cc/engine/templates/catalog_pages/licenses-index.html
+++ b/cc/engine/templates/catalog_pages/licenses-index.html
@@ -8,10 +8,10 @@
<div class="row">
<div class="ten columns alpha">
<h2>
- {{ cctrans(locale, "license.index.what_licenses_do.title")|safe }}
+ {% trans %}What our licenses do{% endtrans %}
</h2>
<div>
- {{ cctrans(locale, "license.index.what_licenses_do.body")|safe }}
+ {% trans %}The Creative Commons copyright licenses and tools forge a balance inside the traditional âall rights reservedâ setting that copyright law creates. Our tools give everyone from individual creators to large companies and institutions a simple, standardized way to grant copyright permissions to their creative work. The combination of our tools and our users is a <a href="http://creativecommons.org/videos/a-shared-culture">vast and growing digital commons</a>, a pool of content that can be <a href="http://creativecommons.org/videos/wanna-work-together">copied, distributed, edited, remixed, and built upon</a>, all within the boundaries of copyright law.{% endtrans %}
</div>
</div>
@@ -26,31 +26,31 @@
<div class="row">
<h2>
- {{ cctrans(locale, "license.index.design_rationale.title")|safe }}
+ {% trans %}License design and rationale{% endtrans %}
</h2>
<div class="eight columns alpha">
<p>
- {{ cctrans(locale, "license.index.design_rationale.body1")|safe }}
+ {% trans %}All Creative Commons licenses have many important features in common. Every license helps creators — we call them licensors if they use our tools — retain copyright while allowing others to copy, distribute, and make some uses of their work — at least non-commercially. Every Creative Commons license also ensures licensors get the credit for their work they deserve. Every Creative Commons license works around the world and lasts as long as applicable copyright lasts (because they are built on copyright). These common features serve as the baseline, on top of which licensors can choose to grant additional permissions when deciding how they want their work to be used.{% endtrans %}
</p>
<p>
- {{ cctrans(locale, "license.index.design_rationale.body2")|safe }}
+ {% trans %}A Creative Commons licensor answers a few simple questions on the path to choosing a license — first, do I want to allow commercial use or not, and then second, do I want to allow derivative works or not? If a licensor decides to allow derivative works, she may also choose to require that anyone who uses the work — we call them licensees — to make that new work available under the same license terms. We call this idea âShareAlikeâ and it is one of the mechanisms that (if chosen) helps the digital commons grow over time. ShareAlike is inspired by the GNU General Public License, used by many free and open source software projects.{% endtrans %}
</p>
</div>
<div class="eight columns omega">
<p>
- {{ cctrans(locale, "license.index.design_rationale.body3")|safe }}
+ {% trans %}Our licenses do not affect freedoms that the law grants to users of creative works otherwise protected by copyright, such as exceptions and limitations to copyright law like fair dealing. Creative Commons licenses require licensees to get permission to do any of the things with a work that the law reserves exclusively to a licensor and that the license does not expressly allow. Licensees must credit the licensor, keep copyright notices intact on all copies of the work, and link to the license from copies of the work. Licensees cannot use technological measures to restrict access to the work by others.{% endtrans %}
</p>
<p>
- {{ cctrans(locale, "license.index.design_rationale.body4")|safe }}
+ {% trans %}<a href="http://creativecommons.org/choose">Try out our simple <em>License Chooser</em></a>.{% endtrans %}
</p>
</div>
</div>
<div class="alt" id="layers">
<div class="row">
<h2>
- {{ cctrans(locale, "license.index.three_layers.title")|safe }}
+ {% trans %}Three âLayersâ Of Licenses{% endtrans %}
</h2>
<div class="six columns alpha">
<img src="/images/license-layers.png" alt="Three Layers of Licenses"/>
@@ -58,23 +58,23 @@
<div class="ten columns omega">
<p>
- {{ cctrans(locale, "license.index.three_layers.body1")|safe }}
+ {% trans %}Our public copyright licenses incorporate a unique and innovative âthree-layerâ design. Each license begins as a traditional legal tool, in the kind of language and text formats that most lawyers know and love. We call this the Legal Code layer of each license.{% endtrans %}
</p>
<p>
- {{ cctrans(locale, "license.index.three_layers.body2")|safe }}
+ {% trans %}But since most creators, educators, and scientists are not in fact lawyers, we also make the licenses available in a format that normal people can read â the Commons Deed (also known as the âhuman readableâ version of the license). The Commons Deed is a handy reference for licensors and licensees, summarizing and expressing some of the most important terms and conditions. Think of the Commons Deed as a user-friendly interface to the Legal Code beneath, although the Deed itself is not a license, and its contents are not part of the Legal Code itself.{% endtrans %}
</p>
<p>
- {{ cctrans(locale, "license.index.three_layers.body3")|safe }}
+ {% trans %}The final layer of the license design recognizes that software, from search engines to office productivity to music editing, plays an enormous role in the creation, copying, discovery, and distribution of works. In order to make it easy for the Web to know when a work is available under a Creative Commons license, we provide a âmachine readableâ version of the license â a summary of the key freedoms and obligations written into a format that software systems, search engines, and other kinds of technology can understand. We developed a standardized way to describe licenses that software can understand called <a href="http://wiki.creativecommons.org/Ccrel">CC Rights Expression Language</a> (CC REL) to accomplish this.{% endtrans %}
</p>
<p>
- {{ cctrans(locale, "license.index.three_layers.body4")|safe }}
+ {% trans %}Searching for open content is an important function enabled by our approach. You can use <a href="http://www.google.com/support/websearch/bin/answer.py?&answer=29508&hl=">Google</a> to search for Creative Commons content, look for pictures at <a href="http://www.flickr.com/creativecommons/">Flickr</a>, albums at <a href="http://www.jamendo.com/en/creativecommons">Jamendo</a>, and general media at <a href="http://spinxpress.com/">spinxpress</a>. The <a href="http://commons.wikimedia.org/wiki/Main_Page">Wikimedia Commons</a>, the multimedia repository of <a href="http://wikipedia.org">Wikipedia</a>, is a core user of our licenses as well.{% endtrans %}
</p>
<p>
- {{ cctrans(locale, "license.index.three_layers.body5")|safe }}
+ {% trans %}Taken together, these three layers of licenses ensure that the spectrum of rights isnât just a legal concept. Itâs something that the creators of works can understand, their users can understand, and even the Web itself can understand.{% endtrans %}
</p>
</div>
</div>
@@ -82,7 +82,7 @@
<div class="row" id="licenses">
<h2>
- {{ cctrans(locale, "license.index.the_licenses.title")|safe }}
+ {% trans %}The Licenses{% endtrans %}
</h2>
<div class="row">
<div class="eight columns alpha">
@@ -93,20 +93,20 @@
<div class="six columns omega">
<p>
<strong>
- {{ cctrans(locale, "licenses.pretty_by")|safe }}
+ {% trans %}Attribution{% endtrans %}
<br/>CC BY</strong>
</p>
<p>
- {{ cctrans(locale, "license.description.by")|safe }}
+ {% trans %}This license lets others distribute, remix, tweak, and build upon your work, even commercially, as long as they credit you for the original creation. This is the most accommodating of licenses offered. Recommended for maximum dissemination and use of licensed materials.{% endtrans %}
</p>
<p>
<span style="color: #000000;">
<a href="http://creativecommons.org/licenses/by/3.0">
- {{ cctrans(locale, "util.View_License_Deed")|safe }}</a>
+ {% trans %}View License Deed{% endtrans %}</a>
| <a href="http://creativecommons.org/licenses/by/3.0/legalcode">
- {{ cctrans(locale, "util.View_Legal_Code")|safe }}</a>
+ {% trans %}View Legal Code{% endtrans %}</a>
</span>
</p>
</div>
@@ -120,22 +120,22 @@
<div class="six columns omega">
<p>
<strong>
- {{ cctrans(locale, "licenses.pretty_by-sa")|safe }}
+ {% trans %}Attribution-ShareAlike{% endtrans %}
<br/>
CC BY-SA
</strong>
</p>
<p>
- {{ cctrans(locale, "license.description.by-sa")|safe }}
+ {% trans %}This license lets others remix, tweak, and build upon your work even for commercial purposes, as long as they credit you and license their new creations under the identical terms. This license is often compared to âcopyleftâ free and open source software licenses. All new works based on yours will carry the same license, so any derivatives will also allow commercial use. This is the license used by Wikipedia, and is recommended for materials that would benefit from incorporating content from Wikipedia and similarly licensed projects.{% endtrans %}
</p>
<p>
<span style="color: #000000;">
<a href="http://creativecommons.org/licenses/by-sa/3.0">
- {{ cctrans(locale, "util.View_License_Deed")|safe }}</a>
+ {% trans %}View License Deed{% endtrans %}</a>
| <a href="http://creativecommons.org/licenses/by-sa/3.0/legalcode">
- {{ cctrans(locale, "util.View_Legal_Code")|safe }}</a>
+ {% trans %}View Legal Code{% endtrans %}</a>
</span>
</p>
</div>
@@ -149,22 +149,22 @@
<div class="six columns omega">
<p>
<strong>
- {{ cctrans(locale, "licenses.pretty_by-nd")|safe }}
+ {% trans %}Attribution-NoDerivs{% endtrans %}
<br/>
CC BY-ND
</strong>
</p>
<p>
- {{ cctrans(locale, "license.description.by-nd")|safe }}
+ {% trans %}This license allows for redistribution, commercial and non-commercial, as long as it is passed along unchanged and in whole, with credit to you.{% endtrans %}
</p>
<p>
<span style="color: #000000;">
<a href="http://creativecommons.org/licenses/by-nd/3.0">
- {{ cctrans(locale, "util.View_License_Deed")|safe }}</a>
+ {% trans %}View License Deed{% endtrans %}</a>
| <a href="http://creativecommons.org/licenses/by-nd/3.0/legalcode">
- {{ cctrans(locale, "util.View_Legal_Code")|safe }}</a>
+ {% trans %}View Legal Code{% endtrans %}</a>
</span>
</p>
</div>
@@ -176,22 +176,22 @@
<div class="six columns omega">
<p>
<strong>
- {{ cctrans(locale, "licenses.pretty_by-nc")|safe }}
+ {% trans %}Attribution-NonCommercial{% endtrans %}
<br/>
CC BY-NC
</strong>
</p>
<p>
- {{ cctrans(locale, "license.description.by-nc")|safe }}
+ {% trans %}This license lets others remix, tweak, and build upon your work non-commercially, and although their new works must also acknowledge you and be non-commercial, they donât have to license their derivative works on the same terms.{% endtrans %}
</p>
<p>
<span style="color: #000000;">
<a href="http://creativecommons.org/licenses/by-nc/3.0">
- {{ cctrans(locale, "util.View_License_Deed")|safe }}</a>
+ {% trans %}View License Deed{% endtrans %}</a>
| <a href="http://creativecommons.org/licenses/by-nc/3.0/legalcode">
- {{ cctrans(locale, "util.View_Legal_Code")|safe }}</a>
+ {% trans %}View Legal Code{% endtrans %}</a>
</span>
</p>
</div>
@@ -205,22 +205,22 @@
<div class="six columns omega">
<p>
<strong>
- {{ cctrans(locale, "licenses.pretty_by-nc-sa")|safe }}
+ {% trans %}Attribution-NonCommercial-ShareAlike{% endtrans %}
<br/>
CC BY-NC-SA
</strong>
</p>
<p>
- {{ cctrans(locale, "license.description.by-nc-sa")|safe }}
+ {% trans %}This license lets others remix, tweak, and build upon your work non-commercially, as long as they credit you and license their new creations under the identical terms.{% endtrans %}
</p>
<p>
<span style="color: #000000;">
<a href="http://creativecommons.org/licenses/by-nc-sa/3.0">
- {{ cctrans(locale, "util.View_License_Deed")|safe }}</a>
+ {% trans %}View License Deed{% endtrans %}</a>
| <a href="http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode">
- {{ cctrans(locale, "util.View_Legal_Code")|safe }}</a>
+ {% trans %}View Legal Code{% endtrans %}</a>
</span>
</p>
</div>
@@ -232,22 +232,22 @@
<div class="six columns omega">
<p>
<strong>
- {{ cctrans(locale, "licenses.pretty_by-nc-nd")|safe }}
+ {% trans %}Attribution-NonCommercial-NoDerivs{% endtrans %}
<br/>
CC BY-NC-ND
</strong>
</p>
<p>
- {{ cctrans(locale, "license.description.by-nc-nd")|safe }}
+ {% trans %}This license is the most restrictive of our six main licenses, only allowing others to download your works and share them with others as long as they credit you, but they canât change them in any way or use them commercially.{% endtrans %}
</p>
<p>
<span style="color: #000000;">
<a href="http://creativecommons.org/licenses/by-nc-nd/3.0">
- {{ cctrans(locale, "util.View_License_Deed")|safe }}</a>
+ {% trans %}View License Deed{% endtrans %}</a>
| <a href="http://creativecommons.org/licenses/by-nc-nd/3.0/legalcode">
- {{ cctrans(locale, "util.View_Legal_Code")|safe }}</a>
+ {% trans %}View Legal Code{% endtrans %}</a>
</span>
</p>
</div>
@@ -255,7 +255,7 @@
</div>
<div class="row">
<p>
- {{ cctrans(locale, "license.about_our_publicdomain_tools")|safe }}
+ {% trans %}We also provide tools that work in the âall rights grantedâ space of the <a href="http://wiki.creativecommons.org/Public_domain">public domain</a>. Our <a href="http://creativecommons.org/about/cc0">CC0 tool</a> allows licensors to waive all rights and place a work in the public domain, and our <a href="http://creativecommons.org/about/pdm">Public Domain Mark</a> allows any web user to âmarkâ a work as being in the public domain.{% endtrans %}
</p>
</div>
</div>
diff --git a/cc/engine/templates/characteristic/by.html b/cc/engine/templates/characteristic/by.html
index f8eb39a..be6c645 100644
--- a/cc/engine/templates/characteristic/by.html
+++ b/cc/engine/templates/characteristic/by.html
@@ -1,6 +1,6 @@
{% extends "macros_templates/popup.html" %}
-{% block title %}{{ cctrans(locale, "char.by_title")|safe }}{% endblock %}
+{% block title %}{% trans %}Attribution{% endtrans %}{% endblock %}
{% block body %}
<p dir="{{ get_ltr_rtl }}" align="{{ is_rtl_align }}" >
@@ -9,13 +9,14 @@
</p>
<p dir="{{ get_ltr_rtl }}" align="{{ is_rtl_align }}">
- <strong>{{ cctrans(locale, "char.by_title")|safe }}</strong></p>
+ <strong>{% trans %}Attribution{% endtrans %}</strong></p>
<p dir="{{ get_ltr_rtl }}" align="{{ is_rtl_align }}">
- {{ cctrans(locale, "char.by_description")|safe }}
+ {% trans %}You must attribute the
+work in the manner specified by the author or licensor.{% endtrans %}
</p>
<div style="text-align:center">
- <a href="javascript:window.close();">{{ cctrans(locale, "util.Close_window")|safe }}</a>
+ <a href="javascript:window.close();">{% trans %}Close window{% endtrans %}</a>
</div>
{% endblock %}
diff --git a/cc/engine/templates/characteristic/nc.html b/cc/engine/templates/characteristic/nc.html
index 48b3495..476c0e1 100644
--- a/cc/engine/templates/characteristic/nc.html
+++ b/cc/engine/templates/characteristic/nc.html
@@ -1,6 +1,6 @@
{% extends "macros_templates/popup.html" %}
-{% block title %}{{ cctrans(locale, "char.nc_title")|safe }}{% endblock %}
+{% block title %}{% trans %}Noncommercial{% endtrans %}{% endblock %}
{% block body %}
<p dir="{{ get_ltr_rtl }}" align="{{ is_rtl_align }}" >
@@ -9,13 +9,13 @@
</p>
<p dir="{{ get_ltr_rtl }}" align="{{ is_rtl_align }}">
- <strong>{{ cctrans(locale, "char.nc_title")|safe }}</strong></p>
+ <strong>{% trans %}Noncommercial{% endtrans %}</strong></p>
<p dir="{{ get_ltr_rtl }}" align="{{ is_rtl_align }}">
- {{ cctrans(locale, "char.nc_description")|safe }}
+ {% trans %}The licensor permits others to copy, distribute and transmit the work. In return, licensees may not use the work for commercial purposes â unless they get the licensor's permission.{% endtrans %}
</p>
<div style="text-align:center">
- <a href="javascript:window.close();">{{ cctrans(locale, "util.Close_window")|safe }}</a>
+ <a href="javascript:window.close();">{% trans %}Close window{% endtrans %}</a>
</div>
{% endblock %}
diff --git a/cc/engine/templates/characteristic/nd.html b/cc/engine/templates/characteristic/nd.html
index be7d696..bca3572 100644
--- a/cc/engine/templates/characteristic/nd.html
+++ b/cc/engine/templates/characteristic/nd.html
@@ -1,6 +1,6 @@
{% extends "macros_templates/popup.html" %}
-{% block title %}{{ cctrans(locale, "char.nd_title")|safe }}{% endblock %}
+{% block title %}{% trans %}No Derivative Works{% endtrans %}{% endblock %}
{% block body %}
<p dir="{{ get_ltr_rtl }}" align="{{ is_rtl_align }}" >
@@ -9,13 +9,13 @@
</p>
<p dir="{{ get_ltr_rtl }}" align="{{ is_rtl_align }}">
- <strong>{{ cctrans(locale, "char.nd_title")|safe }}</strong></p>
+ <strong>{% trans %}No Derivative Works{% endtrans %}</strong></p>
<p dir="{{ get_ltr_rtl }}" align="{{ is_rtl_align }}">
- {{ cctrans(locale, "char.nd_description")|safe }}
+ {% trans %}The licensor permits others to copy, distribute and transmit only unaltered copies of the work â not derivative works based on it.{% endtrans %}
</p>
<div style="text-align:center">
- <a href="javascript:window.close();">{{ cctrans(locale, "util.Close_window")|safe }}</a>
+ <a href="javascript:window.close();">{% trans %}Close window{% endtrans %}</a>
</div>
{% endblock %}
diff --git a/cc/engine/templates/characteristic/sa.html b/cc/engine/templates/characteristic/sa.html
index 4d489a1..809129a 100644
--- a/cc/engine/templates/characteristic/sa.html
+++ b/cc/engine/templates/characteristic/sa.html
@@ -1,6 +1,6 @@
{% extends "macros_templates/popup.html" %}
-{% block title %}{{ cctrans(locale, "char.sa_title")|safe }}{% endblock %}
+{% block title %}{% trans %}Share Alike{% endtrans %}{% endblock %}
{% block body %}
<p dir="{{ get_ltr_rtl }}" align="{{ is_rtl_align }}" >
@@ -9,13 +9,13 @@
</p>
<p dir="{{ get_ltr_rtl }}" align="{{ is_rtl_align }}">
- <strong>{{ cctrans(locale, "char.sa_title")|safe }}</strong></p>
+ <strong>{% trans %}Share Alike{% endtrans %}</strong></p>
<p dir="{{ get_ltr_rtl }}" align="{{ is_rtl_align }}">
- {{ cctrans(locale, "char.sa_description")|safe }}
+ {% trans %}The licensor permits others to distribute derivative works only under the same license or one compatible with the one that governs the licensor's work.{% endtrans %}
</p>
<div style="text-align:center">
- <a href="javascript:window.close();">{{ cctrans(locale, "util.Close_window")|safe }}</a>
+ <a href="javascript:window.close();">{% trans %}Close window{% endtrans %}</a>
</div>
{% endblock %}
diff --git a/cc/engine/templates/chooser_pages/emailhtml.html b/cc/engine/templates/chooser_pages/emailhtml.html
index 895801e..f4a06c7 100644
--- a/cc/engine/templates/chooser_pages/emailhtml.html
+++ b/cc/engine/templates/chooser_pages/emailhtml.html
@@ -4,11 +4,14 @@
{% block body %}
<p>
- {{ cctrans(locale, "license.link_emailed",
- email=request_form['to_email'])|safe }}
+ {% trans email=request_form['to_email'] %}<p>
+The information concerning your choice has been emailed to you at <strong>{{ email }}</strong>.
+</p>
+
+<p>Place the link or the HTML on your website, right next to the work you intend to license. </p>{% endtrans %}
</p>
<div align="center">
- <a href="javascript:window.close();">{{ cctrans(locale, "util.Close_window")|safe }}</a>
+ <a href="javascript:window.close();">{% trans %}Close window{% endtrans %}</a>
</div>
{% endblock %}
diff --git a/cc/engine/templates/chooser_pages/htmlpopup.html b/cc/engine/templates/chooser_pages/htmlpopup.html
index bac2070..722c649 100644
--- a/cc/engine/templates/chooser_pages/htmlpopup.html
+++ b/cc/engine/templates/chooser_pages/htmlpopup.html
@@ -4,24 +4,24 @@
{% block body %}
<p dir="{{ get_ltr_rtl }}" align="{{ is_rtl_align }}">
- {{ cctrans(locale, "license.html_display")|safe }}
+ {% trans %}The HTML to display your button is as follows:{% endtrans %}
</p>
<form action="">
<textarea cols="30" rows="8" name="html"
style="width:90%;height:150px;">{{ license_html }}</textarea>
<p>
<input type="button" onclick="form.html.focus();form.html.select()"
- name="grab" value="{{ cctrans(locale, 'util.Highlight_Text')|safe }}"/>
+ name="grab" value="{% trans %}Highlight Text to Copy{% endtrans %}"/>
</p>
</form>
<p dir="{{ get_ltr_rtl }}" align="{{ is_rtl_align }}">
- {{ cctrans(locale, "license.html_directions")|safe }}
+ {% trans %}Simply copy the text, then paste it into your web documents containing information about your works. <a href="/learn/technology/usingmarkup" target="_blank">More information about adding HTML to your documents here</a>.{% endtrans %}
</p>
<form action="./work-email" method="post">
<p dir="{{ get_ltr_rtl }}" align="{{ is_rtl_align }}">
- {{ cctrans(locale, "license.html_email")|safe }}
+ {% trans %}Enter your email address to get the HTML by email:{% endtrans %}
<input type="text" name="to_email" value="" />
<input type="hidden" name="lang"
value="{{ request.GET.get('lang', '') }}" />
@@ -36,14 +36,14 @@
value="{{ license.title(target_lang) }}" />
<input type="submit"
- value="{{ cctrans(locale, 'util.Send')|safe }}" />
+ value="{% trans %}Send{% endtrans %}" />
</p>
</form>
<div align="center"
dir="{{ get_ltr_rtl }}" align="{{ is_rtl_align }}">
<a href="javascript:window.close();">
- {{ cctrans(locale, "util.Close_window")|safe }}
+ {% trans %}Close window{% endtrans %}
</a>
</div>
{% endblock %}
diff --git a/cc/engine/templates/chooser_pages/index.html b/cc/engine/templates/chooser_pages/index.html
index 9463638..e2d62e7 100644
--- a/cc/engine/templates/chooser_pages/index.html
+++ b/cc/engine/templates/chooser_pages/index.html
@@ -10,17 +10,18 @@
{% block body %}
<div class="chooser">
<p>
- {{ cctrans(locale, "license.what")|safe }}
+ {% trans %}With a Creative Commons license, <strong>you keep your copyright</strong> but allow people to <a href="/learn/licenses/fullrights">copy and distribute your work</a> provided they <a href="#" class="helpLink" id="give_you_credit">give you credit</a> — and only on the conditions you specify here. For those new to Creative Commons licensing, we've prepared <a href="/about/think">a list of things to think about</a>. If you want to offer your work with no conditions attached, or you want to mark a work that is already free of known copyright restrictions and in the public domain, choose one of our <a href="/publicdomain/">public domain tools</a>.{% endtrans %}
</p>
<p>
- {{ cctrans(locale, "license.explain")|safe }}
+ {% trans %}When you choose a <a href="http://creativecommons.org/about/licenses">license</a>, we provide you with HTML you can use to add the license information to your site and information on how to select a license on one of several free hosting services that have incorporated Creative Commons. This is not a registration and we do not retain a record of your selection.{% endtrans %}
</p>
<div id="help_give_you_credit" class="help_panel">
- <div class="hd">{{ cctrans(locale, "char.by_title")|safe }}</div>
+ <div class="hd">{% trans %}Attribution{% endtrans %}</div>
<div class="bd">
- {{ cctrans(locale, "char.by_description")|safe }}
+ {% trans %}You must attribute the
+work in the manner specified by the author or licensor.{% endtrans %}
</div>
</div>
@@ -34,26 +35,26 @@
<p>
<strong>
- {{ cctrans(locale, "api.commercial")|safe }}
+ {% trans %}Allow commercial uses of your work?{% endtrans %}
</strong>
</p>
<ul class="choices">
<li>
<input type="radio" checked="checked"
name="field_commercial" value="y" id="question_2-3"/>
- <label for="question_2-3">{{ cctrans(locale, "util.Yes")|safe }}</label>
+ <label for="question_2-3">{% trans %}Yes{% endtrans %}</label>
<a href="" id="commercial" class="helpLink">
<img src="{{ request.staticdirect('images/information.png') }}"
- alt="{{ cctrans(locale, 'Information')|safe }}"/>
+ alt="{% trans %}Information{% endtrans %}"/>
</a>
<div class="help-popover">
<div class="popover below">
<div class="arrow"></div>
<div class="inner">
- <h3 class="title">{{ cctrans(locale, "Commercial Use")|safe }}</h3>
+ <h3 class="title">{% trans %}Commercial Use{% endtrans %}</h3>
<a href="#" class="close">×</a>
<div class="content">
- <p>{{ cctrans(locale, "license.help.commercial")|safe }}</p>
+ <p>{% trans %}The licensor permits others to copy, distribute, display, and perform the work, including for commercial purposes.{% endtrans %}</p>
</div>
</div>
</div>
@@ -63,19 +64,19 @@
<li>
<input type="radio"
name="field_commercial" value="n" id="question_2-4"/>
- <label for="question_2-4">{{ cctrans(locale, "util.No")|safe }}</label>
+ <label for="question_2-4">{% trans %}No{% endtrans %}</label>
<a href="" id="noncommercial" class="helpLink">
<img src="{{ request.staticdirect('images/information.png') }}"
- alt="{{ cctrans(locale, 'Information')|safe }}"/>
+ alt="{% trans %}Information{% endtrans %}"/>
</a>
<div class="help-popover">
<div class="popover below">
<div class="arrow"></div>
<div class="inner">
- <h3 class="title">{{ cctrans(locale, "licenses.pretty_nc")|safe }}</h3>
+ <h3 class="title">{% trans %}NonCommercial{% endtrans %}</h3>
<a href="#" class="close">×</a>
<div class="content">
- <p>{{ cctrans(locale, "license.help.noncommercial")|safe }}</p>
+ <p>{% trans %}The licensor permits others to copy, distribute, display, and perform the work for non-commercial purposes only.{% endtrans %}</p>
</div>
</div>
</div>
@@ -85,7 +86,7 @@
<p>
<strong>
- {{ cctrans(locale, "api.derivatives")|safe }}
+ {% trans %}Allow modifications of your work?{% endtrans %}
</strong>
</p>
@@ -94,19 +95,19 @@
<input type="radio" checked="checked"
name="field_derivatives" value="y"
id="question_3-5" />
- <label for="question_3-5">{{ cctrans(locale, "util.Yes")|safe }}</label>
+ <label for="question_3-5">{% trans %}Yes{% endtrans %}</label>
<a href="" id="derivatives" class="helpLink">
<img src="{{ request.staticdirect('images/information.png') }}"
- alt="{{ cctrans(locale, 'Information')|safe }}"/>
+ alt="{% trans %}Information{% endtrans %}"/>
</a>
<div class="help-popover">
<div class="popover below">
<div class="arrow"></div>
<div class="inner">
- <h3 class="title">{{ cctrans(locale, "Allow Derivative Works")|safe }}</h3>
+ <h3 class="title">{% trans %}Allow Derivative Works{% endtrans %}</h3>
<a href="#" class="close">×</a>
<div class="content">
- <p>{{ cctrans(locale, "license.help.derivatives")|safe }}</p>
+ <p>{% trans %}The licensor permits others to copy, distribute, display and perform the work, as well as make derivative works based on it.{% endtrans %}</p>
</div>
</div>
</div>
@@ -118,20 +119,20 @@
id="question_3-6" />
<label for="question_3-6">
<span>
- {{ cctrans(locale, "Yes, as long as others share alike")|safe }}
+ {% trans %}Yes, as long as others share alike{% endtrans %}
</span>
<a href="" class="helpLink" id="sharealike">
<img src="{{ request.staticdirect('images/information.png') }}"
- alt="{{ cctrans(locale, 'Information')|safe }}"/>
+ alt="{% trans %}Information{% endtrans %}"/>
</a>
<div class="help-popover">
<div class="popover below">
<div class="arrow"></div>
<div class="inner">
- <h3 class="title">{{ cctrans(locale, "char.sa_title")|safe }}</h3>
+ <h3 class="title">{% trans %}Share Alike{% endtrans %}</h3>
<a href="#" class="close">×</a>
<div class="content">
- <p>{{ cctrans(locale, "char.sa_description")|safe }}</p>
+ <p>{% trans %}The licensor permits others to distribute derivative works only under the same license or one compatible with the one that governs the licensor's work.{% endtrans %}</p>
</div>
</div>
</div>
@@ -142,19 +143,19 @@
<li>
<input type="radio" name="field_derivatives" value="n"
id="question_3-7" />
- <label for="question_3-7">{{ cctrans(locale, "util.No")|safe }}</label>
+ <label for="question_3-7">{% trans %}No{% endtrans %}</label>
<a href="" id="noderivatives" class="helpLink">
<img src="{{ request.staticdirect('images/information.png') }}"
- alt="{{ cctrans(locale, 'Information')|safe }}"/>
+ alt="{% trans %}Information{% endtrans %}"/>
</a>
<div class="help-popover">
<div class="popover below">
<div class="arrow"></div>
<div class="inner">
- <h3 class="title">{{ cctrans(locale, "char.nd_title")|safe }}</h3>
+ <h3 class="title">{% trans %}No Derivative Works{% endtrans %}</h3>
<a href="#" class="close">×</a>
<div class="content">
- <p>{{ cctrans(locale, "char.nd_description")|safe }}</p>
+ <p>{% trans %}The licensor permits others to copy, distribute and transmit only unaltered copies of the work â not derivative works based on it.{% endtrans %}</p>
</div>
</div>
</div>
@@ -164,19 +165,25 @@
<p>
<div>
- {{ cctrans(locale, "license.jurisdiction_question")|safe }}
+ {% trans %}Jurisdiction of your license{% endtrans %}
<a href="" class="helpLink" id="jurisdiction">
<img src="{{ request.staticdirect('images/information.png') }}"
- alt="{{ cctrans(locale, 'Information')|safe }}"/>
+ alt="{% trans %}Information{% endtrans %}"/>
</a>
<div class="help-popover">
<div class="popover below">
<div class="arrow"></div>
<div class="inner">
- <h3 class="title">{{ cctrans(locale, "util.Jurisdiction")|safe }}</h3>
+ <h3 class="title">{% trans %}Jurisdiction{% endtrans %}</h3>
<a href="#" class="close">×</a>
<div class="content">
- <p>{{ cctrans(locale, "license.jurisdiction_help")|safe }}</p>
+ <p>{% trans %}Use the option "International" if you desire a license using language
+and terminology from international treaties. If the licenses have
+been ported to your jurisdiction and you feel that your jurisdiction's
+ported licenses account for some aspect of local legislation that the
+international licenses do not, then you may want to consider
+<a href="http://wiki.creativecommons.org/Frequently_Asked_Questions#Should_I_choose_an_international_license_or_a_ported_license.3F">which
+license is better suited for your needs</a>.{% endtrans %}</p>
</div>
</div>
</div>
@@ -192,7 +199,7 @@
{% if not requested_jurisdiction -%}
selected="selected"
{%- endif %}>
- {{ cctrans(locale, "util.International")|safe }}
+ {% trans %}International{% endtrans %}
</option>
{% for juris_code, juris_name in jurisdictions_names %}
@@ -220,7 +227,7 @@
<div>
<p>
<input type="submit" class="primary btn submit"
- value="{{ cctrans(locale, 'license.Select_a_License')|safe }}" />
+ value="{% trans %}Select a License{% endtrans %}" />
</p>
</div>
</form>
diff --git a/cc/engine/templates/chooser_pages/nonweb_popup.html b/cc/engine/templates/chooser_pages/nonweb_popup.html
index 67f8c29..b7e539f 100644
--- a/cc/engine/templates/chooser_pages/nonweb_popup.html
+++ b/cc/engine/templates/chooser_pages/nonweb_popup.html
@@ -9,23 +9,22 @@
<textarea cols="30" rows="8"
name="html" style="width:90%;height:150px;">
{%- if is_publicdomain -%}
- {{ cctrans(locale, "license.non_web_pd")|safe }}
+ {% trans %}This work is in the Public Domain. To view a copy of the public domain certification, visit http://creativecommons.org/licenses/publicdomain/ or send a letter to Creative Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.{% endtrans %}
{%- else -%}
- {{ cctrans(locale, "license.non_web_statement",
- license_name=license.title(target_lang),
- license_url=license.uri)|safe }}
+ {% trans license_name=license.title(target_lang),
+ license_url=license.uri %}This work is licensed under the Creative Commons {{ license_name }} License. To view a copy of this license, visit {{ license_url }} or send a letter to Creative Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.{% endtrans %}
{%- endif -%}
</textarea>
<p>
<input type="button" onclick="form.html.focus();form.html.select()"
- value="{{ cctrans(locale, 'util.Highlight_Text')|safe }}"
+ value="{% trans %}Highlight Text to Copy{% endtrans %}"
name="grab" />
</p>
</form>
<div align="center">
- <a href="javascript:window.close();">{{ cctrans(locale, "util.Close_window")|safe }}</a>
+ <a href="javascript:window.close();">{% trans %}Close window{% endtrans %}</a>
</div>
{% endblock %}
diff --git a/cc/engine/templates/chooser_pages/partner/index.html b/cc/engine/templates/chooser_pages/partner/index.html
index bdb0f26..5acfd9a 100644
--- a/cc/engine/templates/chooser_pages/partner/index.html
+++ b/cc/engine/templates/chooser_pages/partner/index.html
@@ -4,13 +4,17 @@
{% block body %}
<p>
- {{ cctrans(locale, "license.partner_what")|safe }}
+ {% trans %}Creative Commons licenses help you share your work while keeping
+your copyright. Other people can copy and distribute your work provided they
+<a href="http://creativecommons.org/characteristic/by?lang=en" onclick="window.open('http://creativecommons.org/characteristic/by?lang=en', 'characteristic_help', 'width=375,height=300,scrollbars=yes,resizable=yes,toolbar=no,directories=no,location=yes,menubar=no,status=yes');return false;">give
+you credit</a> -- and only on the conditions you specify here.
+This page helps you choose those conditions.
+{% endtrans %}
</p>
<p>
- {{ cctrans(locale, "license.partner.publicdomain_options",
- cc0_url="/choose/zero/partner?%s" % pd_get_params,
- pd_url="/choose/mark/partner?%s" % pd_get_params)|safe }}
+ {% trans cc0_url="/choose/zero/partner?%s" % pd_get_params,
+ pd_url="/choose/mark/partner?%s" % pd_get_params %}If you want to share a work you created with no conditions, choose <a href="{{ cc0_url }}">CC0</a>. If you're sharing a work that isn't covered by copyright or on which the copyright has expired, choose the <a href="{{ pd_url }}">Public Domain Mark</a>.{% endtrans %}
</p>
<form method="get" action="results-one">
@@ -24,35 +28,32 @@
<p>
<b>
- {{ cctrans(locale, "license.q2",
- lang=target_lang)|safe }}
+ {% trans lang=target_lang %}<strong>Allow commercial uses of your work?</strong> (<a href="/characteristic/nc?lang={{ lang }}" onclick="window.open('/characteristic/nc?lang={{ lang }}', 'characteristic_help', 'width=375,height=300,scrollbars=yes,resizable=yes,toolbar=no,directories=no,location=yes,menubar=no,status=yes');return false;">more info</a> <a href="/characteristic/nc?lang={{ lang }}" onclick="window.open('/characteristic/nc?lang={{ lang }}', 'characteristic_help', 'width=375,height=300,scrollbars=yes,resizable=yes,toolbar=no,directories=no,location=yes,menubar=no,status=yes');return false;"><img src="/images/popup.gif" width="15" height="13" alt="more information" border="0" /></a>){% endtrans %}
</b>
<br />
<input type="radio" checked name="field_commercial"
- value="y" /> {{ cctrans(locale, "util.Yes")|safe }} <br />
+ value="y" /> {% trans %}Yes{% endtrans %} <br />
<input type="radio" name="field_commercial"
- value="n" /> {{ cctrans(locale, "util.No")|safe }} <br />
+ value="n" /> {% trans %}No{% endtrans %} <br />
</p>
<p>
<b>
- {{ cctrans(locale, "license.q3",
- lang=target_lang)|safe }}
+ {% trans lang=target_lang %}<strong>Allow modifications of your work?</strong> (<a href="/characteristic/nd?lang={{ lang }}" onclick="window.open('/characteristic/nd?lang={{ lang }}', 'characteristic_help', 'width=375,height=300,scrollbars=yes,resizable=yes,toolbar=no,directories=no,location=yes,menubar=no,status=yes');return false;">more info</a> <a href="/characteristic/nd?lang={{ lang }}" onclick="window.open('/characteristic/nd?lang={{ lang }}', 'characteristic_help', 'width=375,height=300,scrollbars=yes,resizable=yes,toolbar=no,directories=no,location=yes,menubar=no,status=yes');return false;"><img src="/images/popup.gif" width="15" height="13" alt="more information" border="0" /></a>){% endtrans %}
</b>
<br />
<input type="radio" checked name="field_derivatives" value="y" />
- {{ cctrans(locale, "util.Yes")|safe }}
+ {% trans %}Yes{% endtrans %}
<br />
<input type="radio" name="field_derivatives" value="sa" />
- {{ cctrans(locale, "license.a6",
- lang=target_lang)|safe }}
+ {% trans lang=target_lang %}Yes, as long as others share alike (<a href="/characteristic/sa?lang={{ lang }}" onclick="window.open('/characteristic/sa?lang={{ lang }}', 'characteristic_help', 'width=375,height=300,scrollbars=yes,resizable=yes,toolbar=no,directories=no,location=yes,menubar=no,status=yes');return false;">more info</a> <a href="/characteristic/sa?lang={{ lang }}" onclick="window.open('/characteristic/sa?lang={{ lang }}', 'characteristic_help', 'width=375,height=300,scrollbars=yes,resizable=yes,toolbar=no,directories=no,location=yes,menubar=no,status=yes');return false;"><img src="/images/popup.gif" width="15" height="13" alt="more information" border="0" /></a>){% endtrans %}
<br />
<input type="radio" name="field_derivatives" value="n" />
- {{ cctrans(locale, "util.No")|safe }}
+ {% trans %}No{% endtrans %}
<br />
{% if not show_jurisdiction and requested_jurisdiction %}
@@ -66,7 +67,7 @@
{% if show_jurisdiction %}
<p>
- {{ cctrans(locale, "license.jurisdiction_question")|safe }}
+ {% trans %}Jurisdiction of your license{% endtrans %}
(<a href="http://creativecommons.org/choose/jurisdiction-popup?lang=en"
onclick="window.open('http://creativecommons.org/choose/jurisdiction-popup?lang=en', 'characteristic_help', 'width=375,height=300,scrollbars=yes,resizable=yes,toolbar=no,directories=no,location=yes,menubar=no,status=yes');return false;"
>more info</a>
@@ -78,7 +79,7 @@
<br />
<select name="field_jurisdiction">
- <option value="" selected="selected">{{ cctrans(locale, "util.International")|safe }}</option>
+ <option value="" selected="selected">{% trans %}International{% endtrans %}</option>
{% for juris_code, juris_name in jurisdictions_names %}
<option value="{{ juris_code }}">
@@ -91,9 +92,14 @@
<p>
<input type="submit"
- value="{{ cctrans(locale, 'license.Select_a_License')|safe }}" />
+ value="{% trans %}Select a License{% endtrans %}" />
</p>
</form>
- {{ cctrans(locale, "license.partner_note")|safe }}
+ {% trans %}<p>
+<em>Note:</em> To license a work, you must be its copyright holder or have express authorization from its copyright holder to do so.</p>
+
+<p>
+Creative Commons does not provide legal advice or services. We provide form legal documents; the rest is up to you.
+</p>{% endtrans %}
{% endblock %}
diff --git a/cc/engine/templates/chooser_pages/partner/results.html b/cc/engine/templates/chooser_pages/partner/results.html
index 7a2b85e..597fedd 100644
--- a/cc/engine/templates/chooser_pages/partner/results.html
+++ b/cc/engine/templates/chooser_pages/partner/results.html
@@ -4,14 +4,14 @@
{% block body %}
<p>
- {{ cctrans(locale, "license.partner_selected",
- license_deed_url=license.uri,
- license_pretty_name=license.title(target_lang),
- license_url=license.uri)|safe }}
+ {% trans license_deed_url=license.uri,
+ license_pretty_name=license.title(target_lang),
+ license_url=license.uri %}You have selected the <a target="cc_other" href="{{ license_deed_url }}"><b>{{ license_pretty_name }} License</b></a>.<br>
+This license is permanently located at<br>
+<b><tt>{{ license_url }}</tt></b>.{% endtrans %}
</p>
<p>
- {{ cctrans(locale, "license.you_may_proceed",
- processed_exit_url=exit_url)|safe }}
+ {% trans processed_exit_url=exit_url %}You may now <a href="{{ processed_exit_url }}">proceed</a>{% endtrans %}
</p>
{% endblock %}
diff --git a/cc/engine/templates/chooser_pages/pdmark/details.html b/cc/engine/templates/chooser_pages/pdmark/details.html
index abe3803..3f2e575 100644
--- a/cc/engine/templates/chooser_pages/pdmark/details.html
+++ b/cc/engine/templates/chooser_pages/pdmark/details.html
@@ -15,10 +15,10 @@
<div id="waiver_ui" class="yui-module">
<div class="bd">
<p><div>
- {{ cctrans(locale, "license.mark.additional_metadata")|safe }}
+ {% trans %}These fields are optional, but will be embedded in the HTML generated for the work you are marking. This allows users of the work to locate the work online and find out where to go for more information.{% endtrans %}
<a href="" id="embedded_metadata" class="helpLink">
<img src="{{ request.staticdirect('/images/information.png') }}"
- alt="{{ cctrans(locale, 'Information')|safe }}"/></a>
+ alt="{% trans %}Information{% endtrans %}"/></a>
<div class="help-popover">
<div class="popover below">
<div class="arrow"></div>
@@ -36,23 +36,23 @@
</p>
<div id="help_embedded_metadata" class="help_panel">
- <div class="hd">{{ cctrans(locale, "Embedded Metadata")|safe }}</div>
+ <div class="hd">{% trans %}Embedded Metadata{% endtrans %}</div>
<div class="bd">
- {{ cctrans(locale, "license.mark.metadata_help")|safe }}
+ {% trans %}<p> The information is embedded in a software readable format. This allows search engines to index additional information about the marked work. </p> <p> <a href="http://wiki.creativecommons.org/Metadata">More information</a> on Creative Commons metadata is available if you want to find out more. </p>{% endtrans %}
</div>
</div>
<form id="form-details" action="./results">
<div class="form-section">
- <h3>{{ cctrans(locale, "util.work_information")|safe }}</h3>
+ <h3>{% trans %}Work Information{% endtrans %}</h3>
<div class="form-row">
- <div class="form-question">{{ cctrans(locale, "util.work_name")|safe }}</div>
+ <div class="form-question">{% trans %}Work name{% endtrans %}</div>
<div class="form-answer">
<input name="work_title" class="form-field"/>
<br />
<div class="form-field-description">
- {{ cctrans(locale, "license.mark.work_title")|safe }}
+ {% trans %}This is usually the title of the work given by the author, or if none the name associated with the work by the person identifying the work.{% endtrans %}
</div>
</div>
</div>
@@ -60,26 +60,26 @@
<div style="clear:both;"></div>
<div class="form-section">
- <h3>{{ cctrans(locale, "util.author")|safe }}</h3>
+ <h3>{% trans %}Author{% endtrans %}</h3>
<div class="form-row">
- <div class="form-question">{{ cctrans(locale, "util.author_name")|safe }}</div>
+ <div class="form-question">{% trans %}Author name{% endtrans %}</div>
<div class="form-answer">
<input name="author_title" class="form-field"/>
<br />
<div class="form-field-description">
- {{ cctrans(locale, "license.mark.author_help")|safe }}
+ {% trans %}You may list multiple authors. If unknown, you may wish to state 'unknown'.{% endtrans %}
</div>
</div>
</div>
<div class="form-row">
- <div class="form-question">{{ cctrans(locale, "util.author_url")|safe }}</div>
+ <div class="form-question">{% trans %}Author URL{% endtrans %}</div>
<div class="form-answer">
<input name="author_href" class="form-field"/>
<br />
<div class="form-field-description">
- {{ cctrans(locale, "license.mark.author_url_help")|safe }}
+ {% trans %}This may be the URL where the author published the work online, or the URL where the work is published by the person identifying the work.{% endtrans %}
</div>
</div>
</div>
@@ -87,25 +87,25 @@
<div style="clear:both;"></div>
<div class="form-section">
- <h3>{{ cctrans(locale, "util.identifying_party")|safe }}</h3>
+ <h3>{% trans %}Identifying Individual or Organization{% endtrans %}</h3>
<div class="form-row">
- <div class="form-question">{{ cctrans(locale, "util.name")|safe }}</div>
+ <div class="form-question">{% trans %}Name{% endtrans %}</div>
<div class="form-answer">
<input name="curator_title" class="form-field"/>
<br />
<div class="form-field-description">
- {{ cctrans(locale, "license.mark.curator_help")|safe }}
+ {% trans %}Identify yourself here.{% endtrans %}
</div>
</div>
</div>
<div class="form-row">
- <div class="form-question">{{ cctrans(locale, "util.url")|safe }}</div>
+ <div class="form-question">{% trans %}URL{% endtrans %}</div>
<div class="form-answer">
<input name="curator_href" class="form-field"/>
<div class="form-field-description">
- {{ cctrans(locale, "license.mark.curator_href_help")|safe }}
+ {% trans %}This may be your main website or the information page about you on a hosting website, such as Flickr Commons.{% endtrans %}
</div>
</div>
</div>
@@ -120,7 +120,7 @@
<div class="form-question"> </div>
<div class="form-answer">
<input type="submit" id="submit" class="btn"
- name="field1" value="{{ cctrans(locale, 'util.continue')|safe }}" />
+ name="field1" value="{% trans %}continue{% endtrans %}" />
</div>
</div>
diff --git a/cc/engine/templates/chooser_pages/pdmark/index.html b/cc/engine/templates/chooser_pages/pdmark/index.html
index f37df98..d078b4f 100644
--- a/cc/engine/templates/chooser_pages/pdmark/index.html
+++ b/cc/engine/templates/chooser_pages/pdmark/index.html
@@ -15,27 +15,27 @@
<div id="page-welcome">
<div class="bd">
<div class="pd-explain-differences">
- {{ cctrans(locale, "license.mark.CC0-difference")|safe }}
+ {% trans %}You are using a tool for labeling works that are free of known copyright restrictions. Creative Commons does not recommend this tool for works that are restricted by copyright laws in one or more jurisdictions. If you want to free <b>your own work</b> of copyright restrictions, instead use the <b><a href="/choose/zero/">CC0 public domain dedication</a></b>.{% endtrans %}
</div>
<p>
- {{ cctrans(locale, "license.mark.intro_1")|safe }}
+ {% trans %}Using the Public Domain Mark, you can mark a work that is free of known copyright restrictions and clearly convey that status. When applied properly, the PDM allows the work to be easily discovered, and provides valuable information about the work.{% endtrans %}
</p>
<p>
- {{ cctrans(locale, "license.mark.intro_2")|safe }}
+ {% trans %}The PDM is intended for use with old works that are free of copyright restrictions around the world, or works that have been affirmatively placed in the worldwide public domain prior to the expiration of copyright by the rightsâ holder. It should not be used to mark works that are in the public domain in some jurisdictions while known to be restricted by copyright in others. Currently, Creative Commons does not recommend the Public Domain Mark for works whose copyright status differs jurisdiction to jurisdiction, though we are developing means for marking and tagging such works. You should consult with your legal advisor if you are unsure whether you should use the PDM for a work you have identified.{% endtrans %}
</p>
<p>
- {{ cctrans(locale, "license.mark.intro_3")|safe }}
+ {% trans %}Please note that this is <strong>not a registration process</strong> and Creative Commons does not store or save any of the information you provide. This tool guides you through the process of generating HTML with embedded metadata for marking the work you have identified as free of known copyright restrictions. The work will not be associated with a Public Domain Mark until you publish it marked as being so.{% endtrans %}
</p>
<p>
<a class="btn" id="do-learn-more"
- href="/about/pdm">{{ cctrans(locale, "util.learn_more")|safe }}</a>
+ href="/about/pdm">{% trans %}Learn more{% endtrans %}</a>
<a class="primary btn" href="/choose/mark/details{% if target_lang %}?lang={{ target_lang }}{% endif %}"
- id="do-begin">{{ cctrans(locale, "util.begin")|safe }} »</a>
+ id="do-begin">{% trans %}begin{% endtrans %} »</a>
</p>
{% include "includes/engine_languages.html" %}
diff --git a/cc/engine/templates/chooser_pages/pdmark/partner.html b/cc/engine/templates/chooser_pages/pdmark/partner.html
index c292d39..ef4c47e 100644
--- a/cc/engine/templates/chooser_pages/pdmark/partner.html
+++ b/cc/engine/templates/chooser_pages/pdmark/partner.html
@@ -3,27 +3,25 @@
{% block title %}Choose a License{% endblock title %}
{% block body %}
- <h1>{{ cctrans(locale, "license.confirm_choice")|safe }}</h1>
+ <h1>{% trans %}confirm choice{% endtrans %}</h1>
<p>
- {{ cctrans(locale, "license.mark.intro_1")|safe }}
+ {% trans %}Using the Public Domain Mark, you can mark a work that is free of known copyright restrictions and clearly convey that status. When applied properly, the PDM allows the work to be easily discovered, and provides valuable information about the work.{% endtrans %}
</p>
<p>
- {{ cctrans(locale, "license.mark.intro_2")|safe }}
+ {% trans %}The PDM is intended for use with old works that are free of copyright restrictions around the world, or works that have been affirmatively placed in the worldwide public domain prior to the expiration of copyright by the rightsâ holder. It should not be used to mark works that are in the public domain in some jurisdictions while known to be restricted by copyright in others. Currently, Creative Commons does not recommend the Public Domain Mark for works whose copyright status differs jurisdiction to jurisdiction, though we are developing means for marking and tagging such works. You should consult with your legal advisor if you are unsure whether you should use the PDM for a work you have identified.{% endtrans %}
</p>
<p>
- {{ cctrans(locale, "license.mark.intro_3")|safe }}
+ {% trans %}Please note that this is <strong>not a registration process</strong> and Creative Commons does not store or save any of the information you provide. This tool guides you through the process of generating HTML with embedded metadata for marking the work you have identified as free of known copyright restrictions. The work will not be associated with a Public Domain Mark until you publish it marked as being so.{% endtrans %}
</p>
<p>
- {{ cctrans(locale, "license.partner.mark.use_cc0_instead",
- pd_url="/choose/zero/partner?" + get_params)|safe }}
+ {% trans pd_url="/choose/zero/partner?" + get_params %}If you want to free <em>your own work</em> of copyright restrictions, instead use the <a href="{{ pd_url }}">CC0 public domain dedication</a>.{% endtrans %}
</p>
<p>
- {{ cctrans(locale, "license.you_may_proceed",
- processed_exit_url=exit_url)|safe }}
+ {% trans processed_exit_url=exit_url %}You may now <a href="{{ processed_exit_url }}">proceed</a>{% endtrans %}
</p>
{% endblock %}
diff --git a/cc/engine/templates/chooser_pages/pdmark/results.html b/cc/engine/templates/chooser_pages/pdmark/results.html
index 576efb1..4ad3840 100644
--- a/cc/engine/templates/chooser_pages/pdmark/results.html
+++ b/cc/engine/templates/chooser_pages/pdmark/results.html
@@ -16,7 +16,7 @@
<div id="results">
<div class="bd" id="waiver-results">
<p>
- {{ cctrans(locale, "license.mark.choose_button")|safe }}
+ {% trans %}Choose which style of button you would like to appear by the work on the webpage:{% endtrans %}
</p>
<div class="licensebox" align="center">
@@ -40,41 +40,39 @@
</div>
<span id="waiver-results-leadin">
- {{ cctrans(locale, "license.mark.preview_waiver")|safe }}
+ {% trans %}Here's a preview of how the mark will appear on the website:{% endtrans %}
</span>
<div class="preview"
id="results-preview">{{ rdfa|safe }}</div>
- <h3>{{ cctrans(locale, "license.have_your_own_website")|safe }}</h3>
+ <h3>{% trans %}Have your own website?{% endtrans %}</h3>
<p>
- {{ cctrans(locale, "license.mark.copy_text")|safe }}
+ {% trans %}Copy the text below to your website to let your visitors know that the work identified by you is free of known copyright restrictions. Creative Commons does not maintain a record of the work you have identified using the Public Domain Mark. It is up to you to let people know that you have identified the work using the mark.{% endtrans %}
</p>
<textarea id="codetocopy" cols="70" rows="6" style="width: 100%"
onfocus="select()">{{ rdfa }}</textarea>
<div class="more-metadata-container">
- <h3 style="margin-top:0;">{{ cctrans(locale, "license.zero.send_email")|safe }}</h3>
+ <h3 style="margin-top:0;">{% trans %}Send Email{% endtrans %}</h3>
{% if email_requested %}
{% if successful_send %}
<div>
<p>
- {{ cctrans(locale, "license.zero.email_sent",
- email_addr=email_addr)|safe }}
+ {% trans email_addr=email_addr %}The suggested HTML has been sent to {{ email_addr }}.{% endtrans %}
</p>
</div>
{% else %}
<div class="more-metadata-container error">
- {{ cctrans(locale, "license.zero.email_error",
- email_addr=email_addr)|safe }}
+ {% trans email_addr=email_addr %}An error occurred when we tried to send the email message; you can try clicking the Back button and double checking your email address. If the address you used ({{ email_addr }}) was correct you can <a href="/about/contact">contact us</a>.{% endtrans %}
</div>
{% endif %}
{% else %}
<p>
- {{ cctrans(locale, "license.mark.send_email_updates")|safe }}
+ {% trans %}If you'd like to get the HTML with embedded metadata via email, fill in your email address below.{% endtrans %}
</p>
<form action="{{ request.path_info }}" method="post">
@@ -83,12 +81,12 @@
{% endfor %}
<div class="more-metadata">
- <div>{{ cctrans(locale, "util.your_email")|safe }}</div>
+ <div>{% trans %}your email{% endtrans %}</div>
<input type="textbox" name="email" />
</div>
<input id="do-send-email" type="submit" class="btn"
- value="{{ cctrans(locale, 'util.Send')|safe }}" />
+ value="{% trans %}Send{% endtrans %}" />
</form>
{% endif %}
diff --git a/cc/engine/templates/chooser_pages/publicdomain/publicdomain-2.html b/cc/engine/templates/chooser_pages/publicdomain/publicdomain-2.html
index 3e3db74..363d290 100644
--- a/cc/engine/templates/chooser_pages/publicdomain/publicdomain-2.html
+++ b/cc/engine/templates/chooser_pages/publicdomain/publicdomain-2.html
@@ -1,30 +1,40 @@
{% extends "macros_templates/engine.html" %}
{% block title %}
- {{ cctrans(locale, "util.public_domain_certification")|safe }}
+ {% trans %}Public Domain Certification{% endtrans %}
{% endblock title %}
{% block page_header_title %}
- {{ cctrans(locale, "license.pd.identify_a_pd_work")|safe }}
+ {% trans %}Identify a Public Domain Work{% endtrans %}
{% endblock page_header_title %}
{% block body %}
<p>
<i>
- {{ cctrans(locale, "license.pd.retired")|safe }}
+ {% trans %}Creative Commons has <a href="http://creativecommons.org/retiredlicenses">retired this legal tool</a>. CC recommends using a <a href="http://creativecommons.org/publicdomain">current tool</a> for waiving rights or identifying public domain works.{% endtrans %}
</i>
</p>
<p>
- {{ cctrans(locale, "license.pd.intro_1")|safe }}
+ {% trans %}You have selected the Public Domain Certification. The Public
+ Domain Certification should only be used to certify a work that is
+ already in the public domain. Creative Commons does not recommend
+ you use the Public Domain Certification for dedicating a work
+ still protected by copyright to the public domain. To dedicate a
+ work to the public domain, consider
+ using <a href="/license/zero/">CC0</a>. Please note that if you
+ use the Public Domain Certification to dedicate a work to the
+ public domain, it may not be valid outside of the United States.{% endtrans %}
</p>
<p>
- {{ cctrans(locale, "license.pd.intro_3")|safe }}
+ {% trans %}Once you're done filling this out, you will still have the
+ opportunity to confirm your choice before the certification
+ happens.{% endtrans %}
</p>
<h3>
- {{ cctrans(locale, "license.pd.about_the_work")|safe }}
+ {% trans %}About the work you are certifying{% endtrans %}
</h3>
<form id="publicdomain"
@@ -37,14 +47,14 @@
<tbody>
<tr>
<td align="right">
- {{ cctrans(locale, "util.title_of_work")|safe }}
+ {% trans %}Title of work{% endtrans %}
</td>
<td><input type="text" name="title" value="" />
</td>
</tr>
<tr>
<td align="right">
- {{ cctrans(locale, "util.author")|safe }}
+ {% trans %}Author{% endtrans %}
</td>
<td><input type="text" name="copyright_holder" value="" />
</td>
@@ -53,7 +63,7 @@
<td align="right"> </td>
<td>
<input type="submit" class="btn"
- value="{{ cctrans(locale, 'util.proceed')|safe }}" /></td>
+ value="{% trans %}proceed{% endtrans %}" /></td>
</tr>
</tbody>
</table>
diff --git a/cc/engine/templates/chooser_pages/publicdomain/publicdomain-3.html b/cc/engine/templates/chooser_pages/publicdomain/publicdomain-3.html
index 9f87c3b..9eadd6a 100644
--- a/cc/engine/templates/chooser_pages/publicdomain/publicdomain-3.html
+++ b/cc/engine/templates/chooser_pages/publicdomain/publicdomain-3.html
@@ -1,7 +1,7 @@
{% extends "macros_templates/engine.html" %}
{% block title %}
- {{ cctrans(locale, "util.public_domain_certification")|safe }}
+ {% trans %}Public Domain Certification{% endtrans %}
{% endblock title %}
{% block headers %}
@@ -27,7 +27,7 @@
{% endblock %}
{% block page_header_title %}
- {{ cctrans(locale, "license.pd.confirm_title")|safe }}
+ {% trans %}Confirm Your Public Domain Certification{% endtrans %}
{% endblock %}
{% block body %}
@@ -36,10 +36,17 @@
<form id="form-details" class="form-stacked" action="./publicdomain-4">
<div class="licensebox" style="clear:both;">
<h4>
- {{ cctrans(locale, "deed.pd.title_plain")|safe }}
+ {% trans %}Copyright-Only Dedication (based on United States law)
+or Public Domain Certification{% endtrans %}
</h4>
- {{ cctrans(locale, "deed.pd")|safe }}
+ {% trans %} <p>The person or persons who have associated work with this document (the "Dedicator" or "Certifier") hereby either (a) certifies that, to the best of his knowledge, the work of authorship identified is in the public domain of the country from which the work is published, or (b) hereby dedicates whatever copyright the dedicators holds in the work of authorship identified below (the "Work") to the public domain. A certifier, moreover, dedicates any copyright interest he may have in the associated work, and for these purposes, is described as a "dedicator" below.</p>
+
+ <p>A certifier has taken reasonable steps to verify the copyright status of this work. Certifier recognizes that his good faith efforts may not shield him from liability if in fact the work certified is not in the public domain.</p>
+
+ <p>Dedicator makes this dedication for the benefit of the public at large and to the detriment of the Dedicator's heirs and successors. Dedicator intends this dedication to be an overt act of relinquishment in perpetuity of all present and future rights under copyright law, whether vested or contingent, in the Work. Dedicator understands that such relinquishment of all rights includes the relinquishment of all rights to enforce (by lawsuit or otherwise) those copyrights in the Work.</p>
+
+ <p>Dedicator recognizes that, once placed in the public domain, the Work may be freely reproduced, distributed, transmitted, used, modified, built upon, or otherwise exploited by anyone for any purpose, commercial or non-commercial, and in any way, including by methods that have not yet been invented or conceived.</p>{% endtrans %}
</div>
{% if request_form.get('lang', False) %}
@@ -55,7 +62,9 @@
</div>
<div class="form-answer">
<label for="understand">
- {{ cctrans(locale, "license.pdc.confirm_reading")|safe }}
+ {% trans %}I have read and understand the terms and intended legal
+ effect of this tool, and hereby voluntarily elect to apply it to
+ this work.{% endtrans %}
</label>
</div>
</div>
@@ -64,7 +73,7 @@
<div class="form-question"> </div>
<div class="form-answer">
<input type="submit" id="details-submit" disabled="" class="btn"
- name="field1" value="{{ cctrans(locale, 'util.continue')|safe }}" />
+ name="field1" value="{% trans %}continue{% endtrans %}" />
</div>
</div>
diff --git a/cc/engine/templates/chooser_pages/publicdomain/publicdomain-4.html b/cc/engine/templates/chooser_pages/publicdomain/publicdomain-4.html
index 31270fb..28b7331 100644
--- a/cc/engine/templates/chooser_pages/publicdomain/publicdomain-4.html
+++ b/cc/engine/templates/chooser_pages/publicdomain/publicdomain-4.html
@@ -1,20 +1,20 @@
{% extends "macros_templates/engine.html" %}
{% block title %}
- {{ cctrans(locale, "util.public_domain_certification")|safe }}
+ {% trans %}Public Domain Certification{% endtrans %}
{% endblock title %}
{% block page_header_title %}
- {{ cctrans(locale, "license.pd.identify_a_pd_work")|safe }}
+ {% trans %}Identify a Public Domain Work{% endtrans %}
{% endblock %}
{% block body %}
<p>
- {{ cctrans(locale, "license.mark_pd")|safe }}
+ {% trans %}Now that you've chosen the Public Domain Certification, you should mark the work in the appropriate way.{% endtrans %}
</p>
<div>
- {{ cctrans(locale, "license.mark_web")|safe }}
+ {% trans %}To mark content on a web page, the HTML to display the button is as follows and be sure to <a href="/technology/web">follow the guidelines here</a>:{% endtrans %}
<br /><br />
<div class="textbox">
@@ -27,11 +27,11 @@
<input type="button"
class="btn"
onclick="form.html.focus();form.html.select()"
- value="{{ cctrans(locale, 'util.Highlight_Text')|safe }}"
+ value="{% trans %}Highlight Text to Copy{% endtrans %}"
name="grab" />
[<a href="work-html-popup?licensecode=pd&pd=true"
onclick="window.open('work-html-popup?licensecode=pd&pd=true', 'html_help', 'width=400,height=350,scrollbars=yes,resizable=yes,toolbar=no,directories=no,location=yes,menubar=no,status=yes');return false;"
- >{{ cctrans(locale, "license.get_html_email")|safe }}</a>]
+ >{% trans %}Get HTML and email it to yourself{% endtrans %}</a>]
</p>
</form>
@@ -40,7 +40,6 @@
</div>
<p>
- {{ cctrans(locale, "license.pd.to_mark_nonweb",
- url_vars="pd=1&field_creator=%s&field_worktitle=%s" % (request_form.get('copyright_holder', ''), request_form.get('title', '')))|safe }}
+ {% trans url_vars="pd=1&field_creator=%s&field_worktitle=%s" % (request_form.get('copyright_holder', ''), request_form.get('title', '')) %}To mark a document not on the web, <a href="non-web-popup?{{ url_vars }}" onclick="window.open('non-web-popup?{{ url_vars }}', 'html_help', 'width=400,height=350,scrollbars=yes,resizable=yes,toolbar=no,directories=no,location=yes,menubar=no,status=yes');return false;">add this text</a> to your work.{% endtrans %}
</p>
{% endblock %}
diff --git a/cc/engine/templates/chooser_pages/results.html b/cc/engine/templates/chooser_pages/results.html
index 06da331..218fe81 100644
--- a/cc/engine/templates/chooser_pages/results.html
+++ b/cc/engine/templates/chooser_pages/results.html
@@ -16,7 +16,7 @@
{% block body %}
<p>
- {{ cctrans(locale, "license.choose_button")|safe }}
+ {% trans %}Choose which style of button you'd like on your webpage:{% endtrans %}
</p>
<div class="licensebox">
@@ -52,7 +52,7 @@
</div>
<div>
- {{ cctrans(locale, "license.preview")|safe }}
+ {% trans %}Here's a preview of how your license will appear on your site:{% endtrans %}
</div>
<div class="preview" id="results-preview">
@@ -62,10 +62,10 @@
</div>
<div style="margin-top:20px;margin-bottom:30px;">
- <h4>{{ cctrans(locale, "license.have_your_own_website")|safe }}</h4>
+ <h4>{% trans %}Have your own website?{% endtrans %}</h4>
<p>
- {{ cctrans(locale, "license.copy_text")|safe }}
+ {% trans %}Copy the text below to your Web site to let your visitors know what license applies to your works.{% endtrans %}
</p>
<form action="">
@@ -79,11 +79,10 @@
<p>
<span>
- {{ cctrans(locale, "license.select_text",
- url_vars=request.query_string)|safe }}
+ {% trans url_vars=request.query_string %}Select the contents of the box above and copy it. Or, have it <a href="/license/work-html-popup?{{ url_vars }}" onclick="window.open('work-html-popup?{{ url_vars }}', 'html_help', 'width=400,height=350,scrollbars=yes,resizable=yes,toolbar=no,directories=no,location=yes,menubar=no,status=yes');return false;">emailed to yourself.</a>{% endtrans %}
</span>
<strong>
- {{ cctrans(locale, "license.read_tutorial")|safe }}
+ {% trans %}Need more help? <a href="http://wiki.creativecommons.org/Website/Publish">Read our tutorial</a>.{% endtrans %}
</strong>
</p>
@@ -91,7 +90,7 @@
<div>
<a href="https://creativecommons.net/donate/"><img src="/images/support/2010/cc-support.png" alt="Donate" title="Donate" border="0"/></a></div>
<p>
- {{ cctrans(locale, "license.donate_message")|safe }}
+ {% trans %}Creative Commons is a non-profit organization.<br /> We need your support to continue providing these tools.<br /> <a href="https://creativecommons.net/donate/">Donate today!</a>{% endtrans %}
</p>
</div>
</div>
@@ -103,34 +102,32 @@
{% block sidebar %}
<p>
- {{ cctrans(locale, "license.learn_share")|safe }}
+ {% trans %}Share your work with an existing community that has enabled Creative Commons licensing.{% endtrans %}
</p>
<p>
- {{ cctrans(locale, "license.learn_where_to_publish")|safe }}
+ {% trans %}Learn where to <a href="http://wiki.creativecommons.org/Publish">publish</a> your <a href="http://wiki.creativecommons.org/Publish/Images">images</a>, <a href="http://wiki.creativecommons.org/Publish/Audio">audio</a>, <a href="http://wiki.creativecommons.org/Publish/Video">video</a>, and <a href="http://wiki.creativecommons.org/Publish/Text">text</a>, including <a href="http://wiki.creativecommons.org/Publish/Text#Blog">blogs</a>.{% endtrans %}
</p>
- <h4>{{ cctrans(locale, "license.offline_work")|safe }}</h4>
+ <h4>{% trans %}Offline Work?{% endtrans %}</h4>
<ul class="unstyled">
<li>
<span>
- {{ cctrans(locale, "license.mark_nonweb",
- url_vars=request.query_string)|safe }}
+ {% trans url_vars=request.query_string %}To mark a document not on the web, <a href="non-web-popup?{{ url_vars }}" onclick="window.open('non-web-popup?{{ url_vars }}', 'html_help', 'width=400,height=350,scrollbars=yes,resizable=yes,toolbar=no,directories=no,location=yes,menubar=no,status=yes');return false;">add this text</a> to your work.{% endtrans %}
</span>
</li>
<li>
- {{ cctrans(locale, "license.xmp_metadata",
- url_vars=request.query_string)|safe }}
+ {% trans url_vars=request.query_string %}Get <a href="/choose/metadata.xmp?{{ url_vars }}">metadata</a> for documents that <a href="http://wiki.creativecommons.org/XMP">support XMP</a>.{% endtrans %}
</li>
<li>
<a href="http://creativecommons.org/about/downloads/">
- {{ cctrans(locale, "license.get_high_res")|safe }}
+ {% trans %}Get high resolution and vector versions of the license graphics.{% endtrans %}
</a>
</li>
<li>
<a href="http://wiki.creativecommons.org/Marking/Creators#Marking_Specific_Media">
- {{ cctrans(locale, "license.mark_video")|safe }}
+ {% trans %}Learn how to mark video and other formats.{% endtrans %}
</a>
</li>
</ul>
diff --git a/cc/engine/templates/chooser_pages/zero/confirm.html b/cc/engine/templates/chooser_pages/zero/confirm.html
index de5f86b..0be5164 100644
--- a/cc/engine/templates/chooser_pages/zero/confirm.html
+++ b/cc/engine/templates/chooser_pages/zero/confirm.html
@@ -10,7 +10,7 @@
{% block sidebar %}{% endblock %}
{% block page_header_title %}
- CC0: {{ cctrans(locale, "license.zero.confirm_title")|safe }}
+ CC0: {% trans %}Confirm Waiver{% endtrans %}
{% endblock %}
{% block body %}
@@ -23,15 +23,15 @@
<div id="confirm-waiver">
<div class="bd">
<p>
- {{ cctrans(locale, "license.zero.confirm_waiver_1")|safe }}
+ {% trans %}Are you certain you wish to waive all rights to your work? Once these rights are waived, you cannot reclaim them.{% endtrans %}
</p>
<p>
- {{ cctrans(locale, "license.zero.confirm_waiver_2")|safe }}
+ {% trans %}In particular, if you are an artist or author who depends upon copyright for your income, Creative Commons <strong>does not recommend</strong> that you use this tool.{% endtrans %}
</p>
<p>
- {{ cctrans(locale, "license.zero.confirm_waiver_3")|safe }}
+ {% trans %}If you don't own the rights to this work, then do not use CC0. If you believe that nobody owns rights to the work, then the <a href="/choose/mark/">Public Domain Mark</a> may be what you're looking for.{% endtrans %}
</p>
<div class="form-row">
@@ -40,7 +40,7 @@
<button type="submit" id="decline-submit" class="btn"
name="waiver-decline"
value="decline">
- {{ cctrans(locale, "license.zero.confirm_waiver_no")|safe }}
+ {% trans %}No, I Do Not Waive{% endtrans %}
</button>
</span>
</span>
@@ -50,7 +50,7 @@
<button type="submit" id="confirm-submit"
name="waiver-affirm" class="btn danger"
value="affirm">
- {{ cctrans(locale, "license.zero.confirm_waiver_yes")|safe }}
+ {% trans %}Yes, I Waive{% endtrans %}
</button>
</span>
</span>
diff --git a/cc/engine/templates/chooser_pages/zero/index.html b/cc/engine/templates/chooser_pages/zero/index.html
index f9b6963..6d5c9a9 100644
--- a/cc/engine/templates/chooser_pages/zero/index.html
+++ b/cc/engine/templates/chooser_pages/zero/index.html
@@ -16,33 +16,42 @@
<div id="page-welcome">
<div class="bd">
<div class="pd-explain-differences">
- {{ cctrans(locale, "license.zero.PDM-difference")|safe }}
+ {% trans %}You are using a tool for freeing your own work of copyright restrictions around the world. You may use this tool even if your work is free of copyright in some jurisdictions, if you want to want to ensure it is free everywhere. Creative Commons does not recommend this tool for works that are already in the public domain worldwide, instead use the <b><a href="/choose/mark/">Public Domain Mark</a></b> for such works.{% endtrans %}
</div>
<p>
- {{ cctrans(locale, "license.zero.intro_1")|safe }}
+ {% trans %}Using CC0, you can waive all copyrights and related or
+ neighboring rights that you have over your work, such as
+ your moral rights (to the extent waivable), your publicity
+ or privacy rights, rights you have protecting against unfair
+ competition, and database rights and rights protecting the
+ extraction, dissemination and reuse of data.{% endtrans %}
</p>
<p>
- {{ cctrans(locale, "license.zero.intro_2")|safe }}
+ {% trans %}Keep in mind that you cannot waive rights to a work that you
+ do not own unless you have permission from the owner. To
+ avoid infringing third party rights, you should consult with
+ your legal advisor if you are unsure whether you have all
+ the rights you need to distribute the work.{% endtrans %}
</p>
<p>
- {{ cctrans(locale, "license.zero.intro_3")|safe }}
+ {% trans %}Please note that this is <strong>not a registration process</strong> and Creative Commons does not store or save any of the information you enter. This tool guides you through the process of generating HTML with embedded metadata for marking your work as being available under CC0. Your work will not be associated with CC0 or made available under CC0 until you publish it marked as being so.{% endtrans %}
</p>
<p>
<a id="do-learn-more" class="btn"
- href="/about/cc0">{{ cctrans(locale, "util.learn_more")|safe }}</a>
+ href="/about/cc0">{% trans %}Learn more{% endtrans %}</a>
{% if request.GET.has_key('lang') %}
<a id="do-begin" class="primary btn"
href="{{ '/choose/zero/waiver?lang=' + target_lang }}">
- {{ cctrans(locale, "util.begin")|safe }} »
+ {% trans %}begin{% endtrans %} »
</a>
{% else %}
<a id="do-begin" class="primary btn" href="/choose/zero/waiver">
- {{ cctrans(locale, "util.begin")|safe }} »
+ {% trans %}begin{% endtrans %} »
</a>
{% endif %}
</p>
diff --git a/cc/engine/templates/chooser_pages/zero/partner.html b/cc/engine/templates/chooser_pages/zero/partner.html
index ac9bf25..a838d09 100644
--- a/cc/engine/templates/chooser_pages/zero/partner.html
+++ b/cc/engine/templates/chooser_pages/zero/partner.html
@@ -3,23 +3,30 @@
{% block title %}Choose a License{% endblock title %}
{% block body %}
-<h1>{{ cctrans(locale, "license.confirm_choice")|safe }}</h1>
+<h1>{% trans %}confirm choice{% endtrans %}</h1>
<p>
- {{ cctrans(locale, "license.zero.intro_1")|safe }}
+ {% trans %}Using CC0, you can waive all copyrights and related or
+ neighboring rights that you have over your work, such as
+ your moral rights (to the extent waivable), your publicity
+ or privacy rights, rights you have protecting against unfair
+ competition, and database rights and rights protecting the
+ extraction, dissemination and reuse of data.{% endtrans %}
</p>
<p>
- {{ cctrans(locale, "license.zero.intro_2")|safe }}
+ {% trans %}Keep in mind that you cannot waive rights to a work that you
+ do not own unless you have permission from the owner. To
+ avoid infringing third party rights, you should consult with
+ your legal advisor if you are unsure whether you have all
+ the rights you need to distribute the work.{% endtrans %}
</p>
<p>
- {{ cctrans(locale, "license.partner.zero.use_pdm_instead",
- pd_url="/choose/mark/partner?%s" % get_params)|safe }}
+ {% trans pd_url="/choose/mark/partner?%s" % get_params %}If instead you want to certify that a work is <em>already in the public domain</em>, instead use the <a href="{{ pd_url }}">Public Domain Mark</a>.{% endtrans %}
</p>
<p>
- {{ cctrans(locale, "license.you_may_proceed",
- processed_exit_url=exit_url)|safe }}
+ {% trans processed_exit_url=exit_url %}You may now <a href="{{ processed_exit_url }}">proceed</a>{% endtrans %}
</p>
{% endblock body %}
diff --git a/cc/engine/templates/chooser_pages/zero/results.html b/cc/engine/templates/chooser_pages/zero/results.html
index e0e1f6b..1c4aff3 100644
--- a/cc/engine/templates/chooser_pages/zero/results.html
+++ b/cc/engine/templates/chooser_pages/zero/results.html
@@ -27,15 +27,15 @@
<div id="error">
<div class="bd">
<p>
- {{ cctrans(locale, "license.zero.declined")|safe }}
+ {% trans %}You did not affirm your decision to waive the rights associated with your work. If you'd like to continue you can click the Back button to review your choice.{% endtrans %}
</p>
<ul>
<li>
- <a href="/about/cc0">{{ cctrans(locale, "license.zero.about")|safe }}</a>
+ <a href="/about/cc0">{% trans %}About CC0{% endtrans %}</a>
</li>
<li>
<a href="http://wiki.creativecommons.org/CC0_FAQ"
- >{{ cctrans(locale, "util.FAQ")|safe }}</a>
+ >{% trans %}Frequently Asked Questions{% endtrans %}</a>
</li>
</ul>
</div>
@@ -44,7 +44,7 @@
<div id="results">
<div class="bd" id="waiver-results">
<p>
- {{ cctrans(locale, "license.choose_button")|safe }}
+ {% trans %}Choose which style of button you'd like on your webpage:{% endtrans %}
</p>
<div class="licensebox" align="center">
@@ -68,44 +68,42 @@
</div>
<span id="waiver-results-leadin">
- {{ cctrans(locale, "license.zero.preview_waiver")|safe }}
+ {% trans %}Here's a preview of how your waiver will appear on your site:{% endtrans %}
</span>
<div class="preview" id="results-preview">{{ rdfa|safe }}</div>
- <h3>{{ cctrans(locale, "license.have_your_own_website")|safe }}</h3>
+ <h3>{% trans %}Have your own website?{% endtrans %}</h3>
<p>
- {{ cctrans(locale, "license.zero.copy_text")|safe }}
+ {% trans %}Copy the text below to your Web site to let your visitors know that you've waived the rights to your work. Creative Commons does not retain a record of your selection; as the publisher it's up to you to let people know how they may use your work.{% endtrans %}
</p>
<textarea id="codetocopy" cols="70" rows="6" style="width: 100%"
onfocus="select()">{{ rdfa }}</textarea>
<div class="more-metadata-container">
- <h3 style="margin-top:0;">{{ cctrans(locale, "license.zero.send_email")|safe }}</h3>
+ <h3 style="margin-top:0;">{% trans %}Send Email{% endtrans %}</h3>
{% if email_requested %}
{# email container #}
{% if not succesful_send %}
<div class="more-metadata-container error">
- {{ cctrans(locale, "license.zero.email_error",
- email_addr=email_addr)|safe }}
+ {% trans email_addr=email_addr %}An error occurred when we tried to send the email message; you can try clicking the Back button and double checking your email address. If the address you used ({{ email_addr }}) was correct you can <a href="/about/contact">contact us</a>.{% endtrans %}
</div>
{% else %}
<div>
<p>
- {{ cctrans(locale, "license.zero.email_sent",
- email_addr=email_addr)|safe }}
+ {% trans email_addr=email_addr %}The suggested HTML has been sent to {{ email_addr }}.{% endtrans %}
</p>
{% if requested_send_updates %}
- {{ cctrans(locale, "license.zero.subscribed_to_updates")|safe }}
+ {% trans %}You have asked to be notified of updates to CC0. A subscription request has been sent on your behalf; you must click the link in the confirmation email to complete the sign-up process.{% endtrans %}
{% endif %}
</div>
{% endif %}
{% else %}
<p>
- {{ cctrans(locale, "license.zero.send_email_updates")|safe }}
+ {% trans %}If you'd like to get the HTML with embedded metadata via email and optionally receive updates about CC0, fill in your email address below.{% endtrans %}
</p>
<form action="{{ request.path_info }}" method="post">
@@ -114,12 +112,12 @@
{% endfor %}
<div class="more-metadata">
- <div>{{ cctrans(locale, "util.your_email")|safe }}</div>
+ <div>{% trans %}your email{% endtrans %}</div>
<input type="textbox" name="email" />
</div>
<input id="do-send-email" type="submit" class="btn"
- value="{{ cctrans(locale, 'util.Send')|safe }}" />
+ value="{% trans %}Send{% endtrans %}" />
</form>
{% endif %}
diff --git a/cc/engine/templates/chooser_pages/zero/waiver.html b/cc/engine/templates/chooser_pages/zero/waiver.html
index 519bc6e..838fb48 100644
--- a/cc/engine/templates/chooser_pages/zero/waiver.html
+++ b/cc/engine/templates/chooser_pages/zero/waiver.html
@@ -1,6 +1,6 @@
{% extends "macros_templates/engine.html" %}
-{% block title %}{{ cctrans(locale, "license.zero.waiver_title")|safe }}{% endblock title %}
+{% block title %}{% trans %}CC0: Waiver{% endtrans %}{% endblock title %}
{% block headers %}
<link rel="stylesheet" type="text/css"
@@ -35,18 +35,27 @@
<div class="bd">
<p>
<div>
- {{ cctrans(locale, "license.zero.additional_metadata")|safe }}
+ {% trans %}These fields are optional, but will be embedded in the HTML generated for your work. This allows users of your work to determine how to contact you or where to go for more information about the work.{% endtrans %}
<a href="" id="embedded_metadata" class="helpLink">
<img src="{{ request.staticdirect('/images/information.png') }}"
- alt="{{ cctrans(locale, 'Information')|safe }}"/></a>
+ alt="{% trans %}Information{% endtrans %}"/></a>
<div class="help-popover">
<div class="popover below">
<div class="arrow"></div>
<div class="inner">
- <h3 class="title">{{ cctrans(locale, "Embedded Metadata")|safe }}</h3>
+ <h3 class="title">{% trans %}Embedded Metadata{% endtrans %}</h3>
<a href="#" class="close">×</a>
<div class="content">
- <p>{{ cctrans(locale, "license.zero.metadata_help")|safe }}</p>
+ <p>{% trans %}<p>
+ The information is embedded in a software readable format.
+ This allows search engines to index additional information
+ about your work.
+ </p>
+ <p>
+ <a href="http://wiki.creativecommons.org/Metadata">More
+ information</a> on Creative Commons metadata is available if
+ you want to find out more.
+ </p>{% endtrans %}</p>
</div>
</div>
</div>
@@ -58,27 +67,28 @@
<input type="hidden" name="license-class" value="zero" />
<div class="form-row">
- <div class="form-question">{{ cctrans(locale, "util.your_name")|safe }}</div>
+ <div class="form-question">{% trans %}Your name{% endtrans %}</div>
<div class="form-answer">
<input name="name" class="form-field"/>
</div>
</div>
<div class="form-row">
- <div class="form-question">{{ cctrans(locale, "util.your_url")|safe }}</div>
+ <div class="form-question">{% trans %}Your URL{% endtrans %}</div>
<div class="form-answer">
<input name="actor_href" class="form-field"/>
<a href="" id="url" class="helpLink">
<img src="{{ request.staticdirect('/images/information.png') }}"
- alt="{{ cctrans(locale, 'Information')|safe }}" /></a>
+ alt="{% trans %}Information{% endtrans %}" /></a>
<div class="help-popover">
<div class="popover below">
<div class="arrow"></div>
<div class="inner">
- <h3 class="title">{{ cctrans(locale, "util.your_url")|safe }}</h3>
+ <h3 class="title">{% trans %}Your URL{% endtrans %}</h3>
<a href="#" class="close">×</a>
<div class="content">
- <p>{{ cctrans(locale, "license.zero.your_url_help")|safe }}</p>
+ <p>{% trans %}The URL where people can find more information about
+the work or the person using CC0.{% endtrans %}</p>
</div>
</div>
</div>
@@ -88,7 +98,7 @@
<div class="form-row">
<div class="form-question">
- {{ cctrans(locale, "util.title_of_work")|safe }}
+ {% trans %}Title of work{% endtrans %}
</div>
<div class="form-answer">
<input name="work_title" class="form-field" />
@@ -96,7 +106,7 @@
</div>
<div class="form-row">
- <div class="form-question">{{ cctrans(locale, "util.territory")|safe }}</div>
+ <div class="form-question">{% trans %}Territory{% endtrans %}</div>
<div class="form-answer">
<select name="work_jurisdiction" class="form-field">
<option value="-">---</option>
@@ -107,16 +117,16 @@
<a href="" id="country" class="helpLink">
<img src="{{ request.staticdirect('/images/information.png') }}"
- alt="{{ cctrans(locale, 'Information')|safe }}" /></a>
+ alt="{% trans %}Information{% endtrans %}" /></a>
<div class="help-popover">
<div class="popover below">
<div class="arrow"></div>
<div class="inner">
- <h3 class="title">{{ cctrans(locale, "util.territory")|safe }}</h3>
+ <h3 class="title">{% trans %}Territory{% endtrans %}</h3>
<a href="#" class="close">×</a>
<div class="content">
<p>
- {{ cctrans(locale, "license.zero.country_help")|safe }}
+ {% trans %}Jurisdiction from which the work is being offered under CC0.{% endtrans %}
</p>
</div>
</div>
@@ -133,7 +143,7 @@
</div>
<div class="form-answer">
<label for="confirm">
- {{ cctrans(locale, "license.zero.confirm_waiver")|safe }}
+ {% trans %}I hereby waive all copyright and related or neighboring rights together with all associated claims and causes of action with respect to this work to the extent possible under the law.{% endtrans %}
</label>
</div>
</div>
@@ -154,7 +164,7 @@
</div>
<div class="form-answer">
<label for="understand">
- {{ cctrans(locale, "license.zero.confirm_reading")|safe }}
+ {% trans %}I have read and understand the terms and intended legal effect of CC0, and hereby voluntarily elect to apply it to this work.{% endtrans %}
</label>
</div>
</div>
@@ -168,7 +178,7 @@
<div class="form-answer">
<input type="submit" id="details-submit" disabled="disabled"
class="btn" name="field1"
- value="{{ cctrans(locale, 'util.continue')|safe }}">
+ value="{% trans %}continue{% endtrans %}">
</div>
</div>
diff --git a/cc/engine/templates/includes/engine_languages.html b/cc/engine/templates/includes/engine_languages.html
index aceddd3..640ebf0 100644
--- a/cc/engine/templates/includes/engine_languages.html
+++ b/cc/engine/templates/includes/engine_languages.html
@@ -1,7 +1,7 @@
<div class="licensebox" style="background:#FAFAD6;">
<span dir="{{ get_ltr_rtl }}" style="{{ is_rtl_align }}">
- {{ cctrans(locale, "deed.view_in")|safe }}
+ {% trans %}This page is available in the following languages:{% endtrans %}
</span>
<br/>
diff --git a/cc/engine/templates/includes/more_metadata.html b/cc/engine/templates/includes/more_metadata.html
index 6227b5b..9a562a6 100644
--- a/cc/engine/templates/includes/more_metadata.html
+++ b/cc/engine/templates/includes/more_metadata.html
@@ -1,22 +1,33 @@
<div class="more-metadata-container">
- <h4>{{ cctrans(locale, "license.additional_info")|safe }}</h4>
+ <h4>{% trans %}Additional Information{% endtrans %}</h4>
<p>
<div>
<span>
- {{ cctrans(locale, "license.additional_fields_optional")|safe }}
+ {% trans %}The additional fields are <strong>optional</strong>, but will be embedded in the HTML generated for your license. This allows users of your work to determine how to attribute it or where to go for more information about the work.{% endtrans %}
</span>
<a href="" id="embedded_metadata" class="helpLink">
<img src="{{ request.staticdirect('images/information.png') }}"
- alt="{{ cctrans(locale, 'Information')|safe }}" />
+ alt="{% trans %}Information{% endtrans %}" />
</a>
<div class="help-popover">
<div class="popover below">
<div class="arrow"></div>
<div class="inner">
- <h3 class="title">{{ cctrans(locale, "Embedded Metadata")|safe }}</h3>
+ <h3 class="title">{% trans %}Embedded Metadata{% endtrans %}</h3>
<a href="#" class="close">×</a>
<div class="content">
- <p>{{ cctrans(locale, "license.metadata_help")|safe }}</p>
+ <p>{% trans %}<p>
+ The information is embedded in a software readable format.
+ This allows search engines to index additional information
+ about your work and allows people coming to the license deed
+ from your page to see information on the deed about how to
+ attribute your work.
+ </p>
+ <p>
+ <a href="http://wiki.creativecommons.org/Metadata">More
+ information</a> on Creative Commons metadata is available if
+ you want to find out more.
+ </p>{% endtrans %}</p>
</div>
</div>
</div>
@@ -26,43 +37,43 @@
<div class="more-metadata">
<div class="label">
- {{ cctrans(locale, "license.tell_format")|safe }}
+ {% trans %}Tell us the format of your work:{% endtrans %}
</div>
<select name="field_format">
<option value="" selected="selected">
- {{ cctrans(locale, "util.Other")|safe }}</option>
+ {% trans %}Other{% endtrans %}</option>
<option value="Sound">
- {{ cctrans(locale, "util.Audio")|safe }}</option>
+ {% trans %}Audio{% endtrans %}</option>
<option value="MovingImage">
- {{ cctrans(locale, "util.Video")|safe }}</option>
+ {% trans %}Video{% endtrans %}</option>
<option value="StillImage">
- {{ cctrans(locale, "util.Image")|safe }}</option>
+ {% trans %}Image{% endtrans %}</option>
<option value="Text">
- {{ cctrans(locale, "util.Text")|safe }}</option>
+ {% trans %}Text{% endtrans %}</option>
<option value="Dataset">
- {{ cctrans(locale, "util.Dataset")|safe }}</option>
+ {% trans %}Dataset{% endtrans %}</option>
<option value="InteractiveResource">
- {{ cctrans(locale, "util.Interactive")|safe }}</option>
+ {% trans %}Interactive{% endtrans %}</option>
</select>
</div>
<div class="more-metadata">
- <div class="label">{{ cctrans(locale, "util.title_of_work")|safe }}</div>
+ <div class="label">{% trans %}Title of work{% endtrans %}</div>
<input type="text" name="field_worktitle" value="" />
<a href="" id="worktitle" class="helpLink">
<img src="{{ request.staticdirect('images/information.png') }}"
- alt="{{ cctrans(locale, 'Information')|safe }}" />
+ alt="{% trans %}Information{% endtrans %}" />
</a>
<div class="help-popover">
<div class="popover below">
<div class="arrow"></div>
<div class="inner">
- <h3 class="title">{{ cctrans(locale, "util.title_of_work")|safe }}</h3>
+ <h3 class="title">{% trans %}Title of work{% endtrans %}</h3>
<a href="#" class="close">×</a>
<div class="content">
- <p>{{ cctrans(locale, "The title of the work you are licensing.")|safe }}</p>
+ <p>{% trans %}The title of the work you are licensing.{% endtrans %}</p>
</div>
</div>
</div>
@@ -71,22 +82,22 @@
<div class="more-metadata">
<div class="label">
- {{ cctrans(locale, "util.attribute_to_name")|safe }}
+ {% trans %}Attribute work to name{% endtrans %}
</div>
<input type="text" name="field_attribute_to_name" />
<a href="" id="attribution_name" class="helpLink">
<img src="{{ request.staticdirect('images/information.png') }}"
- alt="{{ cctrans(locale, 'Information')|safe }}" />
+ alt="{% trans %}Information{% endtrans %}" />
</a>
<div class="help-popover">
<div class="popover below">
<div class="arrow"></div>
<div class="inner">
- <h3 class="title">{{ cctrans(locale, "util.attribute_to_name")|safe }}</h3>
+ <h3 class="title">{% trans %}Attribute work to name{% endtrans %}</h3>
<a href="#" class="close">×</a>
<div class="content">
- <p>{{ cctrans(locale, "The name users of the work should give attribution to. For example, the name of the work's author.")|safe }}</p>
+ <p>{% trans %}The name users of the work should give attribution to. For example, the name of the work's author.{% endtrans %}</p>
</div>
</div>
</div>
@@ -96,22 +107,22 @@
<div class="more-metadata">
<div class="label">
- {{ cctrans(locale, "util.attribute_to_url")|safe }}
+ {% trans %}Attribute work to URL{% endtrans %}
</div>
<input type="text" name="field_attribute_to_url" value="" />
<a href="" id="attribution_url" class="helpLink">
<img src="{{ request.staticdirect('images/information.png') }}"
- alt="{{ cctrans(locale, 'Information')|safe }}" />
+ alt="{% trans %}Information{% endtrans %}" />
</a>
<div class="help-popover">
<div class="popover below">
<div class="arrow"></div>
<div class="inner">
- <h3 class="title">{{ cctrans(locale, "util.attribute_to_url")|safe }}</h3>
+ <h3 class="title">{% trans %}Attribute work to URL{% endtrans %}</h3>
<a href="#" class="close">×</a>
<div class="content">
- <p>{{ cctrans(locale, "The URL users of the work should link to. For example, the work's page on the author's site.")|safe }}</p>
+ <p>{% trans %}The URL users of the work should link to. For example, the work's page on the author's site.{% endtrans %}</p>
</div>
</div>
</div>
@@ -119,21 +130,21 @@
</div>
<div class="more-metadata">
- <div class="label">{{ cctrans(locale, "util.source_work")|safe }}</div>
+ <div class="label">{% trans %}Source work URL{% endtrans %}</div>
<input type="text" name="field_sourceurl" value=""/>
<a href="" id="source_work" class="helpLink">
<img src="{{ request.staticdirect('images/information.png') }}"
- alt="{{ cctrans(locale, 'Information')|safe }}" />
+ alt="{% trans %}Information{% endtrans %}" />
</a>
<div class="help-popover">
<div class="popover below">
<div class="arrow"></div>
<div class="inner">
- <h3 class="title">{{ cctrans(locale, "util.source_work")|safe }}</h3>
+ <h3 class="title">{% trans %}Source work URL{% endtrans %}</h3>
<a href="#" class="close">×</a>
<div class="content">
- <p>{{ cctrans(locale, "jargon.source_work_description")|safe }}</p>
+ <p>{% trans %}A work another is derived from.{% endtrans %}</p>
</div>
</div>
</div>
@@ -141,21 +152,21 @@
</div>
<div class="more-metadata">
- <div class="label">{{ cctrans(locale, "util.more_permissions_url")|safe }}</div>
+ <div class="label">{% trans %}More permissions URL{% endtrans %}</div>
<input type="text" name="field_morepermissionsurl" value=""/>
<a href="" id="more_permissions_url" class="helpLink">
<img src="{{ request.staticdirect('images/information.png') }}"
- alt="{{ cctrans(locale, 'Information')|safe }}" />
+ alt="{% trans %}Information{% endtrans %}" />
</a>
<div class="help-popover">
<div class="popover below">
<div class="arrow"></div>
<div class="inner">
- <h3 class="title">{{ cctrans(locale, "util.more_permissions_url")|safe }}</h3>
+ <h3 class="title">{% trans %}More permissions URL{% endtrans %}</h3>
<a href="#" class="close">×</a>
<div class="content">
- <p>{{ cctrans(locale, "A URL where a user can obtain information about clearing rights that are not pre-cleared by your CC license.")|safe }}</p>
+ <p>{% trans %}A URL where a user can obtain information about clearing rights that are not pre-cleared by your CC license.{% endtrans %}</p>
</div>
</div>
</div>
diff --git a/cc/engine/templates/includes/translations.html b/cc/engine/templates/includes/translations.html
index e8ef4ab..31b190a 100644
--- a/cc/engine/templates/includes/translations.html
+++ b/cc/engine/templates/includes/translations.html
@@ -1,6 +1,6 @@
<div id="languages">
<span dir="{{ get_ltr_rtl }}" style="{{ is_rtl_align }}">
- {{ cctrans(locale, "deed.view_in")|safe }}
+ {% trans %}This page is available in the following languages:{% endtrans %}
</span>
<br/>
diff --git a/cc/engine/templates/licenses/devnations_deed.html b/cc/engine/templates/licenses/devnations_deed.html
index 9921e32..9b344e1 100644
--- a/cc/engine/templates/licenses/devnations_deed.html
+++ b/cc/engine/templates/licenses/devnations_deed.html
@@ -16,28 +16,28 @@
dir="{{ get_ltr_rtl}}" style="{{ is_rtl_align }}">
<div id="deed-newer" style="text-align:center">
- <h3>{{ cctrans(locale, "deed.retired")|safe }}</h3>
+ <h3>{% trans %}Creative Commons has <a href="http://creativecommons.org/retiredlicenses">retired this legal tool</a> and does not recommend that it be applied to works.{% endtrans %}</h3>
</div>
<h3 rel="cc:permits"
- resource="http://creativecommons.org/ns#Reproduction">{{ cctrans(locale, "deed.You_are_free")|safe }}</h3>
+ resource="http://creativecommons.org/ns#Reproduction">{% trans %}You are free:{% endtrans %}</h3>
<ul class="license-properties">
<li class="license share" rel="cc:permits"
resource="http://creativecommons.org/ns#Distribution">
- {{ cctrans(locale, "deed.free_copy_distribute")|safe }}
+ {% trans %}<strong>to Share</strong> â to copy, distribute and transmit the work{% endtrans %}
</li>
<li class="license remix" rel="cc:permits"
resource="http://creativecommons.org/ns#DerivativeWorks">
- {{ cctrans(locale, "deed.free_derivative")|safe }}
+ {% trans %}<strong>to Remix</strong> â to adapt the work{% endtrans %}
</li>
</ul>
</div>
<div id="deed-conditions">
- <h3>{{ cctrans(locale, "deed.under_conditions")|safe }}</h3>
+ <h3>{% trans %}Under the following conditions:{% endtrans %}</h3>
<ul class="license-properties"
dir="{{ get_ltr_rtl}}" style="{{ is_rtl_align }}">
@@ -50,15 +50,15 @@
resource="http://creativecommons.org/ns#Attribution"
class="license by">
<p>
- <strong>{{ cctrans(locale, "char.by_title")|safe }}</strong>.
+ <strong>{% trans %}Attribution{% endtrans %}</strong>.
<span>
- {{ cctrans(locale, "char.by_brief")|safe }}
+ {% trans %}You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work).{% endtrans %}
</span>
</p>
</li>
- <li>{{ cctrans(locale, "deed.notice")|safe }}</li>
- <li>{{ cctrans(locale, "deed.permission")|safe }}</li>
+ <li>{% trans %}For any reuse or distribution, you must make clear to others the license terms of this work. The best way to do this is with a link to this web page.{% endtrans %}</li>
+ <li>{% trans %}Any of the above conditions can be <a href="#" id="waived" class="helpLink">waived</a> if you get permission from the copyright holder.{% endtrans %}</li>
<li>
In no way are any of the following rights affected by
@@ -66,10 +66,10 @@
<ul>
<li>
- {{ cctrans(locale, "deed.fair_use")|safe }}
+ {% trans %}Your fair dealing or <a href="http://wiki.creativecommons.org/Frequently_Asked_Questions#Do_Creative_Commons_licenses_affect_fair_use.2C_fair_dealing_or_other_exceptions_to_copyright.3F" id="fair_use" class="helpLink">fair use</a> rights, or other applicable copyright exceptions and limitations;{% endtrans %}
</li>
<li>
- {{ cctrans(locale, "deed.publicity_rights")|safe }}
+ {% trans %}Rights other persons may have either in the work itself or in how the work is used, such as <a href="http://wiki.creativecommons.org/Frequently_Asked_Questions#When_are_publicity_rights_relevant.3F" class="helpLink" id="publicity_rights">publicity</a> or privacy rights.{% endtrans %}
</li>
</ul>
</li>
diff --git a/cc/engine/templates/licenses/pdmark_deed.html b/cc/engine/templates/licenses/pdmark_deed.html
index f275172..0ded2e9 100644
--- a/cc/engine/templates/licenses/pdmark_deed.html
+++ b/cc/engine/templates/licenses/pdmark_deed.html
@@ -13,10 +13,10 @@
{% block body %}
<div id="deed-rights"
dir="{{ get_ltr_rtl }}" style="{{ is_rtl_align }}">
- <h3>{{ cctrans(locale, "deed.zero.no_copyright")|safe }}</h3>
+ <h3>{% trans %}No Copyright{% endtrans %}</h3>
<ul class="license-properties" style="width: 550px;">
<li class="license publicdomain">
- {{ cctrans(locale, "deed.mark.no_law")|safe }}
+ {% trans %}<p id="nolaw-text"> This work has been <b>identified</b> as being free of known restrictions under copyright law, including all related and neighboring rights. </p> <p> <br /> You can copy, modify, distribute and perform the work, even for commercial purposes, all without asking permission. See <b>Other Information</b> below. </p>{% endtrans %}
</li>
<li class="license" style="display:none" id="work-details-block">
@@ -43,22 +43,22 @@
<li style="padding-bottom: 0.5em; display:none;" id="work-details-title"><strong>Work Details</strong></li>
<li style="display:none">
<span class="work-details-item-title">
- {{ cctrans(locale, "deed.workdetails.work")|safe }}
+ {% trans %}Work:{% endtrans %}
</span>
<span id="meta_title" class="work-details-item-value"></span>
</li>
<li style="display:none">
- <span class="work-details-item-title">{{ cctrans(locale, "deed.workdetails.author")|safe }}</span>
+ <span class="work-details-item-title">{% trans %}Author:{% endtrans %}</span>
<span id="meta_author" class="work-details-item-value"></span>
</li>
<li style="display:none">
- <span class="work-details-item-title">{{ cctrans(locale, "deed.workdetails.curator")|safe }}</span>
+ <span class="work-details-item-title">{% trans %}Identified by:{% endtrans %}</span>
<span id="meta_curator" class="work-details-item-value"></span>
</li>
<li id="work-attribution-container" style="margin-top: 25px; display:none;">
<strong>
- {{ cctrans(locale, "deed.cite_this_work")|safe }}
+ {% trans %}You can <a href="" class="helpLink" id="citation_help" name="citation_help">cite</a> this work with this HTML:{% endtrans %}
</strong>
<br />
<input id="work-attribution" value="" />
@@ -73,22 +73,22 @@
<div id="deed-understanding">
<ul class="license-properties">
<li class="license">
- <strong>{{ cctrans(locale, "util.other_information")|safe }}</strong>
+ <strong>{% trans %}Other Information{% endtrans %}</strong>
<ul>
<li>
- {{ cctrans(locale, "deed.mark.other_info.jurisdictions")|safe }}
+ {% trans %}The work may not be free of known copyright restrictions in all <a href="" class="helpLink" id="all_jurisdictions" name="all_jurisdictions">jurisdictions</a>.{% endtrans %}
</li>
<li>
- {{ cctrans(locale, "deed.mark.other_info.other_rights")|safe }}
+ {% trans %}Persons may have other rights in or related to the work, such as patent or trademark rights, and others may have rights in how the work is used, such as <a href="http://wiki.creativecommons.org/Frequently_Asked_Questions#When_are_publicity_rights_relevant.3F" class="helpLink" id="publicity_rights" name="publicity_rights">publicity or privacy</a> rights.{% endtrans %}
</li>
<li>
- {{ cctrans(locale, "deed.mark.other_info.moral_rights")|safe }}
+ {% trans %}In some jurisdictions <a href="" class="helpLink" id="moral_rights" name="moral_rights">moral rights</a> of the author may persist beyond the term of copyright. These rights may include the right to be identified as the author and the right to object to derogatory treatments.{% endtrans %}
</li>
<li>
- {{ cctrans(locale, "deed.mark.other_info.no_warranty")|safe }}
+ {% trans %}Unless expressly stated otherwise, the person who identified the work makes no warranties about the work, and disclaims liability for all uses of the work, to the fullest extent permitted by applicable law.{% endtrans %}
</li>
<li>
- {{ cctrans(locale, "deed.mark.other_info.no_endorsement")|safe }}
+ {% trans %}When using or citing the work, you should not imply <a href="" class="helpLink" id="endorsement" name="endorsement">endorsement</a> by the author or the person who identified the work.{% endtrans %}
</li>
</ul>
</li>
@@ -105,66 +105,66 @@
</div> -->
<div id="help_endorsement">
<div class="hd">
- {{ cctrans(locale, "util.endorsement")|safe }}
+ {% trans %}Endorsement{% endtrans %}
</div>
<div class="bd">
<p>
- {{ cctrans(locale, "deed.help.endorsement")|safe }}
+ {% trans %}In some jurisdictions, wrongfully implying that an author, publisher or anyone else endorses your use of a work may be unlawful.{% endtrans %}
</p>
<p>
- <a href="http://wiki.creativecommons.org/Frequently_Asked_Questions#Do_I_need_to_be_aware_of_anything_else_when_providing_attribution_or_credit.3F">{{ cctrans(locale, "util.learn_more")|safe }}</a>
+ <a href="http://wiki.creativecommons.org/Frequently_Asked_Questions#Do_I_need_to_be_aware_of_anything_else_when_providing_attribution_or_credit.3F">{% trans %}Learn more{% endtrans %}</a>
</p>
</div>
</div>
<div id="help_citation_help">
<div class="hd">
- {{ cctrans(locale, "util.citation")|safe }}
+ {% trans %}Citation{% endtrans %}
</div>
<div class="bd">
<p>
- {{ cctrans(locale, "deed.help.citation")|safe }}
+ {% trans %}Copy and paste the HTML provided into your webpage to easily cite this work.{% endtrans %}
</p>
<p>
- <a href="http://wiki.creativecommons.org/PDM_FAQ#Am_I_required_to_attribute_the_author_of_the_work.2C_or_the_person_who_applied_the_PDM_to_the_work.3F">{{ cctrans(locale, "util.learn_more")|safe }}</a>
+ <a href="http://wiki.creativecommons.org/PDM_FAQ#Am_I_required_to_attribute_the_author_of_the_work.2C_or_the_person_who_applied_the_PDM_to_the_work.3F">{% trans %}Learn more{% endtrans %}</a>
</p>
</div>
</div>
<div id="help_moral_rights">
<div class="hd">
- {{ cctrans(locale, "util.moralrights")|safe }}
+ {% trans %}Moral Rights{% endtrans %}
</div>
<div class="bd">
<p>
- {{ cctrans(locale, "deed.help.moralrights")|safe }}
+ {% trans %}Copyright laws in most jurisdictions around the world grant creators "moral rights" which may provide some redress if use of a work is considered "derogatory".{% endtrans %}
</p>
<p>
- <a href="http://wiki.creativecommons.org/Frequently_Asked_Questions#What_are_moral_rights.2C_and_how_could_I_exercise_them_to_prevent_uses_of_my_work_that_I_don.E2.80.99t_like.3F">{{ cctrans(locale, "util.learn_more")|safe }}</a>
+ <a href="http://wiki.creativecommons.org/Frequently_Asked_Questions#What_are_moral_rights.2C_and_how_could_I_exercise_them_to_prevent_uses_of_my_work_that_I_don.E2.80.99t_like.3F">{% trans %}Learn more{% endtrans %}</a>
</p>
</div>
</div>
<div id="help_publicity_rights">
<div class="hd">
- {{ cctrans(locale, "util.other_rights")|safe }}
+ {% trans %}Other Rights{% endtrans %}
</div>
<div class="bd">
<p>
- {{ cctrans(locale, "deed.help.other_rights")|safe }}
+ {% trans %}The use of a work free of known copyright restrictions may be otherwise regulated or limited. The work or its use may be subject to personal data protection laws, publicity, image, or privacy rights that allow a person to control how their voice, image or likeness is used, or other restrictions or limitations under applicable law.{% endtrans %}
</p>
<p>
- <a href="http://wiki.creativecommons.org/PDM_FAQ#Are_there_other_laws_I_should_be_aware_of_that_might_restrict_my_ability_to_use_a_PDM-marked_work.3F">{{ cctrans(locale, "util.learn_more")|safe }}</a>
+ <a href="http://wiki.creativecommons.org/PDM_FAQ#Are_there_other_laws_I_should_be_aware_of_that_might_restrict_my_ability_to_use_a_PDM-marked_work.3F">{% trans %}Learn more{% endtrans %}</a>
</p>
</div>
</div>
<div id="help_all_jurisdictions">
- <div class="hd">{{ cctrans(locale, "util.term_of_copyright")|safe }}</div>
+ <div class="hd">{% trans %}Term of Copyright{% endtrans %}</div>
<div class="bd">
<p>
- {{ cctrans(locale, "deed.help.term_of_copyright")|safe }}
+ {% trans %}Copyright terms vary jurisdiction to jurisdiction. A work free of copyright restrictions in one jurisdiction may not be similarly free in other jurisdictions.{% endtrans %}
</p>
<p>
- <a href="http://wiki.creativecommons.org/PDM_FAQ#Why_might_a_free_of_copyright_restrictions_in_one_jurisdiction_not_be_free_of_copyright_restrictions_everywhere.3F">{{ cctrans(locale, "util.learn_more")|safe }}</a>
+ <a href="http://wiki.creativecommons.org/PDM_FAQ#Why_might_a_free_of_copyright_restrictions_in_one_jurisdiction_not_be_free_of_copyright_restrictions_everywhere.3F">{% trans %}Learn more{% endtrans %}</a>
</p>
</div>
</div>
@@ -178,21 +178,21 @@
{% block footer %}
<a href="" id="disclaimer"
- class="helpLink" name="disclaimer">{{ cctrans(locale, "util.Disclaimer")|safe }}</a>
+ class="helpLink" name="disclaimer">{% trans %}Disclaimer{% endtrans %}</a>
<div id="cc-link">
<a rel="dc:creator dct:creator" href="http://creativecommons.org/">
- <span property="dc:title dct:title">{{ cctrans(locale, "util.Creative_Commons")|safe }}</span>
+ <span property="dc:title dct:title">{% trans %}Creative Commons{% endtrans %}</span>
</a>
</div>
<div id="help_disclaimer" style="text-align:left" class="help_panel">
- <div class="hd">{{ cctrans(locale, "util.Disclaimer")|safe }}</div>
+ <div class="hd">{% trans %}Disclaimer{% endtrans %}</div>
<div class="bd">
- {{ cctrans(locale, "deed.mark.disclaimer")|safe }}
+ {% trans %}<p> The Public Domain Mark is not a legal instrument. </p> <p> Creative Commons is not a law firm and does not provide legal services or advice. Distributing, displaying, or linking to this Public Domain Mark does not create an attorney-client relationship. </p> <p> Creative Commons has not verified the copyright status of any work to which this mark has been applied. CC makes no warranties about any work or its copyright status in any jurisdiction, and disclaims all liability for all uses of any work. </p>{% endtrans %}
</div>
</div>
{% endblock footer %}
{% block use_this_license %}
<a id="get_this" href="/publicdomain/"
- name="get_this">{{ cctrans(locale, "deed.mark.use_this_tool")|safe }}</a>
+ name="get_this">{% trans %}Use this tool to mark other public domain works.{% endtrans %}</a>
{% endblock use_this_license %}
diff --git a/cc/engine/templates/licenses/publicdomain_deed.html b/cc/engine/templates/licenses/publicdomain_deed.html
index c2e3554..05768f2 100644
--- a/cc/engine/templates/licenses/publicdomain_deed.html
+++ b/cc/engine/templates/licenses/publicdomain_deed.html
@@ -2,7 +2,8 @@
{% block title -%}
Creative Commons —
- {{ cctrans(locale, "deed.pd.title_plain")|safe }}
+ {% trans %}Copyright-Only Dedication (based on United States law)
+or Public Domain Certification{% endtrans %}
{%- endblock title %}
{% block legalcode_block %}{% endblock %}
@@ -15,29 +16,37 @@
{% block license_name %}
<span property="dc:title" style="display: inline;"
- datatype="">{{ cctrans(locale, "deed.pd.title")|safe }}</span>
+ datatype="">{% trans %}Copyright-Only Dedication<a href="#" class="helpLink" id="use_zero">*</a>
+ (based on United States law)<br />
+ or Public Domain Certification{% endtrans %}</span>
{% endblock %}
{% block body %}
<div id="librepd">
<a href="http://freedomdefined.org/">
<img src="/images/deed/seal.png" style="border: 0"
- alt="{{ cctrans(locale, 'This license is acceptable for Free Cultural Works.')|safe }}" />
+ alt="{% trans %}This license is acceptable for Free Cultural Works.{% endtrans %}" />
</a>
</div>
{% if license.deprecated %}
<div id="deed-newer" style="text-align:center">
- <h3>{{ cctrans(locale, "deed.retired")|safe }}</h3>
+ <h3>{% trans %}Creative Commons has <a href="http://creativecommons.org/retiredlicenses">retired this legal tool</a> and does not recommend that it be applied to works.{% endtrans %}</h3>
</div>
{% endif %}
- {{ cctrans(locale, "deed.pd")|safe }}
+ {% trans %} <p>The person or persons who have associated work with this document (the "Dedicator" or "Certifier") hereby either (a) certifies that, to the best of his knowledge, the work of authorship identified is in the public domain of the country from which the work is published, or (b) hereby dedicates whatever copyright the dedicators holds in the work of authorship identified below (the "Work") to the public domain. A certifier, moreover, dedicates any copyright interest he may have in the associated work, and for these purposes, is described as a "dedicator" below.</p>
+
+ <p>A certifier has taken reasonable steps to verify the copyright status of this work. Certifier recognizes that his good faith efforts may not shield him from liability if in fact the work certified is not in the public domain.</p>
+
+ <p>Dedicator makes this dedication for the benefit of the public at large and to the detriment of the Dedicator's heirs and successors. Dedicator intends this dedication to be an overt act of relinquishment in perpetuity of all present and future rights under copyright law, whether vested or contingent, in the Work. Dedicator understands that such relinquishment of all rights includes the relinquishment of all rights to enforce (by lawsuit or otherwise) those copyrights in the Work.</p>
+
+ <p>Dedicator recognizes that, once placed in the public domain, the Work may be freely reproduced, distributed, transmitted, used, modified, built upon, or otherwise exploited by anyone for any purpose, commercial or non-commercial, and in any way, including by methods that have not yet been invented or conceived.</p>{% endtrans %}
<div id="help_use_zero">
<div class="hd">CC0 for Public Domain Dedication</div>
<div class="bd">
- {{ cctrans(locale, "deed.pd.help_use_zero")|safe }}
+ {% trans %}This tool is based on United States law and may not be applicable outside the US. For dedicating new works to the public domain, we recommend <a href="/choose/zero/">CC0</a>.{% endtrans %}
</div>
</div>
diff --git a/cc/engine/templates/licenses/sampling_deed.html b/cc/engine/templates/licenses/sampling_deed.html
index b668dff..74ec45b 100644
--- a/cc/engine/templates/licenses/sampling_deed.html
+++ b/cc/engine/templates/licenses/sampling_deed.html
@@ -12,58 +12,58 @@
<div id="deed-newer"
style="text-align:center">
<h3>
- {{ cctrans(locale, "deed.retired")|safe }}
+ {% trans %}Creative Commons has <a href="http://creativecommons.org/retiredlicenses">retired this legal tool</a> and does not recommend that it be applied to works.{% endtrans %}
</h3>
</div>
{% endif %}
- <h3>{{ cctrans(locale, "deed.You_are_free")|safe }}</h3>
+ <h3>{% trans %}You are free:{% endtrans %}</h3>
<ul class="license-properties">
{% if license.license_code == 'nc-sampling+' %}
<li class="license samplingplus">
- {{ cctrans(locale, "deed.free_sample_nc")|safe }}
+ {% trans %}To sample, mash-up, or otherwise creatively transform this work for noncommercial purposes.{% endtrans %}
</li>
{% else %}
<li class="license sampling">
- {{ cctrans(locale, "deed.free_sample")|safe }}
+ {% trans %}To sample, mash-up, or otherwise creatively transform this work for commercial or noncommercial purposes.{% endtrans %}
</li>
{% endif %}
{% if license.license_code in ('nc-sampling+', 'sampling+') %}
<li class="license samplingplus">
- {{ cctrans(locale, "deed.free_copy_distribute_noncommercial")|safe }}
+ {% trans %}To perform, display, and distribute copies of this whole work for noncommercial purposes (e.g., file-sharing or noncommercial webcasting).{% endtrans %}
</li>
{% endif %}
</ul>
</div>
<div id="deed-conditions">
- <h3>{{ cctrans(locale, "deed.under_conditions")|safe }}</h3>
+ <h3>{% trans %}Under the following conditions:{% endtrans %}</h3>
<ul class="license-properties"
dir="{{ get_ltr_rtl }}" style="{{ is_rtl_align }}">
<li class="license by">
- {{ cctrans(locale, "char.by_brief")|safe }}
+ {% trans %}You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work).{% endtrans %}
</li>
{% if license.license_code == 'nc-sampling+' %}
<li class="license nc">
- {{ cctrans(locale, "char.nc_brief")|safe }}
+ {% trans %}You may not use this work for commercial purposes.{% endtrans %}
</li>
{% else %}
<li>
- {{ cctrans(locale, "char.na_brief")|safe }}
+ {% trans %}You may not use this work to advertise for or promote anything but the work you create from it.{% endtrans %}
</li>
{% endif %}
{% if license.license_code in ('nc-sampling+', 'sampling+') %}
<li>
- {{ cctrans(locale, "deed.notice")|safe }}
+ {% trans %}For any reuse or distribution, you must make clear to others the license terms of this work. The best way to do this is with a link to this web page.{% endtrans %}
</li>
{% else %}
<li>
- {{ cctrans(locale, "deed.notice_withoutdistribution")|safe }}
+ {% trans %}For any reuse, you must make clear to others the license terms of this work.{% endtrans %}
</li>
<li>
- {{ cctrans(locale, "char.no_brief")|safe }}
+ {% trans %}You may not perform, display, or distribute copies of this whole work for any purpose.{% endtrans %}
</li>
{% endif %}
@@ -73,10 +73,10 @@
<ul>
<li>
- {{ cctrans(locale, "deed.fair_use")|safe }}
+ {% trans %}Your fair dealing or <a href="http://wiki.creativecommons.org/Frequently_Asked_Questions#Do_Creative_Commons_licenses_affect_fair_use.2C_fair_dealing_or_other_exceptions_to_copyright.3F" id="fair_use" class="helpLink">fair use</a> rights, or other applicable copyright exceptions and limitations;{% endtrans %}
</li>
<li>
- {{ cctrans(locale, "deed.publicity_rights")|safe }}
+ {% trans %}Rights other persons may have either in the work itself or in how the work is used, such as <a href="http://wiki.creativecommons.org/Frequently_Asked_Questions#When_are_publicity_rights_relevant.3F" class="helpLink" id="publicity_rights">publicity</a> or privacy rights.{% endtrans %}
</li>
</ul>
</li>
diff --git a/cc/engine/templates/licenses/standard_deed.html b/cc/engine/templates/licenses/standard_deed.html
index 029be77..1c2460e 100644
--- a/cc/engine/templates/licenses/standard_deed.html
+++ b/cc/engine/templates/licenses/standard_deed.html
@@ -23,7 +23,7 @@
<div id="libre">
<a href="http://freedomdefined.org/">
<img src="/images/deed/seal.png" style="border: 0"
- alt="{{ cctrans(locale, 'This license is acceptable for Free Cultural Works.')|safe }}" />
+ alt="{% trans %}This license is acceptable for Free Cultural Works.{% endtrans %}" />
</a>
</div>
{% endif %}
@@ -32,7 +32,7 @@
dir="{{ get_ltr_rtl }}" style="{{ is_rtl_align }}">
{% if license.deprecated %}
<div id="deed-newer" style="text-align:center">
- <h3>{{ cctrans(locale, "deed.retired")|safe }}</h3>
+ <h3>{% trans %}Creative Commons has <a href="http://creativecommons.org/retiredlicenses">retired this legal tool</a> and does not recommend that it be applied to works.{% endtrans %}</h3>
</div>
{% endif %}
@@ -45,25 +45,25 @@
{% endif %}
<h3 resource="http://creativecommons.org/ns#Reproduction"
- rel="cc:permits">{{ cctrans(locale, "deed.You_are_free")|safe }}</h3>
+ rel="cc:permits">{% trans %}You are free:{% endtrans %}</h3>
<ul class="license-properties">
<li class="license share"
rel="cc:permits"
resource="http://creativecommons.org/ns#Distribution">
- {{ cctrans(locale, "deed.free_copy_distribute")|safe }}
+ {% trans %}<strong>to Share</strong> â to copy, distribute and transmit the work{% endtrans %}
</li>
{% if not 'nd' in license.license_code %}
<li class="license remix"
rel="cc:permits"
resource="http://creativecommons.org/ns#DerivativeWorks">
- {{ cctrans(locale, "deed.free_derivative")|safe }}
+ {% trans %}<strong>to Remix</strong> â to adapt the work{% endtrans %}
</li>
{% endif %}
{% if "http://creativecommons.org/ns#CommercialUse" not in license.prohibits %}
<li class="license commercial">
- {{ cctrans(locale, "deed.free_commercial")|safe }}
+ {% trans %}to make commercial use of the work{% endtrans %}
</li>
{% endif %}
<li id="more-container"
@@ -74,7 +74,7 @@
</div>
<div id="deed-conditions">
- <h3>{{ cctrans(locale, "deed.under_conditions")|safe }}</h3>
+ <h3>{% trans %}Under the following conditions:{% endtrans %}</h3>
<ul dir="{{ get_ltr_rtl }}" style="{{ is_rtl_align }}"
class="license-properties">
@@ -96,7 +96,7 @@
{% if attr['char_code'] == 'by' %}
<p id="work-attribution-container" style="display:none;">
<strong>
- {{ cctrans(locale, "deed.attribute_this_work")|safe }}
+ {% trans %}Attribute this work:{% endtrans %}
</strong>
<br/>
<input id="work-attribution" value="" type="text"
@@ -108,16 +108,16 @@
value="{{ license.uri }}" />
<a href="" id="attribution_help" class="helpLink">
<img src="{{ request.staticdirect('images/information.png') }}"
- alt="{{ cctrans(locale, 'Information')|safe }}" />
+ alt="{% trans %}Information{% endtrans %}" />
</a>
</p>
<div id="help_attribution_help" class="help_panel">
<div class="hd">
- {{ cctrans(locale, 'What does "Attribute this work" mean?')|safe }}
+ {% trans %}What does "Attribute this work" mean?{% endtrans %}
</div>
<div class="bd">
- {{ cctrans(locale, "The page you came from contained embedded licensing metadata, including how the creator wishes to be attributed for re-use. You can use the HTML here to cite the work. Doing so will also include metadata on your page so that others can find the original work as well.")|safe }}
+ {% trans %}The page you came from contained embedded licensing metadata, including how the creator wishes to be attributed for re-use. You can use the HTML here to cite the work. Doing so will also include metadata on your page so that others can find the original work as well.{% endtrans %}
</div>
</div>
{% endif %}
@@ -128,121 +128,126 @@
<div id="deed-understanding">
<h3>
- {{ cctrans(locale, "deed.with_the_understanding")|safe }}
+ {% trans %}With the understanding that:{% endtrans %}
</h3>
<ul class="understanding license-properties">
<li class="license">
- <strong>{{ cctrans(locale, "util.waiver")|safe }}</strong>
+ <strong>{% trans %}Waiver{% endtrans %}</strong>
—
- {{ cctrans(locale, "deed.permission")|safe }}
+ {% trans %}Any of the above conditions can be <a href="#" id="waived" class="helpLink">waived</a> if you get permission from the copyright holder.{% endtrans %}
</li>
<li class="license">
- <strong>{{ cctrans(locale, "util.Public_Domain")|safe }}</strong>
+ <strong>{% trans %}Public Domain{% endtrans %}</strong>
—
- {{ cctrans(locale, "deed.public_domain")|safe }}
+ {% trans %}Where the work or any of its elements is in the <a href="http://wiki.creativecommons.org/Public_domain" id="public_domain" class="helpLink">public domain</a> under applicable law, that status is in no way affected by the license.{% endtrans %}
</li>
<li class="license">
- <strong>{{ cctrans(locale, "util.other_rights")|safe }}</strong>
+ <strong>{% trans %}Other Rights{% endtrans %}</strong>
—
- {{ cctrans(locale, "deed.other_rights")|safe }}
+ {% trans %}In no way are any of the following rights affected by the license:{% endtrans %}
<ul>
<li>
- {{ cctrans(locale, "deed.fair_use")|safe }}
+ {% trans %}Your fair dealing or <a href="http://wiki.creativecommons.org/Frequently_Asked_Questions#Do_Creative_Commons_licenses_affect_fair_use.2C_fair_dealing_or_other_exceptions_to_copyright.3F" id="fair_use" class="helpLink">fair use</a> rights, or other applicable copyright exceptions and limitations;{% endtrans %}
</li>
{% if license.license_code.find('nd') >= 0 or license.jurisdiction.code != 'us' %}
<li>
- {{ cctrans(locale, "deed.moralrights")|safe }}
+ {% trans %}The author's <a href="http://wiki.creativecommons.org/Frequently_Asked_Questions#I_don.E2.80.99t_like_the_way_a_person_has_used_my_work_in_a_derivative_work_or_included_it_in_a_collective_work.3B_what_can_I_do.3F" id="moral_rights" class="helpLink">moral</a> rights;{% endtrans %}
</li>
{% endif %}
{% if license.jurisdiction.code == 'us' and license.license_code.find('nd') < 0 %}
<li>
- {{ cctrans(locale, "deed.moralrights-remix.us")|safe }}
+ {% trans %}Apart from the remix rights granted under this license, the author's <a href="http://wiki.creativecommons.org/Frequently_Asked_Questions#I_don.E2.80.99t_like_the_way_a_person_has_used_my_work_in_a_derivative_work_or_included_it_in_a_collective_work.3B_what_can_I_do.3F" id="moral_rights" class="helpLink">moral</a> rights;{% endtrans %}
</li>
{% endif %}
<li>
- {{ cctrans(locale, "deed.publicity_rights")|safe }}
+ {% trans %}Rights other persons may have either in the work itself or in how the work is used, such as <a href="http://wiki.creativecommons.org/Frequently_Asked_Questions#When_are_publicity_rights_relevant.3F" class="helpLink" id="publicity_rights">publicity</a> or privacy rights.{% endtrans %}
</li>
</ul>
</li>
<li rel="cc:requires"
resource="http://creativecommons.org/ns#Notice">
- <strong>{{ cctrans(locale, "util.notice")|safe }}</strong>
+ <strong>{% trans %}Notice{% endtrans %}</strong>
—
- {{ cctrans(locale, "deed.notice")|safe }}
+ {% trans %}For any reuse or distribution, you must make clear to others the license terms of this work. The best way to do this is with a link to this web page.{% endtrans %}
</li>
</ul>
{% if license.superseded %}
<div id="deed-newer" tal:condition="">
<p>
- {{ cctrans(locale, "deed.superseded",
- current_version_url=license.current_version.uri)|safe }}
+ {% trans current_version_url=license.current_version.uri %}A <a href="{{ current_version_url }}">new version</a> of this license is available. You should use it for new works, and you may want to relicense existing works under it. No works are <em>automatically</em> put under the new license, however.{% endtrans %}
</p>
</div>
{% endif %}
<div id="help_waived" class="help_panel">
<div class="hd">
- {{ cctrans(locale, "deed.permission.help.title")|safe }}
+ {% trans %}What does "conditions can be waived" mean?{% endtrans %}
</div>
<div class="bd">
<p>
- {{ cctrans(locale, "deed.permission.help")|safe }}
+ {% trans %}CC licenses anticipate that a licensor may want to
+ waive compliance with a specific condition, such as
+ attribution.{% endtrans %}
</p>
<p>
- <a href="http://wiki.creativecommons.org/Frequently_Asked_Questions#Can_I_change_the_terms_of_a_CC_license_or_waive_some_of_its_conditions.3F">{{ cctrans(locale, "util.learn_more")|safe }}</a>.
+ <a href="http://wiki.creativecommons.org/Frequently_Asked_Questions#Can_I_change_the_terms_of_a_CC_license_or_waive_some_of_its_conditions.3F">{% trans %}Learn more{% endtrans %}</a>.
</p>
</div>
</div>
<div id="help_public_domain" class="help_panel">
<div class="hd">
- {{ cctrans(locale, "deed.public_domain.help.title")|safe }}
+ {% trans %}What does "Public Domain" mean?{% endtrans %}
</div>
<div class="bd">
<p>
- {{ cctrans(locale, "deed.public_domain.help")|safe }}
+ {% trans %}A work is in the public domain when it is free for use by anyone for any purpose without restriction under copyright.{% endtrans %}
</p>
<p>
<a href="http://wiki.creativecommons.org/Public_domain"
- >{{ cctrans(locale, "util.learn_more")|safe }}</a>.</p>
+ >{% trans %}Learn more{% endtrans %}</a>.</p>
</div>
</div>
<div id="help_fair_use" class="help_panel">
<div class="hd">
- {{ cctrans(locale, "deed.fair_use.help.title")|safe }}
+ {% trans %}What does "Fair use" mean?{% endtrans %}
</div>
<div class="bd">
<p>
- {{ cctrans(locale, "deed.fair_use.help")|safe }}
+ {% trans %}All jurisdictions
+ allow some limited uses of copyrighted material without
+ permission. CC licenses do not affect the rights of
+ users under those copyright limitations and exceptions,
+ such as fair use and fair dealing where applicable.{% endtrans %}
</p>
<p>
- <a href="http://wiki.creativecommons.org/Frequently_Asked_Questions#Do_Creative_Commons_licenses_affect_fair_use.2C_fair_dealing_or_other_exceptions_to_copyright.3F">{{ cctrans(locale, "util.learn_more")|safe }}</a>.</p>
+ <a href="http://wiki.creativecommons.org/Frequently_Asked_Questions#Do_Creative_Commons_licenses_affect_fair_use.2C_fair_dealing_or_other_exceptions_to_copyright.3F">{% trans %}Learn more{% endtrans %}</a>.</p>
</div>
</div>
<div id="help_moral_rights" class="help_panel">
<div class="hd">
- {{ cctrans(locale, "deed.moralrights.help.title")|safe }}
+ {% trans %}What are "Moral Rights"?{% endtrans %}
</div>
<div class="bd">
<p>
- {{ cctrans(locale, "deed.moralrights.help")|safe }}
+ {% trans %}In addition to the right of licensors to request removal of their name from the work when used in a derivative or collective they don't like, copyright laws in most jurisdictions around the world (with the notable exception of the US except in very limited circumstances) grant creators "moral rights" which may provide some redress if a derivative work represents a "derogatory treatment" of the licensor's work.{% endtrans %}
</p>
<p>
- <a href="http://wiki.creativecommons.org/Frequently_Asked_Questions#I_don.E2.80.99t_like_the_way_a_person_has_used_my_work_in_a_derivative_work_or_included_it_in_a_collective_work.3B_what_can_I_do.3F">{{ cctrans(locale, "util.learn_more")|safe }}</a>.
+ <a href="http://wiki.creativecommons.org/Frequently_Asked_Questions#I_don.E2.80.99t_like_the_way_a_person_has_used_my_work_in_a_derivative_work_or_included_it_in_a_collective_work.3B_what_can_I_do.3F">{% trans %}Learn more{% endtrans %}</a>.
</p>
</div>
@@ -250,15 +255,21 @@
<div id="help_publicity_rights" class="help_panel">
<div class="hd">
- {{ cctrans(locale, "deed.publicity_rights.help.title")|safe }}
+ {% trans %}What are "Publicity Rights"?{% endtrans %}
</div>
<div class="bd">
<p>
- {{ cctrans(locale, "deed.publicity_rights.help")|safe }}
+ {% trans %}Publicity
+ rights allow individuals to control how their voice,
+ image or likeness is used for commercial purposes in
+ public. If a CC-licensed work includes the voice or
+ image of anyone other than the licensor, a user of the
+ work may need to get permission from those individuals
+ before using the work for commercial purposes.{% endtrans %}
</p>
<p>
- <a href="http://wiki.creativecommons.org/Frequently_Asked_Questions#When_are_publicity_rights_relevant.3F">{{ cctrans(locale, "util.learn_more")|safe }}</a>.
+ <a href="http://wiki.creativecommons.org/Frequently_Asked_Questions#When_are_publicity_rights_relevant.3F">{% trans %}Learn more{% endtrans %}</a>.
</p>
</div>
</div>
diff --git a/cc/engine/templates/licenses/zero_deed.html b/cc/engine/templates/licenses/zero_deed.html
index ac0b1c6..60f139e 100644
--- a/cc/engine/templates/licenses/zero_deed.html
+++ b/cc/engine/templates/licenses/zero_deed.html
@@ -14,26 +14,26 @@
style="display:inline !important;">CC0 1.0</span>)
</small>
<br />
- {{ cctrans(locale, "util.public_domain_dedication")|safe }}
+ {% trans %}Public Domain Dedication{% endtrans %}
{% endblock %}
{% block body %}
<div id="deed-rights"
dir="{{ get_ltr_rtl }}" style="{{ is_rtl_align }}">
- <h3>{{ cctrans(locale, "deed.zero.no_copyright")|safe }}</h3>
+ <h3>{% trans %}No Copyright{% endtrans %}</h3>
<div id="librepd">
<a href="http://freedomdefined.org/">
<img src="/images/deed/seal.png"
- alt="{{ cctrans(locale, 'This license is acceptable for Free Cultural Works.')|safe }}" />
+ alt="{% trans %}This license is acceptable for Free Cultural Works.{% endtrans %}" />
</a>
</div>
<ul class="license-properties" style="width: 550px;">
<li class="license nolaw">
<p id="nolaw-text" style="margin-bottom:1em;">
- {{ cctrans(locale, "deed.zero.nocopyright-text")|safe }}
+ {% trans %}The person who associated a work with this deed has <b>dedicated</b> the work to the public domain by waiving all of his or her rights to the work worldwide under copyright law, including all related and neighboring rights, to the extent allowed by law.{% endtrans %}
</p>
<p>
- {{ cctrans(locale, "deed.zero.no-endorsment")|safe }}
+ {% trans %}You can copy, modify, distribute and perform the work, even for commercial purposes, all without asking permission. See <b>Other Information</b> below.{% endtrans %}
</p>
</li>
@@ -51,20 +51,20 @@
</li>
<li style="display:none">
<span class="work-details-item-title">
- {{ cctrans(locale, "deed.workdetails.work")|safe }}
+ {% trans %}Work:{% endtrans %}
</span>
<span id="meta_title" class="work-details-item-value"></span>
</li>
<li style="display:none">
<span class="work-details-item-title">
- {{ cctrans(locale, "deed.workdetails.affirmer")|safe }}
+ {% trans %}<a href="" class="inline-help helpLink" id="who_is_affirmer">Affirmer</a>{% endtrans %}
</span>
<span id="meta_affirmer" class="work-details-item-value"></span>
</li>
<li id="work-attribution-container" style="margin-top: 25px; display:none;">
<strong>
- {{ cctrans(locale, "deed.cite_this_work")|safe }}
+ {% trans %}You can <a href="" class="helpLink" id="citation_help" name="citation_help">cite</a> this work with this HTML:{% endtrans %}
</strong>
<br />
<input id="work-attribution" value="" />
@@ -78,68 +78,68 @@
<ul class="license-properties">
<li class="license">
- <strong>{{ cctrans(locale, "util.other_information")|safe }}</strong>
+ <strong>{% trans %}Other Information{% endtrans %}</strong>
<ul>
<li>
- {{ cctrans(locale, "deed.zero.other_info.other_rights")|safe }}
+ {% trans %}In no way are the patent or trademark rights of any person affected by CC0, nor are the rights that other persons may have in the work or in how the work is used, such as <a href="http://wiki.creativecommons.org/Frequently_Asked_Questions#When_are_publicity_rights_relevant.3F" class="helpLink" id="publicity_rights" name="publicity_rights">publicity or privacy</a> rights.{% endtrans %}
</li>
<li>
- {{ cctrans(locale, "deed.zero.other_info.no_warranty")|safe }}
+ {% trans %}Unless expressly stated otherwise, the person who associated a work with this deed makes no warranties about the work, and disclaims liability for all uses of the work, to the fullest extent permitted by applicable law.{% endtrans %}
</li>
<li>
- {{ cctrans(locale, "deed.zero.other_info.no_endorsement")|safe }}
+ {% trans %}When using or citing the work, you should not imply <a href="" class="helpLink" id="endorsement" name="endorsement">endorsement</a> by the author or the affirmer.{% endtrans %}
</li>
</ul>
</li>
</ul>
<div id="help_publicity_rights">
- <div class="hd">{{ cctrans(locale, "util.other_rights")|safe }}</div>
+ <div class="hd">{% trans %}Other Rights{% endtrans %}</div>
<div class="bd">
<p>
- {{ cctrans(locale, "deed.help.other_rights")|safe }}
+ {% trans %}The use of a work free of known copyright restrictions may be otherwise regulated or limited. The work or its use may be subject to personal data protection laws, publicity, image, or privacy rights that allow a person to control how their voice, image or likeness is used, or other restrictions or limitations under applicable law.{% endtrans %}
</p>
<p>
- <a href="http://wiki.creativecommons.org/Frequently_Asked_Questions#When_are_publicity_rights_relevant.3F">{{ cctrans(locale, "util.learn_more")|safe }}</a>.
+ <a href="http://wiki.creativecommons.org/Frequently_Asked_Questions#When_are_publicity_rights_relevant.3F">{% trans %}Learn more{% endtrans %}</a>.
</p>
</div>
</div>
<div id="help_endorsement">
- <div class="hd">{{ cctrans(locale, "util.endorsement")|safe }}</div>
+ <div class="hd">{% trans %}Endorsement{% endtrans %}</div>
<div class="bd">
<p>
- {{ cctrans(locale, "deed.help.endorsement")|safe }}
+ {% trans %}In some jurisdictions, wrongfully implying that an author, publisher or anyone else endorses your use of a work may be unlawful.{% endtrans %}
</p>
<p>
- <a href="http://wiki.creativecommons.org/Frequently_Asked_Questions#Do_I_need_to_be_aware_of_anything_else_when_providing_attribution_or_credit.3F">{{ cctrans(locale, "util.learn_more")|safe }}</a>.
+ <a href="http://wiki.creativecommons.org/Frequently_Asked_Questions#Do_I_need_to_be_aware_of_anything_else_when_providing_attribution_or_credit.3F">{% trans %}Learn more{% endtrans %}</a>.
</p>
</div>
</div>
<div id="help_citation_help">
- <div class="hd">{{ cctrans(locale, "util.citation")|safe }}</div>
+ <div class="hd">{% trans %}Citation{% endtrans %}</div>
<div class="bd">
<p>
- {{ cctrans(locale, "deed.help.citation")|safe }}
+ {% trans %}Copy and paste the HTML provided into your webpage to easily cite this work.{% endtrans %}
</p>
<p>
- <a href="http://wiki.creativecommons.org/CC0_FAQ#Do_I_have_to_attribute_the_person_who_applied_CC0_to_their_work.3F">{{ cctrans(locale, "util.learn_more")|safe }}</a>
+ <a href="http://wiki.creativecommons.org/CC0_FAQ#Do_I_have_to_attribute_the_person_who_applied_CC0_to_their_work.3F">{% trans %}Learn more{% endtrans %}</a>
</p>
</div>
</div>
<div id="help_who_is_affirmer">
<div class="hd">
- {{ cctrans(locale, "util.who_is_affirmer")|safe }}
+ {% trans %}Who is the affirmer?{% endtrans %}
</div>
<div class="bd">
<p>
- {{ cctrans(locale, "deed.help.who_is_affirmer")|safe }}
+ {% trans %}The affirmer is the person who surrendered rights to the work worldwide using CC0, to the extent allowable by law. It may be the original author of the work or another person who may have had some copyright or related or neighboring legal rights in the work.{% endtrans %}
</p>
</div>
</div>
@@ -158,27 +158,27 @@
<!--- hidden disclaimer text -->
<div id="help_disclaimer_popup" class="help_panel">
<div class="hd">
- {{ cctrans(locale, "util.Disclaimer")|safe }}
+ {% trans %}Disclaimer{% endtrans %}
</div>
<div class="bd">
- {{ cctrans(locale, "deed.zero.disclaimer")|safe }}
+ {% trans %}<p> The Commons Deed is not a legal instrument. It is simply a handy reference for understanding the CC0 Legal Code, a human-readable expression of some of its key terms. Think of it as the user-friendly interface to the CC0 Legal Code beneath. This Deed itself has no legal value, and its contents do not appear in CC0. </p> <p> Creative Commons is not a law firm and does not provide legal services. Distributing, displaying, or linking to this Commons Deed does not create an attorney-client relationship. </p> <p> Creative Commons has not verified the copyright status of any work to which CC0 has been applied. CC makes no warranties about any work or its copyright status in any jurisdiction, and disclaims all liability for all uses of any work. </p>{% endtrans %}
</div>
</div>
<div id="deed-disclaimer">
<div class="summary">
- {{ cctrans(locale, "deed.zero.human_summary")|safe }}
+ {% trans %}This is a human-readable summary of the <a href="./legalcode">Legal Code (read the full text)</a>.{% endtrans %}
</div>
<div class="disclaimer">
<a href="#" id="disclaimer_popup" class="helpLink">
- {{ cctrans(locale, "util.Disclaimer")|safe }}
+ {% trans %}Disclaimer{% endtrans %}
</a>
</div>
</div>
{% endblock legalcode_block %}
{% block use_this_license %}
- <a id="get_this" href="/publicdomain/">{{ cctrans(locale, "deed.use_this_tool")|safe }}</a>
+ <a id="get_this" href="/publicdomain/">{% trans %}Use this tool for your own work.{% endtrans %}</a>
{% endblock use_this_license %}
diff --git a/cc/engine/templates/macros_templates/deed.html b/cc/engine/templates/macros_templates/deed.html
index 6347943..a0f822a 100644
--- a/cc/engine/templates/macros_templates/deed.html
+++ b/cc/engine/templates/macros_templates/deed.html
@@ -97,14 +97,30 @@
{% block legalcode_block %}
<!--- hidden disclaimer text -->
<div id="help_disclaimer_popup" class="help_panel">
- <div class="hd">{{ cctrans(locale, "util.Disclaimer")|safe }}</div>
+ <div class="hd">{% trans %}Disclaimer{% endtrans %}</div>
{% if license.jurisdiction.code == 'jp' %}
<div class="bd">
- {{ cctrans(locale, "deed.disclaimer.jp")|safe }}
+ {% trans %}<p>
+The Commons Deed is not a license. It is simply a handy reference for understanding the Legal Code (the full License) â it is a human-readable expression of some of its key terms. This Deed itself has no legal value, and its contents do not appear in the actual License. The actual terms of the license is set forth by the Legal Code. <a href="legalcode" class="fulltext">Please click here to see the full License</a>.
+</p>
+
+<p>
+Creative Commons and Creative Commons Japan are not law firms, and distributing of or displaying of, or linking to the Commons Deed does not constitute an offer of legal advice or any other legal services. Creative Commons and Creative Commons Japan are not a party to the License underlying this Commons Deed, and disclaim liablity for damages resulting from any use of the Commons Deed and the underlying License.
+</p>
+
+<p>
+The Product licensed under Creative Commons License is provided by the person who applied the License. Creative Commons and Creative Commons Japan make no warranties regarding the title of the licensor. Please read <a href="http://creativecommons.jp/faq/">here</a> for information regarding the application of licenses and exploitation of the Product licensed under Creative Commons licenses.
+</p>{% endtrans %}
</div>
{% else %}
<div class="bd">
- {{ cctrans(locale, "deed.disclaimer")|safe }}
+ {% trans %}<p>
+The Commons Deed is not a license. It is simply a handy reference for understanding the Legal Code (the full license) — it is a human-readable expression of some of its key terms. Think of it as the user-friendly interface to the Legal Code beneath. This Deed itself has no legal value, and its contents do not appear in the actual license.
+</p>
+
+<p>
+Creative Commons is not a law firm and does not provide legal services. Distributing of, displaying of, or linking to this Commons Deed does not create an attorney-client relationship.
+</p>{% endtrans %}
</div>
{% endif %}
</div>
@@ -112,20 +128,20 @@
<div id="deed-disclaimer">
{% if multi_language %}
<div class="summary">
- {{ cctrans(locale, "deed.human_summary_multilanguage")|safe }}
+ {% trans %}This is a human-readable summary of the Legal Code (the full license) available in the following languages:{% endtrans %}
{% for legalcode_link, legalcode, legalcode_name in legalcodes %}
<a href="{{ legalcode_link }}">{{ legalcode_name }}</a>
{% endfor %}
</div>
{% else %}
<div class="summary">
- {{ cctrans(locale, "deed.human_summary")|safe }}
+ {% trans %}This is a human-readable summary of the <a href="legalcode" class="fulltext">Legal Code (the full license)</a>.{% endtrans %}
</div>
{% endif %}
<div class="disclaimer">
<a href="#" id="disclaimer_popup" class="helpLink">
- {{ cctrans(locale, "util.Disclaimer")|safe }}
+ {% trans %}Disclaimer{% endtrans %}
</a>
</div>
</div>
@@ -143,7 +159,7 @@
{% if not license.deprecated %}
{% block use_this_license %}
<a id="get_this" href="/choose/results-one?license_code={{ license_code_quoted }}&jurisdiction={{ license.jurisdiction.code }}&version={{ license.version }}&lang={{ target_lang }}"
- >{{ cctrans(locale, "deed.use_this_license")|safe }}</a>
+ >{% trans %}Use this license for your own work.{% endtrans %}</a>
{% endblock %}
{% endif %}
</p>
diff --git a/cc/engine/templates/macros_templates/partner.html b/cc/engine/templates/macros_templates/partner.html
index 468b544..b7efdfb 100644
--- a/cc/engine/templates/macros_templates/partner.html
+++ b/cc/engine/templates/macros_templates/partner.html
@@ -23,7 +23,7 @@
<div class="nav">
provided by
<a href="http://creativecommons.org/"
- >{{ cctrans(locale, "util.Creative_Commons")|safe }}</a>
+ >{% trans %}Creative Commons{% endtrans %}</a>
</div>
{% block body %}{% endblock %}
</div>
diff --git a/cc/engine/templates/publicdomain/index.html b/cc/engine/templates/publicdomain/index.html
index 2695995..5f5e284 100644
--- a/cc/engine/templates/publicdomain/index.html
+++ b/cc/engine/templates/publicdomain/index.html
@@ -3,41 +3,41 @@
{% block title %}Creative Commons Public Domain Tools{% endblock %}
{% block page_header_title %}
- {{ cctrans(locale, "license.pdtools.title")|safe }}
+ {% trans %}Our Public Domain Tools{% endtrans %}
{% endblock %}
{% block body %}
<p>
- {{ cctrans(locale, "license.pdtools.intro")|safe }}
+ {% trans %}Our licenses help authors keep and manage their copyright on terms they choose. Our public domain tools, on the other hand, enable authors and copyright owners who want to dedicate their works to the worldwide public domain to do so, and facilitate the labeling and discovery of works that are already free of known copyright restrictions.{% endtrans %}
</p>
<h2>CC0</h2>
<p>
- {{ cctrans(locale, "license.pdtools.zero")|safe }}
+ {% trans %}Use this universal tool if you are a holder of copyright or database rights, and you wish to waive all your interests in your work worldwide.{% endtrans %}
</p>
<ul>
<li>
- <a href="/about/cc0">{{ cctrans(locale, "util.learn_more")|safe }}</a>
+ <a href="/about/cc0">{% trans %}Learn more{% endtrans %}</a>
</li>
<li>
- <a href="/choose/zero/">{{ cctrans(locale, "util.use_this_tool")|safe }}</a>
+ <a href="/choose/zero/">{% trans %}Use this tool{% endtrans %}</a>
</li>
</ul>
- <h2>{{ cctrans(locale, "licenses.publicdomain_mark_title")|safe }}</h2>
+ <h2>{% trans %}Public Domain Mark{% endtrans %}</h2>
<p>
- {{ cctrans(locale, "license.pdtools.pdm")|safe }}
+ {% trans %}Use this tool if you have identified a work that is free of known copyright restrictions. Creative Commons does not recommend this tool for works that are restricted by copyright laws in one or more jurisdictions.{% endtrans %}
</p>
<ul>
<li>
- <a href="/about/pdm">{{ cctrans(locale, "util.learn_more")|safe }}</a>
+ <a href="/about/pdm">{% trans %}Learn more{% endtrans %}</a>
</li>
<li>
- <a href="/choose/mark">{{ cctrans(locale, "util.use_this_tool")|safe }}</a>
+ <a href="/choose/mark">{% trans %}Use this tool{% endtrans %}</a>
</li>
</ul>
{% endblock body %}
diff --git a/cc/engine/tests/test_cc_org_i18n.py b/cc/engine/tests/test_cc_org_i18n.py
deleted file mode 100644
index 54974fb..0000000
--- a/cc/engine/tests/test_cc_org_i18n.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from zope.i18n import translate
-
-from cc.i18n import ccorg_i18n_setup
-from cc.i18n.util import negotiate_locale
-
-
-def test_translate():
- assert translate(
- 'char.by_title', domain=ccorg_i18n_setup.I18N_DOMAIN,
- target_language=negotiate_locale('en_US')) == 'Attribution'
diff --git a/cc/engine/tests/test_util.py b/cc/engine/tests/test_util.py
index ff62044..e498fe1 100644
--- a/cc/engine/tests/test_util.py
+++ b/cc/engine/tests/test_util.py
@@ -26,6 +26,37 @@ class FakeRequest(object):
self.accept_language = FakeAcceptLanguage(best_matches)
+def test_get_target_lang_from_request():
+
+ def pick_lang(langs=[], form_lang=None):
+ """Shorthand helper function thing."""
+ environ = {
+ "REQUEST_METHOD" : "GET",
+ "PATH_INFO" : "/",
+ }
+ if form_lang:
+ environ["QUERY_STRING"] = "lang="+form_lang
+ req = Request(environ)
+ req.matchdict = {}
+ req.accept_language = ", ".join(langs)
+ return util.get_target_lang_from_request(req)
+
+ # neutral language case
+ assert pick_lang() == 'en'
+
+ # amurican english
+ assert pick_lang(['en-us', 'en']) == 'en'
+
+ # spanish
+ assert pick_lang(['es']) == 'es'
+
+ # bs
+ assert pick_lang(['total_bs_locale']) == 'en'
+
+ # specific language request
+ assert pick_lang(['es', 'el'], form_lang='jp') == 'jp'
+
+
def test_get_xpath_attribute():
tree = etree.parse(
StringIO.StringIO('<foo><bar><baz basil="herb" /></bar></foo>'))
@@ -153,6 +184,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 89f16b5..6fc18dd 100644
--- a/cc/engine/util.py
+++ b/cc/engine/util.py
@@ -16,18 +16,17 @@ from webob import Response
from zope.component.globalregistry import base
from zope.i18n.interfaces import ITranslationDomain
from zope.i18n import translate
-from zope.i18nmessageid import MessageFactory
from cc.license._lib import rdf_helper, all_possible_license_versions
from cc.license._lib import functions as cclicense_functions
from cc.i18n import ccorg_i18n_setup
+from cc.i18n import mappers
from cc.i18n.gettext_i18n import ugettext_for_locale
+from cc.i18n.gettext_i18n import fake_ugettext as _
from cc.i18n.util import negotiate_locale
from cc.i18n.util import locale_to_lower_upper
from cc.i18n.util import get_all_supported_languages
-_ = MessageFactory('cc_org')
-
BASE_TEMPLATE_DIR = os.path.join(os.path.dirname(__file__), 'templates')
@@ -68,7 +67,7 @@ TEMPLATE_LOADER = jinja2.PackageLoader('cc.engine', 'templates')
TEMPLATE_ENV = jinja2.Environment(
loader=TEMPLATE_LOADER,
autoescape=True,
- extensions=['jinja2.ext.autoescape'])
+ extensions=['jinja2.ext.autoescape', 'jinja2.ext.i18n'])
# Add cctrans to the global context
TEMPLATE_ENV.globals['cctrans'] = cctrans
@@ -89,6 +88,8 @@ def render_template(request, locale, template_path, context):
template = TEMPLATE_ENV.get_template(template_path)
context['request'] = request
context['locale'] = locale
+ if not 'gettext' in context:
+ context['gettext'] = ugettext_for_locale(locale)
rendered = template.render(context)
@@ -221,6 +222,8 @@ def get_license_conditions(license, target_language="en_US"):
conditions on the deeds page. It kinda sucks... I think we could
do better with the new api.
"""
+ ugettext = ugettext_for_locale(target_language)
+
attrs = []
for lic in license.license_code.split('-'):
@@ -230,16 +233,14 @@ def get_license_conditions(license, target_language="en_US"):
continue
# Go through the chars and build up the HTML and such
- char_title = unicode_cleaner(
- translate(
- 'char.%s_title' % lic,
- domain=ccorg_i18n_setup.I18N_DOMAIN,
- target_language=negotiate_locale(target_language)))
- char_brief = unicode_cleaner(
- translate(
- 'char.%s_brief' % lic,
- domain=ccorg_i18n_setup.I18N_DOMAIN,
- target_language=negotiate_locale(target_language)))
+ char_title = None
+ char_brief = None
+ if lic in mappers.CHARACTERISTIC_TITLE_MAP:
+ char_title = ugettext(
+ mappers.CHARACTERISTIC_TITLE_MAP[lic])
+ if lic in mappers.CHARACTERISTIC_BRIEF_DESC_MAP:
+ char_brief = ugettext(
+ mappers.CHARACTERISTIC_BRIEF_DESC_MAP[lic])
icon_name = lic
predicate = 'cc:requires'
@@ -252,10 +253,10 @@ def get_license_conditions(license, target_language="en_US"):
object = 'http://creativecommons.org/ns#ShareAlike'
if license.version == 3.0 and license.code == 'by-sa':
char_brief = unicode_cleaner(
- translate(
- 'char.sa_bysa30_brief',
- domain=ccorg_i18n_setup.I18N_DOMAIN,
- target_language=negotiate_locale(target_language)))
+ ugettext(
+ u'If you alter, transform, or build upon this work, '
+ u'you may distribute the resulting work only under the '
+ u'same, similar or a compatible license.'))
elif lic == 'nd':
predicate = ''
object = ''
@@ -325,11 +326,9 @@ def active_languages():
if code == 'test': continue
- name = domain.translate(
- u'lang.%s' % code, target_language=negotiate_locale(code))
- if name != u'lang.%s' % code:
- # we have a translation for this name...
- result.append(dict(code=code, name=name))
+ gettext = ugettext_for_locale(negotiate_locale(code))
+ name = gettext(mappers.LANG_MAP[code])
+ result.append(dict(code=code, name=name))
result = sorted(result, key=lambda lang: lang['name'].lower())
@@ -505,16 +504,15 @@ def send_email(from_addr, to_addrs, subject, message_body):
LICENSE_INFO_EMAIL_BODY = _(
- 'license.info_email_body',
"""Thank you for using a Creative Commons legal tool for your work.
-You have selected ${license_title}.
+You have selected %(license_title)s.
You should include a reference to this on the web page that includes
the work in question.
Here is the suggested HTML:
-${license_html}
+%(license_html)s
Tips for marking your work can be found at
http://wiki.creativecommons.org/Marking. Information on the supplied HTML and
@@ -530,7 +528,6 @@ Creative Commons Support
info at creativecommons.org""")
LICENSE_INFO_EMAIL_SUBJECT = _(
- 'license.info_email_subject',
'Your Creative Commons License Information')
@@ -549,10 +546,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(
@@ -572,15 +569,16 @@ def get_target_lang_from_request(request):
if request_form.has_key('lang'):
return locale_to_lower_upper(request_form['lang'])
- accept_lang = request.accept_language.best_match(
- get_all_supported_languages())
if request.matchdict.has_key('target_lang'):
target_lang = request.matchdict['target_lang']
- elif accept_lang:
- target_lang = accept_lang
else:
- target_lang = 'en'
-
+ # 'en' is prepended to the list of all supported languages to make it
+ # the first match in a tie breaker. In the event in which the
+ # accept_languages field is blank, webob doesn't just return the
+ # default value for some reason.
+ target_lang = request.accept_language.best_match(
+ ['en'] + list(get_all_supported_languages()),
+ default_match="en")
return locale_to_lower_upper(target_lang)
diff --git a/cc/engine/views.py b/cc/engine/views.py
index 1ba30b4..90bebb4 100644
--- a/cc/engine/views.py
+++ b/cc/engine/views.py
@@ -1,10 +1,7 @@
-import mimetypes
import urllib
from webob import Response, exc
-from cc.engine import util
-
def root_view(request):
return Response("This is the root")
diff --git a/setup.py b/setup.py
index 86e75ba..5e571b6 100644
--- a/setup.py
+++ b/setup.py
@@ -37,9 +37,6 @@ setup(
'cc.licenserdf',
'cc.license',
'cc.i18n',
- 'python-gettext',
- 'zope.interface',
- 'zope.pagetemplate<3.6.0',
'PasteScript',
#'repoze.bfg',
'webob',
hooks/post-receive
--
cc.engine: License chooser, public domain chooser, deeds
More information about the cc-commits
mailing list