From d7f1400e448d2f93611bc66a2cb1252b0e7133be Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Thu, 21 Apr 2016 09:19:08 +0200 Subject: [PATCH] Make strings only used in debug mode not translatable. --- 3d-viewer/3d_cache/3d_cache.cpp | 12 ++++----- 3d-viewer/3d_cache/3d_filename_resolver.cpp | 30 ++++++++++----------- 3d-viewer/3d_cache/sg/ifsg_api.cpp | 2 +- pcbnew/dialogs/dialog_create_array.cpp | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/3d-viewer/3d_cache/3d_cache.cpp b/3d-viewer/3d_cache/3d_cache.cpp index e2210a56c7..04fd36c789 100644 --- a/3d-viewer/3d_cache/3d_cache.cpp +++ b/3d-viewer/3d_cache/3d_cache.cpp @@ -437,7 +437,7 @@ bool S3D_CACHE::loadCacheData( S3D_CACHE_ENTRY* aCacheItem ) if( m_CacheDir.empty() ) { - wxString errmsg = _( "cannot load cached model; config directory unknown" ); + wxString errmsg = "cannot load cached model; config directory unknown"; wxLogTrace( MASK_3D_CACHE, " * [3D model] %s\n", errmsg.ToUTF8() ); return false; @@ -447,7 +447,7 @@ bool S3D_CACHE::loadCacheData( S3D_CACHE_ENTRY* aCacheItem ) if( !wxFileName::FileExists( fname ) ) { - wxString errmsg = _( "cannot open file" ); + wxString errmsg = "cannot open file"; wxLogTrace( MASK_3D_CACHE, " * [3D model] %s '%s'\n", errmsg.ToUTF8(), fname.ToUTF8() ); return false; @@ -508,7 +508,7 @@ bool S3D_CACHE::saveCacheData( S3D_CACHE_ENTRY* aCacheItem ) if( m_CacheDir.empty() ) { - wxString errmsg = _( "cannot load cached model; config directory unknown" ); + wxString errmsg = "cannot load cached model; config directory unknown"; wxLogTrace( MASK_3D_CACHE, " * [3D model] %s\n", errmsg.ToUTF8() ); return false; @@ -586,9 +586,9 @@ bool S3D_CACHE::Set3DConfigDir( const wxString& aConfigDir ) { std::ostringstream ostr; ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - wxString errmsg = _( "failed to create 3D cache directory" ); + wxString errmsg = "failed to create 3D cache directory"; ostr << " * " << errmsg.ToUTF8() << "\n"; - errmsg = _( "cache directory" ); + errmsg = "cache directory"; ostr << " * " << errmsg.ToUTF8() << " '"; ostr << cfgdir.GetPath().ToUTF8() << "'"; wxLogTrace( MASK_3D_CACHE, "%s\n", ostr.str().c_str() ); @@ -645,7 +645,7 @@ wxString S3D_CACHE::Get3DConfigDir( bool createDefault ) if( !cfgpath.DirExists() ) { std::ostringstream ostr; - wxString errmsg = _( "failed to create 3D configuration directory" ); + wxString errmsg = "failed to create 3D configuration directory"; ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; ostr << " * " << errmsg.ToUTF8(); wxLogTrace( MASK_3D_CACHE, "%s\n", ostr.str().c_str() ); diff --git a/3d-viewer/3d_cache/3d_filename_resolver.cpp b/3d-viewer/3d_cache/3d_filename_resolver.cpp index 8c3098a8d1..42675e855c 100644 --- a/3d-viewer/3d_cache/3d_filename_resolver.cpp +++ b/3d-viewer/3d_cache/3d_filename_resolver.cpp @@ -171,8 +171,8 @@ bool S3D_FILENAME_RESOLVER::createPathList( void ) // the user may change this later with a call to SetProjectDir() S3D_ALIAS lpath; - lpath.m_alias = _( "${KIPRJMOD}" ); - lpath.m_pathvar = _( "${KIPRJMOD}" ); + lpath.m_alias = "${KIPRJMOD}"; + lpath.m_pathvar = "${KIPRJMOD}"; lpath.m_pathexp = m_curProjDir; m_Paths.push_back( lpath ); wxFileName fndummy; @@ -329,7 +329,7 @@ wxString S3D_FILENAME_RESOLVER::ResolvePath( const wxString& aFileName ) if( !( m_errflags & ERRFLG_ENVPATH ) ) { m_errflags |= ERRFLG_ENVPATH; - wxString errmsg = _( "[3D File Resolver] No such path; ensure the environment var is defined" ); + wxString errmsg = "[3D File Resolver] No such path; ensure the environment var is defined"; errmsg.append( "\n" ); errmsg.append( tname ); wxLogMessage( "%s\n", errmsg.ToUTF8() ); @@ -400,7 +400,7 @@ wxString S3D_FILENAME_RESOLVER::ResolvePath( const wxString& aFileName ) // this can happen if the file was intended to be relative to // ${KISYS3DMOD} but ${KISYS3DMOD} not set or incorrect. m_errflags |= ERRFLG_RELPATH; - wxString errmsg = _( "[3D File Resolver] No such path" ); + wxString errmsg = "[3D File Resolver] No such path"; errmsg.append( "\n" ); errmsg.append( tname ); wxLogTrace( MASK_3D_RESOLVER, "%s\n", errmsg.ToUTF8() ); @@ -435,7 +435,7 @@ wxString S3D_FILENAME_RESOLVER::ResolvePath( const wxString& aFileName ) if( !( m_errflags & ERRFLG_ALIAS ) ) { m_errflags |= ERRFLG_ALIAS; - wxString errmsg = _( "[3D File Resolver] No such path; ensure the path alias is defined" ); + wxString errmsg = "[3D File Resolver] No such path; ensure the path alias is defined"; errmsg.append( "\n" ); errmsg.append( tname.substr( 1 ) ); wxLogTrace( MASK_3D_RESOLVER, "%s\n", errmsg.ToUTF8() ); @@ -471,10 +471,10 @@ bool S3D_FILENAME_RESOLVER::addPath( const S3D_ALIAS& aPath ) // legacy KISYS3DMOD variable if( aPath.m_pathvar.compare( wxT( "${KISYS3DMOD}" ) ) ) { - wxString msg = _T( "The given path does not exist" ); + wxString msg = _( "The given path does not exist" ); msg.append( wxT( "\n" ) ); msg.append( tpath.m_pathvar ); - wxMessageBox( msg, _T( "3D model search path" ) ); + wxMessageBox( msg, _( "3D model search path" ) ); } tpath.m_pathexp.clear(); @@ -527,7 +527,7 @@ bool S3D_FILENAME_RESOLVER::readPathList( void ) { std::ostringstream ostr; ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - wxString errmsg = _( "3D configuration directory is unknown" ); + wxString errmsg = "3D configuration directory is unknown"; ostr << " * " << errmsg.ToUTF8(); wxLogTrace( MASK_3D_RESOLVER, "%s\n", ostr.str().c_str() ); return false; @@ -546,7 +546,7 @@ bool S3D_FILENAME_RESOLVER::readPathList( void ) { std::ostringstream ostr; ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - wxString errmsg = _( "no 3D configuration file" ); + wxString errmsg = "no 3D configuration file"; ostr << " * " << errmsg.ToUTF8() << " '"; ostr << cfgname.ToUTF8() << "'"; wxLogTrace( MASK_3D_RESOLVER, "%s\n", ostr.str().c_str() ); @@ -559,7 +559,7 @@ bool S3D_FILENAME_RESOLVER::readPathList( void ) { std::ostringstream ostr; ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - wxString errmsg = _( "Could not open configuration file" ); + wxString errmsg = "Could not open configuration file"; ostr << " * " << errmsg.ToUTF8() << " '" << cfgname.ToUTF8() << "'"; wxLogTrace( MASK_3D_RESOLVER, "%s\n", ostr.str().c_str() ); return false; @@ -875,7 +875,7 @@ static bool getHollerith( const std::string& aString, size_t& aIndex, wxString& { std::ostringstream ostr; ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - wxString errmsg = _( "bad Hollerith string on line" ); + wxString errmsg = "bad Hollerith string on line"; ostr << " * " << errmsg.ToUTF8() << "\n'" << aString << "'"; wxLogTrace( MASK_3D_RESOLVER, "%s\n", ostr.str().c_str() ); @@ -888,7 +888,7 @@ static bool getHollerith( const std::string& aString, size_t& aIndex, wxString& { std::ostringstream ostr; ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - wxString errmsg = _( "missing opening quote mark in config file" ); + wxString errmsg = "missing opening quote mark in config file"; ostr << " * " << errmsg.ToUTF8() << "\n'" << aString << "'"; wxLogTrace( MASK_3D_RESOLVER, "%s\n", ostr.str().c_str() ); @@ -901,7 +901,7 @@ static bool getHollerith( const std::string& aString, size_t& aIndex, wxString& { std::ostringstream ostr; ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - wxString errmsg = _( "invalid entry (unexpected end of line)" ); + wxString errmsg = "invalid entry (unexpected end of line)"; ostr << " * " << errmsg.ToUTF8() << "\n'" << aString << "'"; wxLogTrace( MASK_3D_RESOLVER, "%s\n", ostr.str().c_str() ); @@ -917,7 +917,7 @@ static bool getHollerith( const std::string& aString, size_t& aIndex, wxString& { std::ostringstream ostr; ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - wxString errmsg = _( "bad Hollerith string on line" ); + wxString errmsg = "bad Hollerith string on line"; ostr << " * " << errmsg.ToUTF8() << "\n'" << aString << "'"; wxLogTrace( MASK_3D_RESOLVER, "%s\n", ostr.str().c_str() ); @@ -933,7 +933,7 @@ static bool getHollerith( const std::string& aString, size_t& aIndex, wxString& { std::ostringstream ostr; ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - wxString errmsg = _( "invalid entry (unexpected end of line)" ); + wxString errmsg = "invalid entry (unexpected end of line)"; ostr << " * " << errmsg.ToUTF8() << "\n'" << aString << "'"; wxLogTrace( MASK_3D_RESOLVER, "%s\n", ostr.str().c_str() ); diff --git a/3d-viewer/3d_cache/sg/ifsg_api.cpp b/3d-viewer/3d_cache/sg/ifsg_api.cpp index 08f3cda076..b440e7c4fc 100644 --- a/3d-viewer/3d_cache/sg/ifsg_api.cpp +++ b/3d-viewer/3d_cache/sg/ifsg_api.cpp @@ -486,7 +486,7 @@ SGNODE* S3D::ReadCache( const char* aFileName, void* aPluginMgr, delete np; std::ostringstream ostr; ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - wxString errmsg = _( "problems encountered reading cache file" ); + wxString errmsg = "problems encountered reading cache file"; ostr << " * [INFO] " << errmsg.ToUTF8() << " '"; ostr << aFileName << "'"; wxLogTrace( MASK_3D_SG, "%s\n", ostr.str().c_str() ); diff --git a/pcbnew/dialogs/dialog_create_array.cpp b/pcbnew/dialogs/dialog_create_array.cpp index cf5d7cd55a..d7600b6c33 100644 --- a/pcbnew/dialogs/dialog_create_array.cpp +++ b/pcbnew/dialogs/dialog_create_array.cpp @@ -272,7 +272,7 @@ static bool validateLongEntry( const wxTextEntry& entry, if( !entry.GetValue().ToLong( &dest ) ) { wxString err; - err.Printf( _("Bad integral value for %s: %s"), description, entry.GetValue() ); + err.Printf( _("Bad numeric value for %s: %s"), description, entry.GetValue() ); errors.Add( err ); ok = false; }