From c10f6b7f88f640a202ad3f1decfc0277b39264c5 Mon Sep 17 00:00:00 2001 From: Gabriel Monnerat <gabriel@tiolive.com> Date: Wed, 23 Mar 2011 20:40:22 +0000 Subject: [PATCH] continuation of r44547. Use Base_translateString to do translation git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@44548 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../WebSection_newEvent.xml | 34 ++++++++++--------- .../WebSection_viewDocumentActionWidget.xml | 8 +++-- .../WebSection_viewDocumentWidget.xml | 18 +++++----- .../WebSection_viewFavoriteWidget.xml | 34 ++++++++++--------- .../WebSection_viewToolbar.xml | 13 ++++--- .../WebSection_viewUserLoginWidget.xml | 18 ++++++---- bt5/erp5_web_ung_theme/bt/revision | 2 +- 7 files changed, 72 insertions(+), 55 deletions(-) diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_newEvent.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_newEvent.xml index 03eaea3c54..731fad6954 100644 --- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_newEvent.xml +++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_newEvent.xml @@ -36,25 +36,26 @@ <key> <string>_text</string> </key> <value> <unicode encoding="cdata"><![CDATA[ +<tal:block tal:define="default_language python:here.Localizer.get_selected_language()">\n <form id="create_new_event">\n - <label tal:content="python:unicode(here.Base_translateString(\'Event Type\'), \'utf-8\')">Event Type</label>\n + <label tal:content="python:here.Base_translateString(\'Event Type\', lang=default_language)">Event Type</label>\n <select name="portal_type">\n - <option>Acknowledgement</option>\n - <option>Fax Message</option>\n - <option>Letter</option>\n - <option>Mail Message</option>\n - <option>Note</option>\n - <option>Phone Call</option>\n - <option>Short Message</option>\n - <option>Site Message</option>\n - <option>Visit</option>\n - <option>Web Message</option>\n + <option tal:content="python:here.Base_translateString(\'Acknowledgement\', lang=default_language)">Acknowledgement</option>\n + <option tal:content="python:here.Base_translateString(\'Fax Message\', lang=default_language)">Fax Message</option>\n + <option tal:content="python:here.Base_translateString(\'Letter\', lang=default_language)">Letter</option>\n + <option tal:content="python:here.Base_translateString(\'Mail Message\', lang=default_language)">Mail Message</option>\n + <option tal:content="python:here.Base_translateString(\'Note\', lang=default_language)">Note</option>\n + <option tal:content="python:here.Base_translateString(\'Phone Call\', lang=default_language)">Phone Call</option>\n + <option tal:content="python:here.Base_translateString(\'Short Message\', lang=default_language)">Short Message</option>\n + <option tal:content="python:here.Base_translateString(\'Site Message\', lang=default_language)">Site Message</option>\n + <option tal:content="python:here.Base_translateString(\'Visit\', lang=default_language)">Visit</option>\n + <option tal:content="python:here.Base_translateString(\'Web Message\', lang=default_language)">Web Message</option>\n </select>\n <p>\n - <label>Title: </label>\n + <label tal:content="python:here.Base_translateString(\'Title\', lang=default_language)">Title </label>:\n <input name="title" value="" type="text" size="30">\n <p>\n - <label>Start Date: </label>\n + <label tal:content="python:here.Base_translateString(\'Start Date\', lang=default_language)">Start Date </label>:\n <input class="start_date_field" name="start_date_month" value="" maxlength="2" type="text" size="2">/\n <input class="start_date_field" name="start_date_day" value="" maxlength="2" type="text" size="2">/\n <input class="start_date_field" name="start_date_year" value="2011" maxlength="4" type="text" size="4">\n @@ -62,7 +63,7 @@ <input class="start_date_field" name="start_date_hour" value="" maxlength="2" type="text" size="2">:\n <input class="start_date_field" name="start_date_minute" value="" maxlength="2" type="text" size="2">\n <p>\n - <label>Stop Date: </label>\n + <label tal:content="python:here.Base_translateString(\'Stop Date\', lang=default_language)">Stop Date </label>:\n <input class="stop_date_field" name="stop_date_month" value="" maxlength="2" type="text" size="2">/\n <input class="stop_date_field" name="stop_date_day" value="" maxlength="2" type="text" size="2">/\n <input class="stop_date_field" name="stop_date_year" value="2011" maxlength="4" type="text" size="4">\n @@ -70,9 +71,10 @@ <input class="stop_date_field" name="stop_date_hour" value="" maxlength="2" type="text" size="2">:\n <input class="stop_date_field" name="stop_date_minute" value="" maxlength="2" type="text" size="2">\n <p>\n - <label>Text: </label>\n + <label tal:content="python:here.Base_translateString(\'Text\', lang=default_language)">Text </label>:\n <textarea name="event_text_content" rows="2" cols="30"></textarea>\n -</form> +</form>\n +</tal:block> ]]></unicode> </value> </item> diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewDocumentActionWidget.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewDocumentActionWidget.xml index 03503026c9..66d6e6b8e7 100644 --- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewDocumentActionWidget.xml +++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewDocumentActionWidget.xml @@ -37,14 +37,16 @@ <value> <unicode encoding="cdata"><![CDATA[ <tal:block tal:define="actions python:here.Base_filterDuplicateActions(here.portal_actions.listFilteredActionsFor(here));\n - dummy python:request.set(\'actions\', actions);">\n + dummy python:request.set(\'actions\', actions);\n + default_language python:here.Localizer.get_selected_language()">\n <a tal:condition="python: context.getModificationDate() is not None">\n <a tal:content="python: \'Updated %s by\' % context.getModificationDate().ISO()"/>\n </a>\n <a tal:content="here/portal_membership/getAuthenticatedMember"/>\n <button onclick="javascript:clickSaveButton(\'Base_edit\')"\n - name="Base_edit:method" title="Save" \n - class="save" type="submit">Save</button>\n + name="Base_edit:method" \n + class="save" type="submit"\n + tal:content="python:here.Base_translateString(\'Save\', lang=default_language)">Save</button>\n <div class="action_menu">\n <tal:block tal:define="portal_path here/absolute_url;\n url_suffix python: \'/ERP5Site_createNewWebDocument?select_action=\'">\n diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewDocumentWidget.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewDocumentWidget.xml index fb1987890b..f78f93d7e4 100644 --- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewDocumentWidget.xml +++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewDocumentWidget.xml @@ -37,15 +37,15 @@ <value> <unicode encoding="cdata"><![CDATA[ <html>\n -<body>\n - <tal:block metal:define-macro="master">\n - <tal:block metal:use-macro="here/template_erp5_xhtml_style/macros/master">\n - <tal:block metal:fill-slot="layout">\n - <tal:block metal:define-slot="main"/>\n - </tal:block>\n - </tal:block>\n -</tal:block>\n -</body>\n + <body>\n + <tal:block metal:define-macro="master">\n + <tal:block metal:use-macro="here/template_erp5_xhtml_style/macros/master">\n + <tal:block metal:fill-slot="layout">\n + <tal:block metal:define-slot="main"/>\n + </tal:block>\n + </tal:block>\n + </tal:block>\n + </body>\n </html> ]]></unicode> </value> diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewFavoriteWidget.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewFavoriteWidget.xml index 196a8fd7fe..719b00dd4a 100644 --- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewFavoriteWidget.xml +++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewFavoriteWidget.xml @@ -37,22 +37,24 @@ <value> <unicode encoding="cdata"><![CDATA[ <div class="favorite">\n -<tal:block tal:define="website here/getWebSiteValue;\n - portal_path python:website.absolute_url();\n - current_url here/absolute_url;\n - has_editor python: current_url != portal_path;\n - domain_url python: context.REQUEST.form.get(\'domain_url\') or \'ung_domain/all_document_list\';">\n -<a class="domain_selected"></a>\n -<tal:block tal:condition="python: not has_editor">\n - <a tal:attributes="href python: request.get(\'URL\') + \'?domain_url=%s&\' % domain_url + \n - \'form_id=erp5_web_ung_layout&\' + \n - \'list_selection_name=ung_document_list_selection&\' + \n - \'domain_depth:int=0&reset:int=1\'">Refresh</a>\n -</tal:block>\n -<tal:block tal:condition="python: has_editor">\n - <a tal:attributes="href python: request.get(\'URL\') + \'?editable_mode:int=1\'">Refresh</a>\n -</tal:block>\n -</tal:block>\n + <tal:block tal:define="website here/getWebSiteValue;\n + portal_path python:website.absolute_url();\n + current_url here/absolute_url;\n + has_editor python: current_url != portal_path;\n + domain_url python: context.REQUEST.form.get(\'domain_url\') or \'ung_domain/all_document_list\';\n + default_language python:here.Localizer.get_selected_language()">\n + <a class="domain_selected"></a>\n + <tal:block tal:condition="python: not has_editor">\n + <a tal:attributes="href python: request.get(\'URL\') + \'?domain_url=%s&\' % domain_url + \n + \'form_id=erp5_web_ung_layout&\' + \n + \'list_selection_name=ung_document_list_selection&\' + \n + \'domain_depth:int=0&reset:int=1\'">Refresh</a>\n + </tal:block>\n + <tal:block tal:condition="python: has_editor">\n + <a tal:attributes="href python: request.get(\'URL\') + \'?editable_mode:int=1\'"\n + tal:content="python:here.Base_translateString(\'Refresh\', lang=default_language)">Refresh</a>\n + </tal:block>\n + </tal:block>\n </div> ]]></unicode> </value> diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewToolbar.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewToolbar.xml index b46ff5401e..cc95bee925 100644 --- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewToolbar.xml +++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewToolbar.xml @@ -36,10 +36,15 @@ <key> <string>_text</string> </key> <value> <unicode encoding="cdata"><![CDATA[ -<div class="toolbar">\n -<button title="Delete" name="WebSection_deleteObjectList:method" type="submit" class="delete">Delete</button>\n -<button title="Change State" name="#" type="submit" class="change_state">Change State</button>\n -</div> +<tal:block tal:define="default_language python:here.Localizer.get_selected_language()">\n + <div class="toolbar">\n + <button name="WebSection_deleteObjectList:method" \n + type="submit" class="delete"\n + tal:content="python:here.Base_translateString(\'Delete\', lang=default_language)">Delete</button>\n + <button name="#" type="submit" class="change_state"\n + tal:content="python:here.Base_translateString(\'Change State\', lang=default_language)">Change State</button>\n + </div>\n +</tal:block> ]]></unicode> </value> </item> diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewUserLoginWidget.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewUserLoginWidget.xml index c92736dd41..722d738884 100644 --- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewUserLoginWidget.xml +++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewUserLoginWidget.xml @@ -38,18 +38,24 @@ <tal:block tal:define="website here/getWebSiteValue;\n enctype string:multipart/form-data;\n - portal_path python:website.absolute_url();">\n - <a id="right_message">Not Implemented yet</a>\n - <div id="preference_dialog" title="UNG Preferences"></div> \n + portal_path python:website.absolute_url();\n + default_language python:here.Localizer.get_selected_language()">\n + <a id="right_message" tal:content="python:here.Base_translateString(\'Not Implemented yet\', lang=default_language)">Not Implemented yet</a>\n + <div id="preference_dialog" tal:attributes="title python:here.Base_translateString(\'UNG Preferences\', lang=default_language)"></div> \n <tal:block tal:condition="here/portal_membership/isAnonymousUser">\n - <a id="login" tal:attributes="href string: #">Sign in</a>\n + <a id="login" href="#"\n + tal:content="python:here.Base_translateString(\'Sign in\', lang=default_language)">Sign in</a>\n </tal:block>\n <tal:block tal:condition="python:not here.portal_membership.isAnonymousUser()">\n <a tal:content="here/portal_membership/getAuthenticatedMember"/>\n </tal:block>\n <tal:block tal:condition="python: not here.portal_membership.isAnonymousUser()">\n - | <a id="settings" href="#">Settings</a> | <a id="help" href="#">Help</a> |\n - <a tal:attributes="href string:${portal_path}/WebSite_logout">Sign out</a>\n + | <a id="settings" href="#"\n + tal:content="python:here.Base_translateString(\'Settings\', lang=default_language)">Settings</a> \n + | <a id="help" href="#"\n + tal:content="python:here.Base_translateString(\'Help\', lang=default_language)">Help</a> \n + | <a tal:attributes="href string:${portal_path}/WebSite_logout"\n + tal:content="python:here.Base_translateString(\'Sign out\', lang=default_language)">Sign out</a>\n </tal:block>\n </tal:block> diff --git a/bt5/erp5_web_ung_theme/bt/revision b/bt5/erp5_web_ung_theme/bt/revision index 75af06ed67..272a4581e9 100644 --- a/bt5/erp5_web_ung_theme/bt/revision +++ b/bt5/erp5_web_ung_theme/bt/revision @@ -1 +1 @@ -315 \ No newline at end of file +316 \ No newline at end of file -- 2.30.9