Merge pull request #1740 from ingwinlu/count_hidden_pages

Improve pluralization, fixing display count of hidden pages
This commit is contained in:
Justin Mayer 2015-06-11 07:27:41 -07:00
commit e17c4377da
3 changed files with 50 additions and 7 deletions

View file

@ -665,3 +665,19 @@ def path_to_file_url(path):
'''Convert file-system path to file:// URL'''
return six.moves.urllib_parse.urljoin(
"file://", six.moves.urllib.request.pathname2url(path))
def maybe_pluralize(count, singular, plural):
'''
Returns a formatted string containing count and plural if count is not 1
Returns count and singular if count is 1
maybe_pluralize(0, 'Article', 'Articles') -> '0 Articles'
maybe_pluralize(1, 'Article', 'Articles') -> '1 Article'
maybe_pluralize(2, 'Article', 'Articles') -> '2 Articles'
'''
selection = plural
if count == 1:
selection = singular
return '{} {}'.format(count, selection)