Changeset 613


Ignore:
Timestamp:
08/09/06 15:53:32 (13 years ago)
Author:
tarmo
Message:

Closes #630, spent 30m.

Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/Activity.py

    r586 r613  
    3434            label="Video", 
    3535            description="Upload a video if available", 
     36            i18n_domain="lemill", 
     37            label_msgid='label_video', 
     38            description_msgid='help_video', 
    3639            show_content_type= True, 
    3740        ), 
  • trunk/FieldsWidgets.py

    r607 r613  
    234234    _properties.update({ 
    235235        'macro' : 'copyrightwidget', 
    236         'no_label' : True, 
    237236    }) 
    238237     
  • trunk/Piece.py

    r592 r613  
    2626from Resources import Resource 
    2727 
    28 schema = BaseSchema + description + tags + author_schema + original_author_schema + license_schema + coverImage + parentVersion + contentFile + sourceFile + lemill_metadata_mods + deletionReason   
     28schema = BaseSchema + description + tags + author_schema + original_author_schema + piece_license_schema + coverImage + parentVersion + contentFile + sourceFile + lemill_metadata_mods + deletionReason   
    2929 
    3030schema = schema + Schema(( 
  • trunk/SharedMetadata.py

    r611 r613  
    2121from Products.Archetypes.public import * 
    2222from FieldsWidgets import * 
    23 from config import LICENSES 
     23from config import LICENSES, ALL_LICENSES 
    2424 
    2525bodytext = Schema(( 
     
    8181)) 
    8282 
     83license_schema = Schema(( 
     84   TextField('rights', 
     85       schemata="metadata", 
     86       default = "CreativeCommons", 
     87       vocabulary=DisplayList((LICENSES)), 
     88       widget=CopyrightWidget( 
     89           visible={'edit':'visible'}, 
     90                label='License', 
     91                label_msgid='label_license', 
     92                i18n_domain="lemill" 
     93           ), 
     94       ), 
     95)) 
     96 
     97piece_license_schema = Schema(( 
     98   TextField('rights', 
     99       schemata="metadata", 
     100       default = "CreativeCommons", 
     101       vocabulary=DisplayList((ALL_LICENSES)), 
     102       widget=CopyrightWidget( 
     103                visible={'view':'visible','edit':'visible'}, 
     104                label='License', 
     105                label_msgid='label_license', 
     106                i18n_domain="lemill" 
     107           ), 
     108       ), 
     109)) 
    83110license_schema = Schema(( 
    84111   TextField('rights', 
  • trunk/config.py

    r597 r613  
    159159    } 
    160160 
    161 LICENSES = (('CreativeCommons', '''Creative Commons BY-SA License'''), ('FreeDocumentationLicense', 'Free Documentation License'), ('PublicDomain', 'Public Domain')) 
     161ALL_LICENSES = (('CreativeCommons', '''Creative Commons BY-SA License'''), ('FreeDocumentationLicense', 'Free Documentation License'), ('PublicDomain', 'Public Domain')) 
     162LICENSES = ALL_LICENSES[0:1] 
     163 
    162164 
    163165for section in SECTIONS: 
  • trunk/i18n/lemill-en.po

    r609 r613  
    44msgstr "" 
    55"Project-Id-Version: LeMill 0.6\n" 
    6 "POT-Creation-Date: 2006-08-09 11:32+0000\n" 
     6"POT-Creation-Date: 2006-08-09 12:53+0000\n" 
    77"PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n" 
    88"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 
     
    797797msgstr "Enter descriptive tags for this resource, separated by commas." 
    798798 
     799#. Default: "Upload a video if available" 
     800#: widget description of FileWidget for label Video 
     801msgid "help_video" 
     802msgstr "Upload a video if available" 
     803 
    799804#. Default: "Write the actual text content here." 
    800805#: widget description of WYSIWYMWidget for label Body text 
     
    939944msgid "label_lastname" 
    940945msgstr "Last name" 
     946 
     947#. Default: "License" 
     948#: ../skins/lemill/piece_view.pt 
     949msgid "label_license" 
     950msgstr "License" 
    941951 
    942952#. Default: "Audio recording" 
     
    11081118msgstr "Upload a file..." 
    11091119 
     1120#. Default: "Video" 
     1121#: widget label of FileWidget - description "Upload a video if available" 
     1122msgid "label_video" 
     1123msgstr "Video" 
     1124 
    11101125#. Default: "Body text" 
    11111126#: widget label of WYSIWYMWidget - description "Write the actual text content here." 
     
    15211536msgstr "Allowed file types: ${list}" 
    15221537 
     1538#. Default: "The textual material you include here should be written by you. You should not copy text straight from other sources unless they are released under the Creative Commons Attribution Share-Alike 2.5 license - the license used in LeMill. However, you may naturally use citation in your text with references to the original text." 
     1539#: ../skins/lemill/copyrightwidget.pt 
     1540msgid "text_cc_license_notification" 
     1541msgstr "The textual material you include here should be written by you. You should not copy text straight from other sources unless they are released under the Creative Commons Attribution Share-Alike 2.5 license - the license used in LeMill. However, you may naturally use citation in your text with references to the original text." 
     1542 
    15231543#. Default: "Contains ${amount} item(s)" 
    15241544#: ../skins/lemill/collections_list.pt 
  • trunk/i18n/lemill-fi.po

    r609 r613  
    66msgstr "" 
    77"Project-Id-Version: lemill-fi\n" 
    8 "POT-Creation-Date: 2006-08-09 11:32+0000\n" 
    9 "PO-Revision-Date: 2006-08-09 14:35+0300\n" 
     8"POT-Creation-Date: 2006-08-09 12:53+0000\n" 
     9"PO-Revision-Date: 2006-08-09 15:59+0300\n" 
    1010"Last-Translator: Tarmo Toikkanen <tarmo.toikkanen@iki.fi>\n" 
    1111"Language-Team: Finnish\n" 
     
    800800msgstr "SyötÀ tÀtÀ resurssia kuvaavia tageja pilkuilla eroteltuna." 
    801801 
     802#. Default: "Upload a video if available" 
     803#: widget description of FileWidget for label Video 
     804msgid "help_video" 
     805msgstr "LÀhetÀ video toiminnasta, jos sellainen on saatavilla" 
     806 
    802807#. Default: "Write the actual text content here." 
    803808#: widget description of WYSIWYMWidget for label Body text 
     
    942947msgid "label_lastname" 
    943948msgstr "Sukunimi" 
     949 
     950#. Default: "License" 
     951#: ../skins/lemill/piece_view.pt 
     952msgid "label_license" 
     953msgstr "Lisenssi" 
    944954 
    945955#. Default: "Audio recording" 
     
    11111121msgstr "LÀhetÀ tiedosto..." 
    11121122 
     1123#. Default: "Video" 
     1124#: widget label of FileWidget - description "Upload a video if available" 
     1125msgid "label_video" 
     1126msgstr "Video" 
     1127 
    11131128#. Default: "Body text" 
    11141129#: widget label of WYSIWYMWidget - description "Write the actual text content here." 
     
    15241539msgstr "Sallitut tiedostotyypit: ${list}" 
    15251540 
     1541#. Default: "The textual material you include here should be written by you. You should not copy text straight from other sources unless they are released under the Creative Commons Attribution Share-Alike 2.5 license - the license used in LeMill. However, you may naturally use citation in your text with references to the original text." 
     1542#: ../skins/lemill/copyrightwidget.pt 
     1543msgid "text_cc_license_notification" 
     1544msgstr "Kirjoittamasi tekstin tulisi olla itsesi kirjoittamaa. ÄlÀ kopioi tekstiÀ muista lÀhteistÀ, ellei tekstiÀ ole lisensoitu Creative Commons Attribution- Share Alike 2.5 -lisenssillÀ, jota LeMill kÀyttÀÀ. Voit toki lainata muuta tekstiÀ lisÀÀmÀllÀ viittaukset alkuperÀisiin teksteihin." 
     1545 
    15261546#. Default: "Contains ${amount} item(s)" 
    15271547#: ../skins/lemill/collections_list.pt 
  • trunk/i18n/lemill.pot

    r609 r613  
    44msgstr "" 
    55"Project-Id-Version: LeMill 0.6\n" 
    6 "POT-Creation-Date: 2006-08-09 11:32+0000\n" 
     6"POT-Creation-Date: 2006-08-09 12:53+0000\n" 
    77"PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n" 
    88"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 
     
    797797msgstr "" 
    798798 
     799#. Default: "Upload a video if available" 
     800#: widget description of FileWidget for label Video 
     801msgid "help_video" 
     802msgstr "" 
     803 
    799804#. Default: "Write the actual text content here." 
    800805#: widget description of WYSIWYMWidget for label Body text 
     
    938943#: widget label of StringWidget - description "Your last name" 
    939944msgid "label_lastname" 
     945msgstr "" 
     946 
     947#. Default: "License" 
     948#: ../skins/lemill/piece_view.pt 
     949msgid "label_license" 
    940950msgstr "" 
    941951 
     
    11081118msgstr "" 
    11091119 
     1120#. Default: "Video" 
     1121#: widget label of FileWidget - description "Upload a video if available" 
     1122msgid "label_video" 
     1123msgstr "" 
     1124 
    11101125#. Default: "Body text" 
    11111126#: widget label of WYSIWYMWidget - description "Write the actual text content here." 
     
    15211536msgstr "" 
    15221537 
     1538#. Default: "The textual material you include here should be written by you. You should not copy text straight from other sources unless they are released under the Creative Commons Attribution Share-Alike 2.5 license - the license used in LeMill. However, you may naturally use citation in your text with references to the original text." 
     1539#: ../skins/lemill/copyrightwidget.pt 
     1540msgid "text_cc_license_notification" 
     1541msgstr "" 
     1542 
    15231543#. Default: "Contains ${amount} item(s)" 
    15241544#: ../skins/lemill/collections_list.pt 
  • trunk/skins/lemill/copyrightwidget.pt

    r519 r613  
    2020            <License rdf:about="http://creativecommons.org/licenses/by-sa/2.5/"><permits rdf:resource="http://web.resource.org/cc/Reproduction"/><permits rdf:resource="http://web.resource.org/cc/Distribution"/><requires rdf:resource="http://web.resource.org/cc/Notice"/><requires rdf:resource="http://web.resource.org/cc/Attribution"/><permits rdf:resource="http://web.resource.org/cc/DerivativeWorks"/><requires rdf:resource="http://web.resource.org/cc/ShareAlike"/></License></rdf:RDF> --> 
    2121        </div> 
     22        <tal:block tal:condition="python:value!='CreativeCommons'" tal:content="display"/> 
    2223    </metal:view_macro> 
    2324 
     
    3334                <tal:onlyChoice condition="python:vlen==1"> 
    3435                 
    35                     <p tal:content="structure python:vocab.getMsgId(vocab[0])">PLACEHOLDER</p> 
     36                    <p i18n:translate="text_cc_license_notification"> 
     37The textual material you include here should be written by you. You should not copy text straight from other sources unless they are released under the Creative Commons Attribution Share-Alike 2.5 license - the license used in LeMill. However, you may naturally use citation in your text with references to the original text. 
     38        </p> 
    3639                    <input type="hidden"  
    3740                        tal:define="tabindex tabindex/next" 
  • trunk/skins/lemill/document_byline.pt

    r604 r613  
    3131             >PLACEHOLDER</a><tal:separator condition="not:repeat/creator/end">, </tal:separator> 
    3232           </span> 
    33           <tal:block i18n:domain="lemill" i18n:translate="label_by_authors_suffix"></tal:block> 
     33          <tal:block i18n:domain="lemill" i18n:translate="label_by_authors_suffix"> </tal:block> 
    3434          &mdash;  
    3535        </tal:creatornames> 
  • trunk/skins/lemill/piece_view.pt

    r556 r613  
    3232    <metal:fieldMacro use-macro="python:here.widget('tags',mode='view')"/> 
    3333    </p> 
     34 
    3435    <p tal:condition="not:context/isImage"><tal:block i18n:domain="plone" i18n:translate="label_language">Language</tal:block>: 
    3536    <metal:fieldMacro use-macro="python:here.widget('language',mode='view')"/> 
    3637    </p> 
    37     <p> 
     38 
     39    <p><tal:block i18n:translate="label_license">License</tal:block>: 
    3840    <metal:fieldMacro use-macro="python:here.widget('rights',mode='view')"/> 
    3941    </p> 
Note: See TracChangeset for help on using the changeset viewer.