Skip to content

DREF: Add static string translation on dref #2615

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

Merged
susilnem merged 4 commits into from
Dec 19, 2025
Merged

DREF: Add static string translation on dref #2615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4abddb8
feat(dref): Add dref static string translation
susilnem Dec 19, 2025
9d5a93b
chore(dref): register dref fields for translation
susilnem Dec 19, 2025
526b80b
chore(schema): Update schema and gitmodules url
susilnem Dec 19, 2025
711e931
fix(test): Update test assertion logic on deployment
susilnem Dec 19, 2025
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
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "assets"]
path = assets
url = https://github.com/IFRCGo/go-api-artifacts
path = assets
url = git@github.com:IFRCGo/go-api-artifacts.git
2 changes: 1 addition & 1 deletion assets
Open in desktop
Submodule assets updated 1 files
+31 −0 openapi-schema.yaml
57 changes: 57 additions & 0 deletions deployments/migrations/0093_sector_title_ar_sector_title_en_sector_title_es_and_more.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
# Generated by Django 4.2.26 on 2025-12-19 13:23

from django.db import migrations, models


class Migration(migrations.Migration):
dependencies = [
("deployments", "0092_alter_eru_type_alter_erureadinesstype_type"),
]

operations = [
migrations.AddField(
model_name="sector",
name="title_ar",
field=models.CharField(max_length=255, null=True, verbose_name="title"),
),
migrations.AddField(
model_name="sector",
name="title_en",
field=models.CharField(max_length=255, null=True, verbose_name="title"),
),
migrations.AddField(
model_name="sector",
name="title_es",
field=models.CharField(max_length=255, null=True, verbose_name="title"),
),
migrations.AddField(
model_name="sector",
name="title_fr",
field=models.CharField(max_length=255, null=True, verbose_name="title"),
),
migrations.AddField(
model_name="sector",
name="translation_module_original_language",
field=models.CharField(
choices=[
("en", "English"),
("es", "Spanish"),
("fr", "French"),
("ar", "Arabic"),
],
default="en",
help_text="Language used to create this entity",
max_length=2,
verbose_name="Entity Original language",
),
),
migrations.AddField(
model_name="sector",
name="translation_module_skip_auto_translation",
field=models.BooleanField(
default=False,
help_text="Skip auto translation operation for this entity?",
verbose_name="Skip auto translation",
),
),
]
214 changes: 138 additions & 76 deletions deployments/test_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,14 @@ def test_regional_project_get(self, mock_now):
district1a = District.objects.create(name="district1aa", country=country1)
district2 = District.objects.create(name="district2", country=country2)
district2a = District.objects.create(name="district2a", country=country2)
sector_1 = Sector.objects.create(title="Sector 1")
sector_2 = Sector.objects.create(title="Sector 2")
sector_3 = Sector.objects.create(title="Sector 3")
sector_4 = Sector.objects.create(title="Sector 4")
sector_5 = Sector.objects.create(title="Sector 5")
sector_6 = Sector.objects.create(title="Sector 6")
sector_7 = Sector.objects.create(title="Sector 7")
sector_8 = Sector.objects.create(title="Sector 8")

