@@ -211,10 +211,14 @@ def get_search_query_from_webapp(preferences, form):
211 # set query
211 # set query
212 query = raw_text_query.getSearchQuery()
212 query = raw_text_query.getSearchQuery()
214− # get last selected language in query, if possible
214+ # set specific language if set on request, query or preferences
215 # TODO support search with multible languages
215 # TODO support search with multible languages
216 if len(raw_text_query.languages):
216 if len(raw_text_query.languages):
217 query_lang = raw_text_query.languages[-1]
217 query_lang = raw_text_query.languages[-1]
218+ elif 'language' in form:
219+ query_lang = form.get('language')
221+ query_lang = preferences.get_value('language')
219 query_time_range = form.get('time_range')
223 query_time_range = form.get('time_range')