fixing spaces indentation and extra ifs, and adding translations
Merge pull request #513 from MGhanem/fixing_edit_view

fixing spaces indentation and extra ifs, and adding translations