Re-added some lost functionality after previous refactor.
fixed i18n

Change-Id: I4c6812a272d4aefda0cfd90f90834894e368d79a