Re: svn commit: r910590 - /ofbiz/trunk/framework/common/config/general.properties

[Adam Heath-2]

[hidden email] wrote:

> Author: jleroux
> Date: Tue Feb 16 16:55:14 2010
> New Revision: 910590
>
> URL: http://svn.apache.org/viewvc?rev=910590&view=rev
> Log:
> Just realized that I made an error while patching general.properties : wrong line, I removed
> locale.properties.fallback=en
>
> In this commit I put it back and put
> locales.available=de,en,es,fr,it
> at the right place
>
> Sorry for that (by chance this has not much effects)

Actually, it did have a side effect, you changed the default theme to
one you have locally.

Are you running a production system against head?  That is bad
practice.  Or, are you committing to head with a system that is
running production code?  Again, that is bad.

Please run an svn diff first before you commit, to verify that what
you are sending to everyone else in the world is actually what you
intend to send.

ps: I've already fixed the errant change you did.

> Modified:
>     ofbiz/trunk/framework/common/config/general.properties
>
> Modified: ofbiz/trunk/framework/common/config/general.properties
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/general.properties?rev=910590&r1=910589&r2=910590&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/common/config/general.properties (original)
> +++ ofbiz/trunk/framework/common/config/general.properties Tue Feb 16 16:55:14 2010
> @@ -27,7 +27,7 @@
>  # -- the default organizationPartyId for used in dropdowns and reports
>  ORGANIZATION_PARTY=Company
>  # ID of the VisualTheme to use if there VISUAL_THEME UserPreference record for the current user supported values: FLAT_GREY and BIZZNESS_TIME and BLUELIGHT
> -VISUAL_THEME=BIZZNESS_TIME
> +VISUAL_THEME=VINOPS
>  
>  # -- the default decimal format for currency (used in UtilFormatOut.java)
>  currency.decimal.format=#,##0.00
> @@ -38,11 +38,12 @@
>  #    control the default locale - the default locale is set in start.properties.
>  locale.properties.fallback=en
>  
> +
>  # -- Locales made available, separated by commas. This property controls
>  #    which locales the user can select from. If this property is not used,
>  #    then the user will be able to select from all the locales available
>  #    in the JVM.
> -#locales.available=en,fr,nl
> +locales.available=de,en,es,fr,it
>  
>  # -- Time zones made available, separated by commas. This property controls
>  #    which time zones the user can select from. If this property is not used,
> @@ -66,7 +67,7 @@
>  
>  # -- general default 'fromEmailAddress' can be overridden in: EmailTemplateSetting
>  defaultFromEmailAddress=[hidden email]
> -
> +  
>  # -- The default domainname used in the notification emails links
>  # as 'baseUrl' and 'baseSecureUrl' are set in the url.properties file.
>  
>
>

[Adam Heath-2]

[hidden email] wrote:

> Author: jleroux
> Date: Tue Feb 16 16:55:14 2010
> New Revision: 910590
>
> URL: http://svn.apache.org/viewvc?rev=910590&view=rev
> Log:
> Just realized that I made an error while patching general.properties : wrong line, I removed
> locale.properties.fallback=en
>
> In this commit I put it back and put
> locales.available=de,en,es,fr,it
> at the right place
>
> Sorry for that (by chance this has not much effects)
>
> Modified:
>     ofbiz/trunk/framework/common/config/general.properties
>
> Modified: ofbiz/trunk/framework/common/config/general.properties
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/general.properties?rev=910590&r1=910589&r2=910590&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/common/config/general.properties (original)
> +++ ofbiz/trunk/framework/common/config/general.properties Tue Feb 16 16:55:14 2010
> @@ -27,7 +27,7 @@
>  # -- the default organizationPartyId for used in dropdowns and reports
>  ORGANIZATION_PARTY=Company
>  # ID of the VisualTheme to use if there VISUAL_THEME UserPreference record for the current user supported values: FLAT_GREY and BIZZNESS_TIME and BLUELIGHT
> -VISUAL_THEME=BIZZNESS_TIME
> +VISUAL_THEME=VINOPS
>  
>  # -- the default decimal format for currency (used in UtilFormatOut.java)
>  currency.decimal.format=#,##0.00
> @@ -38,11 +38,12 @@
>  #    control the default locale - the default locale is set in start.properties.
>  locale.properties.fallback=en
>  
> +
>  # -- Locales made available, separated by commas. This property controls
>  #    which locales the user can select from. If this property is not used,
>  #    then the user will be able to select from all the locales available
>  #    in the JVM.
> -#locales.available=en,fr,nl
> +locales.available=de,en,es,fr,it

