Fix #22072: Localisation: Separate objective date string from staff tenure date string

[mrmagic2020]

Attempts to fix #22072.

I was able to build the game locally and have the issue addressed. I tested the changes by setting
STR_2736 :{MONTH}, Year {COMMA16} (used for label-value pairs), and
STR_6640 :{MONTH}, Year {COMMA16} (used in sentences)
to different values. I then replaced {MONTHYEAR} to {MONTHYEAR_SENTENCE} in STR_2836 and STR_2837, and the change can be observed in-game.

As I am new to contributing to this project, please review carefully for any mistakes I might have made. Thanks!

[mrmagic2020]

I noticed that formatting tests are failing because I added a new enum member for FormatToken, which caused a shift of the enum values of succeeding members. Should I modify the tests as well?

[AaronVanGeffen]

Could you elaborate why you chose to introduce a new format token? It seems to me the only difference is an added period at the end, which could just be moved to the format string instead.

[mrmagic2020]

Could you elaborate why you chose to introduce a new format token? It seems to me the only difference is an added period at the end, which could just be moved to the format string instead.

Because according to #22072, we need to differentiate M/Y tokens in sentences and a label-value pair for languages that require this feature. So I thought we would need different tokens for each case.

[groenroos]

Thanks, this looks like it would address #22072! What needs to still happen before this can be merged? 🙂

[Gymnasiast]

(Note to self:) This check shouldn’t be necessary. Also fold in with previous condition.