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 some Britishisms in the JSON files. #76981

Merged
merged 2 commits into from
Oct 12, 2024

Conversation

FeepingCreature
Copy link
Contributor

@FeepingCreature FeepingCreature commented Oct 11, 2024

Summary

Bugfixes "Fix Britishisms in the JSON files."

Purpose of change

In penance for being a bit annoying on the IRC, somebody requested that I do a review for britishisms.

Describe the solution

Instead of reviewing thousands of lines manually, I got AI Claude 3.5 Sonnet to make me a tool that basically just scans through all given files word-by-word and flags (and, if requested, substitutes) words that are in the British (en_UK) but not American (en_US)system dictionary.

Describe alternatives you've considered

Testing

Afterwards I did a manual review using git diff --word-diff=color, and consulted Merriam-Webster where unsure. Unless I've missed something, all words replaced at least list as "less common" on https://www.merriam-webster.com/ .

Additional context

Should I do src too? It's a bit riskier cause of autoserialization.

Also, should "arse" be dropped from the list of generic insults?

edit: An "id" change crept past me. I've grepped the diff; no "id" changes aside from that one.

@github-actions github-actions bot added NPC / Factions NPCs, AI, Speech, Factions, Ownership [JSON] Changes (can be) made in JSON Missions Quests and missions Map / Mapgen Overmap, Mapgen, Map extras, Map display Items: Food / Vitamins Comestibles and drinks Spawn Creatures, items, vehicles, locations appearing on map Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies Monsters Monsters both friendly and unfriendly. Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Melee Melee weapons, tactics, techniques, reach attack Scenarios New Scenarios, balancing, bugs with scenarios Items: Containers Things that hold other things Items: Armor / Clothing Armor and clothing <Bugfix> This is a fix for a bug (or closes open issue) astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Oct 12, 2024
@Maleclypse
Copy link
Member

This comes up on occasion, please only fix player visible British spellings. Anything with // or in other comment methods is to stay as is.

@FeepingCreature
Copy link
Contributor Author

Aight, should be fixed.

Copy link
Contributor

Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details.

Click to expand
  • *turns to look at you, lifting an enormous cowboy hat off his eyes. He appears to be in the process of growing out a set of bushy muttonchops and a handlebar mustache. Bright blue eyes peer out from his wrinkled face. "Howdy, pardner. They call me Clemens. John Clemens. I'm an ol' cowhand."
  • A strange gray fruit is placed on a pedestal, like a relic would be placed on a stand for others to admire. Clearly, it isn't anything originating from this world, and the vein-like tendrils along its skin only convince you of that even more. A piece of plastic crudely paperclipped to the back has been used to carve out the message "I'm sorry I'm sorry Im sorr'm soryI'm sorrm sorrsorr" in increasingly illegible handwriting. It gives off the faint smell of mold.
  • Cyanoacrylate, more commonly known as superglue, is a strong, quick curing glue with many applications. It was a favorite of many post-Cataclysm hobbyists, but has become a sought-after trade good due to its wide applications, and the fact it has become essentially impossible to manufacture.
  • Manufactured in Turkey, this work of Farncolin Arms uses an AR-12 shotgun platform to let the user comfortably hold it like a rifle and utilize MKA 1919 magazines of different sizes.
  • Not related to the Soviet weapon designer, Tokarev, this Turkish shotgun uses an AR-12 shotgun platform to make the user comfortably hold it like a rifle and to utilize MKA 1919 magazines of different sizes.

This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to tools/spell_checker/dictionary.txt so they will not trigger an alert next time.

Hints for adding a new word to the dictionary
  • If the word is normally in all lowercase, such as the noun word or the verb does, add it in its lower-case form; if the word is a proper noun, such as the surname George, add it in its initial-caps form; if the word is an acronym or has special letter case, such as the acronym CDDA or the unit mW, add it by preserving the case of all the letters. A word in the dictionary will also match its initial-caps form (if the word is in all lowercase) and all-uppercase form, so a word should be added to the dictionary in its normal letter case even if used in a different letter case in a sentence.
  • For a word to be added to the dictionary, it should either be a real, properly-spelled modern American English word, a foreign loan word (including romanized foreign names), or a foreign or made-up word that is used consistently and commonly enough in the game. Intentional misspelling (including eye dialect) of a word should not be added unless it has become a common terminology in the game, because while someone may have a legitimate use for it, another person may spell it that way accidentally.

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Oct 12, 2024
@Maleclypse Maleclypse merged commit 38fc3b4 into CleverRaven:master Oct 12, 2024
21 of 24 checks passed
@FeepingCreature FeepingCreature deleted the fix/britishisms branch October 12, 2024 18:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Items: Armor / Clothing Armor and clothing Items: Containers Things that hold other things Items: Food / Vitamins Comestibles and drinks [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Map / Mapgen Overmap, Mapgen, Map extras, Map display Melee Melee weapons, tactics, techniques, reach attack Missions Quests and missions Monsters Monsters both friendly and unfriendly. Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies NPC / Factions NPCs, AI, Speech, Factions, Ownership Scenarios New Scenarios, balancing, bugs with scenarios Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants