[cc-commits] [CC SVN] r12759 - in cc.engine/branches/production: . cc/engine/chooser_pages

webmaster at creativecommons.org webmaster at creativecommons.org
Tue Jun 9 18:33:32 EDT 2009


Author: nyergler
Date: 2009-06-09 22:33:32 +0000 (Tue, 09 Jun 2009)
New Revision: 12759

Modified:
   cc.engine/branches/production/
   cc.engine/branches/production/cc/engine/chooser_pages/nonweb_popup.pt
Log:
Merged revisions 12758 via svnmerge from 
svn+ssh://svn@code.creativecommons.org/svnroot/cc.engine/trunk

........
  r12758 | nyergler | 2009-06-09 15:28:18 -0700 (Tue, 09 Jun 2009) | 2 lines
  
  Fallback text for non-web popup (Issue 379).
........



Property changes on: cc.engine/branches/production
___________________________________________________________________
Modified: svnmerge-integrated
   - /cc.engine/trunk:1-6977,6986-7568,7662-7664,7666-7886,7916-7917,7923-8021,8121-8122,8125-8310,8312-8350,8352-8511,8516-8668,8671-8722,8724-9124,9126-9138,9143,9147,9170,9395,9463-11548,11557-11559,11564,11602,11611-11774,11776-11846,11853,11861,11868-11870,11872-11901,11903-12118,12140-12143,12189-12196,12210,12230-12314,12330,12340,12347-12365,12371-12372,12375-12399,12471,12480,12489,12496-12497
   + /cc.engine/trunk:1-6977,6986-7568,7662-7664,7666-7886,7916-7917,7923-8021,8121-8122,8125-8310,8312-8350,8352-8511,8516-8668,8671-8722,8724-9124,9126-9138,9143,9147,9170,9395,9463-11548,11557-11559,11564,11602,11611-11774,11776-11846,11853,11861,11868-11870,11872-11901,11903-12118,12140-12143,12189-12196,12210,12230-12314,12330,12340,12347-12365,12371-12372,12375-12399,12471,12480,12489,12496-12497,12758

Modified: cc.engine/branches/production/cc/engine/chooser_pages/nonweb_popup.pt
===================================================================
--- cc.engine/branches/production/cc/engine/chooser_pages/nonweb_popup.pt	2009-06-09 22:28:18 UTC (rev 12758)
+++ cc.engine/branches/production/cc/engine/chooser_pages/nonweb_popup.pt	2009-06-09 22:33:32 UTC (rev 12759)
@@ -18,14 +18,21 @@
 <textarea cols="30" rows="8" name="html" style="width:90%;height:150px;">
 <span tal:omit-tag="" 
       tal:condition="request/publicdomain|request/pd|nothing"
-      i18n:translate="license.non_web_pd" />
+      i18n:translate="license.non_web_pd">
+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, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.
+</span>
 <span tal:omit-tag="" 
       tal:condition="not:request/publicdomain|request/pd|nothing"
       i18n:translate="license.non_web_statement">
+This work is licensed under the Creative Commons 
    <span tal:omit-tag="" i18n:name="license_name" 
-         tal:content="view/license/name" />
+         tal:content="view/license/name" /> License.
+To view a copy of this license, visit 
    <span tal:omit-tag="" i18n:name="license_url" 
-         tal:content="view/license/uri" />
+         tal:content="view/license/uri" /> or send a letter to
+Creative Commons, 171 Second Street, Suite 300, San Francisco, 
+California, 94105, USA.
+
 </span>
 </textarea>
 <p><input type="button" onclick="form.html.focus();form.html.select()" 




More information about the cc-commits mailing list