From 39817c2980a537ccd6a265afc12feac61f5e9ca8 Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Wed, 18 Nov 2009 15:17:04 +0000 Subject: [PATCH] fix my_preferred_user_interface_language_list. * use multi_check_box_field instead of radio field. * translate language title. * reverse the order of title and value. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@30737 20353a03-c40f-0410-a6d1-a30d3c3de9de --- ...preferred_user_interface_language_list.xml | 170 +++--------------- product/ERP5/bootstrap/erp5_core/bt/revision | 2 +- 2 files changed, 30 insertions(+), 142 deletions(-) diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_view/my_preferred_user_interface_language_list.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_view/my_preferred_user_interface_language_list.xml index 7c4748a607..38f31e016a 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_view/my_preferred_user_interface_language_list.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_view/my_preferred_user_interface_language_list.xml @@ -3,12 +3,24 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <global name="RadioField" module="Products.Formulator.StandardFields"/> + <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> <tuple/> </tuple> </pickle> <pickle> <dictionary> + <item> + <key> <string>delegated_list</string> </key> + <value> + <list> + <string>description</string> + <string>items</string> + <string>orientation</string> + <string>required</string> + <string>title</string> + </list> + </value> + </item> <item> <key> <string>id</string> </key> <value> <string>my_preferred_user_interface_language_list</string> </value> @@ -21,14 +33,6 @@ <key> <string>external_validator_failed</string> </key> <value> <string>The input failed the external validator.</string> </value> </item> - <item> - <key> <string>required_not_found</string> </key> - <value> <string>Input is required but no input given.</string> </value> - </item> - <item> - <key> <string>unknown_selection</string> </key> - <value> <string>You selected an item that was not in the list.</string> </value> - </item> </dictionary> </value> </item> @@ -37,67 +41,15 @@ <value> <dictionary> <item> - <key> <string>alternate_name</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>css_class</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>default</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>editable</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>enabled</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>external_validator</string> </key> + <key> <string>field_id</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>extra_item</string> </key> + <key> <string>form_id</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>first_item</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>items</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>orientation</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>required</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>unicode</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>whitespace_preserve</string> </key> + <key> <string>target</string> </key> <value> <string></string> </value> </item> </dictionary> @@ -107,44 +59,16 @@ <key> <string>tales</string> </key> <value> <dictionary> - <item> - <key> <string>alternate_name</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>css_class</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>default</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>description</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>editable</string> </key> + <key> <string>field_id</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>enabled</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>external_validator</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>extra_item</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>first_item</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>hidden</string> </key> + <key> <string>form_id</string> </key> <value> <string></string> </value> </item> <item> @@ -162,15 +86,11 @@ <value> <string></string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>target</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>unicode</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>whitespace_preserve</string> </key> + <key> <string>title</string> </key> <value> <string></string> </value> </item> </dictionary> @@ -180,45 +100,17 @@ <key> <string>values</string> </key> <value> <dictionary> - <item> - <key> <string>alternate_name</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>css_class</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>default</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>description</string> </key> <value> <string>The languages displayed in the User Interface.</string> </value> </item> <item> - <key> <string>editable</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>enabled</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>external_validator</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>extra_item</string> </key> - <value> <string></string> </value> + <key> <string>field_id</string> </key> + <value> <string>my_multi_check_box_field</string> </value> </item> <item> - <key> <string>first_item</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <int>0</int> </value> + <key> <string>form_id</string> </key> + <value> <string>Base_viewFieldLibrary</string> </value> </item> <item> <key> <string>items</string> </key> @@ -235,16 +127,12 @@ <value> <int>0</int> </value> </item> <item> - <key> <string>title</string> </key> - <value> <string>User Interface Languages</string> </value> + <key> <string>target</string> </key> + <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>unicode</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>whitespace_preserve</string> </key> - <value> <int>0</int> </value> + <key> <string>title</string> </key> + <value> <string>User Interface Languages</string> </value> </item> </dictionary> </value> @@ -263,7 +151,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python:[(x[\'id\'], x[\'title\']) for x in here.Localizer.get_languages_map()]</string> </value> + <value> <string>python:[(here.Localizer.erp5_ui.gettext(x[\'title\'], lang=x[\'id\']), x[\'id\']) for x in here.Localizer.get_languages_map()]</string> </value> </item> </dictionary> </pickle> diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision index a7c670cdb6..c585149e2a 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/revision +++ b/product/ERP5/bootstrap/erp5_core/bt/revision @@ -1 +1 @@ -1382 \ No newline at end of file +1383 \ No newline at end of file -- 2.30.9