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

Condense duplicate strings #5771

Draft
wants to merge 8 commits into
base: upcoming
Choose a base branch
from

Conversation

Bassoonian
Copy link
Collaborator

This PR removes all duplicate strings to allow for easier editing on a larger scale, as well for an easier overview on what is actually being displayed.

As a proof of concept, I have only removed the duplicate empty strings (if not aligned to make sure compatibility is preserved). I have a python script locally (will add it to the final repo) that informs me of many other duplicates. Please let me know if this work is satisfactory or if we should not be bothering with this.

Things to note in the release changelog:

Discord contact info

bassoonian

@@ -132,7 +132,7 @@ static void ContestEffect_UserLessEasilyStartled(void)
SetContestantEffectStringID(eContestAppealResults.contestant,CONTEST_STRING_STOPPED_CARING);
}

// Slightly startles the POK�MON in front.
// Slightly startles the POKéMON in front.

Choose a reason for hiding this comment

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

Looks like the script has messed up és.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Are they messed up for you? I changes them because they were originally incompatible with python’s regex and showing up as invalid characters in VSCode. They show up as é just fine on GitHub on my end, too.

Copy link
Collaborator

Choose a reason for hiding this comment

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

They look like this to me:
image

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Weird, it looks like that on GitHub to me too (at least on my computer, on my phone it looks fine). The diff locally in VSCode (and GitHub Desktop, for reference) looks like I fixed it, if anything:
image

It's weird how this file is the only case where é seems to pose any trouble at all, and I'm not sure why

Choose a reason for hiding this comment

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

It's probably bad system defaults and mixed character encodings crawling in from somewhere.

Edu's screenshot shows an UTF-8 é decoded in ANSI. Python's regexp works in UTF-8, so it's likely that this file ended up with a mixed encoding which throws off autodetection.

A future-proof solution would be to apply encoding=utf-8 to all source files' .gitattributes and review/fix the ANSI remnants within a single run.

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

Successfully merging this pull request may close these issues.

5 participants