Move remaining choices to be determined dynamically in the migrations
Merge pull request #3485 from yakky/feature/fix_language_migration

Move remaining choices to be determined dynamically in the migrations