Optimized the i18n hanldebars markup