Skip to content

new i18n #21

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

Open
psychomonkey911 wants to merge 6 commits into
base: master
Choose a base branch
from
Open

new i18n #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6988f93
new i18
psychomonkey911 Sep 3, 2017
7cdbd42
overwrites during creation
psychomonkey911 Sep 3, 2017
05e227d
groups
psychomonkey911 Sep 3, 2017
f6683d9
groups+memberships
psychomonkey911 Sep 3, 2017
84a933b
correction of translation
psychomonkey911 Sep 5, 2017
d05f7f2
translate for users
psychomonkey911 Sep 5, 2017
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
8 changes: 4 additions & 4 deletions mk42/apps/core/locale/en/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-08-26 00:50+0000\n"
"PO-Revision-Date: 2017-06-13 19:25+0000\n"
"Last-Translator: Alexei Andrushievich <vint21h@vint21h.pp.ua>\n"
"Language-Team: Alexei Andrushievich <vint21h@vint21h.pp.ua>\n"
"Last-Translator: Kirill Boev <forboev@gmail.com>\n"
"Language-Team: Kirill Boev <forboev@gmail.com>, Alexei Andrushievich <vint21h@vint21h.pp.ua>\n"
"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -111,7 +111,7 @@ msgid "slug"
msgstr ""

#: models/group.py:33
msgid "overwrite in creation"
msgid "overwrites during creation"
msgstr ""

#: models/group.py:34
Expand Down Expand Up @@ -171,7 +171,7 @@ msgstr ""

#: templates/templated_email/create_group_email.email:14
#: templates/templated_email/create_group_email.email:33
msgid "If you do not do this please inform us."
msgid "If you don't do this please inform us."
msgstr ""

#: templates/templated_email/create_group_email.email:16
Expand Down
92 changes: 46 additions & 46 deletions mk42/apps/core/locale/uk/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-08-26 00:51+0000\n"
"PO-Revision-Date: 2017-06-13 19:25+0000\n"
"Last-Translator: Alexei Andrushievich <vint21h@vint21h.pp.ua>\n"
"Language-Team: Alexei Andrushievich <vint21h@vint21h.pp.ua>\n"
"Last-Translator: Kirill Boev <forboev@gmail.com>\n"
"Language-Team: Kirill Boev <forboev@gmail.com>, Alexei Andrushievich <vint21h@vint21h.pp.ua>\n"
"Language: uk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand All @@ -20,166 +20,166 @@ msgstr ""
#: admin/event.py:29 admin/group.py:31 admin/log.py:28 admin/membership.py:29
#: admin/rsvp.py:28
msgid "Other"
msgstr ""
msgstr "Інше"

#: admin/group.py:46
msgid "Activate selected groups"
msgstr ""
msgstr "Активувати обрані групи"

#: admin/group.py:60
msgid "Deactivate selected groups"
msgstr ""
msgstr "Деактивувати обрані групи"

#: admin/membership.py:44
msgid "Activate selected memberships"
msgstr ""
msgstr "Активувати обраних учасників"

#: admin/membership.py:58
msgid "Deactivate selected memberships"
msgstr ""
msgstr "Деактивувати обраних учасників"

#: api/permissions/event.py:73
msgid "Invalid dates."
msgstr ""
msgstr "Невірна дата"
Copy link
Member

@vint21h vint21h Sep 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dateS


#: api/serializers/event.py:27
msgid "status"
msgstr ""
msgstr "статус"

#: apps.py:23
msgid "Core"
msgstr ""
msgstr "Ядро"

#: constants.py:22
msgid "Pending"
msgstr ""
msgstr "Очікується"

#: constants.py:23
msgid "Canceled"
msgstr ""
msgstr "Скасовано"
Copy link
Member

@vint21h vint21h Sep 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Тут по контексту статусы относятся к событиям, подія скасовано, что-то не то.


#: constants.py:24
msgid "Ongoing"
msgstr ""
msgstr "Відбувається"

#: constants.py:25
msgid "Finished"
msgstr ""
msgstr "Закінчено"

#: models/event.py:43 models/group.py:31 models/log.py:35
#: models/membership.py:25 models/rsvp.py:24
msgid "ID"
msgstr ""
msgstr "ID"

#: models/event.py:44 models/group.py:32
msgid "name"
msgstr ""
msgstr "назва"

#: models/event.py:45 models/group.py:35
msgid "description"
msgstr ""
msgstr "опис"

#: models/event.py:46 models/group.py:45 models/membership.py:27
msgid "group"
msgstr ""
msgstr "група"

#: models/event.py:47
msgid "address"
msgstr ""
msgstr "адреса"

#: models/event.py:48 models/event.py:51
msgid "start date/time"
msgstr ""
msgstr "дата/час початку"

#: models/event.py:49
msgid "end date/time"
msgstr ""
msgstr "дата/час закінчення"

#: models/event.py:50 models/group.py:36 models/log.py:38
#: models/membership.py:28 models/rsvp.py:27
msgid "created date/time"
msgstr ""
msgstr "дата/час cтворення"

#: models/event.py:83 models/log.py:36 models/rsvp.py:26
msgid "event"
msgstr ""
msgstr "подія"

#: models/event.py:84
msgid "events"
msgstr ""
msgstr "події"

