diff --git a/atst/filters.py b/atst/filters.py index 319a9afd..524d39bb 100644 --- a/atst/filters.py +++ b/atst/filters.py @@ -1,7 +1,6 @@ import re import datetime -from atst.utils.localization import translate -from atst.forms.data import translate_duration +from atst.utils.localization import translate, translate_duration from flask import current_app as app, render_template from jinja2 import contextfilter from jinja2.exceptions import TemplateNotFound diff --git a/atst/forms/data.py b/atst/forms/data.py index 0cb029c4..3afb2ec7 100644 --- a/atst/forms/data.py +++ b/atst/forms/data.py @@ -1,19 +1,5 @@ -import math -from gettext import ngettext - from atst.domain.roles import PORTFOLIO_ROLES as PORTFOLIO_ROLE_DEFINITIONS -from atst.utils.localization import translate - - -def translate_duration(duration_in_months): - duration = [] - years = math.floor(duration_in_months / 12) - months = duration_in_months % 12 - if years > 0: - duration.append("{} {}".format(years, ngettext("year", "years", years))) - if months > 0: - duration.append("{} {}".format(months, ngettext("month", "months", months))) - return (", ").join(duration) +from atst.utils.localization import translate, translate_duration SERVICE_BRANCHES = [ diff --git a/atst/utils/localization.py b/atst/utils/localization.py index 53802fca..fff301fd 100644 --- a/atst/utils/localization.py +++ b/atst/utils/localization.py @@ -1,6 +1,8 @@ import yaml import os from functools import lru_cache +import math +from gettext import ngettext from flask import current_app as app from atst.utils import getattr_path @@ -41,3 +43,14 @@ def translate(key, variables=None): raise LocalizationInvalidKeyError(key, variables) return value.format(**variables).replace("\n", "") + + +def translate_duration(duration_in_months): + duration = [] + years = math.floor(duration_in_months / 12) + months = duration_in_months % 12 + if years > 0: + duration.append("{} {}".format(years, ngettext("year", "years", years))) + if months > 0: + duration.append("{} {}".format(months, ngettext("month", "months", months))) + return (", ").join(duration)