Skip to content

erp5
erp5
Commit 361d41e7 authored by Fabien Morin's avatar Fabien Morin
Browse files
Options

fix some pb : 

color -> colour
visual_pattern -> visual_pattern_title
resource -> resource_title

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@29454 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent fb72ce12
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 20 deletions
bt5/erp5_apparel/PropertySheetTemplateItem/ApparelComponent.py
View file @ 361d41e7
......@@ -33,8 +33,8 @@ class ApparelComponent:
"""
_properties = (
{ 'id' : 'color_count',
'description' : 'Number of colors',
{ 'id' : 'colour_count',
'description' : 'Number of colours',
'type' : 'int',
'mode' : 'w' },
# Override default value XXX
......
bt5/erp5_apparel/PropertySheetTemplateItem/ApparelFabric.py
View file @ 361d41e7
......@@ -41,8 +41,8 @@ class ApparelFabric:
'description' : 'The useful width of the fabric',
'type' : 'float',
'mode' : 'w' },
{ 'id' : 'color_count', # XXXX
'description' : 'Number of colors',
{ 'id' : 'colour_count', # XXXX
'description' : 'Number of colours',
'type' : 'int',
'mode' : 'w' },
{ 'id' : 'quality_reference',
......
bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelColourRangeVariation_view/my_title.xml
View file @ 361d41e7
......@@ -240,7 +240,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Apparel Colour Range Variation</string> </value>
<value> <string>Title</string> </value>
</item>
<item>
<key> <string>truncate</string> </key>
......
bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view.xml
View file @ 361d41e7
......@@ -100,7 +100,7 @@
<value>
<list>
<string>my_variation_category_list</string>
<string>my_color_count</string>
<string>my_colour_count</string>
<string>my_comment</string>
<string>my_translated_validation_state_title</string>
</list>
......
bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view/my_color_count.xml → bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponent_view/my_colour_count.xml
View file @ 361d41e7
......@@ -11,7 +11,7 @@
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>my_color_count</string> </value>
<value> <string>my_colour_count</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
......@@ -240,7 +240,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Color Count</string> </value>
<value> <string>Colour Count</string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
......
bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricModule_viewApparelFabricList/listbox.xml
View file @ 361d41e7
......@@ -335,11 +335,11 @@
<string>Apparel Fabric Template</string>
</tuple>
<tuple>
<string>resource</string>
<string>resource_title</string>
<string>Resource</string>
</tuple>
<tuple>
<string>visual_pattern</string>
<string>visual_pattern_title</string>
<string>Motive</string>
</tuple>
<tuple>
......@@ -412,11 +412,11 @@
<string>Drawing Reference</string>
</tuple>
<tuple>
<string>resource</string>
<string>resource_title</string>
<string>Resource</string>
</tuple>
<tuple>
<string>visual_pattern</string>
<string>visual_pattern_title</string>
<string>Motive</string>
</tuple>
<tuple>
......@@ -613,11 +613,11 @@
<string>Drawing Reference</string>
</tuple>
<tuple>
<string>resource</string>
<string>resource_title</string>
<string>Resource</string>
</tuple>
<tuple>
<string>visual_pattern</string>
<string>visual_pattern_title</string>
<string>Motive</string>
</tuple>
<tuple>
......@@ -671,11 +671,11 @@
<string>Drawing Reference</string>
</tuple>
<tuple>
<string>resource</string>
<string>resource_title</string>
<string>Resource</string>
</tuple>
<tuple>
<string>visual_pattern</string>
<string>visual_pattern_title</string>
<string>Motive</string>
</tuple>
<tuple>
......
bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view.xml
View file @ 361d41e7
......@@ -100,7 +100,7 @@
<string>my_resource</string>
<string>my_visual_pattern</string>
<string>my_trade_description</string>
<string>my_color_count</string>
<string>my_colour_count</string>
<string>my_raw_width</string>
<string>my_net_width</string>
<string>my_base_weight</string>
......
bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view/my_color_count.xml → bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view/my_colour_count.xml
View file @ 361d41e7
......@@ -11,7 +11,7 @@
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>my_color_count</string> </value>
<value> <string>my_colour_count</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
......@@ -240,7 +240,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Color Count</string> </value>
<value> <string>Colour Count</string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
......
bt5/erp5_apparel/bt/revision
View file @ 361d41e7
86
\ No newline at end of file
87
\ 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7