Fix: Missing word in conditional order comparator

[krysclarke]

Fix: Grammatical corrections.

Motivation / Problem

When I was creating some conditional orders with OTTD 13.4 as packaged in Debian Sid, I noted that in the EN_AU translation two of the options were grammatically incorrect:

• is less or equal to
• is greater or equal to

Description

This error was propagated from the EN_GB base text, so this PR corrects the EN_GB strings to:

• is less than or equal to
• is greater than or equal to

Limitations

None known.

[krysclarke]

Which is the 'first line of message' that must match the syntax?
Error: *** First line of message must match: '<keyword>( #<issue>| <commit>(, (<keyword> #<issue>|<commit>))*)?: ([<section])? <Details>'

Yes, I've done a couple of PR's before but I also seemed to have to re-do them a couple of times before I get all the right bits in the right places.

[PeterN]

Which is the 'first line of message' that must match the syntax? Error: *** First line of message must match: '<keyword>( #<issue>| <commit>(, (<keyword> #<issue>|<commit>))*)?: ([<section])? <Details>'

Yes, I've done a couple of PR's before but I also seemed to have to re-do them a couple of times before I get all the right bits in the right places.

It's the commit message itself.

[krysclarke]

Which is the 'first line of message' that must match the syntax? Error: *** First line of message must match: '<keyword>( #<issue>| <commit>(, (<keyword> #<issue>|<commit>))*)?: ([<section])? <Details>'
Yes, I've done a couple of PR's before but I also seemed to have to re-do them a couple of times before I get all the right bits in the right places.

It's the commit message itself.

Which bit is that exactly??? Would it be the "Update english.txt" or "Grammatical corrections" bit of the commit ?
And how do I fix my commit to meet the syntax requirements? Do I have to undo the commit, re-do the edits and possibly close this PR and raise a new one?

[2TallTyler]

The full commit message, in my opinion, should be Fix: Missing word in conditional order comparator. That succinctly explains what you're fixing.

You can edit your commit message by amending your last commit (git commit --amend -m "Fix: Missing word in conditional order comparator") and then force-pushing to update the PR (git push -f).

Oh, and you can rename the PR title to match the commit message, although this isn't required for the checks to pass - just an easy way for us to see what's going on. A missing word isn't really a grammar problem. 😉

[krysclarke]

The full commit message, in my opinion, should be Fix: Missing word in conditional order comparator. That succinctly explains what you're fixing.

You can edit your commit message by amending your last commit (git commit --amend -m "Fix: Missing word in conditional order comparator") and then force-pushing to update the PR (git push -f).

Oh, and you can rename the PR title to match the commit message, although this isn't required for the checks to pass - just an easy way for us to see what's going on. A missing word isn't really a grammar problem. 😉

I can't find a way, through Github, to issue those commands (and I don't think I'm missing something obvious). I figured as it was such a small change, that I'd make the changes in my fork through the Github webpage, but now it's proving to be more of a hassle.

[2TallTyler]

Yeah, you'll need to install git and use the command line tool for these commands. There are instructions to clone a copy of OpenTTD to your computer in CONTRIBUTING. I strongly suggest you follow the instructions to make a new branch instead of trying to commit to your master and then PR from there.