Simplify usage of unbound i18n helper
Merge pull request #1878 from balinterdi/patch-2

Simplify usage of unbound i18n helper