Changeset 317 for branches/branch-1-0/src/helpers/nls.c

Timestamp:

May 31, 2006, 12:03:38 AM (19 years ago)

Author:

pr

Message:

Move doshIsWarp4 to dosh2 and query Syslevel to determine W4/MCP difference

File:

• branches/branch-1-0/src/helpers/nls.c (modified) (3 diffs)

branches/branch-1-0/src/helpers/nls.c

@@ -375 +375 @@
  *@@changed V1.0.4 (2005-10-15) [bvl]: Added support for Locale object settings on MCP systems @@fixes 614
  *@@changed V1.0.4 (2005-10-29) [pr]: Rewritten to prevent memory leaks and errors
+ *@@changed V1.0.5 (2006-05-29) [pr]: Read Country rather than Locale settings on Warp 4 FP13+ @@fixes 614
  */
 
@@ -381 +382 @@
     if (pcs)
     {
-        pcs->ulDateFormat = PrfQueryProfileInt(HINI_USER,
-                                               (PSZ)PMINIAPP_NATIONAL,
-                                               "iDate",
-                                               0);
-        pcs->ulTimeFormat = PrfQueryProfileInt(HINI_USER,
-                                               (PSZ)PMINIAPP_NATIONAL,
-                                               "iTime",
-                                               0);
-        pcs->cDateSep = prfhQueryProfileChar(HINI_USER,
-                                             (PSZ)PMINIAPP_NATIONAL,
-                                             "sDate",
-                                             '/');
-        pcs->cTimeSep = prfhQueryProfileChar(HINI_USER,
-                                             (PSZ)PMINIAPP_NATIONAL,
-                                             "sTime",
-                                             ':');
-        pcs->cDecimal = prfhQueryProfileChar(HINI_USER,
-                                             (PSZ)PMINIAPP_NATIONAL,
-                                             "sDecimal",
-                                             '.');
-        pcs->cThousands = prfhQueryProfileChar(HINI_USER,
-                                               (PSZ)PMINIAPP_NATIONAL,
-                                               "sThousand",
-                                               ',');
-        if (doshIsWarp4()==2)
+        if (doshIsWarp4()==3)   // V1.0.5 (2006-05-29) [pr]
         {
             UconvObject         uconv_object;
@@ -473 +450 @@
                 UniFreeUconvObject(uconv_object);
             }
+        }
+        else
+        {
+            pcs->ulDateFormat = PrfQueryProfileInt(HINI_USER,
+                                                   (PSZ)PMINIAPP_NATIONAL,
+                                                   "iDate",
+                                                   0);
+            pcs->ulTimeFormat = PrfQueryProfileInt(HINI_USER,
+                                                   (PSZ)PMINIAPP_NATIONAL,
+                                                   "iTime",
+                                                   0);
+            pcs->cDateSep = prfhQueryProfileChar(HINI_USER,
+                                                 (PSZ)PMINIAPP_NATIONAL,
+                                                 "sDate",
+                                                 '/');
+            pcs->cTimeSep = prfhQueryProfileChar(HINI_USER,
+                                                 (PSZ)PMINIAPP_NATIONAL,
+                                                 "sTime",
+                                                 ':');
+            pcs->cDecimal = prfhQueryProfileChar(HINI_USER,
+                                                 (PSZ)PMINIAPP_NATIONAL,
+                                                 "sDecimal",
+                                                 '.');
+            pcs->cThousands = prfhQueryProfileChar(HINI_USER,
+                                                   (PSZ)PMINIAPP_NATIONAL,
+                                                   "sThousand",
+                                                   ',');
         }
     }