Diff comments:
> === modified file 'po/widelands/ar.po' > --- po/widelands/ar.po 2019-03-08 07:26:52 +0000 > +++ po/widelands/ar.po 2019-05-03 01:59:08 +0000 > @@ -2574,7 +2574,7 @@ > msgstr "العملاء على الشبكة:" > > #: ../../src/ui_fsmenu/internet_lobby.cc:64 > -msgid "List of games:" Never change the contents of .po files. We have a shell script system for getting any new strings and merging the translations from Transifex. > +msgid "List of open games:" > msgstr "قائمة اﻷلعاب:" > > #: ../../src/ui_fsmenu/internet_lobby.cc:65 > > === modified file 'src/ui_fsmenu/internet_lobby.cc' > --- src/ui_fsmenu/internet_lobby.cc 2019-04-24 06:01:37 +0000 > +++ src/ui_fsmenu/internet_lobby.cc 2019-05-03 01:59:08 +0000 > @@ -63,7 +63,7 @@ > // Text labels > title(this, get_w() / 2, get_h() / 20, _("Metaserver Lobby"), > UI::Align::kCenter), > clients_(this, get_w() * 4 / 125, get_h() * 15 / 100, _("Clients > online:")), > - opengames_(this, get_w() * 17 / 25, get_h() * 15 / 100, _("List of > games:")), > + opengames_(this, get_w() * 17 / 25, get_h() * 15 / 100, _("List of open > games:")), I think we should simply call this "Open Games" > servername_(this, get_w() * 17 / 25, get_h() * 63 / 100, _("Name of > your server:")), > > // Buttons > @@ -218,26 +218,30 @@ > hostgame_.set_enabled(true); > joingame_.set_enabled(false); > std::string localservername = edit_servername_.text(); > + std::string localbuildid = build_id(); > > if (games != nullptr) { // If no communication error occurred, fill > the list. > for (const InternetGame& game : *games) { > const Image* pic; > - if (game.connectable) { > - if (game.build_id == build_id()) > - pic = > g_gr->images().get("images/ui_basic/continue.png"); > - else { > + if (game.connectable == INTERNET_GAME_SETUP && > game.build_id == localbuildid) { > + // only clients with the same build number are > displayed > + pic = > g_gr->images().get("images/ui_basic/continue.png"); > + opengames_list_.add(game.name, game, pic, > false, game.build_id); > + } else if (game.connectable == INTERNET_GAME_SETUP && > + game.build_id.compare(0,6,"build-") != 0 && > localbuildid.compare(0,6,"build-") != 0) { I'm not sure whether AppVeyor builds have an uppercase B here - we'll need to double-check. > + // only development clients are allowed > to see games openend by such > pic = > g_gr->images().get("images/ui_basic/different.png"); > - } > - } else { > - pic = > g_gr->images().get("images/ui_basic/stop.png"); > + opengames_list_.add(game.name, game, > pic, false, game.build_id); > } > // If one of the servers has the same name as the local > name of the > // clients server, we disable the 'hostgame' button to > avoid having more > // than one server with the same name. > if (game.name == localservername) { > hostgame_.set_enabled(false); > + InternetGaming::ref().format_and_add_chat("", > "", true, > + (boost::format(_("A game named %s is already > running. Please choose a different name.")) > + % game.name).str()); > } > - opengames_list_.add(game.name, game, pic, false, > game.build_id); > } > } > } -- https://code.launchpad.net/~widelands-dev/widelands/bug-1825932-open-games/+merge/366860 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands. _______________________________________________ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp