You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2017/03/15 13:56:39 UTC
svn commit: r1787047 -
/ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java
Author: jleroux
Date: Wed Mar 15 13:56:38 2017
New Revision: 1787047
URL: http://svn.apache.org/viewvc?rev=1787047&view=rev
Log:
Improved: Handle only labels with the "_" separator between languages and
countries
(OFBIZ-9261)
This is handled in LabelManagerFactory.java
Element valueElem = (Element) valueNode;
// Support old way of specifying xml:lang value.
// Old way: en_AU, new way: en-AU
String localeName = valueElem.getAttribute("xml:lang");
if( localeName.contains("_")) {
localeName = localeName.replace('_', '-');
}
I replaces this snippet by throwing an exception in order to now to
automatically detect issues
Moreover I notices that there are no longer reasons to bypass the
ExampleEntityLabels and ProductPromoUiLabels files
Modified:
ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java
Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java?rev=1787047&r1=1787046&r2=1787047&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java Wed Mar 15 13:56:38 2017
@@ -114,11 +114,6 @@ public class LabelManagerFactory {
if (UtilValidate.isNotEmpty(fileName) && !fileName.equals(fileInfo.getFileName())) {
continue;
}
- if ("ExampleEntityLabels.xml".equals(fileInfo.getFileName())
- || "ProductPromoUiLabels.xml".equals(fileInfo.getFileName())
- ) {
- continue;
- }
if (Debug.infoOn()) {
Debug.logInfo("Current file : " + fileInfo.getFileName(), module);
}
@@ -157,11 +152,12 @@ public class LabelManagerFactory {
for (Node valueNode : UtilXml.childNodeList(propertyElem.getFirstChild())) {
if (valueNode instanceof Element) {
Element valueElem = (Element) valueNode;
- // Support old way of specifying xml:lang value.
+ // No longer supporting old way of specifying xml:lang value.
// Old way: en_AU, new way: en-AU
String localeName = valueElem.getAttribute("xml:lang");
if( localeName.contains("_")) {
- localeName = localeName.replace('_', '-');
+ GeneralException e = new GeneralException("Confusion in labels with the separator used between languages and countries. Please use a dash instead of an underscore.");
+ throw e;
}
String labelValue = UtilCodec.canonicalize(UtilXml.nodeValue(valueElem.getFirstChild()));
LabelInfo label = labels.get(labelKey + keySeparator + fileInfo.getFileName());
Re: svn commit: r1787047 -
/ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/of
biz/webtools/labelmanager/LabelManagerFactory.java
Posted by Jacques Le Roux <ja...@les7arts.com>.
If you really want to help, here you go https://issues.apache.org/jira/browse/OFBIZ-8154
Jacques
Le 16/03/2017 � 07:10, Jacques Le Roux a �crit :
> BTW before asking you can check by yourself, it's not a big deal ;)
>
> Jacques
>
>
> Le 16/03/2017 � 07:06, Jacques Le Roux a �crit :
>> Hi Taher
>>
>> Inline
>>
>> Le 15/03/2017 � 22:46, Taher Alkhateeb a �crit :
>>> How do you know that this does not crash existing code?
>> Because I tested it
>>> You are switching from an ignore behavior to throwing an exception! Did you check all
>>> reference and calls to it?
>> Of course I did
>>
>> Jacques
>>>
>>> On Wed, Mar 15, 2017 at 4:56 PM, <jl...@apache.org> wrote:
>>>
>>>> Author: jleroux
>>>> Date: Wed Mar 15 13:56:38 2017
>>>> New Revision: 1787047
>>>>
>>>> URL: http://svn.apache.org/viewvc?rev=1787047&view=rev
>>>> Log:
>>>> Improved: Handle only labels with the "_" separator between languages and
>>>> countries
>>>> (OFBIZ-9261)
>>>>
>>>> This is handled in LabelManagerFactory.java
>>>>
>>>> Element valueElem = (Element) valueNode;
>>>> // Support old way of specifying xml:lang value.
>>>> // Old way: en_AU, new way: en-AU
>>>> String localeName = valueElem.getAttribute("xml:lang");
>>>> if( localeName.contains("_")) {
>>>> localeName = localeName.replace('_', '-');
>>>> }
>>>>
>>>> I replaces this snippet by throwing an exception in order to now to
>>>> automatically detect issues
>>>>
>>>> Moreover I notices that there are no longer reasons to bypass the
>>>> ExampleEntityLabels and ProductPromoUiLabels files
>>>>
>>>> Modified:
>>>> ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/
>>>> java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java
>>>>
>>>> Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/
>>>> java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java
>>>> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/
>>>> framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/
>>>> LabelManagerFactory.java?rev=1787047&r1=1787046&r2=1787047&view=diff
>>>> ============================================================
>>>> ==================
>>>> --- ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/
>>>> java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java
>>>> (original)
>>>> +++ ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/
>>>> java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java Wed
>>>> Mar 15 13:56:38 2017
>>>> @@ -114,11 +114,6 @@ public class LabelManagerFactory {
>>>> if (UtilValidate.isNotEmpty(fileName) &&
>>>> !fileName.equals(fileInfo.getFileName())) {
>>>> continue;
>>>> }
>>>> - if ("ExampleEntityLabels.xml".equals(fileInfo.getFileName())
>>>> - || "ProductPromoUiLabels.xml".
>>>> equals(fileInfo.getFileName())
>>>> - ) {
>>>> - continue;
>>>> - }
>>>> if (Debug.infoOn()) {
>>>> Debug.logInfo("Current file : " + fileInfo.getFileName(),
>>>> module);
>>>> }
>>>> @@ -157,11 +152,12 @@ public class LabelManagerFactory {
>>>> for (Node valueNode : UtilXml.childNodeList(propertyElem.getFirstChild()))
>>>> {
>>>> if (valueNode instanceof Element) {
>>>> Element valueElem = (Element) valueNode;
>>>> - // Support old way of specifying xml:lang
>>>> value.
>>>> + // No longer supporting old way of specifying
>>>> xml:lang value.
>>>> // Old way: en_AU, new way: en-AU
>>>> String localeName =
>>>> valueElem.getAttribute("xml:lang");
>>>> if( localeName.contains("_")) {
>>>> - localeName = localeName.replace('_', '-');
>>>> + GeneralException e = new
>>>> GeneralException("Confusion in labels with the separator used between
>>>> languages and countries. Please use a dash instead of an underscore.");
>>>> + throw e;
>>>> }
>>>> String labelValue = UtilCodec.canonicalize(
>>>> UtilXml.nodeValue(valueElem.getFirstChild()));
>>>> LabelInfo label = labels.get(labelKey +
>>>> keySeparator + fileInfo.getFileName());
>>>>
>>>>
>>>>
>>
>>
>
>
Re: svn commit: r1787047 -
/ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/of
biz/webtools/labelmanager/LabelManagerFactory.java
Posted by Jacques Le Roux <ja...@les7arts.com>.
BTW before asking you can check by yourself, it's not a big deal ;)
Jacques
Le 16/03/2017 � 07:06, Jacques Le Roux a �crit :
> Hi Taher
>
> Inline
>
> Le 15/03/2017 � 22:46, Taher Alkhateeb a �crit :
>> How do you know that this does not crash existing code?
> Because I tested it
>> You are switching from an ignore behavior to throwing an exception! Did you check all
>> reference and calls to it?
> Of course I did
>
> Jacques
>>
>> On Wed, Mar 15, 2017 at 4:56 PM, <jl...@apache.org> wrote:
>>
>>> Author: jleroux
>>> Date: Wed Mar 15 13:56:38 2017
>>> New Revision: 1787047
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1787047&view=rev
>>> Log:
>>> Improved: Handle only labels with the "_" separator between languages and
>>> countries
>>> (OFBIZ-9261)
>>>
>>> This is handled in LabelManagerFactory.java
>>>
>>> Element valueElem = (Element) valueNode;
>>> // Support old way of specifying xml:lang value.
>>> // Old way: en_AU, new way: en-AU
>>> String localeName = valueElem.getAttribute("xml:lang");
>>> if( localeName.contains("_")) {
>>> localeName = localeName.replace('_', '-');
>>> }
>>>
>>> I replaces this snippet by throwing an exception in order to now to
>>> automatically detect issues
>>>
>>> Moreover I notices that there are no longer reasons to bypass the
>>> ExampleEntityLabels and ProductPromoUiLabels files
>>>
>>> Modified:
>>> ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/
>>> java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java
>>>
>>> Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/
>>> java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java
>>> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/
>>> framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/
>>> LabelManagerFactory.java?rev=1787047&r1=1787046&r2=1787047&view=diff
>>> ============================================================
>>> ==================
>>> --- ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/
>>> java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java
>>> (original)
>>> +++ ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/
>>> java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java Wed
>>> Mar 15 13:56:38 2017
>>> @@ -114,11 +114,6 @@ public class LabelManagerFactory {
>>> if (UtilValidate.isNotEmpty(fileName) &&
>>> !fileName.equals(fileInfo.getFileName())) {
>>> continue;
>>> }
>>> - if ("ExampleEntityLabels.xml".equals(fileInfo.getFileName())
>>> - || "ProductPromoUiLabels.xml".
>>> equals(fileInfo.getFileName())
>>> - ) {
>>> - continue;
>>> - }
>>> if (Debug.infoOn()) {
>>> Debug.logInfo("Current file : " + fileInfo.getFileName(),
>>> module);
>>> }
>>> @@ -157,11 +152,12 @@ public class LabelManagerFactory {
>>> for (Node valueNode : UtilXml.childNodeList(propertyElem.getFirstChild()))
>>> {
>>> if (valueNode instanceof Element) {
>>> Element valueElem = (Element) valueNode;
>>> - // Support old way of specifying xml:lang
>>> value.
>>> + // No longer supporting old way of specifying
>>> xml:lang value.
>>> // Old way: en_AU, new way: en-AU
>>> String localeName =
>>> valueElem.getAttribute("xml:lang");
>>> if( localeName.contains("_")) {
>>> - localeName = localeName.replace('_', '-');
>>> + GeneralException e = new
>>> GeneralException("Confusion in labels with the separator used between
>>> languages and countries. Please use a dash instead of an underscore.");
>>> + throw e;
>>> }
>>> String labelValue = UtilCodec.canonicalize(
>>> UtilXml.nodeValue(valueElem.getFirstChild()));
>>> LabelInfo label = labels.get(labelKey +
>>> keySeparator + fileInfo.getFileName());
>>>
>>>
>>>
>
>
Re: svn commit: r1787047 -
/ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/of
biz/webtools/labelmanager/LabelManagerFactory.java
Posted by Jacques Le Roux <ja...@les7arts.com>.
Hi Taher
Inline
Le 15/03/2017 � 22:46, Taher Alkhateeb a �crit :
> How do you know that this does not crash existing code?
Because I tested it
> You are switching from an ignore behavior to throwing an exception! Did you check all
> reference and calls to it?
Of course I did
Jacques
>
> On Wed, Mar 15, 2017 at 4:56 PM, <jl...@apache.org> wrote:
>
>> Author: jleroux
>> Date: Wed Mar 15 13:56:38 2017
>> New Revision: 1787047
>>
>> URL: http://svn.apache.org/viewvc?rev=1787047&view=rev
>> Log:
>> Improved: Handle only labels with the "_" separator between languages and
>> countries
>> (OFBIZ-9261)
>>
>> This is handled in LabelManagerFactory.java
>>
>> Element valueElem = (Element) valueNode;
>> // Support old way of specifying xml:lang value.
>> // Old way: en_AU, new way: en-AU
>> String localeName = valueElem.getAttribute("xml:lang");
>> if( localeName.contains("_")) {
>> localeName = localeName.replace('_', '-');
>> }
>>
>> I replaces this snippet by throwing an exception in order to now to
>> automatically detect issues
>>
>> Moreover I notices that there are no longer reasons to bypass the
>> ExampleEntityLabels and ProductPromoUiLabels files
>>
>> Modified:
>> ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/
>> java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java
>>
>> Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/
>> java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java
>> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/
>> framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/
>> LabelManagerFactory.java?rev=1787047&r1=1787046&r2=1787047&view=diff
>> ============================================================
>> ==================
>> --- ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/
>> java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java
>> (original)
>> +++ ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/
>> java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java Wed
>> Mar 15 13:56:38 2017
>> @@ -114,11 +114,6 @@ public class LabelManagerFactory {
>> if (UtilValidate.isNotEmpty(fileName) &&
>> !fileName.equals(fileInfo.getFileName())) {
>> continue;
>> }
>> - if ("ExampleEntityLabels.xml".equals(fileInfo.getFileName())
>> - || "ProductPromoUiLabels.xml".
>> equals(fileInfo.getFileName())
>> - ) {
>> - continue;
>> - }
>> if (Debug.infoOn()) {
>> Debug.logInfo("Current file : " + fileInfo.getFileName(),
>> module);
>> }
>> @@ -157,11 +152,12 @@ public class LabelManagerFactory {
>> for (Node valueNode : UtilXml.childNodeList(propertyElem.getFirstChild()))
>> {
>> if (valueNode instanceof Element) {
>> Element valueElem = (Element) valueNode;
>> - // Support old way of specifying xml:lang
>> value.
>> + // No longer supporting old way of specifying
>> xml:lang value.
>> // Old way: en_AU, new way: en-AU
>> String localeName =
>> valueElem.getAttribute("xml:lang");
>> if( localeName.contains("_")) {
>> - localeName = localeName.replace('_', '-');
>> + GeneralException e = new
>> GeneralException("Confusion in labels with the separator used between
>> languages and countries. Please use a dash instead of an underscore.");
>> + throw e;
>> }
>> String labelValue = UtilCodec.canonicalize(
>> UtilXml.nodeValue(valueElem.getFirstChild()));
>> LabelInfo label = labels.get(labelKey +
>> keySeparator + fileInfo.getFileName());
>>
>>
>>
Re: svn commit: r1787047 - /ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java
Posted by Taher Alkhateeb <sl...@gmail.com>.
How do you know that this does not crash existing code? You are switching
from an ignore behavior to throwing an exception! Did you check all
reference and calls to it?
On Wed, Mar 15, 2017 at 4:56 PM, <jl...@apache.org> wrote:
> Author: jleroux
> Date: Wed Mar 15 13:56:38 2017
> New Revision: 1787047
>
> URL: http://svn.apache.org/viewvc?rev=1787047&view=rev
> Log:
> Improved: Handle only labels with the "_" separator between languages and
> countries
> (OFBIZ-9261)
>
> This is handled in LabelManagerFactory.java
>
> Element valueElem = (Element) valueNode;
> // Support old way of specifying xml:lang value.
> // Old way: en_AU, new way: en-AU
> String localeName = valueElem.getAttribute("xml:lang");
> if( localeName.contains("_")) {
> localeName = localeName.replace('_', '-');
> }
>
> I replaces this snippet by throwing an exception in order to now to
> automatically detect issues
>
> Moreover I notices that there are no longer reasons to bypass the
> ExampleEntityLabels and ProductPromoUiLabels files
>
> Modified:
> ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/
> java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java
>
> Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/
> java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java
> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/
> framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/
> LabelManagerFactory.java?rev=1787047&r1=1787046&r2=1787047&view=diff
> ============================================================
> ==================
> --- ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/
> java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java
> (original)
> +++ ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/
> java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java Wed
> Mar 15 13:56:38 2017
> @@ -114,11 +114,6 @@ public class LabelManagerFactory {
> if (UtilValidate.isNotEmpty(fileName) &&
> !fileName.equals(fileInfo.getFileName())) {
> continue;
> }
> - if ("ExampleEntityLabels.xml".equals(fileInfo.getFileName())
> - || "ProductPromoUiLabels.xml".
> equals(fileInfo.getFileName())
> - ) {
> - continue;
> - }
> if (Debug.infoOn()) {
> Debug.logInfo("Current file : " + fileInfo.getFileName(),
> module);
> }
> @@ -157,11 +152,12 @@ public class LabelManagerFactory {
> for (Node valueNode : UtilXml.childNodeList(propertyElem.getFirstChild()))
> {
> if (valueNode instanceof Element) {
> Element valueElem = (Element) valueNode;
> - // Support old way of specifying xml:lang
> value.
> + // No longer supporting old way of specifying
> xml:lang value.
> // Old way: en_AU, new way: en-AU
> String localeName =
> valueElem.getAttribute("xml:lang");
> if( localeName.contains("_")) {
> - localeName = localeName.replace('_', '-');
> + GeneralException e = new
> GeneralException("Confusion in labels with the separator used between
> languages and countries. Please use a dash instead of an underscore.");
> + throw e;
> }
> String labelValue = UtilCodec.canonicalize(
> UtilXml.nodeValue(valueElem.getFirstChild()));
> LabelInfo label = labels.get(labelKey +
> keySeparator + fileInfo.getFileName());
>
>
>