Why did you had a blank line?

>  
>  # -- Time zones made available, separated by commas. This property controls
>  #    which time zones the user can select from. If this property is not used,
> @@ -66,7 +67,7 @@
>  
>  # -- general default 'fromEmailAddress' can be overridden in: EmailTemplateSetting
>  defaultFromEmailAddress=[hidden email]
> -
> +  
>  # -- The default domainname used in the notification emails links
>  # as 'baseUrl' and 'baseSecureUrl' are set in the url.properties file.

What is with the space changes?  First had a tab, second had 2 spaces.

Please don't mix formatting changes with real changes.

[Jacques Le Roux]

Sorry I hastily/wrongly commited in trunk instead of creating a patch for a custom application. I saw one hour later, and you were
faster than me. Else I'd have reverted all. But I fixed some other little things at r910635
For your 2d question below, I guess there was tab in the file and as I edited with Scite tuned to replace tabs by 4 spaces hence the
change.
For the 1st (blank line), I did not notice and I don't know, I will remove it "soon". I'd like to put the list of the languages
really used in OFBiz but it seems that the behavior of Labels Manager has changed, not a big deal anyway...

Jacques

From: "Adam Heath" <[hidden email]>

> [hidden email] wrote:
>> Author: jleroux
>> Date: Tue Feb 16 16:55:14 2010
>> New Revision: 910590
>>
>> URL: http://svn.apache.org/viewvc?rev=910590&view=rev
>> Log:
>> Just realized that I made an error while patching general.properties : wrong line, I removed
>> locale.properties.fallback=en
>>
>> In this commit I put it back and put
>> locales.available=de,en,es,fr,it
>> at the right place
>>
>> Sorry for that (by chance this has not much effects)
>>
>> Modified:
>>     ofbiz/trunk/framework/common/config/general.properties
>>
>> Modified: ofbiz/trunk/framework/common/config/general.properties
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/general.properties?rev=910590&r1=910589&r2=910590&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/framework/common/config/general.properties (original)
>> +++ ofbiz/trunk/framework/common/config/general.properties Tue Feb 16 16:55:14 2010
>> @@ -27,7 +27,7 @@
>>  # -- the default organizationPartyId for used in dropdowns and reports
>>  ORGANIZATION_PARTY=Company
>>  # ID of the VisualTheme to use if there VISUAL_THEME UserPreference record for the current user supported values: FLAT_GREY and
>> BIZZNESS_TIME and BLUELIGHT
>> -VISUAL_THEME=BIZZNESS_TIME
>> +VISUAL_THEME=VINOPS
>>
>>  # -- the default decimal format for currency (used in UtilFormatOut.java)
>>  currency.decimal.format=#,##0.00
>> @@ -38,11 +38,12 @@
>>  #    control the default locale - the default locale is set in start.properties.
>>  locale.properties.fallback=en
>>
>> +
>>  # -- Locales made available, separated by commas. This property controls
>>  #    which locales the user can select from. If this property is not used,
>>  #    then the user will be able to select from all the locales available
>>  #    in the JVM.
>> -#locales.available=en,fr,nl
>> +locales.available=de,en,es,fr,it
>
> Why did you had a blank line?
>
>>
>>  # -- Time zones made available, separated by commas. This property controls
>>  #    which time zones the user can select from. If this property is not used,
>> @@ -66,7 +67,7 @@
>>
>>  # -- general default 'fromEmailAddress' can be overridden in: EmailTemplateSetting
>>  defaultFromEmailAddress=[hidden email]
>> -
>> +
>>  # -- The default domainname used in the notification emails links
>>  # as 'baseUrl' and 'baseSecureUrl' are set in the url.properties file.
>
> What is with the space changes?  First had a tab, second had 2 spaces.
>
> Please don't mix formatting changes with real changes.
>

[Scott Gray-2]

Hi Jacques,

Just a quick reminder about an approach I've suggested in the past:
If you check out your projects for development from http instead of https then you won't be able to inadvertently commit anything and will be forced to merge any changes with your "committer" checkout before committing back to the project.

