petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

Fix #9595: Always use plural forms of cargo for subsidy strings (#9619)

Browse Source
This commit is contained in:
Charles Pigott
2021-10-18 09:43:14 +01:00
committed by GitHub
parent 5bcdf16dc5
commit 53e17d07d2
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/subsidy.cpp
View File

@@ -74,13 +74,9 @@ std::pair<NewsReferenceType, NewsReferenceType> SetupSubsidyDecodeParam(const Su
NewsReferenceType reftype1 = NR_NONE;
NewsReferenceType reftype2 = NR_NONE;
/* Choose whether to use the singular or plural form of the cargo name based on how we're printing the subsidy */
/* Always use the plural form of the cargo name - trying to decide between plural or singular causes issues for translations */
const CargoSpec *cs = CargoSpec::Get(s->cargo_type);
if (mode == SubsidyDecodeParamType::Gui || mode == SubsidyDecodeParamType::NewsWithdrawn) {
SetDParam(parameter_offset, cs->name);
} else {
SetDParam(parameter_offset, cs->name_single);
}
SetDParam(parameter_offset, cs->name);
switch (s->src_type) {
case ST_INDUSTRY: