Clean up labels between components

• Key: OFBIZ-1780
• Type: Improvement
• Status: Closed
• Resolution: Fixed
• Priority: Minor
• Assignee: Marco Risaliti
• Reporter: Marco Risaliti
• Component/s: ALL COMPONENTS
• Affects Version/s: SVN trunk
• Fix Version/s: SVN trunk

Description

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

Comments

[Marco Risaliti]

First patch.

[Jacques Le Roux]

Hi Marco,

I did not review completly, this makes sense but do you remember OFBIZ-1698 ? I'm still working on the French part of the 18550 lines of ProductUiLabels.xml, sitll 1/3 to do. And some work done by another person on (party or order or both I don't remember) is waiting my review (as translating OFBiz is a bit specific)

[Marco Risaliti]

Hi Jacques,

I'm thinking that the patch in OFBIZ-1698 is a very important task to be done but I think it's not valid for Order and Ecommerce applications because it's not enough to move label duplicated into OrderUiLabels.xml and EcommerceUiLabels.xml to EcommerceUiLabels.xml.
I think that every single label that is used only in Ecommerce has to be put into EcommerceUiLabels.xml and instead if it's used on both application it has to be renamed to OrderXXX and change all the references to this one.
For example the label EcommerceAddAllToCart has to be renamed to OrderAddAllToCart because it was used on both applications.

Thanks
Marco

[Jacques Le Roux]

Marco,

Yes I agree, actually it was more a reminder. I can't see any problems with your patch which makes totally sense as I already said. Morevoer I'm very respectful for such work : it's really tedious (I know what I'm speaking about ;o). But at the end OFBiz will be more attractive to new comers (always the 1st impression impact) and with this specific issue more easy to maintain and understand from the translation POV. Please feel free to commit.

[Bruno Busco]

Marco, Jacques,

I suggest to use the script contained in the OFBIZ-1698 issue before working on other name changing. In this way at least the number of label to edit is reduced (about 800 duplication were eliminated last time I ran it).

[Jacques Le Roux]

Bruno,

I have done more than 2/3 of the work I need to commit before running this script. So I would prefer to run it after because I'm afraid or merging issues if it's ran before this commit. Then I will run it and continue my work on my side. I think that the work done by Marco can be commite before also. I hope to find time thereafter to write some scripts from your script to ease some processes (like finding missing labels in a language). In the same time I will learn Ruby but I'm not too afraid by that. Maybe I will use Java though, I will see when using your script... I will not be available for this task before next week anyway.

Also my concern is that we have to check the result of your script before commiting.

[Bruno Busco]

Jacques,
fill free to do as you like... in any case the script is in Python

-Bruno

[Jacques Le Roux]

Yes, I meaned Python sorry (same kind of beast for me so far ;o).
Frankly I could also search for a free APL interpreter and write it in APL (when I need APL - ie when I need to write a script or a simple expression very quicly - I still use APL+Win 4.0 from 2001) but I prefer to concentrate on novelties :o)

[Marco Risaliti]

First patch committed in OFBiz trunk rev. 656347.

[Marco Risaliti]

Second patch

[Marco Risaliti]

Second patch committed in OFBiz trunk rev. 656426.
Please let me know if something is not correct.

Thanks
Marco

[Marco Risaliti]

WARNING !!!

Please remember that if someone of you has a custom application that extends order and ecommerce application hat to replace the following labels with the new ones.

EcommerceAddAlltoCart --> OrderAddAllToCart
EcommerceAddCheckedtoCart --> OrderAddCheckedToCart
EcommerceChooseVariations --> OrderChooseVariations
EcommerceChooseAmount --> OrderChooseAmount
EcommerceAverageRating --> OrderAverageRating
EcommerceAddtoShoppingList --> OrderAddToShoppingList
EcommerceAnonymous --> OrderAnonymous
EcommerceCheckoutQuick --> OrderCheckoutQuick
EcommerceCheckout --> OrderCheckout
EcommerceCartItemUseinPromotions --> OrderCartItemUseinPromotions
EcommerceCartSummary --> OrderCartSummary
EcommerceAlwaysList --> OrderAlwaysList

