From f662e2548b87d578bf9188f220541e45887aa1c3 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Fri, 8 Dec 2006 12:55:43 +0100
Subject: [PATCH] shlwapi: Fixed string tests for non-English locales.

---
 dlls/shlwapi/tests/string.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c
index 5bed26611d0..6369a87166b 100644
--- a/dlls/shlwapi/tests/string.c
+++ b/dlls/shlwapi/tests/string.c
@@ -761,8 +761,8 @@ START_TEST(string)
   TCHAR decimalDelim[8];
   CoInitialize(0);
 
-  GetLocaleInfo(GetUserDefaultLCID(), LOCALE_STHOUSAND, thousandDelim, 8);
-  GetLocaleInfo(GetUserDefaultLCID(), LOCALE_SDECIMAL, decimalDelim, 8);
+  GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, thousandDelim, 8);
+  GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, decimalDelim, 8);
 
   hShlwapi = GetModuleHandleA("shlwapi");
   if (!hShlwapi)
@@ -787,11 +787,13 @@ START_TEST(string)
     test_StrFormatKBSizeA();
     test_StrFormatKBSizeW();
   }
-  if (0)
-  {
-    /* language-dependent test. FIXME: how to detect the language? */
+
+  /* language-dependent test */
+  if (PRIMARYLANGID(GetUserDefaultLangID()) != LANG_ENGLISH)
+    trace("Skipping StrFromTimeInterval test for non English language\n");
+  else
     test_StrFromTimeIntervalA();
-  }
+
   test_StrCmpA();
   test_StrCmpW();
   test_StrRetToBSTR();