fix various bugs around translation fallback
Merge pull request #304 from doctrine/fix-translations

fix various bugs around translation fallback