Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

development => master #80

Merged
merged 3 commits into from
Aug 8, 2023
Merged

development => master #80

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4d4670
allow 'number' to be None
Aug 6, 2023
d2e8d38
Merge pull request #78 from UKHSA-Internal/allow_None_value_for_plura…
jaro-m Aug 6, 2023
ec53626
Merge pull request #79 from UKHSA-Internal/sandbox
adebayoolabintan Aug 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/template_processor/template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

from pytz import timezone

# Internal:
# Internal:
from ..config import Settings
from .types import DataItem
from ..common.utils import get_release_timestamp
Expand Down Expand Up @@ -233,10 +233,10 @@ def as_date(latest_timestamp: str) -> str:

@as_template_filter
def pluralise(number, singular, plural, null=str()):
if abs(number) > 1:
if number and abs(number) > 1:
return plural

if abs(number) == 1:
if number and abs(number) == 1:
return singular

if number == 0 and not len(null):
Expand Down