Skip to content

Codechange: Spell 'Viewport' consistently#8260

Merged
LordAro merged 1 commit intoOpenTTD:masterfrom
techgeeknz:master_viewport_rename
Jul 27, 2020
Merged

Codechange: Spell 'Viewport' consistently#8260
LordAro merged 1 commit intoOpenTTD:masterfrom
techgeeknz:master_viewport_rename

Conversation

@techgeeknz
Copy link
Copy Markdown
Contributor

@techgeeknz techgeeknz commented Jul 2, 2020

Some places in the codebase misspell 'Viewport' as 'ViewPort' or 'view_port'.
This patch makes everything consistent.

There are several strings that are named VIEW_PORT and/or VIEWPORT. I have left these alone because I do not know what will break.

@LordAro
Copy link
Copy Markdown
Member

LordAro commented Jul 2, 2020

Nothing will break as far as I know, go ahead and do the strings as well :)
(Though take care of the alignment)

@techgeeknz
Copy link
Copy Markdown
Contributor Author

techgeeknz commented Jul 2, 2020

Nothing will break as far as I know, go ahead and do the strings as well :)
(Though take care of the alignment)

It won't break the translation/localisation system?

@LordAro
Copy link
Copy Markdown
Member

LordAro commented Jul 2, 2020

Nah.

Probably.

@glx22
Copy link
Copy Markdown
Contributor

glx22 commented Jul 2, 2020 •
edited
Loading

Translations should be safe if everything match. The translation system always reads the updated strings.
Oh and usually we change english.txt in the main commit, then update all other language in a second one.

@techgeeknz
Copy link
Copy Markdown
Contributor Author

techgeeknz commented Jul 3, 2020

Translations should be safe if everything match. The translation system always reads the updated strings.
Oh and usually we change english.txt in the main commit, then update all other language in a second one.

I thought that only applied to translations? What we are proposing here is to change the symbolic identifiers; things would break horribly if they weren't consistent all the way through, yeah?

@techgeeknz techgeeknz force-pushed the master_viewport_rename branch from 17eead3 to 6dcde46 Compare July 3, 2020 03:53
techgeeknz
techgeeknz commented Jul 3, 2020
View reviewed changes
techgeeknz
techgeeknz commented Jul 3, 2020
View reviewed changes
@techgeeknz techgeeknz force-pushed the master_viewport_rename branch from 6dcde46 to bea33f1 Compare July 3, 2020 04:17
LordAro
LordAro previously approved these changes Jul 3, 2020
View reviewed changes
@techgeeknz techgeeknz force-pushed the master_viewport_rename branch from bea33f1 to 96937df Compare July 3, 2020 07:51
@techgeeknz
Copy link
Copy Markdown
Contributor Author

techgeeknz commented Jul 3, 2020

Oops, didn‘t need to rebase this one. Sorry about that. (I wonder if I can undo it? 🤔)

@techgeeknz techgeeknz force-pushed the master_viewport_rename branch from 96937df to bea33f1 Compare July 3, 2020 08:01
@LordAro
Copy link
Copy Markdown
Member

LordAro commented Jul 3, 2020

Only by (effectively) rebasing again. Why would you want to anyway?

@techgeeknz
Copy link
Copy Markdown
Contributor Author

techgeeknz commented Jul 3, 2020

Only by (effectively) rebasing again. Why would you want to anyway?

Habit, I guess. Most of my PRs seem to end up conflicting with each other one way or another.
Either that, or I may have used it as a base for the GUI refactoring commits and wanted Github to show me a nice, pretty HTML5 diff against master + this.

@techgeeknz
Copy link
Copy Markdown
Contributor Author

techgeeknz commented Jul 7, 2020 •
edited
Loading

Presumably, we are waiting for a rebase upon #8192 before continuing here?

Edit: I have reverted the changes to WC_EXTRA_VIEW_PORT and put these into #8267

@techgeeknz techgeeknz force-pushed the master_viewport_rename branch from bea33f1 to b823268 Compare July 7, 2020 08:42
@techgeeknz techgeeknz mentioned this pull request Jul 7, 2020
Closed
LordAro
LordAro previously approved these changes Jul 10, 2020
View reviewed changes
Copy link
Copy Markdown
Member

@LordAro LordAro left a comment

Choose a reason for hiding this comment

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

Not especially waiting on anything

glx22
glx22 requested changes Jul 16, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@glx22 glx22 left a comment

Choose a reason for hiding this comment

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

You can include the changes from #8267, as #8192 is merged.

@techgeeknz techgeeknz force-pushed the master_viewport_rename branch from b823268 to f2ba109 Compare July 19, 2020 05:52
techgeeknz
techgeeknz commented Jul 19, 2020
View reviewed changes
@techgeeknz
Codechange: Spell 'Viewport' consistently
69fdaa5 
Some places in the codebase misspell 'Viewport' as 'ViewPort' or 'view_port'.
This patch makes everything consistent.
@techgeeknz techgeeknz force-pushed the master_viewport_rename branch from f2ba109 to 69fdaa5 Compare July 19, 2020 07:18
@techgeeknz techgeeknz requested a review from glx22 July 19, 2020 07:38
@techgeeknz techgeeknz mentioned this pull request Jul 21, 2020
Closed
@techgeeknz techgeeknz requested a review from nielsmh July 22, 2020 05:49
@techgeeknz techgeeknz requested a review from LordAro July 22, 2020 05:49
@LordAro LordAro merged commit a10013d into OpenTTD:master Jul 27, 2020
@techgeeknz techgeeknz deleted the master_viewport_rename branch July 28, 2020 19:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@glx22 glx22 glx22 approved these changes

@LordAro LordAro LordAro approved these changes

@nielsmh nielsmh Awaiting requested review from nielsmh

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@techgeeknz @LordAro @glx22 @nielsmh