Ignore:
Timestamp:
Aug 22, 2012 10:22:22 AM (12 years ago)
Author:
potar
Message:

Merged sitemap_date branch into trunk

Location:
quintagroup.plonegooglesitemaps/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • quintagroup.plonegooglesitemaps/trunk

    • Property svn:mergeinfo
      •  

        old new  
        33/quintagroup.plonegooglesitemaps/branches/migratioin_product:2826-2839 
        44/quintagroup.plonegooglesitemaps/branches/plone4:2549-2553 
         5/quintagroup.plonegooglesitemaps/branches/sitemap_date:3481-3509 
        56/quintagroup.plonegooglesitemaps/branches/test_refactoring:2527-2536 
  • quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/content/sitemap.py

    r3163 r3510  
    5252        widget=atapi.MultiSelectionWidget( 
    5353            label=_(u"Review status"), 
    54             description=_(u"You may include items in sitemap depend of " \ 
     54            description=_(u"You may include items in sitemap depend of " 
    5555                          u"their review state."), 
    5656        ), 
     
    6565            label=_(u"Blackout entries"), 
    6666            description=_( 
    67                 u"Objects which match filter condition will be excluded " \ 
    68                 u"from the sitemap.Every record should follow the spec: " \ 
    69                 u"[<filter name>:]<filter arguments>. By default there are " \ 
    70                 u"\"id\" and \"path\" filters (\"id\" used if filter name " \ 
    71                 u"not specified). There is possibility to add new filters. " \ 
    72                 u"Look into README.txt of the " \ 
     67                u"Objects which match filter condition will be excluded " 
     68                u"from the sitemap.Every record should follow the spec: " 
     69                u"[<filter name>:]<filter arguments>. By default there are " 
     70                u"\"id\" and \"path\" filters (\"id\" used if filter name " 
     71                u"not specified). There is possibility to add new filters. " 
     72                u"Look into README.txt of the " 
    7373                u"quintagroup.plonegooglesitemaps package."), 
    7474        ), 
     
    8282        widget=atapi.LinesWidget( 
    8383            label=_(u"URL processing Regular Expressions"), 
    84             description=_(u"Provide regular expressions (in Perl syntax), " \ 
    85                           u"one per line to be applied to URLs before " \ 
    86                           u"including them into Sitemap. Example 1: " \ 
    87                           u"\"s/\/index_html//\" will remove /index_html " \ 
    88                           u"from URLs representing default documents. " \ 
    89                           u"Example 2: " \ 
    90                           u"\"s/[you_site\/internal\/path]/[domain]/\" will " \ 
    91                           u"fix URLs in the sitemap in case they are " \ 
    92                           u"generated on the basis of your site internal" \ 
     84            description=_(u"Provide regular expressions (in Perl syntax), " 
     85                          u"one per line to be applied to URLs before " 
     86                          u"including them into Sitemap. Example 1: " 
     87                          u"\"s/\/index_html//\" will remove /index_html " 
     88                          u"from URLs representing default documents. " 
     89                          u"Example 2: " 
     90                          u"\"s/[you_site\/internal\/path]/[domain]/\" will " 
     91                          u"fix URLs in the sitemap in case they are " 
     92                          u"generated on the basis of your site internal" 
    9393                          u"path rather than your site domain URL. "), 
    9494        ), 
     
    103103        widget=atapi.LinesWidget( 
    104104            label=_(u"Additional URLs"), 
    105             description=_(u"Define additional URLs that are not objects and " \ 
     105            description=_(u"Define additional URLs that are not objects and " 
    106106                          u"that should be included in sitemap."), 
    107107        ), 
     
    115115        widget=atapi.MultiSelectionWidget( 
    116116            label=_(u"Pinging workflow transitions"), 
    117             description=_(u"Select workflow transitions for pinging " \ 
     117            description=_(u"Select workflow transitions for pinging " 
    118118                          u"google on."), 
    119119        ), 
     
    170170            for wf_tr in wf.transitions.values(): 
    171171                if wf_tr.after_script_name in AVAILABLE_WF_SCRIPTS: 
    172                     wf_trans.append(("%s#%s" % (wf_id, wf_tr.id), 
    173                         "%s : %s (%s)" % (wf_id, wf_tr.id, \ 
    174                                           wf_tr.title_or_id()))) 
     172                    wf_trans.append( 
     173                        ("%s#%s" % (wf_id, wf_tr.id), 
     174                         "%s : %s (%s)" % (wf_id, wf_tr.id, 
     175                                           wf_tr.title_or_id()))) 
    175176        return atapi.DisplayList(wf_trans) 
    176177 
Note: See TracChangeset for help on using the changeset viewer.