#: models/group.py:33
msgid "slug"
msgstr ""
msgstr "слаг"

#: models/group.py:33
msgid "overwrite in creation"
msgstr ""
msgid "overwrites during creation"
msgstr "перезаписується під час створення"

#: models/group.py:34
msgid "owner"
msgstr ""
msgstr "творець"

#: models/group.py:37
msgid "updated date/time"
msgstr ""
msgstr "дата/час оновлення"

#: models/group.py:38 models/membership.py:29
msgid "active"
msgstr ""
msgstr "активна"

#: models/group.py:46
msgid "groups"
msgstr ""
msgstr "групи"

#: models/log.py:44
msgid "event log"
msgstr ""
msgstr "журнал події"

#: models/log.py:45
msgid "event logs"
msgstr ""
msgstr "журнал подій"

#: models/membership.py:26 models/rsvp.py:25
msgid "user"
msgstr ""
msgstr "користувач"

#: models/membership.py:36 models/membership.py:37
msgid "membership"
msgstr ""
msgstr "участь у групі"

#: models/rsvp.py:33 models/rsvp.py:34
msgid "rsvp"
msgstr ""
msgstr "rsvp"

#: templates/templated_email/create_group_email.email:6
msgid "Group creation at"
msgstr ""
msgstr "Створення групи на"

#: templates/templated_email/create_group_email.email:10
#: templates/templated_email/create_group_email.email:27
msgid "Hello!"
msgstr ""
msgstr "Здравствуйте"

#: templates/templated_email/create_group_email.email:12
#: templates/templated_email/create_group_email.email:31
msgid "You, or somebody else create group"
msgstr ""
msgstr "Ви або хтось інший створив групу"

#: templates/templated_email/create_group_email.email:12
#: templates/templated_email/create_group_email.email:31
msgid "at"
msgstr ""
msgstr "в"
Copy link
Member

@vint21h vint21h Sep 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

на


#: templates/templated_email/create_group_email.email:14
#: templates/templated_email/create_group_email.email:33
msgid "If you do not do this please inform us."
msgstr ""
msgid "If you don't do this please inform us."
msgstr "Якщо ви цього не робили, будь ласка, повідомте нас"

#: templates/templated_email/create_group_email.email:16
#: templates/templated_email/create_group_email.email:36
msgid "Yours"
msgstr ""
msgstr "Ваша"

#: templates/templated_email/create_group_email.email:18
#: templates/templated_email/create_group_email.email:38
Expand All @@ -189,12 +189,12 @@ msgstr ""
#: templates/templated_email/create_group_email.email:18
#: templates/templated_email/create_group_email.email:38
msgid "team"
msgstr ""
msgstr "команда"

#: validators/event.py:29
msgid "Start of new event can't be in the past"
msgstr ""
msgstr "Початок нової події не може бути минулому"
Copy link
Member

@vint21h vint21h Sep 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

у


#: validators/event.py:42
msgid "End of new event can't be in the past"
msgstr ""
msgstr "Кінець нової події не може бути минулому"
Copy link
Member

@vint21h vint21h Sep 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

у

2 changes: 1 addition & 1 deletion mk42/apps/core/models/group.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class Group(models.Model):

id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False, verbose_name=_("ID"))
name = models.CharField(verbose_name=_("name"), max_length=256, db_index=True, unique=True)
slug = AutoSlugField(verbose_name=_("slug"), populate_from="name", max_length=256, default="", blank=True, db_index=True, editable=True, help_text=_("overwrite in creation"))
slug = AutoSlugField(verbose_name=_("slug"), populate_from="name", max_length=256, default="", blank=True, db_index=True, editable=True, help_text=_("overwrites during creation"))
owner = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=_("owner"), db_index=True, related_name="owned")
description = RedactorField(verbose_name=_("description"), blank=True, null=True, db_index=True)
created = models.DateTimeField(verbose_name=_("created date/time"), blank=True, null=True, db_index=True, auto_now_add=True)
Expand Down
10 changes: 4 additions & 6 deletions mk42/apps/users/locale/en/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-08-26 00:50+0000\n"
"PO-Revision-Date: 2017-06-13 19:25+0000\n"
"Last-Translator: Alexei Andrushievich <vint21h@vint21h.pp.ua>\n"
"Language-Team: Alexei Andrushievich <vint21h@vint21h.pp.ua>\n"
"Last-Translator: Kirill Boev <forboev@gmail.com>\n"
"Language-Team: Kirill Boev <forboev@gmail.com>, Alexei Andrushievich <vint21h@vint21h.pp.ua>\n"
"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand All @@ -32,9 +32,7 @@ msgid "Settings"
msgstr ""

#: admin/user.py:68
msgid ""
"Clear all selected users sessions (logout from all logged in devices) (can "
"take very long time)"
msgid "Clear all selected users sessions (logout from all logged in devices) (can take very long time)"
msgstr ""

#: api/serializers/user.py:26
Expand Down Expand Up @@ -85,7 +83,7 @@ msgstr ""

#: templates/templated_email/registration.email:14
#: templates/templated_email/registration.email:35
msgid "If you do not do this please inform us."
msgid "If you don't do this, please inform us."
msgstr ""

#: templates/templated_email/registration.email:16
Expand Down
Loading