[bug 1110543] Correct {% trans %} block and class issues