Commit f67f26b5 authored by Fabien Morin's avatar Fabien Morin

- use same float number style for all float fields of the FieldLibrary

- in preferred_float_number_style, use items instead of tales, this avoid error and make it more readable, add a missing float style (thanks to jerome)

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@29349 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 11d696a7
...@@ -279,7 +279,7 @@ ...@@ -279,7 +279,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: preferences.getPreference(\'preferred_float_number_style\', \'-1234.5\')</string> </value> <value> <string>python: preferences.getPreference(\'preferred_float_number_style\', \'-1 234.5\')</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -155,12 +155,14 @@ ...@@ -155,12 +155,14 @@
</item> </item>
<item> <item>
<key> <string>input_style</string> </key> <key> <string>input_style</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>precision</string> </key> <key> <string>precision</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -255,11 +257,8 @@ ...@@ -255,11 +257,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="TALESMethod" module="Products.Formulator.TALESField"/>
<string>Products.Formulator.TALESField</string> <tuple/>
<string>TALESMethod</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -274,11 +273,24 @@ ...@@ -274,11 +273,24 @@
<record id="3" aka="AAAAAAAAAAM="> <record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="TALESMethod" module="Products.Formulator.TALESField"/>
<string>Products.Formulator.TALESField</string> <tuple/>
<string>TALESMethod</string>
</tuple> </tuple>
<none/> </pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: preferences.getPreference(\'preferred_float_number_style\', \'-1 234.5\')</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
...@@ -157,9 +157,7 @@ ...@@ -157,9 +157,7 @@
</item> </item>
<item> <item>
<key> <string>items</string> </key> <key> <string>items</string> </key>
<value> <value> <string></string> </value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>required</string> </key> <key> <string>required</string> </key>
...@@ -235,7 +233,32 @@ ...@@ -235,7 +233,32 @@
<item> <item>
<key> <string>items</string> </key> <key> <string>items</string> </key>
<value> <value>
<list/> <list>
<tuple>
<string></string>
<string></string>
</tuple>
<tuple>
<string>-1234.5</string>
<string>-1234.5</string>
</tuple>
<tuple>
<string>-1 234.5</string>
<string>-1 234.5</string>
</tuple>
<tuple>
<string>-1 234,5</string>
<string>-1 234,5</string>
</tuple>
<tuple>
<string>-1.234,5</string>
<string>-1.234,5</string>
</tuple>
<tuple>
<string>-1,234.5</string>
<string>-1,234.5</string>
</tuple>
</list>
</value> </value>
</item> </item>
<item> <item>
...@@ -264,20 +287,4 @@ ...@@ -264,20 +287,4 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: [(\'\', \'\'), (\'-1234.5\', \'-1234.5\'),(\'-1 234.5\', \'-1 234.5\'), (\'-1 234,5\', \'-1 234,5\'), (\'-1.234,5\', \'-1,234.5\')]</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
1319 1320
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment