We will have to work right up until the day we die.

We will have to work right up until the day we die.
这是一句英语口语：
If we don't put money in the bank,We will have to work right up until the day we die.
[如果我们现在不把钱存在银行里,我们就到死都得工作.]
1.right up 是副词短语吗?
2.the day we die 是定语从句的省略写法吗?
我改成the day when we