Changeset 3061 for trunk


Ignore:
Timestamp:
10/25/10 16:07:28 (9 years ago)
Author:
jukka
Message:

Removed some descriptions from i18n

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/LeMillCatalogTool.py

    r3059 r3061  
    2929import time 
    3030from math import log 
     31from messagefactory_ import i18nme as _ 
    3132 
    3233class CatalogTool(PloneCatalogTool): 
     
    219220        return d_list 
    220221 
     222# _('any_time') 
    221223 
    222224    def createBrowsingOptions(self, REQUEST, results=None, **kw): 
     
    386388            except ValueError:  
    387389                selected=0 
    388             d['edited']=[('','Any time',int(not selected),0), (365,'Last year',int(selected==365),0), (30,'Last month',int(selected==30),0), (7,'Last week',int(selected==7),0), (1,'Yesterday',int(selected==1),0)] 
     390            d['edited']=[('',_('Any time'),int(not selected),0), (365,_('Last year'),int(selected==365),0), (30,_('Last month'),int(selected==30),0), (7,_('Last week'),int(selected==7),0), (1,_('Yesterday'),int(selected==1),0)] 
    389391        # Previous search term 
    390392        if 'q' in src: 
     
    507509            if not keywords['Language']: # Delete empty 'Language' 
    508510                del keywords['Language'] 
    509             elif 'portal_type' in keywords: 
    510                 if 'MemberFolder' in keywords['portal_type']: 
     511            elif 'portal_type' in keywords: # If browsing for MemberFolders, ignore Language, use getLanguage_skills instead 
     512                if 'MemberFolder' in keywords['portal_type'] or 'GroupBlog' in keywords['portal_type']: 
    511513                    keywords['getLanguage_skills']=keywords['Language'] 
     514                    del keywords['Language'] 
    512515 
    513516        if 'base' in keywords: 
  • trunk/Schemata.py

    r3052 r3061  
    5555                  format = 'radio', 
    5656                  visible = {'view':'invisible', 'edit':'visible'}, 
    57 #                  label = "Editing settings", 
    58                   label_msgid = 'label_editing_settings', 
    59                   description = 'You can choose how other people can edit this learning resource and if the draft version is hidden from the others.', 
    60                   description_msgid = 'description_editing_settings', 
    61                   i18n_domain = 'lemill', 
    6257                  ), 
    6358              ), 
     
    128123                label='Language', 
    129124                label_msgid="label_language", 
    130                 description="Select the language of this resource.", 
    131                 description_msgid="help_language", 
    132125                i18n_domain="lemill" 
    133126                ), 
     
    337330            label="Target group", 
    338331            label_msgid="label_target_group", 
    339             description="Choose suitable student levels for this resource.", 
    340             description_msgid="description_target_group", 
    341332            i18n_domain="lemill", 
    342333        ), 
     
    355346            label="Subject area", 
    356347            label_msgid="label_subject_area", 
    357             description="Choose curriculum subject areas that are appropriate for this resource.", 
    358             description_msgid="description_subject_area", 
    359348            i18n_domain="lemill", 
    360349        ), 
     
    439428            label="Homepage URL", 
    440429            label_msgid="label_homepage_url", 
    441             description="URL to the homepage", 
    442             description_msgid="decription_homepage_url", 
    443430            i18n_domain="lemill" 
    444431        ), 
  • trunk/i18n/lemill-fi.po

    r3060 r3061  
    29572957#: ../skins/lemill/lemill_activities_view.pt 
    29582958msgid "label_titles" 
    2959 msgstr "Nimikkeett" 
     2959msgstr "Nimikkeet" 
    29602960 
    29612961#. Default: "Tools" 
  • trunk/skins/lemill/lemill_community_view.pt

    r3058 r3061  
    77<metal:main fill-slot="main"> 
    88    <div class="title grid"> 
    9        <h1 i18n:translate="heading_featured_groups">Featured groups</h1> 
     9       <h1 i18n:translate="heading_featured_people">Featured people</h1> 
    1010    </div> 
    1111    <div class="clear"></div> 
     
    2828  <div class="browse_links grid" tal:define="lang_filter context/getLanguageFilter"> 
    2929    <div class="column-left"> 
    30     <h1>People</h1> 
     30    <h1 i18n:translate="heading_people">People</h1> 
    3131    <dl> 
    3232        <dt><a i18n:translate="label_languages" href="cloud?base=language&amp;type=MemberFolder">Languages</a></dt> 
    3333        <dd><span tal:repeat="result context/top3people_languages | nothing"> 
    34             <a href="" tal:attributes="href python:'language?language=%s' % here.url_quote(result)" tal:content="python:here.script_getPrettyLanguage(result)">PLACEHOLDER</a>, </span><a href="rebuildTop3s" tal:condition="context/amIManager">( rebuild top results )</a><a href="cloud?base=language">...</a> 
     34            <a href="" tal:attributes="href python:'browse?language=%s' % here.url_quote(result)" tal:content="python:here.script_getPrettyLanguage(result)">PLACEHOLDER</a>, </span><a href="rebuildTop3s" tal:condition="context/amIManager">( rebuild top results )</a><a href="cloud?base=language">...</a> 
    3535        </dd> 
    3636        <dt><a i18n:translate="label_country" href="" tal:attributes="href string:cloud?type=MemberFolder&amp;base=country">Country</a></dt> 
     
    4848    </div> 
    4949    <div class="column-right"> 
    50     <h1>Groups</h1> 
     50    <h1 i18n:translate="heading_groups">Groups</h1> 
    5151    <dl> 
    5252        <dt><a i18n:translate="label_languages" href="cloud?base=language&amp;type=GroupBlog">Languages</a></dt> 
    5353        <dd><span tal:repeat="result context/top3group_languages | nothing"> 
    54             <a href="" tal:attributes="href python:'language?language=%s' % here.url_quote(result)" tal:content="python:here.script_getPrettyLanguage(result)">PLACEHOLDER</a>, </span><a href="rebuildTop3s" tal:condition="context/amIManager">( rebuild top results )</a><a href="cloud?base=language">...</a> 
     54            <a href="" tal:attributes="href python:'browse?language=%s' % here.url_quote(result)" tal:content="python:here.script_getPrettyLanguage(result)">PLACEHOLDER</a>, </span><a href="rebuildTop3s" tal:condition="context/amIManager">( rebuild top results )</a><a href="cloud?base=language">...</a> 
    5555        </dd> 
    5656        <dt><a i18n:translate="label_subject_areas" href="" tal:attributes="href string:cloud?type=GroupBlog&amp;base=subject_area">Subject areas</a></dt> 
  • trunk/skins/lemill/widget_chapter.pt

    r3048 r3061  
    153153           type="submit" 
    154154           name="add_embed_block" 
    155            value="Embed" 
    156            i18n:attributes="value label_embed;" 
     155           value="Add an embedded section" 
     156           i18n:attributes="value label_add_embed_block;" 
    157157           tal:attributes="tabindex tabindex/next" 
    158158           /> 
  • trunk/skins/lemill/widget_exercise.pt

    r3048 r3061  
    200200            name="add_embedblock" 
    201201            value="Add an embedded section" 
    202             i18n:attributes="value label_embed;" 
     202            i18n:attributes="value label_add_embed_block;" 
    203203            tal:attributes="tabindex tabindex/next" 
    204204            /> 
  • trunk/tests/testExtractTranslations.py

    r3043 r3061  
    191191                ctl['lemill'].add(msgid,msgid,references=['Heading for resource edit form',]) 
    192192 
    193         prefixes = ["My draft","My published"] 
    194         folders = ["content","methods","tools"] 
    195         community_folders = ["community","members","groups","blog posts","tips for use"] 
    196         topics = ["tags","language"] 
    197         material_topics = ["target group","subject area"] 
    198         member_topics = ["country","skills","interests"] 
    199         # My published [folders] 
    200         for suffix in folders: 
    201             msgid=" ".join((prefixes[1],suffix)) 
    202             ctl['lemill'].add(msgid,msgid,references=["Heading",]) 
    203         # My draft content 
    204         msgid=" ".join((prefixes[0],folders[0])) 
    205         ctl['lemill'].add(msgid,msgid,references=["Heading",]) 
    206         # Browse [types] 
    207         for suffix in folders+community_folders: 
    208             msgid=" ".join(("Browse",suffix)) 
    209             ctl['lemill'].add(msgid,msgid,references=['Heading',]) 
    210         # Browse [folder] by [topic] 
    211         for fol in folders+community_folders: 
    212             for top in topics: 
    213                 msgid=" ".join(("Browse",fol,"by",top)) 
    214                 ctl['lemill'].add(msgid,msgid,references=['Heading',]) 
    215         # Browse [folder] where ${criteria_list} 
    216         for fol in folders+community_folders: 
    217             msgid=" ".join(("Browse",fol,"where")) 
    218             ctl['lemill'].add(msgid,msgid,references=['Start of heading, followed by a list of criteria, like \'language is English and tag is learning\'',]) 
    219         # Browse members by [topic] 
    220         for suffix in member_topics: 
    221             msgid=" ".join(("Browse",community_folders[0],"by",suffix)) 
    222             ctl['lemill'].add(msgid,msgid,references=["Heading",]) 
    223         # Browse material by [topic] 
    224         for suffix in material_topics: 
    225             msgid=" ".join(("Browse content by",suffix)) 
    226             ctl['lemill'].add(msgid,msgid,references=["Heading",]) 
    227         # Browse x made by [name] 
    228         for fol in folders+community_folders: 
    229             msgid=" ".join(("Browse",fol,"made by")) 
    230             ctl['lemill'].add(msgid,msgid,references=['f.ex. Browse methods made by [username]']) 
    231         # Some content types in plural form for browse subheadings 
    232         show_by_elements = [x[1][1] for x in TYPE_NAMES.items() if x[0] in ("Learning resource", "LeMillReference", "Piece")] 
    233         for msgid in show_by_elements: 
    234             ctl['lemill'].add(msgid,msgid,references=["Used like this: 'Show: %s'" % msgid,]) 
    235  
    236193        for domain in ['lemill',]: 
    237194            file = open('%s-generated.pot' % domain, 'w') 
Note: See TracChangeset for help on using the changeset viewer.