From bf77dd8a7f290ed8af02aa3e5cf4ba2437fa93d2 Mon Sep 17 00:00:00 2001 From: Laserlicht <13953785+Laserlicht@users.noreply.github.com> Date: Sun, 23 Feb 2025 19:28:58 +0100 Subject: [PATCH] fix incorrect help for lobby send message button --- Mods/vcmi/Content/config/chinese.json | 2 +- Mods/vcmi/Content/config/czech.json | 2 +- Mods/vcmi/Content/config/english.json | 4 +++- Mods/vcmi/Content/config/german.json | 4 +++- Mods/vcmi/Content/config/hungarian.json | 2 +- Mods/vcmi/Content/config/italian.json | 2 +- Mods/vcmi/Content/config/polish.json | 2 +- Mods/vcmi/Content/config/portuguese.json | 2 +- Mods/vcmi/Content/config/swedish.json | 2 +- Mods/vcmi/Content/config/ukrainian.json | 2 +- Mods/vcmi/Content/config/vietnamese.json | 2 +- client/globalLobby/GlobalLobbyServerSetup.cpp | 2 +- config/widgets/lobbyWindow.json | 4 ++-- 13 files changed, 18 insertions(+), 14 deletions(-) diff --git a/Mods/vcmi/Content/config/chinese.json b/Mods/vcmi/Content/config/chinese.json index c24eda09f..b1a7d5668 100644 --- a/Mods/vcmi/Content/config/chinese.json +++ b/Mods/vcmi/Content/config/chinese.json @@ -175,7 +175,7 @@ "vcmi.lobby.match.solo" : "单人游戏", "vcmi.lobby.match.duel" : "与 %s 的游戏", // %s -> nickname of another player "vcmi.lobby.match.multi" : "%d 个玩家", - "vcmi.lobby.room.create" : "创建房间", + "vcmi.lobby.room.create.hover" : "创建房间", "vcmi.lobby.room.players.limit" : "玩家限制", "vcmi.lobby.room.description.public" : "任何玩家都可以加入公开房间。", "vcmi.lobby.room.description.private" : "只有被邀请的玩家能加入私有房间。", diff --git a/Mods/vcmi/Content/config/czech.json b/Mods/vcmi/Content/config/czech.json index 4e09d1674..7066105f2 100644 --- a/Mods/vcmi/Content/config/czech.json +++ b/Mods/vcmi/Content/config/czech.json @@ -178,7 +178,7 @@ "vcmi.lobby.match.solo" : "Hra jednoho hráče", "vcmi.lobby.match.duel" : "Hra s %s", // %s -> nickname of another player "vcmi.lobby.match.multi" : "%d hráčů", - "vcmi.lobby.room.create" : "Vytvořit novou místnost", + "vcmi.lobby.room.create.hover" : "Vytvořit novou místnost", "vcmi.lobby.room.players.limit" : "Omezení počtu hráčů", "vcmi.lobby.room.description.public" : "Jakýkoliv hráč se může připojit do veřejné místnosti.", "vcmi.lobby.room.description.private" : "Pouze pozvaní hráči se mohou připojit do soukromé místnosti.", diff --git a/Mods/vcmi/Content/config/english.json b/Mods/vcmi/Content/config/english.json index bd5c25f54..7fb3b0083 100644 --- a/Mods/vcmi/Content/config/english.json +++ b/Mods/vcmi/Content/config/english.json @@ -178,7 +178,7 @@ "vcmi.lobby.match.solo" : "Singleplayer Game", "vcmi.lobby.match.duel" : "Game with %s", // %s -> nickname of another player "vcmi.lobby.match.multi" : "%d players", - "vcmi.lobby.room.create" : "Create New Room", + "vcmi.lobby.room.create.hover" : "Create New Room", "vcmi.lobby.room.create.help" : "Create a new room in the online lobby that other players can join.", "vcmi.lobby.room.players.limit" : "Players Limit", "vcmi.lobby.room.description.public" : "Any player can join public room.", @@ -202,6 +202,8 @@ "vcmi.lobby.preview.error.mods" : "You are using different set of mods.", "vcmi.lobby.preview.error.version" : "You are using different version of VCMI.", "vcmi.lobby.channel.add" : "Add Channel", + "vcmi.lobby.channel.sendMessage.hover" : "Send message", + "vcmi.lobby.channel.sendMessage.help" : "Send message", "vcmi.lobby.room.new" : "New Game", "vcmi.lobby.room.load" : "Load Game", "vcmi.lobby.room.type" : "Room Type", diff --git a/Mods/vcmi/Content/config/german.json b/Mods/vcmi/Content/config/german.json index 78a34f224..53db01f5c 100644 --- a/Mods/vcmi/Content/config/german.json +++ b/Mods/vcmi/Content/config/german.json @@ -178,7 +178,7 @@ "vcmi.lobby.match.solo" : "Einzelspieler-Spiel", "vcmi.lobby.match.duel" : "Spiel mit %s", // %s -> nickname of another player "vcmi.lobby.match.multi" : "%d Spieler", - "vcmi.lobby.room.create" : "Neuen Spiel-Raum erstellen", + "vcmi.lobby.room.create.hover" : "Neuen Spiel-Raum erstellen", "vcmi.lobby.room.create.help" : "Erstelle einen neuen Raum in der Online-Lobby, dem andere Spieler beitreten können.", "vcmi.lobby.room.players.limit" : "Spieler Limit", "vcmi.lobby.room.description.public" : "Jeder Spieler kann dem öffentlichen Raum beitreten.", @@ -202,6 +202,8 @@ "vcmi.lobby.preview.error.mods" : "Ihr verwendet andere Mods.", "vcmi.lobby.preview.error.version" : "Ihr verwendet eine andere Version von VCMI.", "vcmi.lobby.channel.add" : "Kanal hinzufügen", + "vcmi.lobby.channel.sendMessage.hover" : "Nachricht senden", + "vcmi.lobby.channel.sendMessage.help" : "Nachricht senden", "vcmi.lobby.room.new" : "Neues Spiel", "vcmi.lobby.room.load" : "Spiel laden", "vcmi.lobby.room.type" : "Raumtyp", diff --git a/Mods/vcmi/Content/config/hungarian.json b/Mods/vcmi/Content/config/hungarian.json index 602f0f58a..7eb76dd12 100644 --- a/Mods/vcmi/Content/config/hungarian.json +++ b/Mods/vcmi/Content/config/hungarian.json @@ -175,7 +175,7 @@ "vcmi.lobby.match.solo" : "Egyszemélyes játék", "vcmi.lobby.match.duel" : "Játék %s-szel", // %s -> nickname of another player "vcmi.lobby.match.multi" : "%d játékos", - "vcmi.lobby.room.create" : "Új szoba létrehozása", + "vcmi.lobby.room.create.hover" : "Új szoba létrehozása", "vcmi.lobby.room.players.limit" : "Játékosok száma", "vcmi.lobby.room.description.public" : "Bárki csatlakozhat a nyilvános szobához.", "vcmi.lobby.room.description.private" : "Csak meghívott játékosok csatlakozhatnak a privát szobához.", diff --git a/Mods/vcmi/Content/config/italian.json b/Mods/vcmi/Content/config/italian.json index 9d83a4f3e..94ba45ea4 100644 --- a/Mods/vcmi/Content/config/italian.json +++ b/Mods/vcmi/Content/config/italian.json @@ -177,7 +177,7 @@ "vcmi.lobby.match.solo" : "Partita in singolo", "vcmi.lobby.match.duel" : "Partita con %s", // %s -> nickname of another player "vcmi.lobby.match.multi" : "%d giocatori", - "vcmi.lobby.room.create" : "Crea nuova stanza", + "vcmi.lobby.room.create.hover" : "Crea nuova stanza", "vcmi.lobby.room.players.limit" : "Limite giocatori", "vcmi.lobby.room.description.public" : "Qualsiasi giocatore può entrare in una stanza pubblica.", "vcmi.lobby.room.description.private" : "Solo i giocatori invitati possono entrare in una stanza privata.", diff --git a/Mods/vcmi/Content/config/polish.json b/Mods/vcmi/Content/config/polish.json index 175dc5b5e..0f3863986 100644 --- a/Mods/vcmi/Content/config/polish.json +++ b/Mods/vcmi/Content/config/polish.json @@ -171,7 +171,7 @@ "vcmi.lobby.match.solo" : "Gra jednoosobowa", "vcmi.lobby.match.duel" : "vs. %s", // %s -> nickname of another player "vcmi.lobby.match.multi" : "%d graczy", - "vcmi.lobby.room.create" : "Stwórz nowy pokój", + "vcmi.lobby.room.create.hover" : "Stwórz nowy pokój", "vcmi.lobby.room.players.limit" : "Limit graczy", "vcmi.lobby.room.description.public" : "Każdy może dołączyć do pokoju.", "vcmi.lobby.room.description.private" : "Tylko zaproszeni gracze mogą dołączyć do pokoju.", diff --git a/Mods/vcmi/Content/config/portuguese.json b/Mods/vcmi/Content/config/portuguese.json index e7a66a469..82a927f6a 100644 --- a/Mods/vcmi/Content/config/portuguese.json +++ b/Mods/vcmi/Content/config/portuguese.json @@ -175,7 +175,7 @@ "vcmi.lobby.match.solo" : "Jogo para um Jogador", "vcmi.lobby.match.duel" : "Jogo com %s", // %s -> apelido de outro jogador "vcmi.lobby.match.multi" : "%d jogadores", - "vcmi.lobby.room.create" : "Criar Nova Sala", + "vcmi.lobby.room.create.hover" : "Criar Nova Sala", "vcmi.lobby.room.players.limit" : "Limite de Jogadores", "vcmi.lobby.room.description.public" : "Qualquer jogador pode entrar na sala pública.", "vcmi.lobby.room.description.private" : "Apenas jogadores convidados podem entrar na sala privada.", diff --git a/Mods/vcmi/Content/config/swedish.json b/Mods/vcmi/Content/config/swedish.json index 00d92f1c0..53c2c36f1 100644 --- a/Mods/vcmi/Content/config/swedish.json +++ b/Mods/vcmi/Content/config/swedish.json @@ -178,7 +178,7 @@ "vcmi.lobby.match.solo" : "Spel för en spelare", "vcmi.lobby.match.duel" : "Spel med %s", // %s -> smeknamn på en annan spelare "vcmi.lobby.match.multi" : "%d spelare", - "vcmi.lobby.room.create" : "Skapa nytt rum", + "vcmi.lobby.room.create.hover" : "Skapa nytt rum", "vcmi.lobby.room.players.limit" : "Begränsning av spelare", "vcmi.lobby.room.description.public" : "Alla spelare kan gå med i det offentliga rummet.", "vcmi.lobby.room.description.private": "Endast inbjudna spelare kan gå med i ett privat rum.", diff --git a/Mods/vcmi/Content/config/ukrainian.json b/Mods/vcmi/Content/config/ukrainian.json index f8063cd9a..2c1fd6141 100644 --- a/Mods/vcmi/Content/config/ukrainian.json +++ b/Mods/vcmi/Content/config/ukrainian.json @@ -178,7 +178,7 @@ "vcmi.lobby.match.solo" : "Одиночна гра", "vcmi.lobby.match.duel" : "Гра з %s", // %s -> nickname of another player "vcmi.lobby.match.multi" : "%d гравців", - "vcmi.lobby.room.create" : "Створити нову кімнату", + "vcmi.lobby.room.create.hover" : "Створити нову кімнату", "vcmi.lobby.room.players.limit" : "Максимум гравців", "vcmi.lobby.room.description.public" : "Будь-хто з гравців може приєднатися до публічної кімнати.", "vcmi.lobby.room.description.private" : "Тільки запрошені гравці можуть приєднатися до приватної кімнати.", diff --git a/Mods/vcmi/Content/config/vietnamese.json b/Mods/vcmi/Content/config/vietnamese.json index 81906edb0..3e976ce33 100644 --- a/Mods/vcmi/Content/config/vietnamese.json +++ b/Mods/vcmi/Content/config/vietnamese.json @@ -175,7 +175,7 @@ "vcmi.lobby.match.solo" : "Chơi Đơn", "vcmi.lobby.match.duel" : "Chơi với %s", // %s -> nickname of another player "vcmi.lobby.match.multi" : "người chơi %d", - "vcmi.lobby.room.create" : "Tạo Phòng Mới", + "vcmi.lobby.room.create.hover" : "Tạo Phòng Mới", "vcmi.lobby.room.players.limit" : "Số Người Chơi", "vcmi.lobby.room.description.public" : "Người chơi có thể vào phòng công khai.", "vcmi.lobby.room.description.private" : "Người chơi được mời mới có thể vào phòng riêng tư.", diff --git a/client/globalLobby/GlobalLobbyServerSetup.cpp b/client/globalLobby/GlobalLobbyServerSetup.cpp index baf647af2..566fb1d97 100644 --- a/client/globalLobby/GlobalLobbyServerSetup.cpp +++ b/client/globalLobby/GlobalLobbyServerSetup.cpp @@ -35,7 +35,7 @@ GlobalLobbyServerSetup::GlobalLobbyServerSetup() pos.h = 340; filledBackground = std::make_shared(Rect(0, 0, pos.w, pos.h)); - labelTitle = std::make_shared( pos.w / 2, 20, FONT_BIG, ETextAlignment::CENTER, Colors::YELLOW, CGI->generaltexth->translate("vcmi.lobby.room.create")); + labelTitle = std::make_shared( pos.w / 2, 20, FONT_BIG, ETextAlignment::CENTER, Colors::YELLOW, CGI->generaltexth->translate("vcmi.lobby.room.create.hover")); labelPlayerLimit = std::make_shared( pos.w / 2, 48, FONT_MEDIUM, ETextAlignment::CENTER, Colors::YELLOW, CGI->generaltexth->translate("vcmi.lobby.room.players.limit")); labelRoomType = std::make_shared( pos.w / 2, 108, FONT_MEDIUM, ETextAlignment::CENTER, Colors::YELLOW, CGI->generaltexth->translate("vcmi.lobby.room.type")); labelGameMode = std::make_shared( pos.w / 2, 158, FONT_MEDIUM, ETextAlignment::CENTER, Colors::YELLOW, CGI->generaltexth->translate("vcmi.lobby.room.mode")); diff --git a/config/widgets/lobbyWindow.json b/config/widgets/lobbyWindow.json index 6c95bc732..d3a829fc0 100644 --- a/config/widgets/lobbyWindow.json +++ b/config/widgets/lobbyWindow.json @@ -178,7 +178,7 @@ "type": "button", "position": {"x": 610, "y": 565}, "image": "lobbySendMessage", - "help": "core.help.288", + "help": "vcmi.lobby.channel.sendMessage", "callback": "sendMessage", "hotkey": "globalAccept", "items": @@ -203,7 +203,7 @@ "font": "medium", "alignment": "center", "color": "yellow", - "text": "vcmi.lobby.room.create" + "text": "vcmi.lobby.room.create.hover" } ] },