Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use wxFileName to change catalog extension instead wxString methods, this fixes problems with dots inside file names (modified patch 1169837)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-03-27 16:21:41 +00:00
parent 69120ee48a
commit 58ad1bab8c
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/common/intl.cpp
View File

@@ -72,6 +72,7 @@
#endif #endif
#include "wx/file.h" #include "wx/file.h"
#include "wx/filename.h"
#include "wx/tokenzr.h" #include "wx/tokenzr.h"
#include "wx/module.h" #include "wx/module.h"
#include "wx/fontmap.h" #include "wx/fontmap.h"
@@ -1074,16 +1075,14 @@ static wxString GetFullSearchPath(const wxChar *lang)
} }
// open disk file and read in it's contents // open disk file and read in it's contents
bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName0, bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName,
wxPluralFormsCalculatorPtr& rPluralFormsCalculator) wxPluralFormsCalculatorPtr& rPluralFormsCalculator)
{ {
/* We need to handle locales like de_AT.iso-8859-1 /*
For this we first chop off the .CHARSET specifier and ignore it. We need to handle locales like de_AT.iso-8859-1
FIXME: UNICODE SUPPORT: must use CHARSET specifier! For this we first chop off the .CHARSET specifier and ignore it.
*/ FIXME: UNICODE SUPPORT: must use CHARSET specifier!
wxString szName = szName0; */
if(szName.Find(wxT('.')) != wxNOT_FOUND) // contains a dot
szName = szName.Left(szName.Find(wxT('.')));
wxString searchPath = GetFullSearchPath(szDirPrefix); wxString searchPath = GetFullSearchPath(szDirPrefix);
const wxChar *sublocale = wxStrchr(szDirPrefix, wxT('_')); const wxChar *sublocale = wxStrchr(szDirPrefix, wxT('_'));
@@ -1097,9 +1096,6 @@ bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName0,
<< wxPATH_SEP; << wxPATH_SEP;
} }
wxString strFile = szName;
strFile += MSGCATALOG_EXTENSION;
// don't give translation errors here because the wxstd catalog might // don't give translation errors here because the wxstd catalog might
// not yet be loaded (and it's normal) // not yet be loaded (and it's normal)
// //
@@ -1107,17 +1103,18 @@ bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName0,
NoTransErr noTransErr; NoTransErr noTransErr;
wxLogVerbose(_("looking for catalog '%s' in path '%s'."), wxLogVerbose(_("looking for catalog '%s' in path '%s'."),
szName.c_str(), searchPath.c_str()); szName, searchPath.c_str());
wxFileName fn(szName);
fn.SetExt(MSGCATALOG_EXTENSION);
wxString strFullName; wxString strFullName;
if ( !wxFindFileInPath(&strFullName, searchPath, strFile) ) { if ( !wxFindFileInPath(&strFullName, searchPath, fn.GetFullPath()) ) {
wxLogVerbose(_("catalog file for domain '%s' not found."), szName.c_str()); wxLogVerbose(_("catalog file for domain '%s' not found."), szName);
return false; return false;
} }
// open file // open file
wxLogVerbose(_("using catalog '%s' from '%s'."), wxLogVerbose(_("using catalog '%s' from '%s'."), szName, strFullName.c_str());
szName.c_str(), strFullName.c_str());
wxFile fileMsg(strFullName); wxFile fileMsg(strFullName);
if ( !fileMsg.IsOpened() ) if ( !fileMsg.IsOpened() )