diff options
| author | Adam Tauber <asciimoo@gmail.com> | 2016-05-19 15:52:23 +0200 |
|---|---|---|
| committer | Adam Tauber <asciimoo@gmail.com> | 2016-05-19 15:52:23 +0200 |
| commit | ebc0bcb6125b8db57bcf02f215608cfa7b6e0319 (patch) | |
| tree | a585178dfe8a2aa699c48c8e29e7b54eccc8cd33 /searx/webapp.py | |
| parent | bf1eebb17f2a4e4454d59a59757e0265e33c9dcf (diff) | |
| parent | 242c9ba756460a6bf0ba3f55a65c1bd7e51ad06a (diff) | |
Merge pull request #551 from mikhirev/master
use ngettext for plurals
Diffstat (limited to 'searx/webapp.py')
| -rw-r--r-- | searx/webapp.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/searx/webapp.py b/searx/webapp.py index ed8ff1bd9..b995e1fec 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -48,7 +48,7 @@ from flask import ( Flask, request, render_template, url_for, Response, make_response, redirect, send_from_directory ) -from flask.ext.babel import Babel, gettext, format_date +from flask.ext.babel import Babel, gettext, ngettext, format_date from searx import settings, searx_dir from searx.engines import ( categories, engines, get_engines_stats, engine_shortcuts @@ -411,9 +411,10 @@ def index(): minutes = int((timedifference.seconds / 60) % 60) hours = int(timedifference.seconds / 60 / 60) if hours == 0: - result['publishedDate'] = gettext(u'{minutes} minute(s) ago').format(minutes=minutes) + result['publishedDate'] = ngettext(u'{minutes} minute ago', u'{minutes} minutes ago', minutes).format(minutes=minutes) # noqa else: - result['publishedDate'] = gettext(u'{hours} hour(s), {minutes} minute(s) ago').format(hours=hours, minutes=minutes) # noqa + result['publishedDate'] = ngettext(u'{hours} hour, ', u'{hours} hours, ', hours).format(hours=hours) # noqa + result['publishedDate'] += ngettext(u'{minutes} minute ago', u'{minutes} minutes ago', minutes).format(minutes=minutes) # noqa else: result['publishedDate'] = format_date(result['publishedDate']) |