Regards
Scott

HotWax Media
http://www.hotwaxmedia.com

On 16/02/2010, at 11:39 AM, Jacques Le Roux wrote:

> Sorry I hastily/wrongly commited in trunk instead of creating a patch for a custom application. I saw one hour later, and you were faster than me. Else I'd have reverted all. But I fixed some other little things at r910635
> For your 2d question below, I guess there was tab in the file and as I edited with Scite tuned to replace tabs by 4 spaces hence the
> change.
> For the 1st (blank line), I did not notice and I don't know, I will remove it "soon". I'd like to put the list of the languages
> really used in OFBiz but it seems that the behavior of Labels Manager has changed, not a big deal anyway...
>
> Jacques
>
> From: "Adam Heath" <[hidden email]>
>> [hidden email] wrote:
>>> Author: jleroux
>>> Date: Tue Feb 16 16:55:14 2010
>>> New Revision: 910590
>>>
>>> URL: http://svn.apache.org/viewvc?rev=910590&view=rev
>>> Log:
>>> Just realized that I made an error while patching general.properties : wrong line, I removed
>>> locale.properties.fallback=en
>>>
>>> In this commit I put it back and put
>>> locales.available=de,en,es,fr,it
>>> at the right place
>>>
>>> Sorry for that (by chance this has not much effects)
>>>
>>> Modified:
>>>    ofbiz/trunk/framework/common/config/general.properties
>>>
>>> Modified: ofbiz/trunk/framework/common/config/general.properties
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/general.properties?rev=910590&r1=910589&r2=910590&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/framework/common/config/general.properties (original)
>>> +++ ofbiz/trunk/framework/common/config/general.properties Tue Feb 16 16:55:14 2010
>>> @@ -27,7 +27,7 @@
>>> # -- the default organizationPartyId for used in dropdowns and reports
>>> ORGANIZATION_PARTY=Company
>>> # ID of the VisualTheme to use if there VISUAL_THEME UserPreference record for the current user supported values: FLAT_GREY and
>>> BIZZNESS_TIME and BLUELIGHT
>>> -VISUAL_THEME=BIZZNESS_TIME
>>> +VISUAL_THEME=VINOPS
>>>
>>> # -- the default decimal format for currency (used in UtilFormatOut.java)
>>> currency.decimal.format=#,##0.00
>>> @@ -38,11 +38,12 @@
>>> #    control the default locale - the default locale is set in start.properties.
>>> locale.properties.fallback=en
>>>
>>> +
>>> # -- Locales made available, separated by commas. This property controls
>>> #    which locales the user can select from. If this property is not used,
>>> #    then the user will be able to select from all the locales available
>>> #    in the JVM.
>>> -#locales.available=en,fr,nl
>>> +locales.available=de,en,es,fr,it
>>
>> Why did you had a blank line?
>>
>>>
>>> # -- Time zones made available, separated by commas. This property controls
>>> #    which time zones the user can select from. If this property is not used,
>>> @@ -66,7 +67,7 @@
>>>
>>> # -- general default 'fromEmailAddress' can be overridden in: EmailTemplateSetting
>>> defaultFromEmailAddress=[hidden email]
>>> -
>>> +
>>> # -- The default domainname used in the notification emails links
>>> # as 'baseUrl' and 'baseSecureUrl' are set in the url.properties file.
>>
>> What is with the space changes?  First had a tab, second had 2 spaces.
>>
>> Please don't mix formatting changes with real changes.
>>
>
>

[David E. Jones-2]

I'm sure Adam has a GIT-based solution for this too... ;)

-David


On Feb 16, 2010, at 11:43 AM, Scott Gray wrote:

