Skip to content

Commit 7688fac

Browse files
committed
Translate Russian text to English
1 parent 7b4f987 commit 7688fac

31 files changed

+204
-206
lines changed

task_manager/labels/forms.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ class Meta:
1010
"name": forms.TextInput(attrs={"class": "form-control"}),
1111
}
1212
labels = {
13-
"name": "Имя",
13+
"name": "Name",
1414
}

task_manager/labels/migrations/0002_remove_label_slug_alter_label_created_at_and_more.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ class Migration(migrations.Migration):
1717
migrations.AlterField(
1818
model_name='label',
1919
name='created_at',
20-
field=models.DateTimeField(auto_now_add=True, verbose_name='Дата создания'),
20+
field=models.DateTimeField(auto_now_add=True, verbose_name='Created at'),
2121
),
2222
migrations.AlterField(
2323
model_name='label',
2424
name='name',
25-
field=models.CharField(max_length=100, unique=True, verbose_name='Имя'),
25+
field=models.CharField(max_length=100, unique=True, verbose_name='Name'),
2626
),
2727
]

task_manager/labels/views.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class LabelCreateView(LoginRequiredMixin, CreateView):
2323
login_url = "login"
2424

2525
def form_valid(self, form):
26-
messages.success(self.request, "Метка успешно создана")
26+
messages.success(self.request, "Label created successfully")
2727
return super().form_valid(form)
2828

2929

@@ -35,7 +35,7 @@ class LabelUpdateView(LoginRequiredMixin, UpdateView):
3535
login_url = "login"
3636

3737
def form_valid(self, form):
38-
messages.success(self.request, "Метка успешно изменена")
38+
messages.success(self.request, "Label updated successfully")
3939
return super().form_valid(form)
4040

4141

@@ -48,11 +48,10 @@ class LabelDeleteView(LoginRequiredMixin, DeleteView):
4848
def post(self, request, *args, **kwargs):
4949
label = self.get_object()
5050
if label.labeled_tasks.exists():
51-
messages.error(request,
52-
"Невозможно удалить метку, "
53-
"потому что она используется")
51+
messages.error(request,
52+
"Cannot delete label because it is in use")
5453
return redirect("labels:index")
5554

5655
response = super().post(request, *args, **kwargs)
57-
messages.success(request, "Метка успешно удалена")
56+
messages.success(request, "Label deleted successfully")
5857
return response

task_manager/statuses/forms.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class StatusForm(forms.ModelForm):
66
class Meta:
77
model = Status
88
fields = ["name"]
9-
labels = {"name": "Имя"}
9+
labels = {"name": "Name"}
1010
widgets = {
1111
"name": forms.TextInput(attrs={"class": "form-control"}),
1212
}

task_manager/statuses/tests.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,36 +35,36 @@ def test_login_required(client):
3535

3636
@pytest.mark.django_db
3737
def test_list(auth_client):
38-
Status.objects.create(name="новый")
39-
Status.objects.create(name="в работе")
38+
Status.objects.create(name="new")
39+
Status.objects.create(name="in progress")
4040
resp = auth_client.get(reverse("statuses:index"))
4141
assert resp.status_code == 200
4242
html = resp.content.decode()
43-
assert "новый" in html
44-
assert "в работе" in html
43+
assert "new" in html
44+
assert "in progress" in html
4545

4646

4747
@pytest.mark.django_db
4848
def test_create(auth_client):
4949
resp = auth_client.post(reverse("statuses:create"),
50-
data={"name": "на тестировании"})
50+
data={"name": "testing"})
5151
assert resp.status_code in (302, 301)
52-
assert Status.objects.filter(name="на тестировании").exists()
52+
assert Status.objects.filter(name="testing").exists()
5353

5454

5555
@pytest.mark.django_db
5656
def test_update(auth_client):
57-
st = Status.objects.create(name="черновик")
57+
st = Status.objects.create(name="draft")
5858
resp = auth_client.post(reverse("statuses:update", args=[st.pk]),
59-
data={"name": "завершён"})
59+
data={"name": "done"})
6060
assert resp.status_code in (302, 301)
6161
st.refresh_from_db()
62-
assert st.name == "завершён"
62+
assert st.name == "done"
6363

6464

