Browse Source

use ngettext

Dmitry Mikhirev 9 years ago
parent
commit
6d1d8a8f8d
1 changed files with 4 additions and 3 deletions
  1. 4
    3
      searx/webapp.py

+ 4
- 3
searx/webapp.py View File

48
     Flask, request, render_template, url_for, Response, make_response,
48
     Flask, request, render_template, url_for, Response, make_response,
49
     redirect, send_from_directory
49
     redirect, send_from_directory
50
 )
50
 )
51
-from flask.ext.babel import Babel, gettext, format_date
51
+from flask.ext.babel import Babel, gettext, ngettext, format_date
52
 from searx import settings, searx_dir
52
 from searx import settings, searx_dir
53
 from searx.engines import (
53
 from searx.engines import (
54
     categories, engines, get_engines_stats, engine_shortcuts
54
     categories, engines, get_engines_stats, engine_shortcuts
411
                     minutes = int((timedifference.seconds / 60) % 60)
411
                     minutes = int((timedifference.seconds / 60) % 60)
412
                     hours = int(timedifference.seconds / 60 / 60)
412
                     hours = int(timedifference.seconds / 60 / 60)
413
                     if hours == 0:
413
                     if hours == 0:
414
-                        result['publishedDate'] = gettext(u'{minutes} minute(s) ago').format(minutes=minutes)
414
+                        result['publishedDate'] = ngettext(u'{minutes} minute ago', u'{minutes} minutes ago', minutes).format(minutes=minutes)  # noqa
415
                     else:
415
                     else:
416
-                        result['publishedDate'] = gettext(u'{hours} hour(s), {minutes} minute(s) ago').format(hours=hours, minutes=minutes)  # noqa
416
+                        result['publishedDate'] = ngettext(u'{hours} hour, ', u'{hours} hours, ', hours).format(hours=hours)  # noqa
417
+                        result['publishedDate'] += ngettext(u'{minutes} minute ago', u'{minutes} minutes ago', minutes).format(minutes=minutes)  # noqa
417
                 else:
418
                 else:
418
                     result['publishedDate'] = format_date(result['publishedDate'])
419
                     result['publishedDate'] = format_date(result['publishedDate'])
419
 
420