Two small fixes for status effects i18n.
ClosedPublic
Actions

Authored by wraitii on Jan 9 2021, 10:39 AM.

Details

Reviewers

Commits

Summary

Fixes rP24162.
The default name is the code, which doesn't work since it's a string right now.
Also, rP24162 changed status effects to require a JSON file, therefore we can remove the comment saying it's not necessary.

Test Plan

Agree.

Diff Detail

Repository

rP 0 A.D. Public Repository

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

wraitii created this revision.Jan 9 2021, 10:39 AM

Build is green

builderr-debug-macos.txt
ld: warning: text-based stub file /System/Library/Frameworks//CoreAudio.framework/CoreAudio.tbd and library file /System/Library/Frameworks//CoreAudio.framework/CoreAudio are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox.tbd and library file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback.tbd and library file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreVideo.framework/CoreVideo.tbd and library file /System/Library/Frameworks//CoreVideo.framework/CoreVideo are out of sync. Falling back to library file for linking.
ld: warning: text-based stu

See https://jenkins.wildfiregames.com/job/macos-differential/2725/display/redirect for more details.

Harbormaster completed remote builds in B14800: Diff 15067.Jan 9 2021, 11:29 AM

wraitii requested review of this revision.Jan 9 2021, 11:29 AM

Freagarach added inline comments.Jan 10 2021, 7:28 AM

binaries/data/mods/public/globalscripts/StatusEffects.js
33 ↗	(On Diff #15067)	Do we need to deepfreeze?

wraitii added inline comments.Jan 10 2021, 9:40 AM

binaries/data/mods/public/globalscripts/StatusEffects.js
33 ↗	(On Diff #15067)	I think we might want to, I also think it might break serialising. I'll try to check quickly.

Freagarach added inline comments.Jan 10 2021, 9:42 AM

binaries/data/mods/public/globalscripts/StatusEffects.js
33 ↗	(On Diff #15067)	We didn't have it before since we assigned data on the fly.

wraitii added inline comments.Jan 10 2021, 9:44 AM

binaries/data/mods/public/globalscripts/StatusEffects.js
33 ↗	(On Diff #15067)	Yeah my comment refers to the fact that we'll get warning if we serialise deep frozen objects.

Deepfreezing seems to pass serialization.

Good catch.
Patch is correct and complete.

This revision is now accepted and ready to land.Jan 10 2021, 10:12 AM

Build is green

builderr-debug-macos.txt
ld: warning: text-based stub file /System/Library/Frameworks//CoreAudio.framework/CoreAudio.tbd and library file /System/Library/Frameworks//CoreAudio.framework/CoreAudio are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox.tbd and library file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback.tbd and library file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreVideo.framework/CoreVideo.tbd and library file /System/Library/Frameworks//CoreVideo.framework/CoreVideo are out of sync. Falling back to library file for linking.
ld: warning: text-based stu

See https://jenkins.wildfiregames.com/job/macos-differential/2741/display/redirect for more details.

This revision was landed with ongoing or failed builds.Jan 10 2021, 10:55 AM

Closed by commit rP24532: Small fixes for status effects (authored by wraitii). · Explain Why

This revision was automatically updated to reflect the committed changes.

wraitii added a commit: rP24532: Small fixes for status effects.

Harbormaster completed remote builds in B14824: Diff 15090.Jan 10 2021, 11:19 AM