Do not assume that there is (no) trailing content

If a user by accident added a trailing ':', then the code would interpret this
as the language of the CPE, which is not what we want.

Thus, use the same method for filling out the language.

Thanks to Arnaud Fileux for debugging this and suggesting the fix.
Add changelog for fix