@@ -79,11 +79,20 @@ class Search(object):
7979 modified = False
8080 if query_parts[0].startswith(':'):
8181 lang = query_parts[0][1:]
82− if lang in (x[0] for x in language_codes):
83− self.lang = lang
84− modified = True
82+
83+ for lc in language_codes:
84+ lang_id, lang_name, country = map(str.lower, lc)
85+ if lang == lang_id\
86+ or lang_id.startswith(lang)\
87+ or lang == lang_name\
88+ or lang == country:
89+ self.lang = lang
90+ modified = True
91+ break
92+
8593 elif query_parts[0].startswith('!'):
8694 prefix = query_parts[0][1:].replace('_', ' ')
95+
8796 if prefix in engine_shortcuts\
8897 and not engine_shortcuts[prefix] in self.blocked_engines:
8998 modified = True