Fixed #21544 Problem with number format when not using L10N (Better solution)