6565
@pytest.mark.django_db
6666
def test_delete(auth_client):
67-
st = Status.objects.create(name="временный")
67+
st = Status.objects.create(name="temporary")
6868
get_resp = auth_client.get(reverse("statuses:delete", args=[st.pk]))
6969
assert get_resp.status_code == 200
7070
post_resp = auth_client.post(reverse("statuses:delete", args=[st.pk]))
@@ -76,10 +76,10 @@ def test_delete(auth_client):
7676
def test_cannot_delete_status_in_use(django_user_model):
7777
user = (django_user_model.objects.
7878
create_user(username="alice", password="p123"))
79-
status = Status.objects.create(name="новый")
79+
status = Status.objects.create(name="new")
8080
Task.objects.create(
81-
name="Тестовая задача",
82-
description="Проверка связи",
81+
name="Test task",
82+
description="Connection check",
8383
status=status,
8484
author=user,
8585
)

task_manager/statuses/views.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class StatusCreateView(LoginRequiredMixin, CreateView):
2323
login_url = "login"
2424

2525
def form_valid(self, form):
26-
messages.success(self.request, "Статус успешно создан")
26+
messages.success(self.request, "Status created successfully")
2727
return super().form_valid(form)
2828

2929

@@ -35,7 +35,7 @@ class StatusUpdateView(LoginRequiredMixin, UpdateView):
3535
login_url = "login"
3636

3737
def form_valid(self, form):
38-
messages.success(self.request, "Статус успешно изменен")
38+
messages.success(self.request, "Status updated successfully")
3939
return super().form_valid(form)
4040

4141

@@ -50,9 +50,9 @@ def post(self, request, *args, **kwargs):
5050
if status.tasks.exists():
5151
messages.error(
5252
request,
53-
"Невозможно удалить статус, потому что он используется",
53+
"Cannot delete status because it is in use",
5454
)
5555
return redirect("statuses:index")
5656
response = super().post(request, *args, **kwargs)
57-
messages.success(request, "Статус успешно удален")
57+
messages.success(request, "Status deleted successfully")
5858
return response

task_manager/tasks/filters.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,23 @@
1414
class TaskFilter(df.FilterSet):
1515
status = df.ModelChoiceFilter(
1616
queryset=Status.objects.all().order_by("id"),
17-
label="Статус",
17+
label="Status",
1818
widget=forms.Select(attrs={"class": "form-select"}),
1919
)
2020
executor = df.ModelChoiceFilter(
2121
queryset=User.objects.all().order_by("id"),
22-
label="Исполнитель",
22+
label="Executor",
2323
widget=forms.Select(attrs={"class": "form-select"}),
2424
)
2525
label = df.ModelChoiceFilter(
2626
field_name="labels",
2727
queryset=Label.objects.all().order_by("id"),
28-
label="Метка",
28+
label="Label",
2929
widget=forms.Select(attrs={"class": "form-select"}),
3030
)
3131
self_tasks = df.BooleanFilter(
3232
method="filter_self_tasks",
33-
label="Только свои задачи",
33+
label="Only my tasks",
3434
widget=forms.CheckboxInput(attrs={"class": "form-check-input"}),
3535
)
3636

task_manager/tasks/forms.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ class Meta:
2222
"size": 5}),
2323
}
2424
labels = {
25-
"name": "Имя",
26-
"description": "Описание",
27-
"status": "Статус",
28-
"executor": "Исполнитель",
29-
"labels": "Метки",
25+
"name": "Name",
26+
"description": "Description",
27+
"status": "Status",
28+
"executor": "Executor",
29+
"labels": "Labels",
3030
}
3131

3232
def __init__(self, *args, **kwargs):

task_manager/tasks/tests.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def auth_client(users):
2727

2828
@pytest.fixture
2929
def status_new(db):
30-
return Status.objects.create(name="новый")
30+
return Status.objects.create(name="new")
3131

3232

3333
def test_login_required(client):
@@ -36,58 +36,58 @@ def test_login_required(client):
3636

3737

