From a4a6984d5e2d8ae424cc8f31c223304b260d7670 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 11 Sep 2001 17:04:41 +0000 Subject: [PATCH] don't try to translate the standard encoding names git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/fontmap.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp index 21a3e219e6..0ef4622bdf 100644 --- a/src/common/fontmap.cpp +++ b/src/common/fontmap.cpp @@ -133,7 +133,7 @@ static const wxChar* gs_encodingDescs[] = wxTRANSLATE( "Unicode 8 bit (UTF-8)" ), }; -// and the internal names +// and the internal names (these are not translated on purpose!) static const wxChar* gs_encodingNames[] = { wxT( "iso-8859-1" ), @@ -385,7 +385,7 @@ wxString wxFontMapper::GetEncodingName(wxFontEncoding encoding) { if ( gs_encodings[i] == encoding ) { - return wxGetTranslation(gs_encodingNames[i]); + return gs_encodingNames[i]; } } @@ -712,7 +712,8 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding, // wxFatalError doesn't return } - wxString configEntry, encName = GetEncodingName(encoding); + wxString configEntry, + encName = GetEncodingName(encoding); if ( !!facename ) { configEntry = facename + _T("_");