Fixes #1584 - Hard-Coded language file
Merge pull request #1585 from ATofighi/fix-1584

Fixes #1584 - Hard-Coded language file