diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-09-23 14:54:02 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-09-23 14:54:02 +0300 |
| commit | 3e366adda055e8873eaeb57f1843f5df0b9695d9 (patch) | |
| tree | 8d6e8d9a451547108773bd9d4463c55354f110d1 /src/gui | |
| parent | 3a121eabfc6bf7ad6ff8c69d04fdf98abd94896a (diff) | |
| download | manaverse-3e366adda055e8873eaeb57f1843f5df0b9695d9.tar.gz manaverse-3e366adda055e8873eaeb57f1843f5df0b9695d9.tar.bz2 manaverse-3e366adda055e8873eaeb57f1843f5df0b9695d9.tar.xz manaverse-3e366adda055e8873eaeb57f1843f5df0b9695d9.zip | |
fix calling gettext before gettext initialisation.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/setup_colors.cpp | 6 | ||||
| -rw-r--r-- | src/gui/setup_colors.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp index 16a26a779..88b67223d 100644 --- a/src/gui/setup_colors.cpp +++ b/src/gui/setup_colors.cpp @@ -43,8 +43,8 @@ #include "debug.h" // TRANSLATORS: color selection preview message -const std::string Setup_Colors::rawmsg = - _("This is what the color looks like"); +const char *const Setup_Colors::rawmsg = + N_("This is what the color looks like"); Setup_Colors::Setup_Colors(const Widget2 *const widget) : SetupTab(widget), @@ -52,7 +52,7 @@ Setup_Colors::Setup_Colors(const Widget2 *const widget) : mColorBox(new ListBox(this, userPalette, "")), mScroll(new ScrollArea(mColorBox, true, "setup_colors_background.xml")), mPreview(new BrowserBox(this, BrowserBox::AUTO_WRAP)), - mTextPreview(new TextPreview(this, rawmsg)), + mTextPreview(new TextPreview(this, gettext(rawmsg))), mPreviewBox(new ScrollArea(mPreview, true, "setup_colors_preview_background.xml")), mSelected(-1), diff --git a/src/gui/setup_colors.h b/src/gui/setup_colors.h index 1e631663c..7fe58abb6 100644 --- a/src/gui/setup_colors.h +++ b/src/gui/setup_colors.h @@ -55,7 +55,7 @@ class Setup_Colors final : public SetupTab, void valueChanged(const gcn::SelectionEvent &event) override; private: - static const std::string rawmsg; + static const char *const rawmsg; ListBox *mColorBox; ScrollArea *mScroll; |