0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix two of the dialog functions not accepting translatable strings

Browse source 
(cherry-picked from commit 0327085d99)
This commit is contained in:
Celtic Minstrel 2018-04-15 02:03:31 -04:00
parent 60a91c4536
commit d6052862df
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelog.md
View file

@ -35,6 +35,9 @@
* Fixed Logging Options tooltips not being translatable (bug #2837).
* Updated translations: British English, Chinese (Simplified), Czech, French,
Galician, Italian, Polish, Scottish Gaelic, Spanish, Ukrainian
### Lua API
* Fix wesnoth.show_popup_dialog and wesnoth.show_message_box not accepting
translatable strings
### Multiplayer
* A New Land: Fixed the scenario being broken.
* Added team color to a few background units missing in Aethermaw.

6
src/scripting/lua_gui2.cpp
View file

@ -370,8 +370,8 @@ int show_message_dialog(lua_State* L)
* - Arg 3: Image (optional)
*/
int show_popup_dialog(lua_State *L) {
std::string title = luaL_checkstring(L, 1);
std::string msg = luaL_checkstring(L, 2);
t_string title = luaW_checktstring(L, 1);
t_string msg = luaW_checktstring(L, 2);
std::string image = lua_isnoneornil(L, 3) ? "" : luaL_checkstring(L, 3);
gui2::show_transient_message(title, msg, image, true, true);
@ -423,7 +423,7 @@ int show_menu(lua_State* L) {
* Displays a simple message box.
*/
int show_message_box(lua_State* L) {
const std::string title = luaL_checkstring(L, 1), message = luaL_checkstring(L, 2);
const t_string title = luaW_checktstring(L, 1), message = luaW_checktstring(L, 2);
std::string button = luaL_optstring(L, 3, "ok"), btn_style;
std::transform(button.begin(), button.end(), std::inserter(btn_style, btn_style.begin()), [](char c) { return std::tolower(c); });
bool markup = lua_isnoneornil(L, 3) ? luaW_toboolean(L, 3) : luaW_toboolean(L, 4);