From 3e366adda055e8873eaeb57f1843f5df0b9695d9 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 23 Sep 2013 14:54:02 +0300 Subject: fix calling gettext before gettext initialisation. --- src/gui/setup_colors.cpp | 6 +++--- 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; -- cgit v1.2.3-70-g09d2