Commit 7e34f3b1 authored by Jérome Perrin's avatar Jérome Perrin

pdm: fix "Volume" field

- Use ³ instead of the HTML entity form, ERP5JS does not allow HTML in field names
- Make Component_view uses Base_viewPDMFieldLibrary, like Product_view
- Add the proper description of this in field library
- Resource_viewFieldLibrary/my_base_volume is kept, for compatibility (not sure it's needed)
- Adjust ERP5Site_checkNamingConventions to allow m³, not m&179;
- Update all translations
parent e3752612
...@@ -6246,8 +6246,8 @@ msgstr "Ansichten" ...@@ -6246,8 +6246,8 @@ msgstr "Ansichten"
msgid "Visit" msgid "Visit"
msgstr "Besuch" msgstr "Besuch"
msgid "Volume (m³)" msgid "Volume (m³)"
msgstr "Volumen (m³)" msgstr "Volumen (m³)"
msgid "Warning" msgid "Warning"
msgstr "Warnung" msgstr "Warnung"
......
...@@ -5709,8 +5709,8 @@ msgstr "ソース" ...@@ -5709,8 +5709,8 @@ msgstr "ソース"
msgid "Visit" msgid "Visit"
msgstr "訪問" msgstr "訪問"
msgid "Volume (m³)" msgid "Volume (m³)"
msgstr "体積 (m³)" msgstr "体積 (m³)"
msgid "Warehouse" msgid "Warehouse"
msgstr "倉庫" msgstr "倉庫"
......
...@@ -7297,8 +7297,8 @@ msgstr "보임" ...@@ -7297,8 +7297,8 @@ msgstr "보임"
msgid "Visit" msgid "Visit"
msgstr "방문" msgstr "방문"
msgid "Volume (m³)" msgid "Volume (m³)"
msgstr "체적 (m³)" msgstr "체적 (m³)"
msgid "Warehouse" msgid "Warehouse"
msgstr "웨어하우스" msgstr "웨어하우스"
......
...@@ -3851,8 +3851,8 @@ msgstr "Главное (Бухучет)" ...@@ -3851,8 +3851,8 @@ msgstr "Главное (Бухучет)"
msgid "Visit" msgid "Visit"
msgstr "Визит" msgstr "Визит"
msgid "Volume (m³)" msgid "Volume (m³)"
msgstr "Объем (м³)" msgstr "Объем (м³)"
msgid "Warehouse" msgid "Warehouse"
msgstr "Склад" msgstr "Склад"
......
...@@ -8623,8 +8623,8 @@ msgstr "访问" ...@@ -8623,8 +8623,8 @@ msgstr "访问"
msgid "Virtual Machines" msgid "Virtual Machines"
msgstr "虚拟机" msgstr "虚拟机"
msgid "Volume (m³)" msgid "Volume (m³)"
msgstr "体积(m³)" msgstr "体积(m³)"
msgid "Warehouse" msgid "Warehouse"
msgstr "仓库" msgstr "仓库"
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>Default Quantity of a resource in ERP5. It can be a product or it can be time quantity like hours or minutes for example. Quantity can be found in almost every business field of ERP5 and will always have this meaning, unless the term is different or precise, such as Priced Quantity for example.</string> </value> <value> <string>A typical per unit volume of the resource</string> </value>
</item> </item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
...@@ -95,11 +95,7 @@ ...@@ -95,11 +95,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string>Volume (m³)</string> </value>
Volume (m&#179;)
]]></string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
......
...@@ -69,10 +69,6 @@ ...@@ -69,10 +69,6 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>description</string> </key>
<value> <string>A typical per unit volume of the resource</string> </value>
</item>
<item> <item>
<key> <string>extra_context</string> </key> <key> <string>extra_context</string> </key>
<value> <value>
...@@ -85,11 +81,7 @@ ...@@ -85,11 +81,7 @@
</item> </item>
<item> <item>
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string>Resource_viewFieldLibrary</string> </value> <value> <string>Base_viewPDMFieldLibrary</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Volume (m³)</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
......
...@@ -85,11 +85,7 @@ ...@@ -85,11 +85,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string>Volume (m³)</string> </value>
Volume (m&#179;)
]]></string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
......
# coding: utf-8
# This script checks for naming validity. # This script checks for naming validity.
# #
# NOTE: Do not rely on this script too much! After all, human must take care. # NOTE: Do not rely on this script too much! After all, human must take care.
...@@ -18,7 +19,7 @@ ABBREVIATION_WORD_SET = (( ...@@ -18,7 +19,7 @@ ABBREVIATION_WORD_SET = ((
)) ))
# List of words that do not need to be titlecased # List of words that do not need to be titlecased
LOWERCASE_WORD_SET = set(('g', 'cm', 'kg', '%', '/', '...', 'm', '-', 'g/m2', 'iCalendar', 'm&#179;', 'kB')) LOWERCASE_WORD_SET = set(('g', 'cm', 'kg', '%', '/', '...', 'm', '-', 'g/m2', 'iCalendar', 'm³', 'kB'))
# List of words that should not be modified # List of words that should not be modified
SPECIALCASE_WORD_SET = set(("ChangeLog", "EGov", "iCal", "included", SPECIALCASE_WORD_SET = set(("ChangeLog", "EGov", "iCal", "included",
...@@ -63,7 +64,7 @@ SENTENCE_PART_SET = set(SENTENCE_PART_LIST) ...@@ -63,7 +64,7 @@ SENTENCE_PART_SET = set(SENTENCE_PART_LIST)
assert len(SENTENCE_PART_SET) == len(SENTENCE_PART_LIST) assert len(SENTENCE_PART_SET) == len(SENTENCE_PART_LIST)
# List of allowed characters, usefull to detect non-english strings # List of allowed characters, usefull to detect non-english strings
ALLOWED_CHARS = set("abcdefghijklmnopqrstuvwxyz0123456789%/. ()-_?&'#,;") ALLOWED_CHARS = set("abcdefghijklmnopqrstuvwxyz0123456789%/. ()-_?&'#,;²³")
def checkField(folder, form, field): def checkField(folder, form, field):
""" """
......
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