mock_now.return_value = datetime.datetime(2011, 11, 11, tzinfo=pytz.utc)
# Create new Projects
Expand All @@ -214,7 +222,7 @@ def test_regional_project_get(self, mock_now):
rcountry1,
[district1, district1a],
ProgrammeTypes.BILATERAL,
Sector.objects.get(pk=0),
sector_1,
OperationTypes.PROGRAMME,
[datetime.date(2011, 11, 12), datetime.date(2011, 12, 13)],
6000,
Expand All @@ -225,7 +233,7 @@ def test_regional_project_get(self, mock_now):
rcountry1,
[district1],
ProgrammeTypes.MULTILATERAL,
Sector.objects.get(pk=0),
sector_2,
OperationTypes.EMERGENCY_OPERATION,
[datetime.date(2011, 11, 1), datetime.date(2011, 12, 15)],
1000,
Expand All @@ -236,7 +244,7 @@ def test_regional_project_get(self, mock_now):
rcountry1,
[district2, district2a],
ProgrammeTypes.DOMESTIC,
Sector.objects.get(pk=2),
sector_3,
OperationTypes.PROGRAMME,
[datetime.date(2011, 11, 1), datetime.date(2011, 12, 15)],
4000,
Expand All @@ -247,7 +255,7 @@ def test_regional_project_get(self, mock_now):
rcountry1,
[district2],
ProgrammeTypes.BILATERAL,
Sector.objects.get(pk=9),
sector_4,
OperationTypes.EMERGENCY_OPERATION,
[datetime.date(2010, 11, 12), datetime.date(2010, 1, 13)],
6000,
Expand All @@ -258,7 +266,7 @@ def test_regional_project_get(self, mock_now):
rcountry2,
[district1, district1a],
ProgrammeTypes.BILATERAL,
Sector.objects.get(pk=0),
sector_5,
OperationTypes.PROGRAMME,
[datetime.date(2011, 11, 12), datetime.date(2011, 12, 13)],
86000,
Expand All @@ -269,7 +277,7 @@ def test_regional_project_get(self, mock_now):
rcountry2,
[district1],
ProgrammeTypes.MULTILATERAL,
Sector.objects.get(pk=8),
sector_6,
OperationTypes.EMERGENCY_OPERATION,
[datetime.date(2010, 11, 12), datetime.date(2010, 1, 13)],
6000,
Expand All @@ -280,7 +288,7 @@ def test_regional_project_get(self, mock_now):
rcountry2,
[district2, district2a],
ProgrammeTypes.DOMESTIC,
Sector.objects.get(pk=5),
sector_7,
OperationTypes.PROGRAMME,
[datetime.date(2011, 11, 12), datetime.date(2011, 12, 13)],
100,
Expand All @@ -291,7 +299,7 @@ def test_regional_project_get(self, mock_now):
rcountry2,
[district2],
ProgrammeTypes.BILATERAL,
Sector.objects.get(pk=3),
sector_8,
OperationTypes.PROGRAMME,
[datetime.date(2010, 11, 12), datetime.date(2010, 1, 13)],
2,
Expand Down Expand Up @@ -329,87 +337,141 @@ def test_regional_project_get(self, mock_now):
resp.json(),
)

def deep_sort_response(data):
data["countries_count"] = sorted(data["countries_count"], key=lambda x: x["id"])
data["country_ns_sector_count"] = sorted(data["country_ns_sector_count"], key=lambda x: x["id"])

for country in data["country_ns_sector_count"]:
country["reporting_national_societies"] = sorted(country["reporting_national_societies"], key=lambda x: x["id"])

for ns in country["reporting_national_societies"]:
ns["sectors"] = sorted(ns["sectors"], key=lambda x: x["id"])

data["supporting_ns"] = sorted(data["supporting_ns"], key=lambda x: x["id"])
return data

