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:
3 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/newsextender.py

    r3152 r3510  
    2222 
    2323access_lst = ["Subscription", "Registration"] 
    24 genres_lst = ["PressRelease", "Satire", "Blog", "OpEd", "Opinion", \ 
     24genres_lst = ["PressRelease", "Satire", "Blog", "OpEd", "Opinion", 
    2525              "UserGenerated"] 
    2626 
     
    3131 
    3232    fields = [ 
    33         ExtendableStringField("gsm_access", 
     33        ExtendableStringField( 
     34            "gsm_access", 
    3435            accessor="gsm_access", 
    35             vocabulary=DisplayList(zip(["", ] + access_lst, \ 
     36            vocabulary=DisplayList(zip(["", ] + access_lst, 
    3637                                   ["Open access", ] + access_lst)), 
    3738            default="", 
     
    3940            widget=SelectionWidget( 
    4041                label="Access", 
    41                 description="Specifies whether an article is available to " \ 
    42                     "all readers (in case of the emtpy field, or only to " \ 
     42                description="Specifies whether an article is available to " 
     43                    "all readers (in case of the emtpy field, or only to " 
    4344                    "those with a free or paid membership to your site.", 
    4445                format="radio"), 
    4546        ), 
    46         ExtendableLinesField("gsm_genres", 
     47        ExtendableLinesField( 
     48            "gsm_genres", 
    4749            accessor="gsm_genres", 
    4850            vocabulary=DisplayList(zip(genres_lst, genres_lst)), 
     
    5153            widget=MultiSelectionWidget( 
    5254                label="Genres", 
    53                 description="Select one or more properties for an article, " \ 
    54                     "namely, whether it is a press release, a blog post, an " \ 
    55                     "opinion, an op-ed piece, user-generated content, " \ 
    56                     "or satire.", 
     55                description="Select one or more properties for an article, " 
     56                            "namely, whether it is a press release, " 
     57                            "a blog post, an opinion, an op-ed piece, " 
     58                            "user-generated content, or satire.", 
    5759                format="checkbox"), 
    5860        ), 
    59         ExtendableStringField("gsm_stock", 
     61        ExtendableStringField( 
     62            "gsm_stock", 
    6063            accessor="gsm_stock", 
    6164            default="", 
     
    6366            widget=StringWidget( 
    6467                label="Stock Tickers", 
    65                 description="A comma-separated list of up to 5 stock tickers "\ 
    66                     "of the companies, mutual funds, or other financial " \ 
    67                     "entities that are the main subject of the article. " \ 
    68                     "Relevant primarily for business articles. Each ticker " \ 
    69                     "must be prefixed by the name of its stock exchange, " \ 
    70                     "and must match its entry in Google Finance. " \ 
    71                     "For example, \"NASDAQ:AMAT\" (but not \"NASD:AMAT\"), " \ 
     68                description="A comma-separated list of up to 5 stock tickers " 
     69                    "of the companies, mutual funds, or other financial " 
     70                    "entities that are the main subject of the article. " 
     71                    "Relevant primarily for business articles. Each ticker " 
     72                    "must be prefixed by the name of its stock exchange, " 
     73                    "and must match its entry in Google Finance. " 
     74                    "For example, \"NASDAQ:AMAT\" (but not \"NASD:AMAT\"), " 
    7275                    "or \"BOM:500325\" (but not \"BOM:RIL\").", 
    7376                size=70), 
  • 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.