[Marco Risaliti]

Third patch.

[Marco Risaliti]

Third patch committed in OFBiz trunk rev. 656832.
Please let me know if something is not correct.

Thanks
Marco

[Marco Risaliti]

WARNING !!!

Please remember that if someone of you has a custom application that extends order and ecommerce application hat to replace the following labels with the new ones.

EcommerceClearSearchHistory --> OrderClearSearchHistory
EcommerceClearSearchHistoryNote --> OrderClearSearchHistoryNote
EcommerceConfigure --> OrderConfigure
EcommerceCustomerReviews --> OrderCustomerReviews
EcommerceCustomerTaxId --> OrderCustomerTaxId
EcommerceDigitalProductFiles --> OrderDigitalProductFiles
EcommerceEcludeCategories --> OrderExcludeCategories
EcommerceEcommerce --> OrderEcommerce
EcommerceErrorNoPromotionFoundWithID --> OrderErrorNoPromotionFoundWithID
EcommerceIncludes --> OrderIncludes
EcommerceIncludeSubCategories --> OrderIncludeSubCategories
EcommerceIsAPromotionalItem --> OrderIsAPromotionalItem
EcommerceItem --> OrderItem
EcommerceItemN --> OrderItemN
EcommerceItems --> OrderItems

[Marco Risaliti]

Fourth patch

[Marco Risaliti]

Fourth patch committed in OFBiz trunk rev. 657466.
Please let me know if something is not correct.

Thanks
Marco

[Marco Risaliti]

WARNING !!!

Please remember that if someone of you has a custom application that extends order and ecommerce application has to replace the following labels with the new ones.

EcommerceLastSearches --> OrderLastSearches
EcommerceListType --> OrderListType
EcommerceMakeBooking --> OrderMakeBooking
EcommerceNbrPersons --> OrderNbrPersons
EcommerceNewShoppingList --> OrderNewShoppingList
EcommerceNothingToDoHere --> OrderNothingToDoHere
EcommerceOfPromotion --> OrderOfPromotion
EcommerceOnSale --> OrderOnSale
EcommercePieces --> OrderPieces
EcommerceProduct --> OrderProduct
EcommerceProductsForPromotion --> OrderProductsForPromotion
EcommercePromotionCategories --> OrderPromotionCategories
EcommercePromotionDetails --> OrderPromotionDetails
EcommercePromotionInformation --> OrderPromotionInformation
EcommercePromotionProductsInCategories --> OrderPromotionProductsInCategories

[Marco Risaliti]

Fifth patch committed in OFBiz trunk rev. 657557.
Please let me know if something is not correct.

Thanks
Marco

[Marco Risaliti]

WARNING !!!

Please remember that if someone of you has a custom application that extends order and ecommerce application has to replace the following labels with the new ones.

EcommercePromotionsApplied --> OrderPromotionsApplied
EcommerceQuickAdd --> OrderQuickAdd
EcommerceRanking --> OrderRanking
EcommerceRatings --> OrderRatings
EcommerceSave --> OrderSave
EcommerceShoppingCart --> OrderShoppingCart
EcommerceShoppingCartEmpty --> OrderShoppingCartEmpty
EcommerceSpecialOffers --> OrderSpecialOffers
EcommerceToAddSelectedItemsToShoppingList --> OrderToAddSelectedItemsToShoppingList
EcommerceToCart --> OrderToCart
EcommerceTotal --> OrderTotal
EcommerceViewAllPromotions --> OrderViewAllPromotions
EcommerceViewCart --> OrderViewCart
EcommerceYouMust --> OrderYouMust
EcommerceYourPrice --> OrderYourPrice

[Jacques Le Roux]

Hi Marco,

First of all, thanks for your hard work on this. I just checked your last commit and found at least a problem I dreaded to face : inconsistent labels between files, for instance EcommerceRating in Order and Ecommerce component.

