Use trans tag when there's a comma; indent if statements

Use trans tag when there's a comma; indent if statements #2660