Return value if value are 0

Save correctly if the value is 0, but after the find is returned as an empty string.
Add test for issue #2595

Fold conditions that did the same thing and add a test case.

Closes #2595
Merge branch 'translate-patch'