From 486d7e203ed2871a73dd8280a20e66a4f43f6ab9 Mon Sep 17 00:00:00 2001 From: Llloooggg Date: Thu, 21 Apr 2022 18:32:24 +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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wheretogo/locale/ru/LC_MESSAGES/django.po | 348 ++---------------- wheretogo/maps/apps.py | 3 +- .../migrations/0002_alter_facility_options.py | 17 + wheretogo/maps/models.py | 5 +- 4 files changed, 51 insertions(+), 322 deletions(-) create mode 100644 wheretogo/maps/migrations/0002_alter_facility_options.py diff --git a/wheretogo/locale/ru/LC_MESSAGES/django.po b/wheretogo/locale/ru/LC_MESSAGES/django.po index 5070582..b03dd38 100644 --- a/wheretogo/locale/ru/LC_MESSAGES/django.po +++ b/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-04-19 22:02+0300\n" +"POT-Creation-Date: 2022-04-21 18:29+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -19,154 +19,25 @@ 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" -#: .\templates\account\account_inactive.html:5 -#: .\templates\account\account_inactive.html:8 -msgid "Account Inactive" -msgstr "" -#: .\templates\account\account_inactive.html:10 -msgid "This account is inactive." -msgstr "" +#: maps/apps.py:8 +msgid "Maps" +msgstr "Карты" -#: .\templates\account\email.html:5 .\templates\account\email.html:8 -msgid "E-mail Addresses" -msgstr "" +#: maps/models.py:16 +msgid "facility" +msgstr "предприятие" -#: .\templates\account\email.html:10 -msgid "The following e-mail addresses are associated with your account:" -msgstr "" +#: maps/models.py:17 +msgid "facilities" +msgstr "предприятия" -#: .\templates\account\email.html:24 -msgid "Verified" -msgstr "" - -#: .\templates\account\email.html:26 -msgid "Unverified" -msgstr "" - -#: .\templates\account\email.html:28 -msgid "Primary" -msgstr "" - -#: .\templates\account\email.html:34 -msgid "Make Primary" -msgstr "" - -#: .\templates\account\email.html:35 -msgid "Re-send Verification" -msgstr "" - -#: .\templates\account\email.html:36 -msgid "Remove" -msgstr "" - -#: .\templates\account\email.html:43 -msgid "Warning:" -msgstr "" - -#: .\templates\account\email.html:43 -msgid "" -"You currently do not have any e-mail address set up. You should really add " -"an e-mail address so you can receive notifications, reset your password, etc." -msgstr "" - -#: .\templates\account\email.html:48 -msgid "Add E-mail Address" -msgstr "" - -#: .\templates\account\email.html:53 -msgid "Add E-mail" -msgstr "" - -#: .\templates\account\email.html:63 -msgid "Do you really want to remove the selected e-mail address?" -msgstr "" - -#: .\templates\account\email\base_message.txt:1 -#, python-format -msgid "Hello from %(site_name)s!" -msgstr "" - -#: .\templates\account\email\base_message.txt:5 -#, python-format -msgid "" -"Thank you for using %(site_name)s!\n" -"%(site_domain)s" -msgstr "" - -#: .\templates\account\email\email_confirmation_message.txt:5 -#, python-format -msgid "" -"You're receiving this e-mail because user %(user_display)s has given your e-" -"mail address to register an account on %(site_domain)s.\n" -"\n" -"To confirm this is correct, go to %(activate_url)s" -msgstr "" - -#: .\templates\account\email\email_confirmation_subject.txt:3 -msgid "Please Confirm Your E-mail Address" -msgstr "" - -#: .\templates\account\email\password_reset_key_message.txt:4 -msgid "" -"You're receiving this e-mail because you or someone else has requested a " -"password for your user account.\n" -"It can be safely ignored if you did not request a password reset. Click the " -"link below to reset your password." -msgstr "" - -#: .\templates\account\email\password_reset_key_message.txt:9 -#, python-format -msgid "In case you forgot, your username is %(username)s." -msgstr "" - -#: .\templates\account\email\password_reset_key_subject.txt:3 -#: .\templates\account\email\unknown_account_subject.txt:3 -msgid "Password Reset E-mail" -msgstr "" - -#: .\templates\account\email\unknown_account_message.txt:4 -#, python-format -msgid "" -"You are receiving this e-mail because you or someone else has requested a\n" -"password for your user account. However, we do not have any record of a " -"user\n" -"with email %(email)s in our database.\n" -"\n" -"This mail can be safely ignored if you did not request a password reset.\n" -"\n" -"If it was you, you can sign up for an account using the link below." -msgstr "" - -#: .\templates\account\email_confirm.html:6 -#: .\templates\account\email_confirm.html:10 -msgid "Confirm E-mail Address" -msgstr "" - -#: .\templates\account\email_confirm.html:16 -#, python-format -msgid "" -"Please confirm that %(email)s is an e-mail " -"address for user %(user_display)s." -msgstr "" - -#: .\templates\account\email_confirm.html:20 -msgid "Confirm" -msgstr "" - -#: .\templates\account\email_confirm.html:27 -#, python-format -msgid "" -"This e-mail confirmation link expired or is invalid. Please issue a new e-mail confirmation request." -msgstr "" - -#: .\templates\account\login.html:8 .\templates\account\login.html:17 -#: .\templates\account\login.html:44 .\templates\common\base.html:38 +#: templates/account/login.html:8 templates/account/login.html:17 +#: templates/account/login.html:44 templates/common/base.html:44 msgid "Sign In" msgstr "" -#: .\templates\account\login.html:19 +#: templates/account/login.html:19 #, python-format msgid "" "Please sign in with one\n" @@ -175,212 +46,51 @@ msgid "" " for a %(site_name)s account and sign in below:" msgstr "" -#: .\templates\account\login.html:29 +#: templates/account/login.html:29 msgid "or" msgstr "" -#: .\templates\account\login.html:36 +#: templates/account/login.html:36 #, python-format msgid "" "If you have not created an account yet, then please\n" " sign up first." msgstr "" -"Если у вас ещё нет учётной записи, пожалуйста, сначала " -"зарегистрируйтесь." +"Если у вас ещё нет учётной записи, пожалуйста, сначала зарегистрируйтесь." -#: .\templates\account\login.html:45 -#: .\templates\account\password_change.html:14 +#: templates/account/login.html:45 msgid "Forgot Password?" msgstr "" -#: .\templates\account\logout.html:5 .\templates\account\logout.html:8 -#: .\templates\account\logout.html:17 .\templates\common\base.html:33 +#: templates/account/logout.html:5 templates/account/logout.html:14 +#: templates/account/logout.html:19 templates/common/base.html:39 msgid "Sign Out" msgstr "" -#: .\templates\account\logout.html:10 +#: templates/account/logout.html:15 msgid "Are you sure you want to sign out?" msgstr "" -#: .\templates\account\messages\cannot_delete_primary_email.txt:2 -#, python-format -msgid "You cannot remove your primary e-mail address (%(email)s)." -msgstr "" - -#: .\templates\account\messages\email_confirmation_sent.txt:2 -#, python-format -msgid "Confirmation e-mail sent to %(email)s." -msgstr "" - -#: .\templates\account\messages\email_confirmed.txt:2 -#, python-format -msgid "You have confirmed %(email)s." -msgstr "" - -#: .\templates\account\messages\email_deleted.txt:2 -#, python-format -msgid "Removed e-mail address %(email)s." -msgstr "" - -#: .\templates\account\messages\logged_in.txt:4 -#, python-format -msgid "Successfully signed in as %(name)s." -msgstr "" - -#: .\templates\account\messages\logged_out.txt:2 -msgid "You have signed out." -msgstr "" - -#: .\templates\account\messages\password_changed.txt:2 -msgid "Password successfully changed." -msgstr "" - -#: .\templates\account\messages\password_set.txt:2 -msgid "Password successfully set." -msgstr "" - -#: .\templates\account\messages\primary_email_set.txt:2 -msgid "Primary e-mail address set." -msgstr "" - -#: .\templates\account\messages\unverified_primary_email.txt:2 -msgid "Your primary e-mail address must be verified." -msgstr "" - -#: .\templates\account\password_change.html:5 -#: .\templates\account\password_change.html:8 -#: .\templates\account\password_change.html:13 -#: .\templates\account\password_reset_from_key.html:4 -#: .\templates\account\password_reset_from_key.html:7 -#: .\templates\account\password_reset_from_key_done.html:4 -#: .\templates\account\password_reset_from_key_done.html:7 -msgid "Change Password" -msgstr "" - -#: .\templates\account\password_reset.html:6 -#: .\templates\account\password_reset.html:10 -#: .\templates\account\password_reset_done.html:6 -#: .\templates\account\password_reset_done.html:9 -msgid "Password Reset" -msgstr "" - -#: .\templates\account\password_reset.html:15 -msgid "" -"Forgotten your password? Enter your e-mail address below, and we'll send you " -"an e-mail allowing you to reset it." -msgstr "" - -#: .\templates\account\password_reset.html:20 -msgid "Reset My Password" -msgstr "" - -#: .\templates\account\password_reset.html:23 -msgid "Please contact us if you have any trouble resetting your password." -msgstr "" - -#: .\templates\account\password_reset_done.html:15 -msgid "" -"We have sent you an e-mail. If you have not received it please check your " -"spam folder. Otherwise contact us if you do not receive it in a few minutes." -msgstr "" - -#: .\templates\account\password_reset_from_key.html:7 -msgid "Bad Token" -msgstr "" - -#: .\templates\account\password_reset_from_key.html:11 -#, python-format -msgid "" -"The password reset link was invalid, possibly because it has already been " -"used. Please request a new password reset." -msgstr "" - -#: .\templates\account\password_reset_from_key.html:16 -msgid "change password" -msgstr "" - -#: .\templates\account\password_reset_from_key_done.html:8 -msgid "Your password is now changed." -msgstr "" - -#: .\templates\account\password_set.html:5 -#: .\templates\account\password_set.html:8 -#: .\templates\account\password_set.html:13 -msgid "Set Password" -msgstr "" - -#: .\templates\account\signup.html:5 +#: templates/account/signup.html:7 msgid "Signup" msgstr "" -#: .\templates\account\signup.html:8 .\templates\account\signup.html:18 -#: .\templates\common\base.html:41 +#: templates/account/signup.html:16 templates/account/signup.html:22 +#: templates/common/base.html:47 msgid "Sign Up" msgstr "" -#: .\templates\account\signup.html:10 +#: templates/account/signup.html:17 #, python-format msgid "" "Already have an account? Then please sign in." msgstr "" -#: .\templates\account\signup_closed.html:5 -#: .\templates\account\signup_closed.html:8 -msgid "Sign Up Closed" -msgstr "" +#: templates/common/base.html:28 +msgid "Map" +msgstr "Карта" -#: .\templates\account\signup_closed.html:10 -msgid "We are sorry, but the sign up is currently closed." -msgstr "" - -#: .\templates\account\snippets\already_logged_in.html:5 -msgid "Note" -msgstr "" - -#: .\templates\account\snippets\already_logged_in.html:5 -#, python-format -msgid "you are already logged in as %(user_display)s." -msgstr "" - -#: .\templates\account\verification_sent.html:5 -#: .\templates\account\verification_sent.html:8 -#: .\templates\account\verified_email_required.html:5 -#: .\templates\account\verified_email_required.html:8 -msgid "Verify Your E-mail Address" -msgstr "" - -#: .\templates\account\verification_sent.html:10 -msgid "" -"We have sent an e-mail to you for verification. Follow the link provided to " -"finalize the signup process. If you do not see the verification e-mail in " -"your main inbox, check your spam folder. Please contact us if you do not " -"receive the verification e-mail within a few minutes." -msgstr "" - -#: .\templates\account\verified_email_required.html:12 -msgid "" -"This part of the site requires us to verify that\n" -"you are who you claim to be. For this purpose, we require that you\n" -"verify ownership of your e-mail address. " -msgstr "" - -#: .\templates\account\verified_email_required.html:16 -msgid "" -"We have sent an e-mail to you for\n" -"verification. Please click on the link inside that e-mail. If you do not see " -"the verification e-mail in your main inbox, check your spam folder. " -"Otherwise\n" -"contact us if you do not receive it within a few minutes." -msgstr "" - -#: .\templates\account\verified_email_required.html:20 -#, python-format -msgid "" -"Note: you can still change your e-" -"mail address." -msgstr "" - -#: .\templates\common\base.html:32 +#: templates/common/base.html:38 msgid "Change E-mail" msgstr "Сменить E-mail" diff --git a/wheretogo/maps/apps.py b/wheretogo/maps/apps.py index f97db36..f9165b7 100644 --- a/wheretogo/maps/apps.py +++ b/wheretogo/maps/apps.py @@ -1,7 +1,8 @@ from django.apps import AppConfig +from django.utils.translation import gettext_lazy as _ class MapConfig(AppConfig): default_auto_field = "django.db.models.BigAutoField" name = "maps" - verbose_name = "Maps" + verbose_name = _("Maps") diff --git a/wheretogo/maps/migrations/0002_alter_facility_options.py b/wheretogo/maps/migrations/0002_alter_facility_options.py new file mode 100644 index 0000000..5a5ff29 --- /dev/null +++ b/wheretogo/maps/migrations/0002_alter_facility_options.py @@ -0,0 +1,17 @@ +# Generated by Django 4.0.3 on 2022-04-21 15:29 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('maps', '0001_initial'), + ] + + operations = [ + migrations.AlterModelOptions( + name='facility', + options={'verbose_name': 'facility', 'verbose_name_plural': 'facilities'}, + ), + ] diff --git a/wheretogo/maps/models.py b/wheretogo/maps/models.py index ff4fcf4..28ab461 100644 --- a/wheretogo/maps/models.py +++ b/wheretogo/maps/models.py @@ -1,4 +1,5 @@ from django.contrib.gis.db import models as gis_models +from django.utils.translation import gettext_lazy as _ from django.db import models @@ -12,8 +13,8 @@ class Facility(models.Model): ) class Meta: - verbose_name = "facility" - verbose_name_plural = "Facilities" + verbose_name = _("facility") + verbose_name_plural = _("facilities") def __unicode__(self): return self.name