Changeset 560

Show
Ignore:
Timestamp:
10/05/06 09:38:21
Author:
crchemist
Message:

Merge with i18n branch.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • qPloneComments/branches/plone-2.5/Extensions/__init__.py

    r559 r560  
    11# this file is here to make Install.py importable. 
    2 # we need to make it non-zero size to make winzip cooperate 

  • qPloneComments/branches/plone-2.5/skins/qplonecomments/2.0.5/discussion_publish_comment.py

    r559 r560  
    2525publishDiscussion(reply) 
    2626 
    27 portal_status_message='Comment+successfully+published' 
     27portal_status_message='Comment+published' 
    2828 
    2929transaction_note('Published discussion item') 

  • qPloneComments/branches/plone-2.5/skins/qplonecomments/2.0.5/discussion_reply.cpy

    r559 r560  
    9090transaction_note('Added comment to %s at %s' % (parent.title_or_id(), reply.absolute_url())) 
    9191 
    92 portal_status_message='Comment successfully added.' 
     92portal_status_message='Comment published.' 
    9393 
    9494# Inform user about awaiting moderation 
    9595if ifModerate and reply: 
    96     portal_status_message='Your comment awaits moderation.' 
     96    portal_status_message=url_quote_plus('Currently, all comments require approval before being published. Please check back later.') 
    9797 
    9898target = '%s/%s?portal_status_message=%s' % (parent.absolute_url(), parent.getTypeInfo().getActionById('view'), portal_status_message) 

  • qPloneComments/branches/plone-2.5/skins/qplonecomments/2.0.5/discussion_reply_form.cpt

    r559 r560  
    3030 
    3131            <div class="field" 
    32                  tal:condition="isForAnonymous"> 
     32                 tal:condition="isForAnonymous" 
     33                 i18n:domain="plonecomments"> 
    3334 
    3435                <div class="field" 
    …… 
    5657                               size="40" 
    5758                               tabindex="" 
    58                                i18n:attributes="title" 
     59                               i18n:attributes="alt title" 
    5960                               tal:attributes="tabindex tabindex/next; 
    6061                                               value python:test(isAnon, '', member.getUserName()); 

  • qPloneComments/branches/plone-2.5/skins/qplonecomments/2.0.5/discussionitem_view.pt

    r559 r560  
    5656                <input class="destructive" 
    5757                   type="submit" 
    58                    value="Remove This Reply" 
     58                   value="Remove this reply" 
    5959                   i18n:attributes="value" 
    6060                   /> 
    …… 
    7070                <input class="standalone" 
    7171                       type="submit" 
    72                        value="Publish This Reply" 
     72                       value="Publish" 
     73                                          i18n:domain="plonecomments" 
    7374                       i18n:attributes="value" 
    7475                       /> 
    …… 
    7677 
    7778            <div class="documentByLine" 
    78                  tal:condition="not:isPublished">Until publishing this comment adding reply impossible.</div> 
     79                 tal:condition="not:isPublished"> 
     80                                <span i18n:translate="text_no_reply_until_published">Until publishing this comment adding reply impossible.</span> 
     81                   </div> 
    7982 
    8083        </div> 

  • qPloneComments/branches/plone-2.5/skins/qplonecomments/2.0.5/validate_talkback.vpy

    r559 r560  
    2525        req = context.REQUEST 
    2626        if not (req.form.has_key('Creator') and not req.form['Creator'] == ""): 
    27             state.setError('Creator', 'Please enter your Name.', 'name_required') 
     27            state.setError('Creator', 'Please enter your name.', 'name_required') 
    2828 
    2929if state.getErrors(): 

  • qPloneComments/branches/plone-2.5/skins/qplonecomments/2.0.5/viewThreadsAtBottom.pt

    r559 r560  
    100100                        <input class="destructive" 
    101101                               type="submit" 
    102                                value="Remove This Discussion" 
     102                               value="Remove" 
    103103                               i18n:attributes="value" 
    104104                               /> 
    …… 
    114114                        <input class="standalone" 
    115115                               type="submit" 
    116                                value="Publish This Discussion" 
     116                               value="Publish" 
    117117                               i18n:attributes="value" 
    118118                               /> 
    …… 
    120120 
    121121                    <div class="documentByLine" 
    122                          tal:condition="not:isPublished">Until publishing this comment adding reply impossible.</div> 
     122                         i18n:translate="text_no_add_reply" 
     123                         tal:condition="not:isPublished">Comment must be approved before replies to comment accepted.</div> 
    123124 
    124125                    <div tal:define="replies python:here.getReplyReplies(reply)" 

  • qPloneComments/branches/plone-2.5/skins/qplonecomments/2.1/discussion_publish_comment.py

    r559 r560  
    2525publishDiscussion(reply) 
    2626 
    27 portal_status_message='Comment+successfully+published' 
     27portal_status_message='Comment published.' 
    2828 
    2929putils = getToolByName(context, 'plone_utils') 

  • qPloneComments/branches/plone-2.5/skins/qplonecomments/2.1/discussion_reply.cpy

    r559 r560  
    9393 
    9494# Inform user about awaiting moderation 
    95 portal_status_message='Comment+successfully+added' 
     95portal_status_message='Comment published.' 
    9696if ifModerate and reply: 
    97     portal_status_message='Your+comment+awaits+moderation' 
     97    portal_status_message=url_quote_plus('Currently, all comments require approval before being published. Please check back later.') 
    9898 
    9999from Products.CMFPlone.utils import transaction_note 

  • qPloneComments/branches/plone-2.5/skins/qplonecomments/2.1/discussion_reply_form.cpt

    r559 r560  
    7676 
    7777            <div class="field" 
    78                  tal:condition="isForAnonymous"> 
     78                 tal:condition="isForAnonymous" 
     79                 i18n:domain="plonecomments"> 
    7980 
    8081                <div class="field" 
    …… 
    102103                               size="40" 
    103104                               tabindex="" 
    104                                i18n:attributes="title" 
     105                               i18n:attributes="alt title" 
    105106                               tal:attributes="tabindex tabindex/next; 
    106107                                               value python:test(isAnon, '', member.getUserName()); 

  • qPloneComments/branches/plone-2.5/skins/qplonecomments/2.1/validate_talkback.vpy

    r559 r560  
    3333        req = context.REQUEST 
    3434        if not (req.form.has_key('Creator') and not req.form['Creator'] == ""): 
    35             state.setError('Creator', 'Please enter your Name.', 'name_required') 
     35            state.setError('Creator', 'Please enter your name.', 'name_required') 
    3636 
    3737if state.getErrors(): 

  • qPloneComments/branches/plone-2.5/skins/qplonecomments/2.1/viewThreadsAtBottom.pt

    r559 r560  
    112112                    <br/> 
    113113                    <div class="documentByLine" 
    114                          tal:condition="not:isPublished">Until publishing this comment adding reply impossible.</div> 
     114                         i18n:translate="text_no_add_reply" 
     115                         tal:condition="not:isPublished">Comment must be approved before replies to comment accepted.</div> 
    115116 
    116117                </div> 

  • qPloneComments/branches/plone-2.5/skins/qplonecomments/2.5/discussion_publish_comment.py

    r559 r560  
    2525publishDiscussion(reply) 
    2626 
    27 portal_status_message='Comment+successfully+published' 
     27portal_status_message='Comment published.' 
    2828 
    2929putils = getToolByName(context, 'plone_utils') 

  • qPloneComments/branches/plone-2.5/skins/qplonecomments/2.5/discussion_reply.cpy

    r559 r560  
    9191 
    9292# Inform user about awaiting moderation 
    93 portal_status_message='Comment+successfully+added' 
     93portal_status_message='Comment published.' 
    9494if ifModerate and reply: 
    95     portal_status_message='Your+comment+awaits+moderation' 
     95    portal_status_message=url_quote_plus('Currently, all comments require approval before being published. Please check back later.') 
    9696 
    9797from Products.CMFPlone.utils import transaction_note 

  • qPloneComments/branches/plone-2.5/skins/qplonecomments/2.5/discussion_reply_form.cpt

    r559 r560  
    7676 
    7777            <div class="field" 
    78                  tal:condition="isForAnonymous"> 
     78                 tal:condition="isForAnonymous" 
     79                 i18n:domain="plonecomments"> 
    7980 
    8081                <div class="field" 
    …… 
    102103                               size="40" 
    103104                               tabindex="" 
    104                                i18n:attributes="title" 
     105                               i18n:attributes="alt title" 
    105106                               tal:attributes="tabindex tabindex/next; 
    106107                                               value python:test(isAnon, '', member.getUserName()); 

  • qPloneComments/branches/plone-2.5/skins/qplonecomments/2.5/validate_talkback.vpy

    r559 r560  
    3333        req = context.REQUEST 
    3434        if not (req.form.has_key('Creator') and not req.form['Creator'] == ""): 
    35             state.setError('Creator', 'Please enter your Name.', 'name_required') 
     35            state.setError('Creator', 'Please enter your name.', 'name_required') 
    3636 
    3737if state.getErrors(): 

  • qPloneComments/branches/plone-2.5/skins/qplonecomments/2.5/viewThreadsAtBottom.pt

    r559 r560  
    112112                    <br/> 
    113113                    <div class="documentByLine" 
    114                          tal:condition="not:isPublished">Until publishing this comment adding reply impossible.</div> 
     114                         i18n:translate="text_no_add_reply" 
     115                         tal:condition="not:isPublished">Comment must be approved before replies to comment accepted.</div> 
    115116 
    116117                </div> 

  • qPloneComments/branches/plone-2.5/skins/qplonecomments/approve_comment_template.pt

    r559 r560  
    1 <div i18n:domain="plone"  
     1<div i18n:domain="plonecomments"  
    22     tal:omit-tag="" 
    33     tal:define="charset here/portal_properties/site_properties/default_charset|string:utf-8; 
    …… 
    66>To: <tal:x replace="options/mto"/> 
    77From: <tal:x replace="options/mfrom"/> 
    8 Subject: <tal:x condition="organization_name" replace="string:[$organization_name] "/>New comment awaits moderation 
     8Subject: <tal:x condition="organization_name" replace="string:[$organization_name] "/><tal:subject i18n:translate="approvemail_subject">New comment awaits moderation</tal:subject> 
    99 
    10 <tal:x define="obj nocall:options/obj"> 
    11 New comment added to page "<tal:x replace="obj/Title"/>" at: 
    12 <tal:x replace="obj/absolute_url"/> 
    13 </tal:x> 
     10<tal:new_comment define="obj nocall:options/obj"  
     11       i18n:translate="approvemail_new_comment_link"> 
     12       Please review new comment added to the following page "<tal:x replace="obj/Title" i18n:name="title"/>": 
     13       <tal:link replace="obj/absolute_url" i18n:name="link"/> 
     14</tal:new_comment> 
    1415 
    1516-- 
    16 <tal:x condition="organization_name" replace="string:$organization_name "/>Support Team. 
    17  
     17<tal:signature i18n:translate="signature">  
     18    <tal:organization_name condition="organization_name"  
     19                           replace="string:$organization_name"  
     20                           i18n:name="organization_name"/> 
     21    Support Team. 
     22</tal:signature> 
    1823</div> 

  • qPloneComments/branches/plone-2.5/skins/qplonecomments/prefs_comments_setup_form.cpt

    r559 r560  
    22      xml:lang="en" 
    33      lang="en" 
    4       i18n:domain="plone" 
     4      i18n:domain="plonecomments" 
    55      metal:use-macro="here/prefs_main_template/macros/master"> 
    66        <!--      metal:use-macro="here/main_template/macros/master" --> 
    …… 
    1010     tal:define="errors python:request.get('controller_state', None).getErrors();"> 
    1111 
    12     <div metal:define-macro="main" i18n:domain="plone"> 
     12    <div metal:define-macro="main" i18n:domain="plonecomments"> 
    1313    <div class="configlet"> 
    1414    <div class="documentEditable"> 
    1515 
    16     <!-- simulating views --> 
     16    <!-- simulating views on the configure/comments pages until we have real objects. --> 
    1717    <ul class="contentViews" 
    1818       tal:define="tabs python:('Configure qPloneComments','prefs_comments_setup_form'), ('Recent comments moderation','prefs_recent_comments_form'),; 
    …… 
    3333    <!-- End of tabs --> 
    3434    <div class="documentContent" metal:define-slot="prefs_content"> 
    35         <h1 i18n:translate="qpc_setup">Plone Comments Setup</h1> 
     35        <h1 i18n:translate="heading_comments_setup">Plone Comments Setup</h1> 
    3636 
    3737        <a href="" 
    3838           class="link-parent" 
    3939           tal:attributes="href string: $portal_url/plone_control_panel" 
    40            i18n:translate="label_up_to_plone_setup"> 
     40           i18n:translate="label_up_to_plone_setup" 
     41           i18n:domain="plone"> 
    4142           Up to Plone Setup 
    4243        </a> 
    …… 
    5152 
    5253            <fieldset> 
    53                 <legend i18n:translate="legend_qpc_notification_legend">qPloneComments setup Details</legend> 
     54                <legend i18n:translate="legend_setup_options">qPloneComments setup options</legend> 
    5455 
    5556                <div class="field" 
    …… 
    235236                                           tabindex tabindex/next;"/> 
    236237 
    237                     <label i18n:translate="label_enable_approve_notification" 
     238                    <label i18n:translate="label_enable_approve_user_notification" 
    238239                           for="isEnableApproveUserNotification">Enable Commentator notification on comment was published.</label> 
    239240                </div> 
    …… 
    254255                                           tabindex tabindex/next;"/> 
    255256 
    256                     <label i18n:translate="label_enable_approve_notification" 
     257                    <label i18n:translate="label_enable_reject_notification" 
    257258                           for="isRejectionNotificationEnabled">Enable Commentator notification on comment was rejected.</label> 
    258259                </div> 
    …… 
    274275                                           tabindex tabindex/next;"/> 
    275276 
    276                     <label i18n:translate="label_enable_approve_notification" 
     277                    <label i18n:translate="label_enable_reply_notification" 
    277278                           for="isReplyNotificationEnabled">Enable Commentator notification on comment was replied.</label> 
    278279                </div> 

  • qPloneComments/branches/plone-2.5/skins/qplonecomments/prefs_recent_comments_delete.cpy

    r559 r560  
     1<<<<<<< .working 
    12## Script (Python) "prefs_recent_comments_delete" 
    23##bind container=container 
    …… 
    3233psm = comment_ids and 'Comments was successfully deleted.' or 'Please select items to be processed.' 
    3334return state.set(portal_status_message=psm) 
     35======= 
     36## Script (Python) "prefs_recent_comments_delete" 
     37##bind container=container 
     38##bind context=context 
     39##bind namespace= 
     40##bind script=script 
     41##bind subpath=traverse_subpath 
     42##parameters= 
     43##title= 
     44## 
     45 
     46from Products.CMFCore.utils import getToolByName 
     47portal_discussion = getToolByName(context, "portal_discussion") 
     48portal_catalog = getToolByName(context, "portal_catalog") 
     49 
     50request = context.REQUEST 
     51comment_ids = request.get('ids') 
     52 
     53for comment_id in comment_ids: 
     54    comment = portal_catalog(id=comment_id,portal_type='Discussion Item')[0].getObject() 
     55 
     56    parent = comment.inReplyTo() 
     57    if parent is not None: 
     58        talkback = portal_discussion.getDiscussionFor(parent) 
     59    else: 
     60        talkback = parent = comment.aq_parent 
     61 
     62    talkback.deleteReply( comment_id ) 
     63 
     64return state.set(portal_status_message='Comment(s) deleted.') 
     65 
     66>>>>>>> .merge-right.r488 

  • qPloneComments/branches/plone-2.5/skins/qplonecomments/prefs_recent_comments_form.cpt

    r559 r560  
    22      xml:lang="en" 
    33      lang="en" 
    4       i18n:domain="plone" 
     4      i18n:domain="plonecomments" 
    55      metal:use-macro="here/prefs_main_template/macros/master"> 
    66        <!--      metal:use-macro="here/main_template/macros/master" --> 
    …… 
    1313    <div class="configlet"> 
    1414    <div class="documentEditable"> 
     15    <!-- simulating views on the configure/comments pages until we have real objects. --> 
     16    <ul class="contentViews"> 
     17        <li class=""> 
     18        <a href="" 
     19        tal:attributes="href string:prefs_comments_setup_form" 
     20        i18n:translate="label_configure">Configure qPloneComments</a> 
     21        </li> 
    1522 
    16     <!-- simulating views --> 
    17     <ul class="contentViews" 
    18        tal:define="tabs python:('Configure qPloneComments','prefs_comments_setup_form'), ('Recent comments moderation','prefs_recent_comments_form'),; 
    19                    tabs python:[ {'label':label, 'name':name} for (label,name) in tabs ];" 
    20     > 
    21         <li class="selected"  
    22             tal:repeat="tab tabs" 
    23             tal:attributes="class python:tab['name']==template.id and 'selected' or ''"> 
     23        <li class="selected"> 
    2424        <a href="" 
    25            tal:attributes="href string:${here/absolute_url}/${tab/name}" 
    26            i18n:translate="" tal:content="tab/label">Recent comments moderation</a> 
     25        tal:attributes="href string:${template/id}" 
     26        i18n:translate="label_comments">Recent comments moderation</a> 
    2727        </li> 
    2828    </ul> 
    …… 
    3636         tal:define ="results python:here.portal_catalog.searchResults(portal_type='Discussion Item',review_state='private',sort_on='created',sort_order='reverse');"> 
    3737 
    38         <h1 i18n:translate="qpc_setup">Recent comments</h1> 
     38        <h1 i18n:translate="heading_comments">Recent comments</h1> 
    3939 
    4040        <a href="" 
    4141           class="link-parent" 
    4242           tal:attributes="href string: $portal_url/plone_control_panel" 
    43            i18n:translate="label_up_to_plone_setup"> 
     43           i18n:translate="label_up_to_plone_setup" 
     44           i18n:domain="plone"> 
    4445           Up to Plone Setup 
    4546        </a> 
    46         <div tal:condition="not:results"> No new comments.</div> 
     47         
     48        <p tal:condition="not:results" i18n:translate="text_no_new_comments">No new comments.</p> 
    4749 
    4850        <div tal:condition="results" 
    …… 
    5759                  tal:attributes="action string:${here/getId}/${template/getId}"> 
    5860                <fieldset> 
    59                     <legend i18n:translate="legend_qpc_notification_legend">List of recent comments</legend> 
     61                    <legend i18n:translate="legend_recent_comments">List of recent comments</legend> 
    6062 
    6163                    <table><tbody> 
    …… 
    7274                                 alt="Select all items" 
    7375                                 i18n:attributes="title label_select_all_items; alt label_select_all_items;" 
     76                                 i18n:domain="plone" 
    7477                      /> 
    7578                      </th> 

  • qPloneComments/branches/plone-2.5/skins/qplonecomments/prefs_recent_comments_publish.cpy

    r559 r560  
    2121    manage_mails(comment, container, action='publishing') 
    2222 
    23 psm = comment_ids and 'Comments was successfully published.' or 'Please select items to be processed.' 
     23psm = comment_ids and 'Comment(s) published.' or 'Please select items to be processed.' 
    2424return state.set(portal_status_message=psm) 

  • qPloneComments/branches/plone-2.5/skins/qplonecomments/published_comment_template.pt

    r559 r560  
    1 <div i18n:domain="plone"  
     1<div i18n:domain="plonecomments"  
    22     tal:omit-tag="" 
    33     tal:define="charset here/portal_properties/site_properties/default_charset|string:utf-8; 
    …… 
    66>To: <tal:x replace="options/mto"/> 
    77From: <tal:x replace="options/mfrom"/> 
    8 Subject: <tal:x condition="organization_name" replace="string:[$organization_name] "/>New comment added 
     8Subject: <tal:x condition="organization_name" replace="string:[$organization_name] "/><tal:subject i18n:translate="publishedmail_subject">New comment added</tal:subject> 
    99 
    10 <tal:x define="obj nocall:options/obj"> 
    11 New comment added to page "<tal:x replace="obj/Title"/>" at: 
    12 <tal:x replace="obj/absolute_url"/> 
    13 </tal:x> 
     10<tal:new_comment define="obj nocall:options/obj" i18n:translate="publishedmail_new_comment_link"> 
     11View new comment added to the following page "<tal:x replace="obj/Title" i18n:name="title"/>": 
     12<tal:x replace="obj/absolute_url" i18n:name="link"/> 
     13</tal:new_comment> 
    1414 
    1515-- 
    16 <tal:x condition="organization_name" replace="string:$organization_name "/>Support Team. 
     16<tal:signature i18n:translate="signature">  
     17    <tal:organization_name condition="organization_name"  
     18                           replace="string:$organization_name"  
     19                           i18n:name="organization_name"/> 
     20    Support Team. 
     21</tal:signature> 
    1722 
    1823</div> 

  • qPloneComments/branches/plone-2.5/skins/qplonecomments/validate_reply.vpy

    r559 r560  
    1010 
    1111if hasattr(context, 'review_state') and not context.review_state=="published": 
    12     return state.set(status='failure', portal_status_message="You can't add comment to not published reply.") 
     12    return state.set(status='failure', portal_status_message="Reply not allowed because the response is to a comment waiting to be approved. Please wait for the comment to be approved before replying.") 
    1313 
    1414return state