diff options
author | Charles Pigott <charlespigott@googlemail.com> | 2021-10-18 09:43:14 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-18 09:43:14 +0100 |
commit | 53e17d07d24cf54a8aa4cdc81ece4122c61aaabd (patch) | |
tree | bbfb97f2b30945d09a5f27541b33b0b1fad9f164 /src/subsidy.cpp | |
parent | 5bcdf16dc5539ebc2afd58fc2a348d39d13d53fb (diff) | |
download | openttd-53e17d07d24cf54a8aa4cdc81ece4122c61aaabd.tar.xz |
Fix #9595: Always use plural forms of cargo for subsidy strings (#9619)
Diffstat (limited to 'src/subsidy.cpp')
-rw-r--r-- | src/subsidy.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/subsidy.cpp b/src/subsidy.cpp index 0b1c1a721..e8fc951c4 100644 --- a/src/subsidy.cpp +++ b/src/subsidy.cpp @@ -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: |