Issue 3418 v2

Resolves issue: https://code.google.com/p/otwarchive/issues/detail?id=3418

Version .02 now includes tests!
There may be a reason for it, and if I don't ask I'll never know! So is there a reason why the blank space before the "until" is part of the interpolated text? At first, I thought the space was missing when I saw ```It will not become a part of the collection "}until```, and then realised that both options of the ternary had a string ending in a blank. It's the piddliest thing, I know, but it bugs me. >.>