[ https://issues.apache.org/jira/browse/OFBIZ-1780?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12664850#action_12664850 ] Jacques Le Roux commented on OFBIZ-1780: ---------------------------------------- Hi Marco, Seems not to be related to the svn tool but your files, this time I got D:\workspace\ofbizRun>patch -p0 0<cleanup_labels34.patch patching file framework/widget/config/conditional.xml patching file framework/guiapp/config/XuiUiLabels.xml patching file framework/guiapp/src/org/ofbiz/guiapp/xui/XuiSession.java patching file framework/common/widget/LookupForms.xml patching file framework/common/config/TemporalExpressionUiLabels.xml patching file framework/common/config/PrefErrorUiLabels.xml patching file framework/common/config/CommonEntityLabels.xml patching file framework/common/config/CommonUiLabels.xml Hunk #1 succeeded at 5482 (offset 20 lines). patching file framework/bi/config/BiUiLabels.xml patching file framework/example/widget/example/ExampleMenus.xml patching file framework/example/config/ExampleHelpUiLabels.xml patching file framework/example/config/ExampleEntityLabels.xml patching file framework/example/config/ExampleUiLabels.xml patching file framework/webtools/widget/Menus.xml patch: **** malformed patch at line 795: I guess the line 795 is the same as the line 13 before, this seems to a problem in framework/webtools/widget/Menus.xml. Anyway I have already commited the good part in r735315, I let you update and generate a new one. > Clean up labels between components > ---------------------------------- > > Key: OFBIZ-1780 > URL: https://issues.apache.org/jira/browse/OFBIZ-1780 > Project: OFBiz > Issue Type: Improvement > Components: ALL COMPONENTS > Affects Versions: SVN trunk > Reporter: Marco Risaliti > Assignee: Marco Risaliti > Priority: Minor > Fix For: SVN trunk > > Attachments: cleanup_labels.patch, cleanup_labels10.patch, cleanup_labels11.patch, cleanup_labels12.patch, cleanup_labels13.patch, cleanup_labels14.patch, cleanup_labels15.patch, cleanup_labels16.patch, cleanup_labels17.patch, cleanup_labels17.patch, cleanup_labels18.patch, cleanup_labels19.patch, cleanup_labels2.patch, cleanup_labels20.patch, cleanup_labels20.patch, cleanup_labels21.patch, cleanup_labels22.patch, cleanup_labels23.patch, cleanup_labels24.patch, cleanup_labels25.patch, cleanup_labels26.patch, cleanup_labels27.patch, cleanup_labels28.patch, cleanup_labels29.patch, cleanup_labels3.patch, cleanup_labels30.patch, cleanup_labels31.patch, cleanup_labels32.patch, cleanup_labels33.patch, cleanup_labels33.patch, cleanup_labels34.patch, cleanup_labels4.patch, cleanup_labels5.patch, cleanup_labels6.patch, cleanup_labels7.patch, cleanup_labels7.patch, cleanup_labels8.patch, cleanup_labels9.patch, screenshot-1.jpg, screenshot-2.jpg > > > Clean up labels between order and ecommerce application. > If a label has been used between order and ecommerce application it will be converted to OrderXXX style and instead if they has been used by a specific application they will be converted to that specific style (OrderXXX or EcommerceXXX). > This is the first patch and some more work is needed. > Let me know what did you think of it ? > Thanks > Marco > Extended to deal with ALL COMPONENTS -- This message is automatically generated by JIRA. - You can reply to this email to add a comment to the issue online. |
In reply to this post by Nicolas Malin (Jira)
[ https://issues.apache.org/jira/browse/OFBIZ-1780?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Marco Risaliti updated OFBIZ-1780: ---------------------------------- Attachment: cleanup_labels35.patch Hi Jacques, I'm uploading a new patch with the remaining labels. Can you try to commit it ? Thanks a lot for your patient Marco > Clean up labels between components > ---------------------------------- > > Key: OFBIZ-1780 > URL: https://issues.apache.org/jira/browse/OFBIZ-1780 > Project: OFBiz > Issue Type: Improvement > Components: ALL COMPONENTS > Affects Versions: SVN trunk > Reporter: Marco Risaliti > Assignee: Marco Risaliti > Priority: Minor > Fix For: SVN trunk > > Attachments: cleanup_labels.patch, cleanup_labels10.patch, cleanup_labels11.patch, cleanup_labels12.patch, cleanup_labels13.patch, cleanup_labels14.patch, cleanup_labels15.patch, cleanup_labels16.patch, cleanup_labels17.patch, cleanup_labels17.patch, cleanup_labels18.patch, cleanup_labels19.patch, cleanup_labels2.patch, cleanup_labels20.patch, cleanup_labels20.patch, cleanup_labels21.patch, cleanup_labels22.patch, cleanup_labels23.patch, cleanup_labels24.patch, cleanup_labels25.patch, cleanup_labels26.patch, cleanup_labels27.patch, cleanup_labels28.patch, cleanup_labels29.patch, cleanup_labels3.patch, cleanup_labels30.patch, cleanup_labels31.patch, cleanup_labels32.patch, cleanup_labels33.patch, cleanup_labels33.patch, cleanup_labels34.patch, cleanup_labels35.patch, cleanup_labels4.patch, cleanup_labels5.patch, cleanup_labels6.patch, cleanup_labels7.patch, cleanup_labels7.patch, cleanup_labels8.patch, cleanup_labels9.patch, screenshot-1.jpg, screenshot-2.jpg > > > Clean up labels between order and ecommerce application. > If a label has been used between order and ecommerce application it will be converted to OrderXXX style and instead if they has been used by a specific application they will be converted to that specific style (OrderXXX or EcommerceXXX). > This is the first patch and some more work is needed. > Let me know what did you think of it ? > Thanks > Marco > Extended to deal with ALL COMPONENTS -- This message is automatically generated by JIRA. - You can reply to this email to add a comment to the issue online. |
In reply to this post by Nicolas Malin (Jira)
[ https://issues.apache.org/jira/browse/OFBIZ-1780?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jacques Le Roux closed OFBIZ-1780. ---------------------------------- Resolution: Fixed Thanks a lot for all your work Marco ! Your last patch is in trunk revision: 735402 > Clean up labels between components > ---------------------------------- > > Key: OFBIZ-1780 > URL: https://issues.apache.org/jira/browse/OFBIZ-1780 > Project: OFBiz > Issue Type: Improvement > Components: ALL COMPONENTS > Affects Versions: SVN trunk > Reporter: Marco Risaliti > Assignee: Marco Risaliti > Priority: Minor > Fix For: SVN trunk > > Attachments: cleanup_labels.patch, cleanup_labels10.patch, cleanup_labels11.patch, cleanup_labels12.patch, cleanup_labels13.patch, cleanup_labels14.patch, cleanup_labels15.patch, cleanup_labels16.patch, cleanup_labels17.patch, cleanup_labels17.patch, cleanup_labels18.patch, cleanup_labels19.patch, cleanup_labels2.patch, cleanup_labels20.patch, cleanup_labels20.patch, cleanup_labels21.patch, cleanup_labels22.patch, cleanup_labels23.patch, cleanup_labels24.patch, cleanup_labels25.patch, cleanup_labels26.patch, cleanup_labels27.patch, cleanup_labels28.patch, cleanup_labels29.patch, cleanup_labels3.patch, cleanup_labels30.patch, cleanup_labels31.patch, cleanup_labels32.patch, cleanup_labels33.patch, cleanup_labels33.patch, cleanup_labels34.patch, cleanup_labels35.patch, cleanup_labels4.patch, cleanup_labels5.patch, cleanup_labels6.patch, cleanup_labels7.patch, cleanup_labels7.patch, cleanup_labels8.patch, cleanup_labels9.patch, screenshot-1.jpg, screenshot-2.jpg > > > Clean up labels between order and ecommerce application. > If a label has been used between order and ecommerce application it will be converted to OrderXXX style and instead if they has been used by a specific application they will be converted to that specific style (OrderXXX or EcommerceXXX). > This is the first patch and some more work is needed. > Let me know what did you think of it ? > Thanks > Marco > Extended to deal with ALL COMPONENTS -- This message is automatically generated by JIRA. - You can reply to this email to add a comment to the issue online. |
Free forum by Nabble | Edit this page |