TranslatableListener heavy refactoring

this merge leftover should be removed