[cle-release-team] CLE 2.9.2 update: merge work complete

[Anthony Whyte]

The change that JFL is referring to in the now defunct /user LocaleComparator was made as part of trunk commit, r122583

http://source.sakaiproject.org/viewsvn/?view=rev&rev=122583

Anth


On Apr 19, 2013, at 9:00 AM, Jean-Francois Leveque wrote:

> Sorry, but I'm not part of the kernel team and I therefore restrain 
> myself from doing changes in kernel.
> 
> kernel/kernel-impl/src/main/java/org/sakaiproject/component/impl/BasicConfigurationService.java
> 
> LocaleComparator's compare is
> 
> 	public int compare(Locale localeOne, Locale localeTwo) {
> 	String displayNameOne = localeOne.getDisplayName();
> 	String displayNameTwo = localeTwo.getDisplayName();
> 	return displayNameOne.compareTo(displayNameTwo);
> 	}
> 
> and shoulb be, as 
> user/user-tool-prefs/tool/src/java/org/sakaiproject/user/tool/LocaleComparator.java 
> was
> 
> public int compare(Locale localeOne, Locale localeTwo)
> 	{
> 	String displayNameOne = localeOne.getDisplayName(localeOne).toLowerCase();
> 	String displayNameTwo = localeTwo.getDisplayName(localeTwo).toLowerCase();
> 	return displayNameOne.compareTo(displayNameTwo);
> 	}
> 
> The difference is not much, but it's important to do it this way.
> 
> Cheers,
> 
> J-F
> 
> On 19/04/2013 14:52, Jean-Francois Leveque wrote:
>> Last comment from Aaron before giving up is:
>>> I think I stated clearly that the reason that comparator was removed is because there is already a comparator in the SCS which is an exact copy. This we took this one out since it was simply duplication. Also, the order looks right to me (alpha order).
>>> 
>>> I am unassigning this since I don't understand the issue. Hopefully someone who understand the issue can pick this up.
>> 
>> I'm afraid I can't find the part of the code he's referring to. Maybe
>> I'm too tired. Can someone help me with this?
>> 
>> J-F
>> 
>> On 19/04/2013 14:47, Jean-Francois Leveque wrote:
>>> As far as I can tell, the values are not in a alpha case-insensitive
>>> which is the expected order, or even case-sensitive order, AFAICT.
>>> 
>>> français is before Deutsch and Nederlands is before English.
>>> 
>>> Each locale is now displayed in the language for that locale, but the
>>> sorting should be on displayed, not other values such as the locale name
>>> in English.
>>> 
>>> Please check the LocaleComparator and provide code that does the work.
>>> 
>>> J-F
>>> 
>>> On 19/04/2013 14:01, Aaron Zeckoski wrote:
>>>> It looks fine to me as is (appearing in alpha order by language) but I
>>>> guess there is some concern about the ordering of the languages or
>>>> something I am not getting.
>>>> -AZ
>>>> 
>>>> 
>>>> On Fri, Apr 19, 2013 at 7:46 AM, Neal Caidin
>>>> <nealcaidin at sakaifoundation.org>    wrote:
>>>>> What are the options?
>>>>> 
>>>>> * fix and re-merge before cutting 2.9.2-rc01
>>>>> * proceed with cutting rc01 with this as a known issue
>>>>> * back this change out of 2.9.x to revert the regression, then proceed with rc01
>>>>> 
>>>>> ?
>>>>> 
>>>>> I presume that this is currently the only issue holding up rc01?
>>>>> 
>>>>> Thanks,
>>>>> Neal
>>>>> 
>>>>> On Apr 19, 2013, at 5:04 AM, Anthony Whyte<arwhyte at umich.edu>    wrote:
>>>>> 
>>>>>> I'm on the road today (day off) but I'll check back later this morning and see if there is any further work on the ticket.
>>>>>> 
>>>>>> Anth
>>>>>> 
>>>>>> 
>>>>>> On Apr 19, 2013, at 4:30 AM, Jean-Francois Leveque wrote:
>>>>>> 
>>>>>>> Changes in https://jira.sakaiproject.org/browse/SAK-23435 broke the
>>>>>>> locales order in the user preferences.
>>>>>>> 
>>>>>>> I had to reopen this issue. I also had to close it before reopening
>>>>>>> because of the workflow. :(
>>>>>>> 
>>>>>>> Cheers,
>>>>>>> J-F
>>>>>>> 
>>>>>>> On 18/04/2013 21:48, Anthony Whyte wrote:
>>>>>>>> Sam, Aaron and I just completed 2.9.x merge work.  The 2.9.x merge backlog now stands at 2 tickets, both of which are being punted to the 2.9.3 release. [1]  I think its time to consider cutting 2.9.0-rc01 tag.
>>>>>>>> 
>>>>>>>> I also recommend that from this moment until 2.9.x is released, we limit branch merge work to release blockers and regressions discovered during final testing.
>>>>>>>> 
>>>>>>>> I've started a local build of 2.9.x-all against an empty .m2 repo.  If I hit a build failure you'll be the first to know.
>>>>>>>> 
>>>>>>>> Cheers,
>>>>>>>> 
>>>>>>>> Anthony
>>>>>>>> 
>>>>>>>> 
>>>>>>>> [1] https://jira.sakaiproject.org/browse/SAK-22798
>>>>>>>>       major, accessibility; merge conflicts, Gonzalo Silverio and Joe Humbert concur that we can punt on this
>>>>>>>>       https://jira.sakaiproject.org/browse/SAK-22521
>>>>>>>>       major, neoPortal sites drawer issue, no trunk commit revision provided despite repeated requests, so punt
> _______________________________________________
> cle-release-team mailing list
> cle-release-team at collab.sakaiproject.org
> http://collab.sakaiproject.org/mailman/listinfo/cle-release-team