Changeset 8031

Timestamp:

Mar 4, 2002, 11:44:59 AM (24 years ago)

Author:

sandervl

Message:

YD: Fall back to english resource if time format not found for default language; updated italian NLS resource

Location:

trunk/src/kernel32

Files:

• nls/ita.nls (modified) (1 diff)
• ole2nls.c (modified) (2 diffs)

trunk/src/kernel32/nls/ita.nls

@@ -41 +41 @@
 LOCVAL(LOCALE_SSHORTDATE,"dd.MM.yyyy")
 LOCVAL(LOCALE_SLONGDATE,"ddd, d. MMMM yyyy")
-/* LOCVAL(LOCALE_STIMEFORMAT) */
+LOCVAL(LOCALE_STIMEFORMAT, "HH:mm:ss")
 LOCVAL(LOCALE_IDATE,"1")
 /* LOCVAL(LOCALE_ILDATE) */

trunk/src/kernel32/ole2nls.c

@@ -1 @@
-/* $Id: ole2nls.c,v 1.2 2002-02-09 12:45:13 sandervl Exp $
+/* $Id: ole2nls.c,v 1.3 2002-03-04 10:44:58 sandervl Exp $
  *
  *  National Language Support library
@@ -544 +544 @@
 
     /* check if language is registered in the kernel32 resources */
+#ifdef __WIN32OS2__
+    if((res_size = NLS_LoadStringExW(GetModuleHandleA("KERNEL32"), LANGIDFROMLCID(lcid),
+        LCType, wcBuffer, sizeof(wcBuffer)/sizeof(wcBuffer[0]))) > 1) {
+#else
     if((res_size = NLS_LoadStringExW(GetModuleHandleA("KERNEL32"), LANGIDFROMLCID(lcid),
         LCType, wcBuffer, sizeof(wcBuffer)/sizeof(wcBuffer[0])))) {
+#endif
         WideCharToMultiByte(CP_ACP, 0, wcBuffer, res_size, acBuffer, dwBufferSize, NULL, NULL);
         retString = acBuffer;
         found = 1;
     }
+
+#ifdef __WIN32OS2__
+    /* nls not found: try with English (United States) */
+    if(!found && (res_size = NLS_LoadStringExW(GetModuleHandleA("KERNEL32"), LANGIDFROMLCID(0x0409),
+        LCType, wcBuffer, sizeof(wcBuffer)/sizeof(wcBuffer[0])))>1) {
+        WideCharToMultiByte(CP_ACP, 0, wcBuffer, res_size, acBuffer, dwBufferSize, NULL, NULL);
+        retString = acBuffer;
+        found = 1;
+    }
+#endif
     }