refactor to add l20n support per hangout discussion