Skip to content

Commit fc5447a

Browse files
committed
[Fixes #13649] Multilang: remove modeltranslation
1 parent e489286 commit fc5447a

23 files changed

+222
-279
lines changed

geonode/base/admin.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
from treebeard.admin import TreeAdmin
3131
from treebeard.forms import movenodeform_factory
3232

33-
from modeltranslation.admin import TabbedTranslationAdmin
34-
3533
from geonode.base.management.commands.thesaurus_subcommands.load import ACTION_UPDATE
3634
from geonode.base.models import (
3735
TopicCategory,
@@ -79,13 +77,13 @@ def set_user_and_group_dataset_permission(modeladmin, request, queryset):
7977
set_user_and_group_dataset_permission.short_description = "Set layer permissions"
8078

8179

82-
class LicenseAdmin(TabbedTranslationAdmin):
80+
class LicenseAdmin(admin.ModelAdmin):
8381
model = License
8482
list_display = ("id", "name")
8583
list_display_links = ("name",)
8684

8785

88-
class TopicCategoryAdmin(TabbedTranslationAdmin):
86+
class TopicCategoryAdmin(admin.ModelAdmin):
8987
model = TopicCategory
9088
list_display_links = ("identifier",)
9189
list_display = ("identifier", "description", "gn_description", "fa_class", "is_choice")
@@ -110,7 +108,7 @@ def has_delete_permission(self, request, obj=None):
110108
return False
111109

112110

113-
class RegionAdmin(TabbedTranslationAdmin):
111+
class RegionAdmin(admin.ModelAdmin):
114112
model = Region
115113
list_display_links = ("name",)
116114
list_display = ("code", "name", "parent")
@@ -121,7 +119,7 @@ class RegionAdmin(TabbedTranslationAdmin):
121119
group_fieldsets = True
122120

123121

124-
class SpatialRepresentationTypeAdmin(TabbedTranslationAdmin):
122+
class SpatialRepresentationTypeAdmin(admin.ModelAdmin):
125123
model = SpatialRepresentationType
126124
list_display_links = ("identifier",)
127125
list_display = ("identifier", "description", "gn_description", "is_choice")
@@ -135,7 +133,7 @@ def has_delete_permission(self, request, obj=None):
135133
return False
136134

137135

138-
class RestrictionCodeTypeAdmin(TabbedTranslationAdmin):
136+
class RestrictionCodeTypeAdmin(admin.ModelAdmin):
139137
model = RestrictionCodeType
140138
list_display_links = ("identifier",)
141139
list_display = ("identifier", "description", "gn_description", "is_choice")
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# Generated by Django 5.2 on 2025-10-21 13:47
2+
3+
from django.db import migrations
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
("base", "0095_alter_configuration_id_alter_contactrole_id_and_more"),
10+
]
11+
12+
operations = [
13+
migrations.RemoveField(
14+
model_name="license",
15+
name="description_en",
16+
),
17+
migrations.RemoveField(
18+
model_name="license",
19+
name="license_text_en",
20+
),
21+
migrations.RemoveField(
22+
model_name="license",
23+
name="name_en",
24+
),
25+
migrations.RemoveField(
26+
model_name="region",
27+
name="name_en",
28+
),
29+
migrations.RemoveField(
30+
model_name="restrictioncodetype",
31+
name="description_en",
32+
),
33+
migrations.RemoveField(
34+
model_name="restrictioncodetype",
35+
name="gn_description_en",
36+
),
37+
migrations.RemoveField(
38+
model_name="spatialrepresentationtype",
39+
name="description_en",
40+
),
41+
migrations.RemoveField(
42+
model_name="spatialrepresentationtype",
43+
name="gn_description_en",
44+
),
45+
migrations.RemoveField(
46+
model_name="topiccategory",
47+
name="description_en",
48+
),
49+
migrations.RemoveField(
50+
model_name="topiccategory",
51+
name="gn_description_en",
52+
),
53+
]

geonode/base/translation.py

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -17,53 +17,3 @@
1717
#
1818
#########################################################################
1919

20-
from modeltranslation.translator import translator, TranslationOptions
21-
from geonode.base.models import (
22-
TopicCategory,
23-
SpatialRepresentationType,
24-
Region,
25-
RestrictionCodeType,
26-
License,
27-
ResourceBase,
28-
)
29-
30-
31-
class TopicCategoryTranslationOptions(TranslationOptions):
32-
fields = (
33-
"description",
34-
"gn_description",
35-
)
36-
37-
38-
class SpatialRepresentationTypeTranslationOptions(TranslationOptions):
39-
fields = (
40-
"description",
41-
"gn_description",
42-
)
43-
44-
45-
class RegionTranslationOptions(TranslationOptions):
46-
fields = ("name",)
47-
48-
49-
class RestrictionCodeTypeTranslationOptions(TranslationOptions):
50-
fields = (
51-
"description",
52-
"gn_description",
53-
)
54-
55-
56-
class LicenseTranslationOptions(TranslationOptions):
57-
fields = (
58-
"name",
59-
"description",
60-
"license_text",
61-
)
62-
63-
64-
translator.register(TopicCategory, TopicCategoryTranslationOptions)
65-
translator.register(SpatialRepresentationType, SpatialRepresentationTypeTranslationOptions)
66-
translator.register(Region, RegionTranslationOptions)
67-
translator.register(RestrictionCodeType, RestrictionCodeTypeTranslationOptions)
68-
translator.register(License, LicenseTranslationOptions)
69-
translator.register(ResourceBase)

geonode/documents/admin.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919

2020
from django.contrib import admin
2121

22-
from modeltranslation.admin import TabbedTranslationAdmin
23-
2422
from geonode.documents.models import Document
2523
from geonode.base.admin import ResourceBaseAdminForm, SparseInline
2624

@@ -34,7 +32,7 @@ class Meta(ResourceBaseAdminForm.Meta):
3432
# )
3533

3634

37-
class DocumentAdmin(TabbedTranslationAdmin):
35+
class DocumentAdmin(admin.ModelAdmin):
3836
inlines = (SparseInline,)
3937
exclude = ("ll_bbox_polygon", "bbox_polygon", "srid", "tkeywords")
4038
list_display = (

geonode/documents/forms.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
import json
2222
import logging
2323

24-
from modeltranslation.forms import TranslationModelForm
25-
2624
from django import forms
2725
from django.conf import settings
2826
from django.forms import HiddenInput
@@ -76,7 +74,7 @@ def _get_max_size(self):
7674
return max_size_db_obj.max_size
7775

7876

79-
class DocumentCreateForm(TranslationModelForm):
77+
class DocumentCreateForm(forms.ModelForm):
8078
"""
8179
The document upload form.
8280
"""
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Generated by Django 5.2 on 2025-10-21 13:47
2+
3+
from django.db import migrations
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
("documents", "0038_alter_document_doc_url"),
10+
]
11+
12+
operations = [
13+
migrations.RemoveField(
14+
model_name="document",
15+
name="abstract_en",
16+
),
17+
migrations.RemoveField(
18+
model_name="document",
19+
name="constraints_other_en",
20+
),
21+
migrations.RemoveField(
22+
model_name="document",
23+
name="data_quality_statement_en",
24+
),
25+
migrations.RemoveField(
26+
model_name="document",
27+
name="purpose_en",
28+
),
29+
migrations.RemoveField(
30+
model_name="document",
31+
name="supplemental_information_en",
32+
),
33+
migrations.RemoveField(
34+
model_name="document",
35+
name="title_en",
36+
),
37+
]

geonode/documents/translation.py

Lines changed: 0 additions & 35 deletions
This file was deleted.

geonode/geoapps/admin.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919

2020
from django.contrib import admin
2121

22-
from modeltranslation.admin import TabbedTranslationAdmin
23-
2422
from geonode.geoapps.models import GeoApp
2523
from geonode.base.admin import ResourceBaseAdminForm
2624

@@ -31,7 +29,7 @@ class Meta(ResourceBaseAdminForm.Meta):
3129
fields = "__all__"
3230

3331

34-
class GeoAppAdmin(TabbedTranslationAdmin):
32+
class GeoAppAdmin(admin.ModelAdmin):
3533
exclude = ("ll_bbox_polygon", "bbox_polygon", "srid", "tkeywords")
3634
list_display_links = ("title",)
3735
list_display = (

geonode/geoapps/translation.py

Lines changed: 0 additions & 28 deletions
This file was deleted.

geonode/groups/admin.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,13 @@
1818
#########################################################################
1919

2020
from django.contrib import admin
21-
from modeltranslation.admin import TranslationAdmin
2221
from geonode.base.admin import set_user_and_group_dataset_permission
2322

2423
from . import models
2524

2625

2726
@admin.register(models.GroupCategory)
28-
class GroupCategoryAdmin(TranslationAdmin):
27+
class GroupCategoryAdmin(admin.ModelAdmin):
2928
list_display = (
3029
"name",
3130
"slug",

0 commit comments

Comments
 (0)