adjusted I18N to be consistent with intl message formatting