This can be seen from 2 POVs :
1) These labels are simply inconsistent and, though we lost information in your rewriting, it shoud not be a big deal to fix them.
2) This was done intentionally and the labels are not inconsistent but overriden (as Adrian already outlined in http://docs.ofbiz.org/display/OFBIZ/Tips+for+translation)

As you can see, it implies to look exhaustively in each use of each label to be sure of their usages... That's why we should be very careful when doing this task. There is no hurry and we can't afford to lose information. There is a french proverb which says "L'enfer est pavé de bonnes intentions" (hell is paved with good intentions) very suitable in this case (http://www.answers.com/topic/list-of-english-proverbs :o)

There are maybe more like this one, I did not check further

Thanks

[Marco Risaliti]

Hi Jacques,

I'm sorry but I did not understand you.
Could you please give me a simple example (with a screenshot) that shows me your issues.
I have checked the label EcommerceRating and it's used now only in the ecommerce application and so I didn't understand what you mean in this case for order application.

Thanks
Marco

[Jacques Le Roux]

Marco,

I agree that it's not obvious. Please, note however that my intent is to make a more general comment, anyway here is the example

As you can see in http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?view=diff&r1=657556&r2=657557&pathrev=657557, previously we had

• <property key="EcommerceRating">
• <value xml:lang="de">Bewertung (1-5; 5 entspricht sehr gut)</value>
• <value xml:lang="en">Rating (1-5; 5 being best)</value>
• <value xml:lang="es">Voto (de 1 a 5)</value>
• <value xml:lang="fr">Note(s) (de 1 à 5, 5 étant la meilleure)</value>
• <value xml:lang="it">Posizione(1-5; 5 è il migliore)</value>
• <value xml:lang="nl">Waardering (1-5; 5 is het beste)</value>
• <value xml:lang="pt_PT">Classe (1-5; 5 para o melhor)</value>
• <value xml:lang="ro">Pozitia(1-5; 5 este cea mai buna )</value>
• <value xml:lang="ru">Рейтинг (1-5; 5 лучший)</value>
• <value xml:lang="th">การประเมิณ (1-5; 5 คุณสมบัติดีที่สุด)</value>
• <value xml:lang="zh">评级 (1-5; 5最好)</value>
• </property>
  In Order component and this was used in Ecommerce as you can see in screenshot-1. Now we have only the poorer one (at least in french but there are other languages concerned) which was already in Ecommerce as you can see in screenshot-2. As I said my intent is to underline the kind of drawbacks we can get doing this delicate issue. I did not find the time yet to evaluate the work proposed by Bruno but maybe we should have a look to see if it can avoid this type of issues. But I doubt it's possible to do this automatically easily since it's seems a challenging task, even by hand, as I hope this comment proves it.

[Marco Risaliti]

Jacques,

Yes, I have understood your problem but I have follow this way to merge all the labels between ecommerce and order :

if the translated labels was already available in EcommerceUiLabels.xml then I have take the translation form there otherwise from the OrderUiLabels.xml.
So for French probably the correct translation was on it and we have lost it but I cannot know it.

Thanks
Marco

[Jacques Le Roux]

Yes I understand you POV. And Actually it''s more because the legacy work was poorly done. Hopefully, there are not much like that and I will have a look and at least will put back the old Order one In Ecommerce as there is more information there.

Thanks

[Bruno Busco]

The python script that I attached in OFBIZ-1698 scans for label duplication between files if a duplication is found then it merges the languages strings in the higher priority file (so that no content is lost) and deletes the entry from the lower priority file.
Then the files are automatically sorted and so what remains to do is to change the name of the labels according to the file they are in.
In the file there is also a report of what it has done when I run it.
If you are interested and need help just ask.

-Bruno

[Jacques Le Roux]

Marco,

I'm currently looking at this issue and it clearly appears that the problem is that the Order labels were loaded after the Ecommerce labels and hence were overrided them. They (Order labels) were definitively better writed (at least in french but it seems that it's true for other languages too). I'm rewriting them in french (and even for all other languages when they are totally missing as for EcommerceRead for instance) and I suggest to evrybody to check them. I propose to stop this sort of work and to have a look at what Bruno suggested before everything else...

Thanks to both

[Jacques Le Roux]

For instance a good example is EcommerceSelectedGiftWrap

Before

• <property key="EcommerceSelectedGiftWrap">
• <value xml:lang="en">"Selected Gift Wrap is not available for all items. The items which are available have been selected, the others remain unchanged."</value>
• <value xml:lang="es">"La evoltura no está permitida para todos los artíclos. Los artículos disponibles han sido seleccionados, la orden permanece sin cambios."</value>
• <value xml:lang="fr">"L'emballage cadeau choisi n'est pas disponible pour tous les articles. Les articles pour lesquels c'est disponible ont été retenus, les autres restent inchangés."</value>
• <value xml:lang="it">"Selezione Omaggio non disponivile per tutte le righe. Le righe che sono disponibile saranno selezionate, le altre rimarrano invariate."</value>
• <value xml:lang="nl">"De geselecteerde geschenkverpakking is niet beschikbaar voor alle items. De items die beschikbaar zijn, zijn geselecteerd, de anderen zijn niet veranderd."</value>
• <value xml:lang="ro">"Selectioneaza Omagiu indisponibil pentru toate liniile. Liniile care sunt disponibile vor fi selectionate, celelalte vor ramane invariate."</value>
• <value xml:lang="ru">"Выбранная подарочная упаковка не доступна для всех позиций. Выбраны только позиции для которых упаковка доступна."</value>
• <value xml:lang="th">"การเลือกกระดาษห่อของขวัญไม่สามารถนำไปใช้ได้กับทุกรายการ. เลือกใช้ได้กับรายการอื่น ๆ ที่ยังไม่มีการเปลี่ยนแปลงเหลืออยู่"
  -</value>
• <value xml:lang="zh">"所选的礼品包装无法对全部明细使用。这些选中的明细是可用的，其它没有改变。"</value>
• </property>
  After

<property key="EcommerceSelectedGiftWrap">
<value xml:lang="en">Selected Gift Wrap</value>
<value xml:lang="es">"La evoltura no está permitida para todos los artíclos. Los artículos disponibles han sido seleccionados, la orden permanece sin cambios."</value>
<value xml:lang="fr">Papier cadeau sélezctionné</value>
<value xml:lang="hi_IN">चुना गया लपेटन सभी सामान के लिये उपलब्ध नहीं है, जो सामान उपलब्ध है वह चुना गया है, बाकी वैसे ही है.</value>
<value xml:lang="it">"Selezione Omaggio non disponivile per tutte le righe. Le righe che sono disponibile saranno selezionate, le altre rimarrano invariate."</value>
<value xml:lang="ja">"Selected Gift Wrap is not available for all items. The items which are available have been selected, the others remain unchanged."</value>
<value xml:lang="nl">"De geselecteerde geschenkverpakking is niet beschikbaar voor alle items. De items die beschikbaar zijn, zijn geselecteerd, de anderen zijn niet veranderd."</value>
<value xml:lang="ro">"Selectioneaza Omagiu indisponibil pentru toate liniile. Liniile care sunt disponibile vor fi selectionate, celelalte vor ramane invariate."</value>
<value xml:lang="ru">"Выбранная подарочная упаковка не доступна для всех позиций. Выбраны только позиции для которых упаковка доступна."</value>
<value xml:lang="th">เลือกห่อของขวัญ</value>
<value xml:lang="zh">"所选的礼品包装无法对全部明细使用。这些选中的明细是可用的，其它没有改变。"</value>
</property>

Another french proverb : "L'enfer est dans les détails" (Hell is in details) (seems that Frenchs like to talk about Hell ;o)

[Jacques Le Roux]

Hi Marco, all developers,

I think we are able to continue this work. The rule has unofficially changed (except if someone is against and has good arguments) : there should be only one instance of a label in all translation files and labels should be, as much as passible, prefixed by the application name.

Please comment if you have any ideas. If we officialy agree, I will update this page accordingly http://docs.ofbiz.org/display/OFBIZ/Tips+for+translation which is wrong for the moment...

Thanks

[Marco Risaliti]

I'm agree with you Jacques about new rules for translation of labels.
We can wait comments and/or ideas before continue it in that way.

Thanks
Marco

[Marco Risaliti]

Removed some unsued labels.

[Marco Risaliti]

This patch contains some labels renamed from OrderXXX to EcommerceXXX

OrderBeSureToIncludeYourOrderNb --> EcommerceBeSureToIncludeYourOrderNb
OrderAssignItems --> EcommerceAssignItems
OrderBackHome --> EcommerceBackHome
OrderChangePaymentInfo --> EcommerceChangePaymentInfo
OrderChangeShippingAddress --> EcommerceChangeShippingAddress
OrderChangeShippingOptions --> EcommerceChangeShippingOptions
OrderConfirmation --> EcommerceOrderConfirmation
OrderContinueShopping --> EcommerceContinueShopping

Thanks
Marco

[Marco Risaliti]

cleanup_labels5.patch committed in rev. 711973
cleanup_labels6.patch committed in rev. 711991

[Marco Risaliti]

This patch contains some labels renamed from OrderXXX to EcommerceXXX

OrderDefaultShipmentMethod --> EcommerceDefaultShipmentMethod
OrderDefaultShipmentMethodMsg --> EcommerceDefaultShipmentMethodMsg
OrderEstimateNextOrderDate --> EcommerceEstimateNextOrderDate
OrderHistory --> EcommerceOrderHistory

Removed unused labels:
OrderFinalOrderNotification
OrderInvoice

Thanks
Marco

[Marco Risaliti]

Updated patch after conflict resolution.

[Marco Risaliti]

cleanup_labels7.patch committed in rev. 713531

[Marco Risaliti]

Move some labels from EcommerceUiLabels.xml to OrderUiLabels.xml.
Jacques and Christian could you please check if the labels OrderContinueToFinalOrderReview
OrderEmailSentToFollowingAddresses are correctly translated in French and Deutch.

Thanks
Marco

[Marco Risaliti]

cleanup_labels8.patch committed in rev. 717946

[Marco Risaliti]

Move some labels from EcommerceUiLabels.xml to OrderUiLabels.xml.
Please check if the labels OrderGiftMessage, OrderGrandTotal, OrderHowShallWeShipIt, OrderHowShallYouPay,
OrderIsThisGift are still correctly translated.

Thanks
Marco

[Marco Risaliti]

cleanup_labels9.patch committed in rev. 717947

[Jacques Le Roux]

Thanks Marco,

Checked and commited some changes in r717997

[Marco Risaliti]

Move some labels from EcommerceUiLabels.xml to OrderUiLabels.xml.

Please check if those labels are still correctly translated:

OrderNoOrderFound
OrderNoQuoteFound
OrderOrderConfirmation
OrderOrderItems
OrderSalesTax
OrderShippingInformation
OrderSpecialInstructions
OrderSplitIntoMultipleShipments
OrderSplittingPreference
OrderTrackingNumber
OrderUpdateEmailAddress
OrderWhereShallWeShipIt
OrderVerifyConfiguration
OrderPleaseShipItemsBecomeAvailable
OrderPleaseWaitUntilBeforeShipping
OrderOrder
OrderAllowSplit
OrderBacktoShoppingCart
OrderBeSureIncludeOrder
OrderBillUpTo
OrderCOD
OrderCommaSeperatedEmailAddresses
OrderAdjustments
OrderChooseAnotherGift
OrderQtyPicked
OrderQtyShipped

Those unused labels has been removed :
OrderOrderChangeNotification
OrderOrderCorresponding
OrderFinalOrderNotification

Thanks
Marco

[Marco Risaliti]

cleanup_labels10.patch committed in rev. 718098

[Jacques Le Roux]

Checked in French, no problems. Hopefully the same in other languages...

[Marco Risaliti]

Move some labels from EcommerceUiLabels.xml/OrderUiLabels.xml to AccountingUiLabels.xml.
Please check if those labels are still correctly translated:

AccountingAHCElectronicCheck
AccountingAccount
AccountingAccountType
AccountingAddNewCreditCard
AccountingAddNewEftAccount
AccountingBankName
AccountingBillingAccount
AccountingBillUpTo
AccountingBillingAccountOnly
AccountingCardNumber
AccountingCardType
AccountingCompanyNameAccount
AccountingCompanyNameCard
AccountingCreditCard
AccountingEFTAccount
AccountingExpirationDate
AccountingFirstNameCard
AccountingLastNameCard
AccountingMiddleNameCard
AccountingNameAccount
AccountingNoAccount

[Marco Risaliti]

cleanup_labels11.patch committed in rev. 718719.

[Marco Risaliti]

Move some labels from EcommerceUiLabels.xml/OrderUiLabels.xml to AccountingUiLabels.xml.
Please check if those labels are still correctly translated:

AccountingNoBillingAccount
AccountingNoPaymentMethods
AccountingOfflinePayment
AccountingPaymentInformation
AccountingPleaseSendPaymentTo
AccountingPayWithPayPal
AccountingPayWithWorldPay
AccountingPaymentInformation
AccountingPaymentVia
AccountingPrefixCard
AccountingReceivePayment
AccountingRoutingNumber
AccountingSplitPayment
AccountingUseGiftCardNotOnFile
AccountingVisaMastercardAmexDiscover

[Marco Risaliti]

cleanup_labels12.patch committed in rev. 718736.

[Jacques Le Roux]

OK, in French

[Marco Risaliti]

Renamed some labels from EcommerceUiLabels.xml :

Factoids --> EcommerceFactoids
ListPriceRange --> ProductListPriceRange
QuoteHistory --> EcommerceQuoteHistory
RequestHistory --> EcommerceRequestHistory
ShipmentItems --> EcommerceShipmentItems

Please check if this label is still correctly translated:
ProductListPriceRange

Thanks
Marco

[Marco Risaliti]

cleanup_labels12.patch committed in rev. 719049.

[Marco Risaliti]

oops, cleanup_labels13.patch committed in rev. 719049.

[Marco Risaliti]

Moved or Merged all the Party labels from EcommerceUiLabels/OrderUiLabels to PartyUiLabels.

[Marco Risaliti]

cleanup_labels14.patch committed in rev. 729636.

Please check if the following labels are still translated correctly after they are merged into PartyUiLabels.xml :

PartyAddNewAddress
PartyAddPurpose
PartyAddrAttnName
PartyAddressLine1
PartyAddressLine2
PartyAdditionalPartyEntry
PartyAreaCode
PartyAttentionName
PartyBillingAddress
PartyBirthDate
PartyBirthDateMissingError
PartyBusinessPhone
PartyCity
PartyCityMissing
PartyContactInformation
PartyContactLists
PartyContactMechIdMissing
PartyContactNumber
PartyContactNumberMissing
PartyContactPurposes
PartyContactType
PartyCountryCode
PartyCountryMissing
PartyEditContactInfo
PartyEmailAddress
PartyEmailAddressNotFormattedCorrectly
PartyEnterPasswordTwice
PartyFindParty
PartyFirstName
PartyFirstNameMissing
PartyGender
PartyHeight
PartyHideOld
PartyHomePhone
PartyLastName
PartyLastNameMissingError
PartyLookupParty
PartyMaritalStatus
PartyMiddleInitial
PartyName
PartyNewUser
PartyNickName
PartyNoContactInformation
PartyNoSupplier
PartyPassportNumber
PartyPasswordMatchError
PartyPasswordMissing
PartyPersonalInformation
PartyPhoneNumber
PartyProfile
PartyPurposeTypeNotFound
PartyReply
PartySelectContactType
PartyShowOld
PartySocialSecurityNumber
PartyState
PartySuffix
PartyTheProfileOf
PartyToName
PartyUseCurrentAddress
PartyWeight
PartyYearsWork
PartyZipCode
PartyParties
PartyParty
PartyPartyId
PartyPartyNotDefined
PartyRole
PartyRoleType
PartySelectcRoleForParty
PartySupplier
PartyUserLoginId

Thanks
Marco

[Marco Risaliti]

Renamed some Common labels in EcommerceUiLabels to Ecommerce in the same file

[Marco Risaliti]

cleanup_labels15.patch committed in rev. 729638.

[Marco Risaliti]

Moved and Merged all the Product labels from EcommerceUiLabels/OrderUiLabels to ProductUiLabels.

[Marco Risaliti]

cleanup_labels16.patch committed in rev. 729687.

Please check if the following labels are still translated correctly after they are merged into ProductUiLabels.xml :

ProductAddProductsUsingDefaultQuantities
ProductAdvancedSearch
ProductAdvancedSearchIn
ProductAdvancedSearchInCategory
ProductBeTheFirstToReviewThisProduct
ProductBrowseBlogs
ProductBrowseCategories
ProductCatalog
ProductCategory
ProductCategoryNotFoundForCategoryID
ProductChooseCatalog
ProductCompareAtPrice
ProductCreateNewProduct
ProductCustomerRating
ProductDefaultPrice
ProductEntireCatalog
ProductErrorProductNotFound
ProductIncludeSubCategories
ProductItem
ProductItemOutOfStock
ProductItems
ProductKeywords
ProductKeywordRelevancy
ProductLastSearch
ProductListPrice
ProductNewSearch
ProductNoLongerAvailable
ProductNoProductsInThisCategory
ProductNoResultsFound
ProductNotYetAvailable
ProductProduct
ProductPopularityByOrders
ProductPopularityByViews
ProductPrioritizeProductsInCategory
ProductProductId
ProductProductName
ProductProductNoLongerAvailable
ProductProductNotFound
ProductProductNotReviewedYet
ProductProductNotYetMadeAvailable
ProductProductStore
ProductRegularPrice
ProductSearchCatalog
ProductSearchInCategory
ProductType
ProductUsuallyShipsIn
ProductWebSite
ProductWorkItem

Thanks
Marco

[Marco Risaliti]

Moved and merged some Common labels from EcommerceUiLabels.xml to CommonUiLabels.xml.
If some framework committer could review it I can made some more cleaning on labels.

Thanks
Marco

[Jacques Le Roux]

Hi Marco,

Seems to be an encoding issue with cleanup_labels17.patch :

D:\Workspace\ofbizRun>patch -p0 0<cleanup_labels17.patch
patching file applications/ecommerce/config/EcommerceUiLabels.xml
Hunk #1 FAILED at 19.
Hunk #2 FAILED at 3781.
2 out of 2 hunks FAILED – saving rejects to file applications/ecommerce/config/EcommerceUiLabels.xml.rej
patching file framework/common/config/CommonUiLabels.xml
Hunk #1 succeeded at 3188 with fuzz 2.
Hunk #2 succeeded at 3499 with fuzz 1.
Hunk #3 succeeded at 3638 with fuzz 2.
Hunk #4 FAILED at 7685.
Hunk #5 succeeded at 7979 with fuzz 2.
Hunk #6 FAILED at 7988.
Hunk #7 FAILED at 7998.
Hunk #8 succeeded at 8012 with fuzz 2.
Hunk #9 FAILED at 8021.
Hunk #10 succeeded at 8029 with fuzz 2.
Hunk #11 succeeded at 8090 with fuzz 2.
Hunk #12 succeeded at 8109 with fuzz 2.
Hunk #13 succeeded at 8139 with fuzz 2.
4 out of 13 hunks FAILED – saving rejects to file framework/common/config/CommonUiLabels.xml.rej

[Marco Risaliti]

Updated patch for moving some Common labels from EcommerceUiLabels.xml to CommonUiLabels.xml

[Jacques Le Roux]

Cleanup_labels17.patch commited in r729805

[Marco Risaliti]

Moved all Facility labels from OrderUiLabels.xml to ProductUiLabels.xml

[Marco Risaliti]

Cleanup_labels18.patch commited into rev. 730128.

[Marco Risaliti]

Cleanup_labels18.patch commited in rev. 730128.

[Marco Risaliti]

Misc clean up on Accounting labels.

[Marco Risaliti]

Cleanup_labels19.patch commited in rev. 730637.

[Marco Risaliti]

After committed cleanup_labels19.patch please check if the following labels are still translated correctly after they are merged :

AccountingBillingAccount
AccountingCardInfoNotBelongToYou
AccountingCardNumber
AccountingCreateNewCreditCard
AccountingCreateNewEftAccount
AccountingCreditCard
AccountingEditCreditCard
AccountingEditGiftCard
AccountingGiftCard
AccountingPaymentsReceived

AccountingFixedAsset
AccountingFixedAssetId
AccountingFixedAssetProductAdd
AccountingFixedAssetProductType
AccountingFixedAssets
AccountingPaymentMethodType
AccountingPayments
FormFieldTitle_agreementId
FormFieldTitle_agreementText
FormFieldTitle_billingAccountId
FormFieldTitle_contactMechId
FormFieldTitle_currencyUomId
FormFieldTitle_entryDate
FormFieldTitle_fixedAssetTypeId
FormFieldTitle_internalName
FormFieldTitle_inventoryItemId
FormFieldTitle_invoiceId
FormFieldTitle_invoiceItemSeqId
FormFieldTitle_orderDate
FormFieldTitle_partyId
FormFieldTitle_partyIdFrom
FormFieldTitle_partyIdTo
FormFieldTitle_paymentId
FormFieldTitle_paymentMethodId
FormFieldTitle_paymentMethodTypeId
FormFieldTitle_percentage
FormFieldTitle_physicalInventoryId
FormFieldTitle_productFeatureId
FormFieldTitle_productId
FormFieldTitle_productPromoId
FormFieldTitle_recurrenceInfoId
FormFieldTitle_removeButton
FormFieldTitle_roleTypeIdFrom
FormFieldTitle_roleTypeIdTo
FormFieldTitle_roleTypeId
FormFieldTitle_serialNumber
FormFieldTitle_shipmentId
FormFieldTitle_statusId
FormFieldTitle_subject
FormFieldTitle_taxAuthGeoId
FormFieldTitle_textData
FormFieldTitle_total
FormFieldTitle_workEffortId

Thanks
Marco

[Marco Risaliti]

Renamed some Product labels and move some labels at common level.
If some framework committer can review and commit it I can then proceed with more cleanings on labels.

Thanks a lot
Marco

[Jacques Le Roux]

Marco,

Again an encoding issue in this patch look for instance at

+ <value xml:lang="fr">Marge bénéficiaire calculée</value>

There are others

[Marco Risaliti]

A lot of Product labels renamed/moved or merged.

[Marco Risaliti]

Cleanup_labels20.patch commited in rev. 730853.

[Marco Risaliti]

Updated patch for Common labels moved to CommonUiLabels.xml.
Jacques I have now probably solved the issue of encoding characters.

Thanks
Marco

[Marco Risaliti]

After committed cleanup_labels20.patch please check if the following labels are still translated correctly after they are merged :

FormFieldTitle_allowMultiple
FormFieldTitle_allowProductStoreChange
FormFieldTitle_allowUpdate
FormFieldTitle_availableTime
FormFieldTitle_caContentAssocTypeId
FormFieldTitle_carrierPartyId
FormFieldTitle_categoryName
FormFieldTitle_characterSetId
FormFieldTitle_comments
FormFieldTitle_communicationEventId
FormFieldTitle_communicationEventTypeId
FormFieldTitle_contentId
FormFieldTitle_contentName
FormFieldTitle_contentPurposeTypeId
FormFieldTitle_contentTypeId
FormFieldTitle_cookieDomain
FormFieldTitle_cost

Thanks
Marco

[Marco Risaliti]

A lot of cleaning into Party labels.

[Marco Risaliti]

Cleanup_labels22.patch committed into rev. 731038.

Cleanup_labels21.patch about Common labels is still need to be committed.

Thanks
Marco

[Marco Risaliti]

A lot of cleaning into Content labels.

[Marco Risaliti]

Cleanup_labels23.patch committed into rev. 731189.

Cleanup_labels21.patch about Common labels is still need to be committed.

Thanks
Marco

[Jacques Le Roux]

Cleanup_labels21.patch committed into rev. 731234 & 731235

[Marco Risaliti]

A lot of Marketing/Manufacturing/Workeffort labels cleaning.

[Marco Risaliti]

Cleanup_labels24.patch committed into rev. 731303.

Thanks
Marco

[Marco Risaliti]

A lot of cleaning into WorkEffort labels.