Fix i18n for boolean filter (updates the fix for #2170)

Same as PR #2206 but squashes commits into a single commit. Updates 47fe4c5f483399c0efda0d3cf275d5d12b0283d3 that initially fixed #2170 but introduced a regression.