[Dotgnu-pnet-commits] CVS: pnetlib/runtime/System/Globalization CompareInfo.cs,1.6,1.7 CultureInfo.cs,1.14,1.15 _I18NCultureHandler.cs,1.1,1.2

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Globalization
In directory subversions:/tmp/cvs-serv19746/runtime/System/Globalization

Modified Files:
        CompareInfo.cs CultureInfo.cs _I18NCultureHandler.cs 
Log Message:


Pass the user override flag to I18N when creating cultures.


Index: CompareInfo.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Globalization/CompareInfo.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** CompareInfo.cs      14 Nov 2002 04:04:16 -0000      1.6
--- CompareInfo.cs      14 Nov 2002 06:10:28 -0000      1.7
***************
*** 67,71 ****
  
                                // Find the culture-specific handler.
!                               handler = 
_I18NCultureHandler.GetCultureHandler(culture);
                                if(handler != null)
                                {
--- 67,71 ----
  
                                // Find the culture-specific handler.
!                               handler = 
_I18NCultureHandler.GetCultureHandler(culture, true);
                                if(handler != null)
                                {

Index: CultureInfo.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Globalization/CultureInfo.cs,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** CultureInfo.cs      14 Nov 2002 05:01:40 -0000      1.14
--- CultureInfo.cs      14 Nov 2002 06:10:28 -0000      1.15
***************
*** 74,78 ****
                                        cultureName = 
CultureNameTable.GetNameInfoByID
                                                (0x0C0A, true);
!                                       handler = 
_I18NCultureHandler.GetCultureHandler(cultureID);
                                }
                                else if(culture == 0x007F)
--- 74,79 ----
                                        cultureName = 
CultureNameTable.GetNameInfoByID
                                                (0x0C0A, true);
!                                       handler = 
_I18NCultureHandler.GetCultureHandler
!                                               (cultureID, useUserOverride);
                                }
                                else if(culture == 0x007F)
***************
*** 90,94 ****
                                        cultureName = 
CultureNameTable.GetNameInfoByID
                                                (culture, true);
!                                       handler = 
_I18NCultureHandler.GetCultureHandler(cultureID);
                                }
                                userOverride = useUserOverride;
--- 91,96 ----
                                        cultureName = 
CultureNameTable.GetNameInfoByID
                                                (culture, true);
!                                       handler = 
_I18NCultureHandler.GetCultureHandler
!                                               (cultureID, useUserOverride);
                                }
                                userOverride = useUserOverride;
***************
*** 103,107 ****
                                cultureID   = cultureName.cultureID;
                                userOverride = useUserOverride;
!                               handler = 
_I18NCultureHandler.GetCultureHandler(cultureID);
                        }
  
--- 105,110 ----
                                cultureID   = cultureName.cultureID;
                                userOverride = useUserOverride;
!                               handler = _I18NCultureHandler.GetCultureHandler
!                                       (cultureID, useUserOverride);
                        }
  
***************
*** 158,162 ****
                                                }
                                                if(id <= 0 ||
!                                                  
_I18NCultureHandler.GetCultureHandler(id) == null)
                                                {
                                                        currentCulture = 
InvariantCulture;
--- 161,166 ----
                                                }
                                                if(id <= 0 ||
!                                                  
_I18NCultureHandler.GetCultureHandler
!                                                               (id, true) == 
null)
                                                {
                                                        currentCulture = 
InvariantCulture;

Index: _I18NCultureHandler.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Globalization/_I18NCultureHandler.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** _I18NCultureHandler.cs      14 Nov 2002 03:17:10 -0000      1.1
--- _I18NCultureHandler.cs      14 Nov 2002 06:10:28 -0000      1.2
***************
*** 91,101 ****
  
        // Get the culture handler for a specific culture.
!       internal static _I18NCultureHandler GetCultureHandler(int culture)
                        {
!                               Object obj = Encoding.InvokeI18N("GetCulture", 
culture);
                                if(obj == null)
                                {
                                        // Try the neutral culture instead.
!                                       obj = Encoding.InvokeI18N("GetCulture", 
culture & 0x03FF);
                                }
                                return (_I18NCultureHandler)obj;
--- 91,104 ----
  
        // Get the culture handler for a specific culture.
!       internal static _I18NCultureHandler GetCultureHandler
!                               (int culture, bool useUserOverride)
                        {
!                               Object obj = Encoding.InvokeI18N
!                                               ("GetCulture", culture, 
useUserOverride);
                                if(obj == null)
                                {
                                        // Try the neutral culture instead.
!                                       obj = Encoding.InvokeI18N
!                                               ("GetCulture", culture & 
0x03FF, useUserOverride);
                                }
                                return (_I18NCultureHandler)obj;