aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

clearify wording (#4173)

Browse source
This commit is contained in:
tooomm 2020-11-23 18:24:49 +01:00 committed by GitHub
parent 51b24bb92c
commit 589fbcdcd5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
cockatrice/src/tab_server.cpp
View file

@ -112,7 +112,7 @@ void RoomSelector::processListRoomsEvent(const Event_ListRooms &event)
QString RoomSelector::getRoomPermissionDisplay(const ServerInfo_Room &room) QString RoomSelector::getRoomPermissionDisplay(const ServerInfo_Room &room)
{ {
/* /*
* A room can have a permission level and a privilege level. How ever we want to display only the necessary * A server room can have a permission level and a privilege level. How ever we want to display only the necessary
* information on the server tab needed to inform users of required permissions to enter a room. If the room has a * information on the server tab needed to inform users of required permissions to enter a room. If the room has a
* privilege level the server tab will display the privilege level in the "permissions" column in the row however if * privilege level the server tab will display the privilege level in the "permissions" column in the row however if
* the room contains a permissions level for the room the permissions level defined for the room will be displayed. * the room contains a permissions level for the room the permissions level defined for the room will be displayed.
@ -206,19 +206,23 @@ void TabServer::joinRoomFinished(const Response &r,
case Response::RespOk: case Response::RespOk:
break; break;
case Response::RespNameNotFound: case Response::RespNameNotFound:
QMessageBox::critical(this, tr("Error"), tr("Failed to join the room: it doesn't exist on the server.")); QMessageBox::critical(this, tr("Error"),
tr("Failed to join the server room: it doesn't exist on the server."));
return; return;
case Response::RespContextError: case Response::RespContextError:
QMessageBox::critical(this, tr("Error"), QMessageBox::critical(
tr("The server thinks you are in the room but your client is unable to display it. " this, tr("Error"),
"Try restarting your client.")); tr("The server thinks you are in the server room but your client is unable to display it. "
"Try restarting your client."));
return; return;
case Response::RespUserLevelTooLow: case Response::RespUserLevelTooLow:
QMessageBox::critical(this, tr("Error"), tr("You do not have the required permission to join this room.")); QMessageBox::critical(this, tr("Error"),
tr("You do not have the required permission to join this server room."));
return; return;
default: default:
QMessageBox::critical(this, tr("Error"), QMessageBox::critical(
tr("Failed to join the room due to an unknown error: %1.").arg(r.response_code())); this, tr("Error"),
tr("Failed to join the server room due to an unknown error: %1.").arg(r.response_code()));
return; return;
} }