From d0a2a81ca7111ed24aefb51f2a0aea55288504d3 Mon Sep 17 00:00:00 2001
From: Tristan Cavelier <tristan.cavelier@nexedi.com>
Date: Tue, 22 Dec 2015 12:28:35 -0500
Subject: [PATCH] revert some commits to have nice diff output later
Revert "erp5_project: translate title and description in sale order detailed report"
This reverts commit 54cfebfc28c9d44ab5a63374f5ad654b603d5a2c.
Revert "erp5_project: translate title and comment in project coverage list"
This reverts commit 75710ed03f1bd3fa25c6db02ff9b005e4b4ad212.
Revert "erp5_project: translate comment and description in requirement view"
This reverts commit fa3b4c3ac2624c46d829302233b11bea2ea4ab9b.
---
...irementDocument_getProjectCoverageList.xml | 10 +-
.../erp5_project/Requirement_view.xml | 2 -
.../my_translated_comment.xml | 280 ------------------
.../my_translated_description.xml | 280 ------------------
.../SaleOrder_viewDetailedReportMacro.xml | 10 +-
5 files changed, 10 insertions(+), 572 deletions(-)
delete mode 100644 bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view/my_translated_comment.xml
delete mode 100644 bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view/my_translated_description.xml
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_getProjectCoverageList.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_getProjectCoverageList.xml
index a3a704f8ce..9bfc9b0be5 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_getProjectCoverageList.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_getProjectCoverageList.xml
@@ -58,8 +58,8 @@ for r in context.contentValues(portal_type= "Requirement", sort_on = ((\'int_ind
if not requirement_related_list:\n
if not r.contentValues(portal_type= "Requirement", sort_on = ((\'int_index\',\'ascending\', \'int\'),), checked_permission=\'View\'):\n
result.append({\'requirement_reference\': r.Requirement_getDefaultReference(),\n
- \'requirement_title\': r.getTranslatedTitle(),\n
- \'requirement_comment\': r.getTranslatedComment(),\n
+ \'requirement_title\': r.getTitle(),\n
+ \'requirement_comment\': r.getComment(),\n
\'repeat_index\' : 0,\n
\'repeat_count\' : 1,\n
\'project_reference\': \'Not covered\',\n
@@ -69,12 +69,12 @@ for r in context.contentValues(portal_type= "Requirement", sort_on = ((\'int_ind
i = 0\n
for p in requirement_related_list:\n
result.append({\'requirement_reference\': r.Requirement_getDefaultReference(),\n
- \'requirement_title\': r.getTranslatedTitle(),\n
- \'requirement_comment\': r.getTranslatedComment(),\n
+ \'requirement_title\': r.getTitle(),\n
+ \'requirement_comment\': r.getComment(),\n
\'repeat_index\' : i,\n
\'repeat_count\' : requirement_related_count,\n
\'project_reference\': p.Project_getDefaultReference(),\n
- \'project_title\': p.getTranslatedTitle(),\n
+ \'project_title\': p.getTitle(),\n
\'stop_date\': p.getStopDate()})\n
i += 1\n
result.extend(r.RequirementDocument_getProjectCoverageList())\n
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view.xml
index f8a07ee0d7..7620183d18 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view.xml
@@ -75,7 +75,6 @@
<value>
<list>
<string>my_description</string>
- <string>my_translated_description</string>
</list>
</value>
</item>
@@ -114,7 +113,6 @@
<string>my_source_decision_title</string>
<string>my_initial_implementation_state</string>
<string>my_comment</string>
- <string>my_translated_comment</string>
<string>my_translated_validation_state_title</string>
</list>
</value>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view/my_translated_comment.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view/my_translated_comment.xml
deleted file mode 100644
index 91fd33515f..0000000000
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view/my_translated_comment.xml
+++ /dev/null
@@ -1,280 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>id</string> </key>
- <value> <string>my_translated_comment</string> </value>
- </item>
- <item>
- <key> <string>message_values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>external_validator_failed</string> </key>
- <value> <string>The input failed the external validator.</string> </value>
- </item>
- <item>
- <key> <string>line_too_long</string> </key>
- <value> <string>A line was too long.</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>too_long</string> </key>
- <value> <string>You entered too many characters.</string> </value>
- </item>
- <item>
- <key> <string>too_many_lines</string> </key>
- <value> <string>You entered too many lines.</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>overrides</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>
- <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</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>height</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_length</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_linelength</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_lines</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>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>width</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <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>
- <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</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>height</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_length</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_linelength</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_lines</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>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>width</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <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></string> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <int>0</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</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>height</string> </key>
- <value> <int>5</int> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>max_length</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_linelength</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_lines</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>required</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Translated Comment</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>
- </item>
- <item>
- <key> <string>width</string> </key>
- <value> <int>40</int> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view/my_translated_description.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view/my_translated_description.xml
deleted file mode 100644
index 57d0be71f8..0000000000
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_view/my_translated_description.xml
+++ /dev/null
@@ -1,280 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>id</string> </key>
- <value> <string>my_translated_description</string> </value>
- </item>
- <item>
- <key> <string>message_values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>external_validator_failed</string> </key>
- <value> <string>The input failed the external validator.</string> </value>
- </item>
- <item>
- <key> <string>line_too_long</string> </key>
- <value> <string>A line was too long.</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>too_long</string> </key>
- <value> <string>You entered too many characters.</string> </value>
- </item>
- <item>
- <key> <string>too_many_lines</string> </key>
- <value> <string>You entered too many lines.</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>overrides</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>
- <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</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>height</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_length</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_linelength</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_lines</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>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>width</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <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>
- <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</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>height</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_length</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_linelength</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_lines</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>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>width</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <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></string> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <int>0</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</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>height</string> </key>
- <value> <int>5</int> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>max_length</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_linelength</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_lines</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>required</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Translated Description</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>
- </item>
- <item>
- <key> <string>width</string> </key>
- <value> <int>40</int> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewDetailedReportMacro.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewDetailedReportMacro.xml
index 6f2e1bcbae..a7af3c220c 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewDetailedReportMacro.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewDetailedReportMacro.xml
@@ -72,7 +72,7 @@
<!-- Display Lines -->\n
<tal:block tal:repeat="line_item python:current_line.contentValues(portal_type=\'Sale Order Line\', sort_on = ((\'int_index\',\'ascending\', \'int\'),))">\n
<text:h text:outline-level=\'1\' text:style-name=\'Heading_20_1\'\n
- tal:content="line_item/getTranslatedTitle"\n
+ tal:content="line_item/getTitle"\n
tal:attributes="text:outline-level python:\'%s\' % depth;\n
text:style-name python:\'Heading_20_%s\' % depth">Sale Order Line</text:h>\n
<text:p text:style-name=\'Project_20_Box\'>\n
@@ -99,10 +99,10 @@
</text:p>\n
<text:p text:style-name=\'Project_20_Box\' tal:condition="line_item/getSourceTitleList">\n
<text:span text:style-name=\'T1\' i18n:translate="Resources" i18n:domain="erp5_ui">Resources</text:span>: <tal:block tal:replace="python:\', \'.join(line_item.getSourceTradeTitleList([]))">JP Smets, B. Faye</tal:block></text:p>\n
- <text:p text:style-name=\'Project_20_Box\' tal:condition="line_item/getTranslatedOutcomeDescription">\n
+ <text:p text:style-name=\'Project_20_Box\' tal:condition="line_item/getOutcomeDescription">\n
<text:span text:style-name=\'T1\' i18n:translate="Result" i18n:domain="erp5_ui">Result</text:span>: <tal:block tal:replace="line_item/getOutcomeDescription">description of result</tal:block>\n
</text:p>\n
- <tal:block tal:repeat="partial_description python: line_item.getTranslatedDescription().split(\'\\n\')">\n
+ <tal:block tal:repeat="partial_description python: line_item.getDescription().split(\'\\n\')">\n
<text:p text:style-name=\'Text_20_body\' tal:content="partial_description">Project Line description</text:p>\n
</tal:block>\n
<tal:block tal:define="global current_line python:line_item"/>\n
@@ -117,7 +117,7 @@
<tal:block tal:define="global depth python:depth + 1"/>\n
<text:h text:outline-level=\'1\' text:style-name=\'Heading_20_1\'\n
tal:attributes="text:outline-level python:\'%s\' % depth;\n
- text:style-name python:\'Heading_20_%s\' % depth"><tal:block i18n:translate="Milestone:" i18n:domain="erp5_ui">Milestone: </tal:block><tal:block tal:content="line_item/getTranslatedTitle">Project Line</tal:block></text:h>\n
+ text:style-name python:\'Heading_20_%s\' % depth"><tal:block i18n:translate="Milestone:" i18n:domain="erp5_ui">Milestone: </tal:block><tal:block tal:content="line_item/getTitle">Project Line</tal:block></text:h>\n
<text:p text:style-name=\'Project_20_Box\'>\n
<text:span text:style-name=\'T1\' i18n:translate="" i18n:domain="erp5_ui">ID</text:span>: <tal:block tal:replace="line_item/Project_getDefaultReference">description of result</tal:block>\n
<tal:block tal:condition="line_item/getRequirementValueList">\n
@@ -131,7 +131,7 @@
</tal:block>\n
<text:span text:style-name=\'T1\' i18n:translate="End" i18n:domain="erp5_ui">End</text:span>: <tal:block tal:replace="line_item/getStopDate">2006-01-01</tal:block>\n
</text:p>\n
- <tal:block tal:repeat="partial_description python: line_item.getTranslatedDescription().split(\'\\n\')">\n
+ <tal:block tal:repeat="partial_description python: line_item.getDescription().split(\'\\n\')">\n
<text:p text:style-name=\'Text_20_body\' tal:content="partial_description">Milestone description</text:p>\n
</tal:block>\n
\n
--
2.30.9