diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2016-07-10 14:20:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-10 14:20:06 +0200 |
commit | 637796900080cfcf407e1045f10e6e9040c8d33e (patch) | |
tree | f399c05605f9ca1aeea3d886548a69b2a9362aa5 /scene/gui | |
parent | ae3d316798b6fbb36f73e7c2c0724dfac4f7ecad (diff) | |
parent | 061cadcae57cf05b9fe60d42f1a8da0f0e6dc328 (diff) |
Merge pull request #5623 from Ovnuniarchos/LineEditXlatedPHolder
LineEdit placeholder property now accepts translated strings.
Diffstat (limited to 'scene/gui')
-rw-r--r-- | scene/gui/line_edit.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp index d6c018ae8e..6c47072b33 100644 --- a/scene/gui/line_edit.cpp +++ b/scene/gui/line_edit.cpp @@ -31,6 +31,7 @@ #include "os/os.h" #include "print_string.h" #include "label.h" +#include "translation.h" #ifdef TOOLS_ENABLED #include "tools/editor/editor_settings.h" #endif @@ -947,7 +948,7 @@ String LineEdit::get_text() const { void LineEdit::set_placeholder(String p_text) { - placeholder = p_text; + placeholder = XL_MESSAGE(p_text); update(); } |