From 12419186cec23d36d99db5f1d6cf656dfb2a5fbb Mon Sep 17 00:00:00 2001 From: Mayoro Diagne <mayoro@nexedi.com> Date: Wed, 2 Jun 2010 12:23:29 +0000 Subject: [PATCH] 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 --- ...FromUserName.xml => Egov_getTendererFromUserName.xml} | 2 +- .../listbox_organisation_title.xml | 2 +- .../WebSite_viewPendingApplicationRenderer.xml | 2 +- .../WebSite_viewRegisterInformationHead.xml | 2 +- .../scripts/sendPendingNotificationByMail.xml | 4 ++-- .../scripts/sendSubmissionNotificationByMail.xml | 4 ++-- .../scripts/EGov_generatePortalType.xml | 9 +++++++++ bt5/erp5_egov/bt/change_log | 3 +++ bt5/erp5_egov/bt/revision | 2 +- 9 files changed, 21 insertions(+), 9 deletions(-) rename bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/{SAFI_getTendererFromUserName.xml => Egov_getTendererFromUserName.xml} (98%) diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/SAFI_getTendererFromUserName.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Egov_getTendererFromUserName.xml similarity index 98% rename from bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/SAFI_getTendererFromUserName.xml rename to bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Egov_getTendererFromUserName.xml index 537fde0cab..bdb1632c6a 100644 --- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/SAFI_getTendererFromUserName.xml +++ b/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> diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Folder_viewEgovContentList/listbox_organisation_title.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Folder_viewEgovContentList/listbox_organisation_title.xml index fe9d728752..3addaabfbf 100644 --- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Folder_viewEgovContentList/listbox_organisation_title.xml +++ b/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> diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewPendingApplicationRenderer.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewPendingApplicationRenderer.xml index f757218c4f..487e0c01e7 100644 --- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewPendingApplicationRenderer.xml +++ b/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 diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewRegisterInformationHead.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewRegisterInformationHead.xml index df758d6470..a3cc482e9e 100644 --- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewRegisterInformationHead.xml +++ b/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 diff --git a/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/sendPendingNotificationByMail.xml b/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/sendPendingNotificationByMail.xml index 18ee752233..1b283b641f 100644 --- a/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/sendPendingNotificationByMail.xml +++ b/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 diff --git a/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/sendSubmissionNotificationByMail.xml b/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/sendSubmissionNotificationByMail.xml index d46ff40366..fd77a2a198 100644 --- a/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/sendSubmissionNotificationByMail.xml +++ b/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 diff --git a/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/portal_type_interaction_workflow/scripts/EGov_generatePortalType.xml b/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/portal_type_interaction_workflow/scripts/EGov_generatePortalType.xml index 676b477fd3..eb10f9d7ec 100644 --- a/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/portal_type_interaction_workflow/scripts/EGov_generatePortalType.xml +++ b/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 diff --git a/bt5/erp5_egov/bt/change_log b/bt5/erp5_egov/bt/change_log index 1aa77d6e60..e754f07237 100644 --- a/bt5/erp5_egov/bt/change_log +++ b/bt5/erp5_egov/bt/change_log @@ -1,3 +1,6 @@ +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 diff --git a/bt5/erp5_egov/bt/revision b/bt5/erp5_egov/bt/revision index 7c2b018235..a9d3bc092c 100644 --- a/bt5/erp5_egov/bt/revision +++ b/bt5/erp5_egov/bt/revision @@ -1 +1 @@ -521 \ No newline at end of file +523 \ No newline at end of file -- 2.30.9