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

Switch from (s) to plural form whenever possible in message log (#3487)

Browse source 
* Use plural form whenever possible

Change for "%1 draws %2 card(s)" is self explanatory

Change for "look top X" switches var %2 and %3 so i can skip %3 for singular and translate as "top card", as explained in tr comment

For "counter(s)" i just moved it into %3 (each color) since plural form is already used there.

* clangify

* manual clangify attempt

* Add missing tr

* More missing tr
This commit is contained in:
Caledor 2019-01-06 20:48:20 +01:00 committed by ctrlaltca
parent 84f6da103f
commit ce140041e3
3 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cockatrice/src/dlg_connect.cpp
View file

@ -273,15 +273,15 @@ void DlgConnect::newHostSelected(bool state)
previousHosts->setDisabled(true); previousHosts->setDisabled(true);
btnRefreshServers->setDisabled(true); btnRefreshServers->setDisabled(true);
hostEdit->clear(); hostEdit->clear();
hostEdit->setPlaceholderText("Server URL"); hostEdit->setPlaceholderText(tr("Server URL"));
hostEdit->setDisabled(false); hostEdit->setDisabled(false);
portEdit->clear(); portEdit->clear();
portEdit->setPlaceholderText("Communication Port"); portEdit->setPlaceholderText(tr("Communication Port"));
portEdit->setDisabled(false); portEdit->setDisabled(false);
playernameEdit->clear(); playernameEdit->clear();
passwordEdit->clear(); passwordEdit->clear();
saveEdit->clear(); saveEdit->clear();
saveEdit->setPlaceholderText("Unique Server Name"); saveEdit->setPlaceholderText(tr("Unique Server Name"));
saveEdit->setDisabled(false); saveEdit->setDisabled(false);
serverContactLabel->setText(""); serverContactLabel->setText("");
serverContactLink->setText(""); serverContactLink->setText("");

2
cockatrice/src/dlg_settings.cpp
View file

@ -649,7 +649,7 @@ MessagesSettingsPage::MessagesSettingsPage()
connect(&roomHistory, SIGNAL(stateChanged(int)), settingsCache, SLOT(setRoomHistory(int))); connect(&roomHistory, SIGNAL(stateChanged(int)), settingsCache, SLOT(setRoomHistory(int)));
customAlertString = new QLineEdit(); customAlertString = new QLineEdit();
customAlertString->setPlaceholderText("Word1 Word2 Word3"); customAlertString->setPlaceholderText(tr("Word1 Word2 Word3"));
customAlertString->setText(settingsCache->getHighlightWords()); customAlertString->setText(settingsCache->getHighlightWords());
connect(customAlertString, SIGNAL(textChanged(QString)), settingsCache, SLOT(setHighlightWords(QString))); connect(customAlertString, SIGNAL(textChanged(QString)), settingsCache, SLOT(setHighlightWords(QString)));

23
cockatrice/src/messagelogwidget.cpp
View file

@ -156,7 +156,7 @@ void MessageLogWidget::logAlwaysRevealTopCard(Player *player, CardZone *zone, bo
void MessageLogWidget::logAttachCard(Player *player, QString cardName, Player *targetPlayer, QString targetCardName) void MessageLogWidget::logAttachCard(Player *player, QString cardName, Player *targetPlayer, QString targetCardName)
{ {
appendHtmlServerMessage(QString("%1 attaches %2 to %3's %4.") appendHtmlServerMessage(tr("%1 attaches %2 to %3's %4.")
.arg(sanitizeHtml(player->getName())) .arg(sanitizeHtml(player->getName()))
.arg(cardLink(cardName)) .arg(cardLink(cardName))
.arg(sanitizeHtml(targetPlayer->getName())) .arg(sanitizeHtml(targetPlayer->getName()))
@ -341,7 +341,7 @@ void MessageLogWidget::logDrawCards(Player *player, int number)
mulliganPlayer = player; mulliganPlayer = player;
else { else {
soundEngine->playSound("draw_card"); soundEngine->playSound("draw_card");
appendHtmlServerMessage(tr("%1 draws %2 card(s).") appendHtmlServerMessage(tr("%1 draws %2 card(s).", "", number)
.arg(sanitizeHtml(player->getName())) .arg(sanitizeHtml(player->getName()))
.arg("<font color=\"blue\">" + QString::number(number) + "</font>")); .arg("<font color=\"blue\">" + QString::number(number) + "</font>"));
} }
@ -354,10 +354,11 @@ void MessageLogWidget::logDumpZone(Player *player, CardZone *zone, int numberCar
.arg(sanitizeHtml(player->getName())) .arg(sanitizeHtml(player->getName()))
.arg(zone->getTranslatedName(zone->getPlayer() == player, CaseLookAtZone))); .arg(zone->getTranslatedName(zone->getPlayer() == player, CaseLookAtZone)));
else else
appendHtmlServerMessage(tr("%1 is looking at the top %2 card(s) %3.") appendHtmlServerMessage(
.arg(sanitizeHtml(player->getName())) tr("%1 is looking at the top %3 card(s) %2.", "top card for singular, top %3 cards for plural", numberCards)
.arg("<font color=\"blue\">" + QString::number(numberCards) + "</font>") .arg(sanitizeHtml(player->getName()))
.arg(zone->getTranslatedName(zone->getPlayer() == player, CaseTopCardsOfZone))); .arg(zone->getTranslatedName(zone->getPlayer() == player, CaseTopCardsOfZone))
.arg("<font color=\"blue\">" + QString::number(numberCards) + "</font>"));
} }
void MessageLogWidget::logFlipCard(Player *player, QString cardName, bool faceDown) void MessageLogWidget::logFlipCard(Player *player, QString cardName, bool faceDown)
@ -626,20 +627,20 @@ void MessageLogWidget::logSetCardCounter(Player *player, QString cardName, int c
QString finalStr; QString finalStr;
int delta = abs(oldValue - value); int delta = abs(oldValue - value);
if (value > oldValue) if (value > oldValue)
finalStr = tr("%1 places %2 %3 counter(s) on %4 (now %5)."); finalStr = tr("%1 places %2 %3 on %4 (now %5).");
else else
finalStr = tr("%1 removes %2 %3 counter(s) from %4 (now %5)."); finalStr = tr("%1 removes %2 %3 from %4 (now %5).");
QString colorStr; QString colorStr;
switch (counterId) { switch (counterId) {
case 0: case 0:
colorStr = tr("red", "", delta); colorStr = tr("red counter(s)", "", delta);
break; break;
case 1: case 1:
colorStr = tr("yellow", "", delta); colorStr = tr("yellow counter(s)", "", delta);
break; break;
case 2: case 2:
colorStr = tr("green", "", delta); colorStr = tr("green counter(s)", "", delta);
break; break;
default:; default:;
} }