fix messed up i18n method usage and added TODO

Change-Id: I573ba086e3ce5999a20d3fd08b8eb83aec9f41bd