2014-xili fixed I10n functions

to be fully tested in template validation service