svn commit: r978894 - in /ofbiz/branches/release10.04: ./ applications/product/config/ProductUiLabels.xml

Author: jleroux
Date: Sat Jul 24 16:34:55 2010
New Revision: 978894

URL: http://svn.apache.org/viewvc?rev=978894&view=rev
Log:
"Applied fix from trunk for revision: 978893"
------------------------------------------------------------------------
r978893 | jleroux | 2010-07-24 18:29:30 +0200 (sam. 24 juil. 2010) | 22 lignes

Fix a very specific issue reported by Matthieu Bollot on Neogia dev ML.

Matthieu thought it could be related to double quotes in labels when actually it was the conjunction of double quotes *AND* the word locale that Freemarker tried to interpret

the error was

2010-07-24 18:20:26,718 (http-0.0.0.0-28443-2) [MacroScreenRenderer.java:101:ERROR]
---- exception report ----------------------------------------------------------
Error rendering screen macro [<@renderScreenletBegin id="" title="Mise à jour des champs descriptifs de la fiche article (à supprimer si vous voulez utiliser "alternate locale", autrement dit traduire)" colla
psible=false saveCollapsed=true collapsibleAreaId="" expandToolTip="" collapseToolTip="" fullUrlString="" padded=true menuString="" showMore=true collapsed=false javaScriptEnabled=false />] thru ftl
Exception: freemarker.core.ParseException
Message: Encountered "locale" at line 1, column 140 in Sat Jul 24 18:20:26 CEST 2010.
Was expecting:
    "=" ...

---- stack trace ---------------------------------------------------------------
freemarker.core.ParseException: Encountered "locale" at line 1, column 140 in Sat Jul 24 18:20:26 CEST 2010.
Was expecting:
    "=" ...


I checked, there were not any other cases
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/applications/product/config/ProductUiLabels.xml

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 24 16:34:55 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958953,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958953,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893

Modified: ofbiz/branches/release10.04/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/config/ProductUiLabels.xml?rev=978894&r1=978893&r2=978894&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/branches/release10.04/applications/product/config/ProductUiLabels.xml Sat Jul 24 16:34:55 2010
@@ -15232,7 +15232,7 @@
         <value xml:lang="de">Einfache Felder übersteuern</value>
         <value xml:lang="en">Override Simple Fields</value>
         <value xml:lang="es">Reemplazar campos simples</value>
-        <value xml:lang="fr">Mise à jour des champs descriptifs de la fiche article (à supprimer si vous voulez utiliser "alternate locale", autrement dit traduire)</value>
+        <value xml:lang="fr">Mise à jour des champs descriptifs de la fiche article (à supprimer si vous voulez utiliser alternate locale, autrement dit traduire)</value>
         <value xml:lang="it">Sovrapponi Campi Semplici</value>
         <value xml:lang="ro">Suprapune Campuri Simple </value>
         <value xml:lang="ru">Заменить простые поля</value>