> Hi Jacques,
>
> Just a quick reminder about an approach I've suggested in the past:
> If you check out your projects for development from http instead of https then you won't be able to inadvertently commit anything and will be forced to merge any changes with your "committer" checkout before committing back to the project.
>
> Regards
> Scott
>
> HotWax Media
> http://www.hotwaxmedia.com
>
> On 16/02/2010, at 11:39 AM, Jacques Le Roux wrote:
>
>> Sorry I hastily/wrongly commited in trunk instead of creating a patch for a custom application. I saw one hour later, and you were faster than me. Else I'd have reverted all. But I fixed some other little things at r910635
>> For your 2d question below, I guess there was tab in the file and as I edited with Scite tuned to replace tabs by 4 spaces hence the
>> change.
>> For the 1st (blank line), I did not notice and I don't know, I will remove it "soon". I'd like to put the list of the languages
>> really used in OFBiz but it seems that the behavior of Labels Manager has changed, not a big deal anyway...
>>
>> Jacques
>>
>> From: "Adam Heath" <[hidden email]>
>>> [hidden email] wrote:
>>>> Author: jleroux
>>>> Date: Tue Feb 16 16:55:14 2010
>>>> New Revision: 910590
>>>>
>>>> URL: http://svn.apache.org/viewvc?rev=910590&view=rev
>>>> Log:
>>>> Just realized that I made an error while patching general.properties : wrong line, I removed
>>>> locale.properties.fallback=en
>>>>
>>>> In this commit I put it back and put
>>>> locales.available=de,en,es,fr,it
>>>> at the right place
>>>>
>>>> Sorry for that (by chance this has not much effects)
>>>>
>>>> Modified:
>>>>   ofbiz/trunk/framework/common/config/general.properties
>>>>
>>>> Modified: ofbiz/trunk/framework/common/config/general.properties
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/general.properties?rev=910590&r1=910589&r2=910590&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/framework/common/config/general.properties (original)
>>>> +++ ofbiz/trunk/framework/common/config/general.properties Tue Feb 16 16:55:14 2010
>>>> @@ -27,7 +27,7 @@
>>>> # -- the default organizationPartyId for used in dropdowns and reports
>>>> ORGANIZATION_PARTY=Company
>>>> # ID of the VisualTheme to use if there VISUAL_THEME UserPreference record for the current user supported values: FLAT_GREY and
>>>> BIZZNESS_TIME and BLUELIGHT
>>>> -VISUAL_THEME=BIZZNESS_TIME
>>>> +VISUAL_THEME=VINOPS
>>>>
>>>> # -- the default decimal format for currency (used in UtilFormatOut.java)
>>>> currency.decimal.format=#,##0.00
>>>> @@ -38,11 +38,12 @@
>>>> #    control the default locale - the default locale is set in start.properties.
>>>> locale.properties.fallback=en
>>>>
>>>> +
>>>> # -- Locales made available, separated by commas. This property controls
>>>> #    which locales the user can select from. If this property is not used,
>>>> #    then the user will be able to select from all the locales available
>>>> #    in the JVM.
>>>> -#locales.available=en,fr,nl
>>>> +locales.available=de,en,es,fr,it
>>>
>>> Why did you had a blank line?
>>>
>>>>
>>>> # -- Time zones made available, separated by commas. This property controls
>>>> #    which time zones the user can select from. If this property is not used,
>>>> @@ -66,7 +67,7 @@
>>>>
>>>> # -- general default 'fromEmailAddress' can be overridden in: EmailTemplateSetting
>>>> defaultFromEmailAddress=[hidden email]
>>>> -
>>>> +
>>>> # -- The default domainname used in the notification emails links
>>>> # as 'baseUrl' and 'baseSecureUrl' are set in the url.properties file.
>>>
>>> What is with the space changes?  First had a tab, second had 2 spaces.
>>>
>>> Please don't mix formatting changes with real changes.
>>>
>>
>>
>

[Adam Heath-2]

David E Jones wrote:
> I'm sure Adam has a GIT-based solution for this too... ;)

Actually, not really.  I have all my ofbiz git-svn checkouts from from
https, but actually https://svn.eu.apache.org instead; it's a mirror,
and git-svn is heavyweight, and this reduces the load on the main server.

It's just with git, I can commit whatever the hell I want, and not
have to worry about breaking anybody else.  I can even commit
completely half-ass broken shit, switch to another branch, fix
whatever, then resume where I was.  Or, rebase back to something
earlier in my stack, reorder a commit or split, then resume.

[Jacques Le Roux]

Hi Scott,

Yes, thanks for the reminder.

It's also convenient to work directly with https, because sometimes you can quickly send a change to the trunk.
Anyway, I have just changed as you suggest also for this application. I forget too easily on which instance I'm working (age? :/) !

BTW for those interested, as easy as: svn switch --relocate https://svn.apache.org/repos/asf/ofbiz/trunk 
http://svn.apache.org/repos/asf/ofbiz/trunk

