diff options
author | Kahrl <kahrl@gmx.net> | 2015-07-14 18:20:50 +0200 |
---|---|---|
committer | Kahrl <kahrl@gmx.net> | 2015-07-14 19:01:33 +0200 |
commit | b30e8d8ec689fbb65b1cee6fb6ff79322b204d0d (patch) | |
tree | c79514c3d3c5df08d6a826be82f7bf4e1dfa4a16 /src | |
parent | 8ac0cf500ff336c43f6c42b306431fa6564b7cc8 (diff) | |
download | minetest-b30e8d8ec689fbb65b1cee6fb6ff79322b204d0d.tar.gz minetest-b30e8d8ec689fbb65b1cee6fb6ff79322b204d0d.tar.bz2 minetest-b30e8d8ec689fbb65b1cee6fb6ff79322b204d0d.zip |
Make serialization error message translatable
Also don't show "probably running a different version" message in simple singleplayer mode
Diffstat (limited to 'src')
-rw-r--r-- | src/game.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/game.cpp b/src/game.cpp index 41bfa5e60..d5819f78a 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -4352,9 +4352,13 @@ void the_game(bool *kill, } } catch (SerializationError &e) { - error_message = std::string("A serialization error occurred:\n") - + e.what() + "\n\nThe server is probably " - " running a different version of " PROJECT_NAME_C "."; + error_message = strgettext("A serialization error occurred:") + + "\n" + e.what(); + if (!simple_singleplayer_mode) { + error_message += "\n\n" + + strgettext("The server is probably running a different version of") + + " " PROJECT_NAME_C "."; + } errorstream << error_message << std::endl; } catch (ServerError &e) { error_message = e.what(); |