@@ -128,11 +128,8 @@ outgoing_proxies = settings['outgoing'].get('proxies', None)
128128def get_locale():
129129 locale = request.accept_languages.best_match(settings['locales'].keys())
130130
131− if settings['ui'].get('default_locale'):
132− locale = settings['ui']['default_locale']
133−
134− if request.cookies.get('locale', '') in settings['locales']:
135− locale = request.cookies.get('locale', '')
131+ if request.preferences.get_value('locale') != '':
132+ locale = request.preferences.get_value('locale')
136133
137134 if 'locale' in request.args\
138135 and request.args['locale'] in settings['locales']:
@@ -248,7 +245,7 @@ def image_proxify(url):
248245 if url.startswith('//'):
249246 url = 'https:' + url
250247
251− if not settings['server'].get('image_proxy') and not request.cookies.get('image_proxy'):
248+ if not request.preferences.get_value('image_proxy'):
252249 return url
253250
254251 hash_string = url + settings['server']['secret_key']
@@ -289,14 +286,13 @@ def render(template_name, override_theme=None, **kwargs):
289286 if not kwargs['selected_categories']:
290287 cookie_categories = request.preferences.get_value('categories')
291288 for ccateg in cookie_categories:
292− if ccateg in categories:
293− kwargs['selected_categories'].append(ccateg)
289+ kwargs['selected_categories'].append(ccateg)
294290
295291 if not kwargs['selected_categories']:
296292 kwargs['selected_categories'] = ['general']
297293
298294 if 'autocomplete' not in kwargs:
299− kwargs['autocomplete'] = autocomplete
295+ kwargs['autocomplete'] = request.preferences.get_value('autocomplete')
300296
301297 if get_locale() in rtl_locales and 'rtl' not in kwargs:
302298 kwargs['rtl'] = True
@@ -501,7 +497,7 @@ def autocompleter():
501497 # normal autocompletion results only appear if max 3 inner results returned
502498 if len(raw_results) <= 3 and completer:
503499 # get language from cookie
504− language = request.cookies.get('language')
500+ language = request.preferences.get_value('language')
505501 if not language or language == 'all':
506502 language = 'en'
507503 else: