add todo rework locale attribution after resolving