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

Lots of typo fixes #359

Closed
wants to merge 46 commits into from
Closed

Conversation

TheGiraffe3
Copy link
Contributor

@TheGiraffe3 TheGiraffe3 commented Sep 14, 2024

You might want to squash and merge.

Automated processes found most of these errors.

AUTHORS Show resolved Hide resolved
Copy link
Member

@blast007 blast007 left a comment

Choose a reason for hiding this comment

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

Most of this seems fine. The AUTHORS file needs the encoding fixed so it doesn't break names.

For any msgid changes in the data/l10n/ files, you'd want to sure that the strings in the game code are changed as well. For instance, you changed "recieved" to "received", but src/bzadmin/ServerLink.cxx and src/bzflag/ServerLink.cxx still have "bytes recieved".

I'm not sure if we should care about fixing typos shtool since it is a third-party file and it isn't one that anyone every looks at anyway.

I'd need to check a bit more if we can just get rid of misc/libtool.m4.

AUTHORS Outdated Show resolved Hide resolved
autogen.sh Outdated Show resolved Hide resolved
autogen.sh Outdated Show resolved Hide resolved
@@ -196,7 +196,7 @@ int main(int argc, char *argv[])
echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
[ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means SDL was incorrectly installed"
echo "*** exact error that occurred. This usually means SDL was incorrectly installed"
Copy link
Member

Choose a reason for hiding this comment

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

This typo is from upstream SDL repository that we pulled this file from. Fixing it upstream would be better, and then we can fix it here by pulling it from upstream.

https://github.com/libsdl-org/SDL/blob/SDL2/sdl2.m4

Copy link
Contributor Author

@TheGiraffe3 TheGiraffe3 Sep 15, 2024

Choose a reason for hiding this comment

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

Changes suggested and merged. I'm not sure how to pull from upstream, so should I just leave it like this?

misc/libtool.m4 Outdated Show resolved Hide resolved
@@ -267,7 +267,7 @@ eval `echo h.$opt_spec |\
eval `echo h:help,$opt_alias |\
sed -e 's/-/_/g' -e 's/\([a-zA-Z0-9]\):\([^,]*\),*/opt_ALIAS_\2=\1;/g'`

# interate over argument line
# iterate over argument line
Copy link
Member

Choose a reason for hiding this comment

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

This is a generated file from an upstream project called GNU shtool. We're using an older version, but the latest release still has these typos. Given that the newest release is from 2008, I don't imagine this will get fixed upstream.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

So would you like it to be fixed here or stay consistent with the other release?

data/l10n/bzflag_sv.po Show resolved Hide resolved
Copy link
Contributor Author

@TheGiraffe3 TheGiraffe3 left a comment

Choose a reason for hiding this comment

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

Not sure what happened here.

include/Obstacle.h Outdated Show resolved Hide resolved
include/Obstacle.h Outdated Show resolved Hide resolved
@blast007 blast007 added this to the 2.4.28 milestone Sep 22, 2024
@TheGiraffe3

This comment was marked as outdated.

@TheGiraffe3
Copy link
Contributor Author

TheGiraffe3 commented Sep 23, 2024

Will reopen as a new PR later.

EDIT: #362.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants