Fix capacity and calendar translations in comparator (#5269)