Internationalization refactoring pass 2 : removing dependencies to
previous implentation