[Springnet-commits] Spring.Net/src/Spring/Spring.Web/Web/UI Page.cs, 1.83, 1.84
Brought to you by:
aseovic,
markpollack
From: Erich E. <oak...@us...> - 2007-08-27 17:43:23
|
Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Web/Web/UI In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv12432/src/Spring/Spring.Web/Web/UI Modified Files: Page.cs Log Message: fixed SPRNET-659 added missing files AbstractCacheTests added Tests for Spring.Web/Globalization/Resolvers fixed Spring.Testing.NUnit.Tests.2003 project Index: Page.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Web/Web/UI/Page.cs,v retrieving revision 1.83 retrieving revision 1.84 diff -C2 -d -r1.83 -r1.84 *** Page.cs 23 Aug 2007 10:38:12 -0000 1.83 --- Page.cs 25 Aug 2007 14:26:35 -0000 1.84 *************** *** 231,236 **** #endif { ! Thread.CurrentThread.CurrentCulture = UserCulture; ! Thread.CurrentThread.CurrentUICulture = UserCulture; } --- 231,244 ---- #endif { ! CultureInfo userCulture = this.UserCulture; ! Thread.CurrentThread.CurrentUICulture = userCulture; ! if (userCulture.IsNeutralCulture) ! { ! Thread.CurrentThread.CurrentCulture = CultureInfo.CreateSpecificCulture(userCulture.Name); ! } ! else ! { ! Thread.CurrentThread.CurrentCulture = userCulture; ! } } *************** *** 1492,1497 **** { CultureResolver.SetCulture(value); - Thread.CurrentThread.CurrentCulture = value; Thread.CurrentThread.CurrentUICulture = value; OnUserCultureChanged(EventArgs.Empty); } --- 1500,1512 ---- { CultureResolver.SetCulture(value); Thread.CurrentThread.CurrentUICulture = value; + if (value.IsNeutralCulture) + { + Thread.CurrentThread.CurrentCulture = CultureInfo.CreateSpecificCulture(value.Name); + } + else + { + Thread.CurrentThread.CurrentCulture = value; + } OnUserCultureChanged(EventArgs.Empty); } |