3838
def test_list(auth_client, users, status_new):
39-
Task.objects.create(name="Тестовая задача", description="Описание",
39+
Task.objects.create(name="Test task", description="Description",
4040
status=status_new, author=users["u1"])
41-
Task.objects.create(name="Вторая", description="Ещё одна",
41+
Task.objects.create(name="Second", description="Another one",
4242
status=status_new, author=users["u1"])
4343
r = auth_client.get(reverse("tasks:index"))
4444
assert r.status_code == 200
4545
html = r.content.decode()
46-
assert "Тестовая задача" in html
47-
assert "Вторая" in html
46+
assert "Test task" in html
47+
assert "Second" in html
4848

4949

5050
def test_create(auth_client, users, status_new):
5151
resp = auth_client.post(reverse("tasks:create"), data={
52-
"name": "Новая задача",
53-
"description": "Что-то сделать",
52+
"name": "New task",
53+
"description": "Do something",
5454
"status": status_new.pk,
5555
"executor": users["u2"].pk,
5656
})
5757
assert resp.status_code in (302, 301)
58-
assert Task.objects.filter(name="Новая задача",
58+
assert Task.objects.filter(name="New task",
5959
status=status_new,
6060
author=users["u1"]).exists()
6161

6262

6363
def test_update(auth_client, users, status_new):
64-
t = Task.objects.create(name="Черновик", description="Описание",
64+
t = Task.objects.create(name="Draft", description="Description",
6565
status=status_new, author=users["u1"])
6666
resp = auth_client.post(reverse("tasks:update", args=[t.pk]), data={
67-
"name": "Изменено",
68-
"description": "Новое описание",
67+
"name": "Updated",
68+
"description": "New description",
6969
"status": status_new.pk,
7070
"executor": users["u2"].pk,
7171
})
7272
assert resp.status_code in (302, 301)
7373
t.refresh_from_db()
74-
assert t.name == "Изменено"
75-
assert t.description == "Новое описание"
74+
assert t.name == "Updated"
75+
assert t.description == "New description"
7676
assert t.executor == users["u2"]
7777

7878

7979
def test_view(auth_client, users, status_new):
80-
t = Task.objects.create(name="Посмотреть", description="Детали",
80+
t = Task.objects.create(name="View", description="Details",
8181
status=status_new, author=users["u1"])
8282
r = auth_client.get(reverse("tasks:detail", args=[t.pk]))
8383
assert r.status_code == 200
8484
html = r.content.decode()
85-
assert "Посмотреть" in html
86-
assert "Детали" in html
85+
assert "View" in html
86+
assert "Details" in html
8787

8888

8989
def test_delete(auth_client, users, status_new):
90-
t = Task.objects.create(name="Удалить", description="Ненужная",
90+
t = Task.objects.create(name="Delete", description="Unneeded",
9191
status=status_new, author=users["u1"])
9292
r_get = auth_client.get(reverse("tasks:delete", args=[t.pk]))
9393
assert r_get.status_code == 200
@@ -98,7 +98,7 @@ def test_delete(auth_client, users, status_new):
9898

9999
def test_only_author_can_delete(auth_client, users, status_new):
100100
t = Task.objects.create(
101-
name="Чужая задача", description="...",
101+
name="Someone else's task", description="...",
102102
status=status_new, author=users["u2"]
103103
)
104104
r = auth_client.post(reverse("tasks:delete", args=[t.pk]))

task_manager/tasks/views.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class TaskCreateView(LoginRequiredMixin, CreateView):
4242

4343
def form_valid(self, form):
4444
form.instance.author = self.request.user
45-
messages.success(self.request, "Задача успешно создана")
45+
messages.success(self.request, "Task created successfully")
4646
return super().form_valid(form)
4747

4848

@@ -54,7 +54,7 @@ class TaskUpdateView(LoginRequiredMixin, UpdateView):
5454
login_url = "login"
5555

5656
def form_valid(self, form):
57-
messages.success(self.request, "Задача успешно изменена")
57+
messages.success(self.request, "Task updated successfully")
5858
return super().form_valid(form)
5959

6060

@@ -69,10 +69,10 @@ def test_func(self):
6969

7070
def handle_no_permission(self):
7171
if self.request.user.is_authenticated:
72-
messages.error(self.request, "Задачу может удалить только ее автор")
72+
messages.error(self.request, "Only the author can delete the task")
7373
return redirect("tasks:index")
7474
return super().handle_no_permission()
7575

7676
def post(self, request, *args, **kwargs):
77-
messages.success(self.request, "Задача успешно удалена")
77+
messages.success(self.request, "Task deleted successfully")
7878
return super().post(request, *args, **kwargs)

0 commit comments

Comments
 (0)