fixing spaces indentation and extra ifs, and adding translations

@AmrARaouf