[Upg] Use helper + change locale dir