Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

CHANGED: #1471 Added a new property for CI18N noResolution, when it's set the translation labels are not resolved, and it's set while using the GUI Editor.

Browse source 
--HG--
branch : gsoc2012-gui-editor
This commit is contained in:
dfighter1985 2012-07-21 04:44:47 +02:00
parent a84fe1bcf4
commit af7eb699c2
3 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
code/nel/include/nel/misc/i18n.h
View file

@ -206,6 +206,8 @@ public:
static void hashToUCString(uint64 hash, ucstring &dst); static void hashToUCString(uint64 hash, ucstring &dst);
//@} //@}
static void setNoResolution( bool b ){ noResolution = b; }
private: private:
typedef std::map<std::string, ucstring> StrMapContainer; typedef std::map<std::string, ucstring> StrMapContainer;
@ -254,6 +256,9 @@ private:
TLineFormat lineFmt, TLineFormat lineFmt,
bool warnIfIncludesNotFound, bool warnIfIncludesNotFound,
TReadContext &readContext); TReadContext &readContext);
// Don't resolve labels
static bool noResolution;
}; };
} // NLMISC } // NLMISC

8
code/nel/src/misc/i18n.cpp
View file

@ -33,6 +33,7 @@ string CI18N::_SelectedLanguageCode;
CI18N::ILoadProxy *CI18N::_LoadProxy = 0; CI18N::ILoadProxy *CI18N::_LoadProxy = 0;
vector<string> CI18N::_LanguageCodes; vector<string> CI18N::_LanguageCodes;
vector<ucstring> CI18N::_LanguageNames; vector<ucstring> CI18N::_LanguageNames;
bool CI18N::noResolution = false;
void CI18N::setLoadProxy(ILoadProxy *loadProxy) void CI18N::setLoadProxy(ILoadProxy *loadProxy)
{ {
@ -160,6 +161,13 @@ void CI18N::loadFromFilename(const string &filename, bool reload)
const ucstring &CI18N::get (const string &label) const ucstring &CI18N::get (const string &label)
{ {
if( noResolution )
{
static ucstring labelString;
labelString = label;
return labelString;
}
if (label.empty()) if (label.empty())
{ {
static ucstring emptyString; static ucstring emptyString;

3
code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/nelgui_widget.cpp
View file

@ -21,6 +21,7 @@
#include "nel/gui/interface_group.h" #include "nel/gui/interface_group.h"
#include "nel/gui/widget_manager.h" #include "nel/gui/widget_manager.h"
#include "nel/misc/path.h" #include "nel/misc/path.h"
#include "nel/misc/i18n.h"
#include <set> #include <set>
#include <string> #include <string>
@ -36,11 +37,13 @@ namespace GUIEditor
NelGUIWidget::~NelGUIWidget() NelGUIWidget::~NelGUIWidget()
{ {
NLGUI::CViewRenderer::release(); NLGUI::CViewRenderer::release();
NLMISC::CI18N::setNoResolution( false );
} }
void NelGUIWidget::init() void NelGUIWidget::init()
{ {
NLMISC::CI18N::setNoResolution( true );
NLMISC::CPath::remapExtension( "dds", "tga", true ); NLMISC::CPath::remapExtension( "dds", "tga", true );
NLMISC::CPath::remapExtension( "dds", "png", true ); NLMISC::CPath::remapExtension( "dds", "png", true );
NLMISC::CPath::remapExtension( "png", "tga", true ); NLMISC::CPath::remapExtension( "png", "tga", true );