Web · Wiki · Activities · Blog · Lists · Chat · Meeting · Bugs · Git · Translate · Archive · People · Donate

Commit 1499a73db180e137a2a3fea96c1065ae01d5c373

Fix regression search term regression + locale/unicode kwargs (by alsroot)
app/app.py
(11 / 11)
  
1818import os
1919import sys
2020import signal
21import locale
2122from math import ceil
2223from string import join,split
2324
6666@babel.localeselector
6767def get_locale():
6868 # try to guess the language from the user accept
69 # header the browser transmits.
70 locale = request.accept_languages.best_match(['es', 'en'])
71 if locale:
72 logging.info ('Locale from headers: %s' % locale)
69 # header the browser transmits.
70 lang = request.accept_languages.best_match(['es', 'en'])
71 if lang:
72 logging.info('Locale from headers: %s' % lang)
7373 else:
7474 # otherwise we're probably embedded, get from env
75 import locale
76 locale = locale.setlocale(locale.LC_ALL, '')[:2]
77 logging.info ('Locale from env: %s' % locale)
78
79 return locale
75 lang = locale.getdefaultlocale()[0].split('_')[0]
76 logging.info('Locale from env: %s' % lang)
8077
78 return lang
79
8180@app.template_filter('timedelta')
8281def timedelta(mtime):
8382 return format_datetime(mtime, _('MMMM d, yyyy'))
336336 template='_resource-list.html'
337337 else:
338338 template='resource-list.html'
339 kwargs = {resource:'button_selected'}
339 kwargs = {str(resource): 'button_selected'}
340340 return render_template(template, query=query, resource=resource,
341341 result=r, type='resource', page=page, info=info,
342342 total_pages=total_pages, meta=meta,
532532 else:
533533 template='context-view.html'
534534 _pjax=False
535 kwargs = {resource_type+'s':'button_selected'}
535 kwargs = {str(resource_type) + 's': 'button_selected'}
536536 return render_template(template, result=r,
537537 total_pages=total_pages, info=info, meta=meta,
538538 resource_label=resource_label, stroke=stroke,
  
2525 <!-- input id="search" type="text" name="terms" value="{{query or ''}}"
2626 onkeyup="onKeyPressed(event)" /-->
2727 <div class="ui-widget">
28 <input id="query" />
28 <input id="query" name="terms" value="{{query or ''}}">
2929 </div>
3030 </li>
3131 <li class="toolbar-items" onclick="location='/context'">