Updated locale selection method