widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #16811
[Merge] lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands
Toni Förster has proposed merging lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands.
Commit message:
only display games for the same version and when they are open
* The list in the lobby has been renamed to "List if open Games"
* only games a user can join will be listet
* when a game is running it gets removed from the list
* development builds are not displayed for normal builds
* no message is posted to the chat when the game can't be joined
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1825932 in widelands: "Games in progress get reported as "now available" on lobby join"
https://bugs.launchpad.net/widelands/+bug/1825932
For more details, see:
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.
=== modified file 'po/widelands/ar.po'
--- po/widelands/ar.po 2019-03-08 07:26:52 +0000
+++ po/widelands/ar.po 2019-05-02 20:08:50 +0000
@@ -2574,7 +2574,7 @@
msgstr "العملاء على الشبكة:"
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr "قائمة اﻷلعاب:"
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/ast.po'
--- po/widelands/ast.po 2019-03-08 07:26:52 +0000
+++ po/widelands/ast.po 2019-05-02 20:08:50 +0000
@@ -2500,7 +2500,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/bg.po'
--- po/widelands/bg.po 2019-03-08 07:26:52 +0000
+++ po/widelands/bg.po 2019-05-02 20:08:50 +0000
@@ -2505,7 +2505,7 @@
msgstr "Клиенти на линия:"
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr "Списък от игри:"
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/br.po'
--- po/widelands/br.po 2019-03-08 07:26:52 +0000
+++ po/widelands/br.po 2019-05-02 20:08:50 +0000
@@ -2553,7 +2553,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/ca.po'
--- po/widelands/ca.po 2019-03-08 07:26:52 +0000
+++ po/widelands/ca.po 2019-05-02 20:08:50 +0000
@@ -2502,7 +2502,7 @@
msgstr "Clients en línia:"
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr "Llista de partides:"
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/cs.po'
--- po/widelands/cs.po 2019-03-08 07:26:52 +0000
+++ po/widelands/cs.po 2019-05-02 20:08:50 +0000
@@ -2539,7 +2539,7 @@
msgstr "Klienti online:"
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr "Seznam her:"
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/da.po'
--- po/widelands/da.po 2019-03-08 07:26:52 +0000
+++ po/widelands/da.po 2019-05-02 20:08:50 +0000
@@ -2503,7 +2503,7 @@
msgstr "Tilsluttede klienter:"
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr "Spilliste:"
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/de.po'
--- po/widelands/de.po 2019-04-09 07:53:45 +0000
+++ po/widelands/de.po 2019-05-02 20:08:50 +0000
@@ -2515,7 +2515,7 @@
msgstr "Clients online:"
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr "Liste der Spiele:"
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/el.po'
--- po/widelands/el.po 2019-03-08 07:26:52 +0000
+++ po/widelands/el.po 2019-05-02 20:08:50 +0000
@@ -2501,7 +2501,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr "Λίστα παιχνιδιών:"
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/en_CA.po'
--- po/widelands/en_CA.po 2019-03-08 07:26:52 +0000
+++ po/widelands/en_CA.po 2019-05-02 20:08:50 +0000
@@ -2499,7 +2499,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/en_GB.po'
--- po/widelands/en_GB.po 2019-03-08 07:26:52 +0000
+++ po/widelands/en_GB.po 2019-05-02 20:08:50 +0000
@@ -2503,8 +2503,8 @@
msgstr "Clients online:"
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
-msgstr "List of games:"
+msgid "List of open games:"
+msgstr "List of open games:"
#: ../../src/ui_fsmenu/internet_lobby.cc:65
msgid "Name of your server:"
=== modified file 'po/widelands/en_US.po'
--- po/widelands/en_US.po 2019-03-08 07:26:52 +0000
+++ po/widelands/en_US.po 2019-05-02 20:08:50 +0000
@@ -2499,7 +2499,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/eo.po'
--- po/widelands/eo.po 2019-03-08 07:26:52 +0000
+++ po/widelands/eo.po 2019-05-02 20:08:50 +0000
@@ -2502,7 +2502,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr "Listo da ludoj:"
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/es.po'
--- po/widelands/es.po 2019-03-08 07:26:52 +0000
+++ po/widelands/es.po 2019-05-02 20:08:50 +0000
@@ -2510,7 +2510,7 @@
msgstr "Clientes en línea:"
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr "Lista de juegos:"
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/et.po'
--- po/widelands/et.po 2019-03-08 07:26:52 +0000
+++ po/widelands/et.po 2019-05-02 20:08:50 +0000
@@ -2502,7 +2502,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/eu.po'
--- po/widelands/eu.po 2019-03-08 07:26:52 +0000
+++ po/widelands/eu.po 2019-05-02 20:08:50 +0000
@@ -2501,7 +2501,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/fa.po'
--- po/widelands/fa.po 2019-03-08 07:26:52 +0000
+++ po/widelands/fa.po 2019-05-02 20:08:50 +0000
@@ -2501,7 +2501,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/fi.po'
--- po/widelands/fi.po 2019-04-05 04:54:49 +0000
+++ po/widelands/fi.po 2019-05-02 20:08:50 +0000
@@ -2506,7 +2506,7 @@
msgstr "Pelaajia verkossa:"
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr "Rekisteröidyt pelit:"
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/fr.po'
--- po/widelands/fr.po 2019-04-05 04:54:49 +0000
+++ po/widelands/fr.po 2019-05-02 20:08:50 +0000
@@ -2513,7 +2513,7 @@
msgstr "Clients en ligne :"
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr "Liste des parties :"
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/fy.po'
--- po/widelands/fy.po 2019-03-08 07:26:52 +0000
+++ po/widelands/fy.po 2019-05-02 20:08:50 +0000
@@ -2499,7 +2499,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/ga.po'
--- po/widelands/ga.po 2019-03-08 07:26:52 +0000
+++ po/widelands/ga.po 2019-05-02 20:08:50 +0000
@@ -2552,7 +2552,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/gd.po'
--- po/widelands/gd.po 2019-04-12 07:03:01 +0000
+++ po/widelands/gd.po 2019-05-02 20:08:50 +0000
@@ -2540,7 +2540,7 @@
msgstr "Cliantan air loidhne:"
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr "Liosta dhe na geamannan:"
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/gl.po'
--- po/widelands/gl.po 2019-03-08 07:26:52 +0000
+++ po/widelands/gl.po 2019-05-02 20:08:50 +0000
@@ -2502,7 +2502,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr "Lista de partidas:"
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/he.po'
--- po/widelands/he.po 2019-03-08 07:26:52 +0000
+++ po/widelands/he.po 2019-05-02 20:08:50 +0000
@@ -2535,7 +2535,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/hi.po'
--- po/widelands/hi.po 2019-03-08 07:26:52 +0000
+++ po/widelands/hi.po 2019-05-02 20:08:50 +0000
@@ -2498,7 +2498,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/hr.po'
--- po/widelands/hr.po 2019-03-08 07:26:52 +0000
+++ po/widelands/hr.po 2019-05-02 20:08:50 +0000
@@ -2519,7 +2519,7 @@
msgstr "Klijenta na vezi:"
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr "Popis igra"
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/hu.po'
--- po/widelands/hu.po 2019-04-18 12:41:44 +0000
+++ po/widelands/hu.po 2019-05-02 20:08:50 +0000
@@ -2506,7 +2506,7 @@
msgstr "Elérhető ügyfelek:"
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr "Játékok listája:"
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/ia.po'
--- po/widelands/ia.po 2019-03-08 07:26:52 +0000
+++ po/widelands/ia.po 2019-05-02 20:08:50 +0000
@@ -2498,7 +2498,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/id.po'
--- po/widelands/id.po 2019-03-08 07:26:52 +0000
+++ po/widelands/id.po 2019-05-02 20:08:50 +0000
@@ -2483,7 +2483,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/ig.po'
--- po/widelands/ig.po 2019-03-08 07:26:52 +0000
+++ po/widelands/ig.po 2019-05-02 20:08:50 +0000
@@ -2481,7 +2481,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/it.po'
--- po/widelands/it.po 2019-03-08 07:26:52 +0000
+++ po/widelands/it.po 2019-05-02 20:08:50 +0000
@@ -2508,7 +2508,7 @@
msgstr "Clients online:"
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr "Lista delle partite:"
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/ja.po'
--- po/widelands/ja.po 2019-03-08 07:26:52 +0000
+++ po/widelands/ja.po 2019-05-02 20:08:50 +0000
@@ -2483,7 +2483,7 @@
msgstr "オンラインのクライアント: "
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr "ゲーム一覧: "
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/jv.po'
--- po/widelands/jv.po 2019-03-08 07:26:52 +0000
+++ po/widelands/jv.po 2019-05-02 20:08:50 +0000
@@ -2480,7 +2480,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/ka.po'
--- po/widelands/ka.po 2019-03-08 07:26:52 +0000
+++ po/widelands/ka.po 2019-05-02 20:08:50 +0000
@@ -2499,7 +2499,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/ko.po'
--- po/widelands/ko.po 2019-03-08 07:26:52 +0000
+++ po/widelands/ko.po 2019-05-02 20:08:50 +0000
@@ -2487,7 +2487,7 @@
msgstr "접속 중인 클라이언트:"
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr "게임 목록:"
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/krl.po'
--- po/widelands/krl.po 2019-03-08 07:26:52 +0000
+++ po/widelands/krl.po 2019-05-02 20:08:50 +0000
@@ -2499,7 +2499,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/la.po'
--- po/widelands/la.po 2019-03-08 07:26:52 +0000
+++ po/widelands/la.po 2019-05-02 20:08:50 +0000
@@ -2503,7 +2503,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr "Ludorum index:"
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/lt.po'
--- po/widelands/lt.po 2019-03-08 07:26:52 +0000
+++ po/widelands/lt.po 2019-05-02 20:08:50 +0000
@@ -2535,7 +2535,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/mr.po'
--- po/widelands/mr.po 2019-03-08 07:26:52 +0000
+++ po/widelands/mr.po 2019-05-02 20:08:50 +0000
@@ -2500,7 +2500,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/ms.po'
--- po/widelands/ms.po 2019-03-08 07:26:52 +0000
+++ po/widelands/ms.po 2019-05-02 20:08:50 +0000
@@ -2483,7 +2483,7 @@
msgstr "Klien atas-talian:"
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr "Senarai permainan:"
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/my.po'
--- po/widelands/my.po 2019-03-08 07:26:52 +0000
+++ po/widelands/my.po 2019-05-02 20:08:50 +0000
@@ -2480,7 +2480,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/nb.po'
--- po/widelands/nb.po 2019-03-08 07:26:52 +0000
+++ po/widelands/nb.po 2019-05-02 20:08:50 +0000
@@ -2499,7 +2499,7 @@
msgstr "Klienter:"
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr "Liste over spill:"
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/nds.po'
--- po/widelands/nds.po 2019-04-09 07:53:45 +0000
+++ po/widelands/nds.po 2019-05-02 20:08:50 +0000
@@ -2504,7 +2504,7 @@
msgstr "Togegene Gasten:"
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr "Liste vun Speeln:"
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/nl.po'
--- po/widelands/nl.po 2019-04-09 07:53:45 +0000
+++ po/widelands/nl.po 2019-05-02 20:08:50 +0000
@@ -2504,7 +2504,7 @@
msgstr "Cliënten online:"
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr "Lijst met spellen:"
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/nn.po'
--- po/widelands/nn.po 2019-03-08 07:26:52 +0000
+++ po/widelands/nn.po 2019-05-02 20:08:50 +0000
@@ -2500,7 +2500,7 @@
msgstr "Pålogga klientar"
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr "Spelliste"
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/oc.po'
--- po/widelands/oc.po 2019-03-08 07:26:52 +0000
+++ po/widelands/oc.po 2019-05-02 20:08:50 +0000
@@ -2500,7 +2500,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/pl.po'
--- po/widelands/pl.po 2019-03-08 07:26:52 +0000
+++ po/widelands/pl.po 2019-05-02 20:08:50 +0000
@@ -2543,7 +2543,7 @@
msgstr "Gracze online:"
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr "Lista gier:"
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/pt.po'
--- po/widelands/pt.po 2019-03-08 07:26:52 +0000
+++ po/widelands/pt.po 2019-05-02 20:08:50 +0000
@@ -2502,7 +2502,7 @@
msgstr "Clientes em rede:"
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr "Lista dos jogos:"
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/pt_BR.po'
--- po/widelands/pt_BR.po 2019-04-16 08:31:10 +0000
+++ po/widelands/pt_BR.po 2019-05-02 20:08:50 +0000
@@ -2506,7 +2506,7 @@
msgstr "Clientes on-line:"
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr "Lista dos jogos:"
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/ro.po'
--- po/widelands/ro.po 2019-03-08 07:26:52 +0000
+++ po/widelands/ro.po 2019-05-02 20:08:50 +0000
@@ -2519,7 +2519,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/ru.po'
--- po/widelands/ru.po 2019-04-05 04:54:49 +0000
+++ po/widelands/ru.po 2019-05-02 20:08:50 +0000
@@ -2545,7 +2545,7 @@
msgstr "Клиенты в сети:"
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr "Список игр:"
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/rw.po'
--- po/widelands/rw.po 2019-03-08 07:26:52 +0000
+++ po/widelands/rw.po 2019-05-02 20:08:50 +0000
@@ -2500,7 +2500,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/si.po'
--- po/widelands/si.po 2019-03-08 07:26:52 +0000
+++ po/widelands/si.po 2019-05-02 20:08:50 +0000
@@ -2500,7 +2500,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/sk.po'
--- po/widelands/sk.po 2019-03-08 07:26:52 +0000
+++ po/widelands/sk.po 2019-05-02 20:08:50 +0000
@@ -2538,7 +2538,7 @@
msgstr "Klienti online:"
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr "Zoznam hier:"
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/sl.po'
--- po/widelands/sl.po 2019-03-08 07:26:52 +0000
+++ po/widelands/sl.po 2019-05-02 20:08:50 +0000
@@ -2537,7 +2537,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr "Seznam iger:"
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/sr.po'
--- po/widelands/sr.po 2019-03-08 07:26:52 +0000
+++ po/widelands/sr.po 2019-05-02 20:08:50 +0000
@@ -2518,7 +2518,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/sv.po'
--- po/widelands/sv.po 2019-03-29 07:27:04 +0000
+++ po/widelands/sv.po 2019-05-02 20:08:50 +0000
@@ -2502,7 +2502,7 @@
msgstr "Uppkopplade klienter:"
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr "Spellista:"
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/tr.po'
--- po/widelands/tr.po 2019-03-08 07:26:52 +0000
+++ po/widelands/tr.po 2019-05-02 20:08:50 +0000
@@ -2502,7 +2502,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/uk.po'
--- po/widelands/uk.po 2019-03-08 07:26:52 +0000
+++ po/widelands/uk.po 2019-05-02 20:08:50 +0000
@@ -2540,7 +2540,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr "Список ігор:"
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/vi.po'
--- po/widelands/vi.po 2019-03-08 07:26:52 +0000
+++ po/widelands/vi.po 2019-05-02 20:08:50 +0000
@@ -2482,7 +2482,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/widelands.pot'
--- po/widelands/widelands.pot 2019-04-22 05:17:43 +0000
+++ po/widelands/widelands.pot 2019-05-02 20:08:50 +0000
@@ -2444,7 +2444,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/zh_CN.po'
--- po/widelands/zh_CN.po 2019-03-08 07:26:52 +0000
+++ po/widelands/zh_CN.po 2019-05-02 20:08:50 +0000
@@ -2484,7 +2484,7 @@
msgstr "在线客户端:"
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr "游戏列表:"
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'po/widelands/zh_TW.po'
--- po/widelands/zh_TW.po 2019-03-08 07:26:52 +0000
+++ po/widelands/zh_TW.po 2019-05-02 20:08:50 +0000
@@ -2483,7 +2483,7 @@
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:64
-msgid "List of games:"
+msgid "List of open games:"
msgstr ""
#: ../../src/ui_fsmenu/internet_lobby.cc:65
=== modified file 'src/network/internet_gaming.cc'
--- src/network/internet_gaming.cc 2019-05-01 20:17:37 +0000
+++ src/network/internet_gaming.cc 2019-05-02 20:08:50 +0000
@@ -486,7 +486,7 @@
InternetGame* ing = new InternetGame();
ing->name = packet.string();
ing->build_id = packet.string();
- ing->connectable = (packet.string() == INTERNET_GAME_SETUP);
+ ing->connectable = packet.string();
gamelist_.push_back(*ing);
bool found = false;
@@ -497,10 +497,11 @@
break;
}
}
- if (!found)
+ if (!found && ing->connectable != INTERNET_GAME_RUNNING){
format_and_add_chat(
- "", "", true,
- (boost::format(_("The game %s is now available")) % ing->name).str());
+ "", "", true,
+ (boost::format(_("The game %s is now available")) % ing->name).str());
+ }
delete ing;
ing = nullptr;
=== modified file 'src/network/internet_gaming.h'
--- src/network/internet_gaming.h 2019-02-23 11:00:49 +0000
+++ src/network/internet_gaming.h 2019-05-02 20:08:50 +0000
@@ -43,7 +43,7 @@
struct InternetGame {
std::string name;
std::string build_id;
- bool connectable;
+ std::string connectable;
};
/**
=== 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-02 20:08:50 +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:")),
servername_(this, get_w() * 17 / 25, get_h() * 63 / 100, _("Name of your server:")),
// Buttons
@@ -218,18 +218,20 @@
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) {
+ // 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
@@ -237,7 +239,6 @@
if (game.name == localservername) {
hostgame_.set_enabled(false);
}
- opengames_list_.add(game.name, game, pic, false, game.build_id);
}
}
}
@@ -332,10 +333,8 @@
void FullscreenMenuInternetLobby::server_selected() {
if (opengames_list_.has_selection()) {
const InternetGame* game = &opengames_list_.get_selected();
- if (game->connectable)
+ if (game->connectable == INTERNET_GAME_SETUP)
joingame_.set_enabled(true);
- else
- joingame_.set_enabled(false);
}
}
@@ -344,7 +343,7 @@
// if the game is open try to connect it, if not do nothing.
if (opengames_list_.has_selection()) {
const InternetGame* game = &opengames_list_.get_selected();
- if (game->connectable)
+ if (game->connectable == INTERNET_GAME_SETUP)
clicked_joingame();
}
}
Follow ups
-
[Merge] lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands
From: Toni Förster, 2019-05-12
-
Re: [Merge] lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands
From: Toni Förster, 2019-05-11
-
[Merge] lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands
From: Toni Förster, 2019-05-11
-
Re: [Merge] lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands
From: Toni Förster, 2019-05-11
-
Re: [Merge] lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands
From: GunChleoc, 2019-05-10
-
[Merge] lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands
From: bunnybot, 2019-05-09
-
Re: [Merge] lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands
From: Toni Förster, 2019-05-09
-
Re: [Merge] lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands
From: Toni Förster, 2019-05-09
-
Re: [Merge] lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands
From: GunChleoc, 2019-05-09
-
[Merge] lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands
From: bunnybot, 2019-05-07
-
[Merge] lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands
From: bunnybot, 2019-05-07
-
[Merge] lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands
From: Toni Förster, 2019-05-06
-
Re: [Merge] lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands
From: Toni Förster, 2019-05-06
-
Re: [Merge] lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands
From: GunChleoc, 2019-05-03
-
Re: [Merge] lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands
From: Toni Förster, 2019-05-03
-
Re: [Merge] lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands
From: GunChleoc, 2019-05-03
-
Re: [Merge] lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands
From: Toni Förster, 2019-05-03
-
Re: [Merge] lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands
From: Toni Förster, 2019-05-03
-
Re: [Merge] lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands
From: GunChleoc, 2019-05-03
-
Re: [Merge] lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands
From: Toni Förster, 2019-05-03
-
Re: [Merge] lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands
From: GunChleoc, 2019-05-03
-
Re: [Merge] lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands
From: Toni Förster, 2019-05-03
-
Re: [Merge] lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands
From: GunChleoc, 2019-05-03
-
[Merge] lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands
From: bunnybot, 2019-05-03
-
Re: [Merge] lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands
From: Toni Förster, 2019-05-03
-
Re: [Merge] lp:~widelands-dev/widelands/bug-1825932-open-games into lp:widelands
From: Toni Förster, 2019-05-02