Move translate_duration() into localization file

This commit is contained in:
leigh-mil 2019-01-16 15:38:08 -05:00
parent cfecf3d544
commit 4fa325818c
3 changed files with 15 additions and 17 deletions

View File

@ -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

View File

@ -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 = [

View File

@ -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)