0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve comments for translators around VNGETTEXT

Browse source 
I tried to use the Wiki docs, and found the Wiki docs were outdated compared to
our codebase, which prompted this code review.

(cherry picked from commit 59df683484)
This commit is contained in:
Steve Cotton 2021-12-23 15:28:01 +01:00
parent b574f76f3d
commit 167e7874d5
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/actions/move.cpp
View file

@ -1123,17 +1123,22 @@ namespace { // Private helpers for move_unit()
std::string message;
color_t msg_color;
if ( friend_count_ != 0 && enemy_count_ != 0 ) {
// Both friends and enemies sighted -- neutral message.
// TRANSLATORS: This becomes the "friendphrase" in "Units sighted! ($friendphrase, $enemyphrase)"
symbols["friendphrase"] = VNGETTEXT("Part of 'Units sighted! (...)' sentence^1 friendly", "$friends friendly", friend_count_, symbols);
// TRANSLATORS: This becomes the "enemyphrase" in "Units sighted! ($friendphrase, $enemyphrase)"
symbols["enemyphrase"] = VNGETTEXT("Part of 'Units sighted! (...)' sentence^1 enemy", "$enemies enemy", enemy_count_, symbols);
// TRANSLATORS: Both friends and enemies sighted -- neutral message.
// This is shown when a move is interrupted because units were revealed from the fog of war.
message = VGETTEXT("Units sighted! ($friendphrase, $enemyphrase)", symbols);
msg_color = font::NORMAL_COLOR;
} else if ( enemy_count_ != 0 ) {
// Only enemies sighted -- bad message.
// TRANSLATORS: Only enemies sighted -- bad message.
// This is shown when a move is interrupted because units were revealed from the fog of war.
message = VNGETTEXT("Enemy unit sighted!", "$enemies enemy units sighted!", enemy_count_, symbols);
msg_color = font::BAD_COLOR;
} else if ( friend_count_ != 0 ) {
// Only friends sighted -- good message.
// TRANSLATORS: Only friends sighted -- good message.
// This is shown when a move is interrupted because units were revealed from the fog of war.
message = VNGETTEXT("Friendly unit sighted", "$friends friendly units sighted", friend_count_, symbols);
msg_color = font::GOOD_COLOR;
}

3
src/gui/widgets/multimenu_button.cpp
View file

@ -174,6 +174,9 @@ void multimenu_button::update_label()
if(selected.size() > max_shown_) {
const unsigned excess = selected.size() - max_shown_;
selected.resize(max_shown_ + 1);
// TRANSLATORS: In a drop-down menu that's a list of toggle-boxes, this becomes part
// of the text on the button when many of the boxes are selected. The text becomes
// "x, y and 1 other", "x, y and 2 others", etc.
selected.back() = VNGETTEXT("multimenu^$excess other", "$excess others", excess, {{"excess", std::to_string(excess)}});
}
set_label(utils::format_conjunct_list(_("multimenu^None Selected"), selected));