2010-06-02 mayoro

* add some processing in procedure title in case of special caracters before generating portal_type

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@35897 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/SAFI_getTendererFromUserName.xml → bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Egov_getTendererFromUserName.xml

@@ -129,7 +129,7 @@ return tenderer\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>SAFI_getTendererFromUserName</string> </value>
+            <value> <string>Egov_getTendererFromUserName</string> </value>
         </item>
         <item>
             <key> <string>warnings</string> </key>

bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Folder_viewEgovContentList/listbox_organisation_title.xml

@@ -273,7 +273,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: cell.SAFI_getTendererFromUserName()</string> </value>
+            <value> <string>python: cell.EGov_getTendererFromUserName()</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewPendingApplicationRenderer.xml

@@ -57,7 +57,7 @@ Description:\n
     </div>\n
     <div class="become_vip_explanations">\n
       <tal:block i18n:domain="ui" i18n:translate="">\n
-      Safi is a major Internet portal for performing administrative formalities\n
+      ERP5 EGov is a major Internet portal for performing administrative formalities\n
       online. It is a quick and easy way to make a statement, or a application for\n
       jutificatif,... without having to move or to queue. For more\n
       information, please click\n

bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewRegisterInformationHead.xml

@@ -47,7 +47,7 @@ Description:\n
 \n
 <tal:block metal:define-macro="main">\n
   <div class="become_member_head section_explanation" i18n:translate="" i18n:domain="ui">\n
-    The SAFI portal allows to make on-line administratives formalities.\n
+    The ERP5 EGov portal allows to make on-line administratives formalities.\n
     It is possible to make requests without being registred (anonymous request).\n
     However the registration is deeply advised.\n
   </div>\n

bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/sendPendingNotificationByMail.xml

@@ -81,7 +81,7 @@ procedure=translateString(form.getPortalType())\n
 wf_info=form.Egov_getProcedureWorkflowStateInfo(\'egov_universal_workflow\',\'pending\')\n
 date_of_submission=wf_info[\'time\'].strftime(\'%d/%m/%y %H:%M\')\n
 \n
-subject = translateString("[SAFI] Your ${procedure}  reference: ${form_id} has been submitted", \n
+subject = translateString("[E-government] Your ${procedure}  reference: ${form_id} has been submitted", \n
                            mapping = dict(procedure=procedure, form_id=form_id))\n
 \n
 msg_content=""" \n
@@ -90,7 +90,7 @@ Your ${procedure} has been transmitted under the reference : ${form_id}, at ${da
 \n
 The procedure is pending and will continue after your payment.\n
 \n
-SAFI TEAM\n
+E-government TEAM\n
 \n
 """\n
 \n

bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/sendSubmissionNotificationByMail.xml

@@ -81,7 +81,7 @@ procedure=translateString(form.getPortalType())\n
 wf_info=form.Egov_getProcedureWorkflowStateInfo(\'egov_universal_workflow\',\'submitted\')\n
 date_of_submission=wf_info[\'time\'].strftime(\'%d/%m/%y %H:%M\')\n
 \n
-subject = translateString("[SAFI] Your ${procedure} document number: ${form_id} has been submitted", \n
+subject = translateString("[E-government] Your ${procedure} document number: ${form_id} has been submitted", \n
                            mapping = dict(procedure=procedure, form_id=form_id))\n
 \n
 msg_content=""" \n
@@ -89,7 +89,7 @@ msg_content=""" \n
 Your ${procedure} has been transmitted under the reference : ${form_id}, at ${date_of_submission}\n
 \n
 \n
-SAFI TEAM\n
+E-government TEAM\n
 \n
 """\n
 \n

bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/portal_type_interaction_workflow/scripts/EGov_generatePortalType.xml

@@ -56,8 +56,17 @@
             <value> <string>procedure_request = state_change[\'object\']\n
 \n
 portal_type_name = procedure_request.getProcedureTitle()\n
+portal_type_name = portal_type_name.replace("\'", "")\n
+portal_type_name = portal_type_name.replace(\'é\', \'e\')\n
+portal_type_name = portal_type_name.replace(\'è\', \'e\')\n
+portal_type_name = portal_type_name.replace(\'à\', \'a\')\n
+portal_type_name = portal_type_name.replace(\'ç\', \'c\')\n
+portal_type_name = portal_type_name.replace(\'ê\', \'e\')\n
 portal_type_name = \' \'.join([word.capitalize() for word in portal_type_name.split(\' \')])\n
 \n
+#in case of so much whitespace in the name like \'Fo   ooo\' filled in the form \n
+portal_type_name.replace(\' \',\'\')\n
+\n
 ## verifying if portal_type exist or not\n
 \n
 portal = context.getPortalObject()\n

bt5/erp5_egov/bt/change_log

+2010-06-02 mayoro
+* add some processing in procedure title in case of special caracters before generating portal_type
+
 2010-06-02 mayoro
 * rename extension for egov security
 * remove some word added by mistakes

bt5/erp5_egov/bt/revision

-521
\ No newline at end of file
+523
\ No newline at end of file