removed extra if condition, added i18n stuff