Only use ->parse on i18n messages if required

Change-Id: I89e9d9aa4becde968900f7f07a302de791519004