fix: change translation logic to handle plurals better

fix: change translation logic to handle plurals better #7777