resp = self.client.get(f"/api/v2/region-project/{region.pk}/movement-activities/", format="json")
self.assertEqual(
"".join(
sorted(
json.dumps(

resp_data = resp.json()

expected_data = {
"total_projects": 8,
"countries_count": [
{
"id": country1.id,
"name": country1.name,
"iso": country1.iso,
"iso3": country1.iso3,
"projects_count": 4,
"planned_projects_count": 2,
"ongoing_projects_count": 1,
"completed_projects_count": 1,
},
{
"id": country2.id,
"name": country2.name,
"iso": country2.iso,
"iso3": country2.iso3,
"projects_count": 4,
"planned_projects_count": 1,
"ongoing_projects_count": 1,
"completed_projects_count": 2,
},
],
"country_ns_sector_count": [
{
"id": country1.id,
"name": country1.name,
"reporting_national_societies": [
{
"id": rcountry1.id,
"name": rcountry1.name,
"sectors": [
{
"id": sector_1.id,
"sector": sector_1.title,
"count": 1,
},
{
"id": sector_2.id,
"sector": sector_2.title,
"count": 1,
},
],
},
{
"total_projects": 8,
"countries_count": [
"id": rcountry2.id,
"name": rcountry2.name,
"sectors": [
{
"id": country1.id,
"name": "country1",
"iso": "WZ",
"iso3": None,
"projects_count": 4,
"planned_projects_count": 2,
"ongoing_projects_count": 1,
"completed_projects_count": 1,
"id": sector_5.id,
"sector": sector_5.title,
"count": 1,
},
{
"id": country2.id,
"name": "country2",
"iso": "WW",
"iso3": None,
"projects_count": 4,
"planned_projects_count": 1,
"ongoing_projects_count": 1,
"completed_projects_count": 2,
"id": sector_6.id,
"sector": sector_6.title,
"count": 1,
},
],
"country_ns_sector_count": [
},
],
},
{
"id": country2.id,
"name": country2.name,
"reporting_national_societies": [
{
"id": rcountry1.id,
"name": rcountry1.name,
"sectors": [
{
"id": country1.id,
"name": "country1",
"reporting_national_societies": [
{
"id": rcountry1.id,
"name": "rcountry1",
"sectors": [{"id": 0, "sector": Sector.objects.get(pk=0).title, "count": 2}],
},
{
"id": rcountry2.id,
"name": "rcountry2",
"sectors": [
{"id": 0, "sector": Sector.objects.get(pk=0).title, "count": 1},
{"id": 8, "sector": Sector.objects.get(pk=8).title, "count": 1},
],
},
],
"id": sector_3.id,
"sector": sector_3.title,
"count": 1,
},
{
"id": country2.id,
"name": "country2",
"reporting_national_societies": [
{
"id": rcountry1.id,
"name": "rcountry1",
"sectors": [
{"id": 2, "sector": Sector.objects.get(pk=2).title, "count": 1},
{"id": 9, "sector": Sector.objects.get(pk=9).title, "count": 1},
],
},
{
"id": rcountry2.id,
"name": "rcountry2",
"sectors": [
{"id": 3, "sector": Sector.objects.get(pk=3).title, "count": 1},
{"id": 5, "sector": Sector.objects.get(pk=5).title, "count": 1},
],
},
],
"id": sector_4.id,
"sector": sector_4.title,
"count": 1,
},
],
"supporting_ns": [
{"count": 4, "id": rcountry1.id, "name": "rcountry1"},
{"count": 4, "id": rcountry2.id, "name": "rcountry2"},
},
{
"id": rcountry2.id,
"name": rcountry2.name,
"sectors": [
{
"id": sector_7.id,
"sector": sector_7.title,
"count": 1,
},
{
"id": sector_8.id,
"sector": sector_8.title,
"count": 1,
},
],
}
)
)
),
"".join(sorted(json.dumps(resp.json()))),
},
],
},
],
"supporting_ns": [
{
"id": rcountry1.id,
"name": rcountry1.name,
"count": 4,
},
{
"id": rcountry2.id,
"name": rcountry2.name,
"count": 4,
},
],
}
self.assertEqual(
deep_sort_response(expected_data),
deep_sort_response(resp_data),
)
# ^ the order of the deep recursive dict could vary, that is why this flat comparison

Expand Down
6 changes: 6 additions & 0 deletions deployments/translation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
PersonnelDeployment,
Project,
RegionalProject,
Sector,
)


Expand Down Expand Up @@ -49,3 +50,8 @@ class ProjectTO(TranslationOptions):
"name",
"description",
)


@register(Sector)
class SectorTO(TranslationOptions):
fields = ("title",)
2 changes: 1 addition & 1 deletion docs/go-artifacts.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ This is a **GitHub repository** used to store and manage **build files**, **gene

Command
```bash
docker compose run --rm serve ./manage.py spectacular --file .assets/openapi-schema.yaml
docker compose run --rm serve ./manage.py spectacular --file ./assets/openapi-schema.yaml
```

### 🚨 Manually added files
Expand Down
Binary file modified dref/locale/ar/LC_MESSAGES/django.mo
View file
Open in desktop
Binary file not shown.
Loading
Loading