[Winmerge-svn] SF.net SVN: winmerge: [4815] branches/R2_6/Src

[<ge...@us...>]

Revision: 4815
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4815&view=rev
Author:   gerundt
Date:     2007-12-07 14:52:32 -0800 (Fri, 07 Dec 2007)

Log Message:
-----------
BUG: [ 1834284 ] "Short Size" columns not rounded in translations
 Submitted by Jochen Tucht

Modified Paths:
--------------
    branches/R2_6/Src/Changes.txt
    branches/R2_6/Src/Common/LanguageSelect.cpp
    branches/R2_6/Src/locality.cpp

Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt	2007-12-07 22:47:19 UTC (rev 4814)
+++ branches/R2_6/Src/Changes.txt	2007-12-07 22:52:32 UTC (rev 4815)
@@ -5,6 +5,10 @@
 2007-12-07 Tim
  BUG: [ 1831512 ] Left Date column of CSV Report from "Generate Report.." menu
   Src: DirCmpReport.cpp
+ BUG: [ 1834284 ] "Short Size" columns not rounded in translations
+  Submitted by Jochen Tucht
+  Src: locality.cpp
+  Src/Common: LanguageSelect.cpp
 
 2007-11-21 Kimmo
  BUG: [ 1828930 ] Copy Left To Right with VCS

Modified: branches/R2_6/Src/Common/LanguageSelect.cpp
===================================================================
--- branches/R2_6/Src/Common/LanguageSelect.cpp	2007-12-07 22:47:19 UTC (rev 4814)
+++ branches/R2_6/Src/Common/LanguageSelect.cpp	2007-12-07 22:52:32 UTC (rev 4815)
@@ -265,11 +265,6 @@
 		SetThreadLocale(MAKELCID(m_wCurLanguage, SORT_DEFAULT));
 
 		int idx = GetLanguageArrayIndex(m_wCurLanguage);
-		if (idx != -1
-			&& *lang_map[idx].pszLocale != _T('\0'))
-		{
-			_tsetlocale(LC_ALL, lang_map[idx].pszLocale);
-		}
 	}
 	
 	return result;

Modified: branches/R2_6/Src/locality.cpp
===================================================================
--- branches/R2_6/Src/locality.cpp	2007-12-07 22:47:19 UTC (rev 4814)
+++ branches/R2_6/Src/locality.cpp	2007-12-07 22:52:32 UTC (rev 4815)
@@ -105,9 +105,12 @@
 	NumFormat.NumDigits = decimalDigits; // LOCALE_IDIGITS
 	NumFormat.LeadingZero = getLocaleUint(LOCALE_ILZERO, 0);
 	NumFormat.Grouping = GetLocaleGrouping(3);
-	NumFormat.lpDecimalSep = _T("."); // should not be used
-	CString sep = getLocaleStr(LOCALE_STHOUSAND, _T(","));
-	NumFormat.lpThousandSep = (LPTSTR)(LPCTSTR)sep;
+	TCHAR DecimalSep[8];
+	TCHAR ThousandSep[8];
+	NumFormat.lpDecimalSep = GetLocaleInfo(LOCALE_USER_DEFAULT,
+	LOCALE_SDECIMAL, DecimalSep, 8) ? DecimalSep : _T(".");
+	NumFormat.lpThousandSep = GetLocaleInfo(LOCALE_USER_DEFAULT,
+	LOCALE_STHOUSAND, ThousandSep, 8) ? ThousandSep : _T(",");
 	NumFormat.NegativeOrder = getLocaleUint(LOCALE_INEGNUMBER , 0);
 
 	CString out;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.