[TASK] Add missing adaptions for non localization

Releases: 2.5

Change-Id: I257d15b058eec73a06f89e06624176ff43591739
Reviewed-on: https://review.typo3.org/20053
Reviewed-by: Nico de Haen
Tested-by: Nico de Haen