Commit missing form for #37 + #21 with support for i18n #26.
Update language injection code to take into consideration user configuration for #21 - closes #21