Skip to content

Adding Swedish entries in various json #2715

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Adding Swedish entries in various json #2715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions Patch104pZH/ModBundleCoreAudioItems.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,21 @@
]
}
]
},
{
"name": "CoreAudioSwedish",
"big": true,
"files": [
{
"sourceParent": "GameFilesEdited",
"sourceTargetList": [
{
"source": "Data/Audio/Sounds/English/*.wav",
"target": "Data/Audio/Sounds/English/*.wav"
}
]
}
]
}
]
}
Expand Down
34 changes: 34 additions & 0 deletions Patch104pZH/ModBundleCoreLanguageItems.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,40 @@
}
}
]
},
{
"name": "CoreLangSwedish",
"big": true,
"setGameLanguageOnInstall": "English",
"files": [
{
"sourceParent": "GameFilesEdited",
"sourceTargetList": [
{
"source": "Data/Swedish/*.ini",
"target": "Data/English/*.ini"
}
]
},
{
"sourceParent": "GameFilesEdited",
"sourceTargetList": [
{
"source": "Data/generals.str",
"target": "Data/English/generals.csf"
}
],
"params": {
"language": "Swedish",
Copy link
Contributor

Choose a reason for hiding this comment

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

Will this cause an error on build?

Copy link
Contributor Author

@Polypheides Polypheides Mar 21, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

it depends on where or how an error would occur, i ran the BuildInstallRunWithGui.bat without issues.

Copy link
Contributor

Choose a reason for hiding this comment

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

Select the Swedish pack in the gui and click on Build.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it will build and launch the game with core or full Swedish, but i do have a modified gametextcompiler.exe for Swedish if that is needed for the build process.

Is there a build log text output i can link or just the command line?

image

Copy link
Contributor Author

@Polypheides Polypheides Mar 21, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

for the gametextcompiler

xezon/Thyme@88b7c40

Copy link
Contributor

Choose a reason for hiding this comment

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

Does it work with old gametextcompiler that does not have Swedish added yet?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Does it work with old gametextcompiler that does not have Swedish added yet?

Short answer: No

Long answer:
I have made a pull request over at xezon/thyme this will implement Swedish and many other languages.

We would need to add this new version over at https://github.com/TheSuperHackers/GeneralsTools/tree/main/Tools
so this will be fetched when running the setup

Here is a link for a compiled gametextcompiler.exe https://www.dropbox.com/scl/fi/4jsp12fdb2tzh1y4d1wi1/gametextcompiler.zip?rlkey=dfnlkc5rja8wem32abosoh4rs&st=dt0qyodw&dl=0

Copy link
Contributor

Choose a reason for hiding this comment

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

Ok. If Swedish breaks build right now then we need to postpone submit until after new gametextcompiler is hooked up.

Copy link
Contributor Author

@Polypheides Polypheides Mar 30, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Ok. If Swedish breaks build right now then we need to postpone submit until after new gametextcompiler is hooked up.

Building Swedish and Ukrainian fail, building all the other languages succeed.

Do Post Build ...
Build Job completed in 21.192 s

We need to update the WindowsTools.json with size hash and github link.

The error when building Swedish with the current main branch build progress and compiler:
subprocess.CalledProcessError: Command '['C:\\Users\\Film\\Desktop\\GENERALS\\PATCH1~1\\Scripts\\Windows\\.tools\\gametextcompiler.exe', '-LOAD_STR', 'C:\\Users\\Film\\Desktop\\GENERALS\\PATCH1~1\\.Build\\RawBundleItems\\CoreLangSwedish\\Data\\Swedish\\generals.csf.tmp', '-SAVE_CSF', 'C:\\Users\\Film\\Desktop\\GENERALS\\PATCH1~1\\.Build\\RawBundleItems\\CoreLangSwedish\\Data\\Swedish\\generals.csf', '-LOAD_STR_LANGUAGES', 'Swedish']' returned non-zero exit status 2.

My additions should fix all this when the compiler gets added to the tool repo.

"excludeMarkersList": [
[
"//patch104p-optional-begin",
"//patch104p-optional-end"
]
]
}
}
]
}
]
}
Expand Down
14 changes: 14 additions & 0 deletions Patch104pZH/ModBundleCorePacks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,20 @@
"CoreW3D",
"CoreWindow"
]
},
{
"name": "CoreSwedish",
"itemNames": [
"CoreAudio",
"CoreAudioSwedish",
"CoreINI",
"CoreLangSwedish",
"CoreMaps",
"CoreMisc",
"CoreTextures",
"CoreW3D",
"CoreWindow"
]
}
]
}
Expand Down
21 changes: 21 additions & 0 deletions Patch104pZH/ModBundleFullPacks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,27 @@
"CoreWindow",
"RecoveredTextures"
]
},
{
"name": "FullSwedish",
"itemNames": [
"OptionalAudio",
"OptionalAudioSwedish",
"OptionalINI",
"OptionalLangSwedish",
"OptionalTextures",
"OptionalW3D",
"CoreAudio",
"CoreAudioSwedish",
"CoreINI",
"CoreLangSwedish",
"CoreMaps",
"CoreMisc",
"CoreTextures",
"CoreW3D",
"CoreWindow",
"RecoveredTextures"
]
}
]
}
Expand Down
27 changes: 27 additions & 0 deletions Patch104pZH/ModBundleOptionalAudioItems.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,33 @@
]
}
]
},
{
"name": "OptionalAudioSwedish",
"big": true,
"files": [
{
"sourceParent": "GameFilesOptional",
"sourceTargetList": [
{
"source": "Data/Audio/Sounds/English/*.wav",
"target": "Data/Audio/Sounds/English/*.wav"
},
{
"source": "Data/Audio/Sounds/Restoration/CommonVoice/*.wav",
"target": "Data/Audio/Sounds/English/*.wav"
},
{
"source": "Data/Audio/Sounds/Restoration/EnglishVoice/*.wav",
"target": "Data/Audio/Sounds/English/*.wav"
},
{
"source": "Data/Audio/Speech/Restoration/EnglishEva/*.wav",
"target": "Data/Audio/Speech/English/*.wav"
}
]
}
]
}
]
}
Expand Down
24 changes: 24 additions & 0 deletions Patch104pZH/ModBundleOptionalLanguageItems.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,30 @@
}
}
]
},
{
"name": "OptionalLangSwedish",
"big": true,
"files": [
{
"sourceParent": "GameFilesEdited",
"sourceTargetList": [
{
"source": "Data/generals.str",
"target": "Data/Swedish/generals.csf"
}
],
"params": {
"language": "Swedish",
"excludeMarkersList": [
[
"//patch104p-core-begin",
"//patch104p-core-end"
]
]
}
}
]
}
]
}
Expand Down