Navigation Menu

Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from Oct 18, 2021

Conversation

LordAro
Copy link
Member

@LordAro LordAro commented Oct 17, 2021

Motivation / Problem

Subsidy strings use a hardcoded singular/plural form of cargo names, depending on the string. For some languages this is the wrong one and cannot be changed.

Description

Make subsidy strings always use the plural form of cargo names. Reword english strings to match (remove 'service')

Limitations

Invalidates all existing translations. Might cause the reverse problem for some languages

Checklist for review

Some things are not automated, and forgotten often. This list is a reminder for the reviewers.

  • The bug fix is important enough to be backported? (label: 'backport requested')
  • This PR touches english.txt or translations? Check the guidelines
  • This PR affects the save game format? (label 'savegame upgrade')
  • This PR affects the GS/AI API? (label 'needs review: Script API')
    • ai_changelog.hpp, gs_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')

} else {
SetDParam(parameter_offset, cs->name_single);
}
SetDParam(parameter_offset, cs->name);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this mean name_single can be removed completely?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably? It's not used anywhere else. Might make reintroducing it at some point in the future difficult though

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But by the logic of this PR, it will always be a problem for translations?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would guess that depends on the string, but likely, yes

Copy link
Member

@TrueBrain TrueBrain left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have no clue if this is a good idea or not; but I do like you fix a bug. So YOLO?

(we can keep the name_single for now .. who knows)

@LordAro LordAro added the backport requested This PR should be backport to current release (RC / stable) label Oct 18, 2021
@LordAro LordAro merged commit 53e17d0 into OpenTTD:master Oct 18, 2021
@LordAro LordAro deleted the bug9595 branch October 18, 2021 08:43
TrueBrain pushed a commit to TrueBrain/OpenTTD that referenced this pull request Oct 23, 2021
@TrueBrain TrueBrain added backported This PR is backported to a current release (RC / stable) and removed backport requested This PR should be backport to current release (RC / stable) labels Oct 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backported This PR is backported to a current release (RC / stable)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants