Changeset 142 for trunk/src/helpers/nls.c

Timestamp:

Feb 21, 2002, 8:24:22 PM (23 years ago)

Author:

umoeller

Message:

misc. updates

File:

• trunk/src/helpers/nls.c (modified) (5 diffs)

trunk/src/helpers/nls.c

@@ -22 +22 @@
 
 /*
- *      Copyright (C) 1997-2001 Ulrich M”ller.
+ *      Copyright (C) 1997-2002 Ulrich M”ller.
  *      This file is part of the "XWorkplace helpers" source package.
  *      This is free software; you can redistribute it and/or modify
@@ -268 +268 @@
 
     nlsDateTime(pszBuf,
-                 NULL,          // no time
-                 &dt,
-                 ulDateFormat,
-                 cDateSep,
-                 0, 0);         // no time
+                NULL,          // no time
+                &dt,
+                ulDateFormat,
+                cDateSep,
+                0, 0);         // no time
 }
 
@@ -326 +326 @@
  *@@added V0.9.0 (99-11-07) [umoeller]
  *@@changed V0.9.16 (2001-12-05) [pr]: fixed AM/PM hour bug
+ *@@changed V0.9.18 (2002-02-13) [umoeller]: fixed AM/PM hour bug fix
  */
 
@@ -387 +388 @@
             if (pDateTime->hours >= 12)  // V0.9.16 (2001-12-05) [pr] if (pDateTime->hours > 12)
             {
+                // yeah cool Paul, now we get 00:20 PM if it's 20 past noon
+                // V0.9.18 (2002-02-13) [umoeller]
+                ULONG ulHours;
+                if (!(ulHours = pDateTime->hours % 12))
+                    ulHours = 12;
+
                 // >= 12h: PM.
                 PrfQueryProfileString(HINI_USER,
@@ -395 +402 @@
                 sprintf(pszTime, "%02d%c%02d%c%02d %s",
                         // leave 12 == 12 (not 0)
-                        pDateTime->hours % 12,
+                        ulHours,
                             cTimeSep,
                         pDateTime->minutes,