Replace :count lang choice

Original pull request #2206 but now on 4.0 branch.