[Generator] [I18N] Fix behavior to work with recent changes