From c0141bc79da45380c7007588b18ed8eabf1e5b9a Mon Sep 17 00:00:00 2001 From: Llloooggg Date: Sat, 10 Sep 2022 14:51:51 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D1=8F=20=D1=88=D0=B8=D1=80=D0=BE=D1=82=D1=8B=20?= =?UTF-8?q?=D0=B8=20=D0=B4=D0=BE=D0=BB=D0=B3=D0=BE=D1=82=D1=8B=20=D0=B2=20?= =?UTF-8?q?=D0=B0=D0=B4=D0=BC=D0=B8=D0=BD=D0=BA=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/wheretogo/facilities/forms.py | 3 +++ backend/wheretogo/facilities/models.py | 16 +++++++------- .../wheretogo/locale/ru/LC_MESSAGES/django.po | 21 +++++++++++++------ 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/backend/wheretogo/facilities/forms.py b/backend/wheretogo/facilities/forms.py index aa7790b..790389f 100644 --- a/backend/wheretogo/facilities/forms.py +++ b/backend/wheretogo/facilities/forms.py @@ -1,5 +1,6 @@ from django import forms from django.contrib.gis.geos import Point +from django.utils.translation import gettext_lazy from facilities.models import Facility @@ -10,11 +11,13 @@ class FacilityLocationForm(forms.ModelForm): min_value=-90, max_value=90, required=True, + label=gettext_lazy("Latitude"), ) longitude = forms.FloatField( min_value=-180, max_value=180, required=True, + label=gettext_lazy("Longitude"), ) class Meta(object): diff --git a/backend/wheretogo/facilities/models.py b/backend/wheretogo/facilities/models.py index 4678931..c40a50d 100644 --- a/backend/wheretogo/facilities/models.py +++ b/backend/wheretogo/facilities/models.py @@ -1,19 +1,21 @@ from django.contrib.gis.db import models as gis_models -from django.utils.translation import gettext_lazy as _ +from django.utils.translation import gettext_lazy from django.db import models class Facility(models.Model): - name = models.CharField(max_length=200, verbose_name=_("name")) - address = models.CharField(max_length=100, verbose_name=_("address")) - city = models.CharField(max_length=50, verbose_name=_("city")) + name = models.CharField(max_length=200, verbose_name=gettext_lazy("name")) + address = models.CharField( + max_length=100, verbose_name=gettext_lazy("address") + ) + city = models.CharField(max_length=50, verbose_name=gettext_lazy("city")) location = gis_models.PointField( - null=True, blank=True, verbose_name=_("location") + null=True, blank=True, verbose_name=gettext_lazy("location") ) class Meta: - verbose_name = _("facility") - verbose_name_plural = _("facilities") + verbose_name = gettext_lazy("facility") + verbose_name_plural = gettext_lazy("facilities") def __str__(self): return f"{self.name}: {self.city}, {self.address}" diff --git a/backend/wheretogo/locale/ru/LC_MESSAGES/django.po b/backend/wheretogo/locale/ru/LC_MESSAGES/django.po index 3d04686..0284f65 100644 --- a/backend/wheretogo/locale/ru/LC_MESSAGES/django.po +++ b/backend/wheretogo/locale/ru/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-09-10 07:27+0300\n" +"POT-Creation-Date: 2022-09-10 14:48+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -19,26 +19,35 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n" "%100>=11 && n%100<=14)? 2 : 3);\n" -#: facilities/apps.py:8 facilities/models.py:16 + +#: facilities/apps.py:8 facilities/models.py:18 msgid "facilities" msgstr "заведения" +#: facilities/forms.py:14 +msgid "Latitude" +msgstr "Широта" + +#: facilities/forms.py:20 +msgid "Longitude" +msgstr "Долгота" + #: facilities/models.py:7 msgid "name" msgstr "название" -#: facilities/models.py:8 +#: facilities/models.py:9 msgid "address" msgstr "адрес" -#: facilities/models.py:9 +#: facilities/models.py:11 msgid "city" msgstr "город" -#: facilities/models.py:11 +#: facilities/models.py:13 msgid "location" msgstr "местоположение" -#: facilities/models.py:15 +#: facilities/models.py:17 msgid "facility" msgstr "заведение"