Jacques

From: "Scott Gray" <[hidden email]>
Hi Jacques,

Just a quick reminder about an approach I've suggested in the past:
If you check out your projects for development from http instead of https then you won't be able to inadvertently commit anything
and will be forced to merge any changes with your "committer" checkout before committing back to the project.

Regards
Scott

HotWax Media
http://www.hotwaxmedia.com

On 16/02/2010, at 11:39 AM, Jacques Le Roux wrote:

> Sorry I hastily/wrongly commited in trunk instead of creating a patch for a custom application. I saw one hour later, and you were
> faster than me. Else I'd have reverted all. But I fixed some other little things at r910635
> For your 2d question below, I guess there was tab in the file and as I edited with Scite tuned to replace tabs by 4 spaces hence
> the
> change.
> For the 1st (blank line), I did not notice and I don't know, I will remove it "soon". I'd like to put the list of the languages
> really used in OFBiz but it seems that the behavior of Labels Manager has changed, not a big deal anyway...
>
> Jacques
>
> From: "Adam Heath" <[hidden email]>
>> [hidden email] wrote:
>>> Author: jleroux
>>> Date: Tue Feb 16 16:55:14 2010
>>> New Revision: 910590
>>>
>>> URL: http://svn.apache.org/viewvc?rev=910590&view=rev
>>> Log:
>>> Just realized that I made an error while patching general.properties : wrong line, I removed
>>> locale.properties.fallback=en
>>>
>>> In this commit I put it back and put
>>> locales.available=de,en,es,fr,it
>>> at the right place
>>>
>>> Sorry for that (by chance this has not much effects)
>>>
>>> Modified:
>>>    ofbiz/trunk/framework/common/config/general.properties
>>>
>>> Modified: ofbiz/trunk/framework/common/config/general.properties
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/general.properties?rev=910590&r1=910589&r2=910590&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/framework/common/config/general.properties (original)
>>> +++ ofbiz/trunk/framework/common/config/general.properties Tue Feb 16 16:55:14 2010
>>> @@ -27,7 +27,7 @@
>>> # -- the default organizationPartyId for used in dropdowns and reports
>>> ORGANIZATION_PARTY=Company
>>> # ID of the VisualTheme to use if there VISUAL_THEME UserPreference record for the current user supported values: FLAT_GREY and
>>> BIZZNESS_TIME and BLUELIGHT
>>> -VISUAL_THEME=BIZZNESS_TIME
>>> +VISUAL_THEME=VINOPS
>>>
>>> # -- the default decimal format for currency (used in UtilFormatOut.java)
>>> currency.decimal.format=#,##0.00
>>> @@ -38,11 +38,12 @@
>>> #    control the default locale - the default locale is set in start.properties.
>>> locale.properties.fallback=en
>>>
>>> +
>>> # -- Locales made available, separated by commas. This property controls
>>> #    which locales the user can select from. If this property is not used,
>>> #    then the user will be able to select from all the locales available
>>> #    in the JVM.
>>> -#locales.available=en,fr,nl
>>> +locales.available=de,en,es,fr,it
>>
>> Why did you had a blank line?
>>
>>>
>>> # -- Time zones made available, separated by commas. This property controls
>>> #    which time zones the user can select from. If this property is not used,
>>> @@ -66,7 +67,7 @@
>>>
>>> # -- general default 'fromEmailAddress' can be overridden in: EmailTemplateSetting
>>> defaultFromEmailAddress=[hidden email]
>>> -
>>> +
>>> # -- The default domainname used in the notification emails links
>>> # as 'baseUrl' and 'baseSecureUrl' are set in the url.properties file.
>>
>> What is with the space changes?  First had a tab, second had 2 spaces.
>>
>> Please don't mix formatting changes with real changes.
>>
>
>

[Jacques Le Roux]

From: "Adam Heath" <[hidden email]>
> David E Jones wrote:
>> I'm sure Adam has a GIT-based solution for this too... ;)
>
> Actually, not really.  I have all my ofbiz git-svn checkouts from from
> https, but actually https://svn.eu.apache.org instead; it's a mirror,
> and git-svn is heavyweight, and this reduces the load on the main server.

I understand why https://svn.eu.apache.org  is overloaded now (joke ;o)

Jacques