Skip to content

Commit 94e520f

Browse files
thenav56thenav56
authored
Merge pull request #2046 from IFRCGo/feature/remove-unwanted-translation-fields
Translation fixes
2 parents 2ab1b27 + d88c35b commit 94e520f

File tree

6 files changed

+331
-154
lines changed

6 files changed

+331
-154
lines changed

‎api/admin.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ class DisasterTypeAdmin(CompareVersionAdmin, TranslationAdmin, admin.ModelAdmin)
160160
search_fields = ('name',)
161161

162162

163-
class KeyFigureInline(admin.TabularInline):
163+
class KeyFigureInline(admin.TabularInline, TranslationInlineModelAdmin):
164164
model = models.KeyFigure
165165

166166

@@ -172,11 +172,11 @@ class EventContactInline(admin.TabularInline):
172172
model = models.EventContact
173173

174174

175-
class SituationReportInline(admin.TabularInline, TranslationInlineModelAdmin):
175+
class SituationReportInline(admin.TabularInline):
176176
model = models.SituationReport
177177

178178

179-
class EventFeaturedDocumentInline(admin.TabularInline, TranslationInlineModelAdmin):
179+
class EventFeaturedDocumentInline(admin.TabularInline):
180180
model = models.EventFeaturedDocument
181181

182182

@@ -459,11 +459,11 @@ class GeneralDocumentAdmin(CompareVersionAdmin, RegionRestrictedAdmin, Translati
459459
search_fields = ('name', 'document')
460460

461461

462-
class CountryKeyFigureInline(admin.TabularInline):
462+
class CountryKeyFigureInline(admin.TabularInline, TranslationInlineModelAdmin):
463463
model = models.CountryKeyFigure
464464

465465

466-
class RegionKeyFigureInline(admin.TabularInline):
466+
class RegionKeyFigureInline(admin.TabularInline, TranslationInlineModelAdmin):
467467
model = models.RegionKeyFigure
468468

469469

@@ -599,7 +599,7 @@ def get_actions(self, request):
599599
return actions
600600

601601

602-
class SituationReportAdmin(CompareVersionAdmin, RegionRestrictedAdmin, TranslationAdmin):
602+
class SituationReportAdmin(CompareVersionAdmin, RegionRestrictedAdmin):
603603
search_fields = ('name', 'event__name',)
604604
list_display = ('name', 'link_to_event', 'type', 'visibility',)
605605
country_in = 'event__countries__in'

‎api/migrations/0189_auto_20240219_0904.py‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
# Generated by Django 3.2.23 on 2024-02-19 09:04
2+
3+
from django.db import migrations
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('api', '0188_auto_20240109_0508'),
10+
]
11+
12+
operations = [
13+
migrations.RemoveField(
14+
model_name='eventfeatureddocument',
15+
name='description_ar',
16+
),
17+
migrations.RemoveField(
18+
model_name='eventfeatureddocument',
19+
name='description_en',
20+
),
21+
migrations.RemoveField(
22+
model_name='eventfeatureddocument',
23+
name='description_es',
24+
),
25+
migrations.RemoveField(
26+
model_name='eventfeatureddocument',
27+
name='description_fr',
28+
),
29+
migrations.RemoveField(
30+
model_name='eventfeatureddocument',
31+
name='title_ar',
32+
),
33+
migrations.RemoveField(
34+
model_name='eventfeatureddocument',
35+
name='title_en',
36+
),
37+
migrations.RemoveField(
38+
model_name='eventfeatureddocument',
39+
name='title_es',
40+
),
41+
migrations.RemoveField(
42+
model_name='eventfeatureddocument',
43+
name='title_fr',
44+
),
45+
migrations.RemoveField(
46+
model_name='eventfeatureddocument',
47+
name='translation_module_original_language',
48+
),
49+
migrations.RemoveField(
50+
model_name='eventfeatureddocument',
51+
name='translation_module_skip_auto_translation',
52+
),
53+
migrations.RemoveField(
54+
model_name='situationreport',
55+
name='name_ar',
56+
),
57+
migrations.RemoveField(
58+
model_name='situationreport',
59+
name='name_en',
60+
),
61+
migrations.RemoveField(
62+
model_name='situationreport',
63+
name='name_es',
64+
),
65+
migrations.RemoveField(
66+
model_name='situationreport',
67+
name='name_fr',
68+
),
69+
migrations.RemoveField(
70+
model_name='situationreport',
71+
name='translation_module_original_language',
72+
),
73+
migrations.RemoveField(
74+
model_name='situationreport',
75+
name='translation_module_skip_auto_translation',
76+
),
77+
]

‎api/migrations/0190_auto_20240220_0510.py‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
# Generated by Django 3.2.23 on 2024-02-20 05:10
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('api', '0189_auto_20240219_0904'),
10+
]
11+
12+
operations = [
13+
migrations.AddField(
14+
model_name='adminkeyfigure',
15+
name='deck_ar',
16+
field=models.CharField(max_length=50, null=True, verbose_name='deck'),
17+
),
18+
migrations.AddField(
19+
model_name='adminkeyfigure',
20+
name='deck_en',
21+
field=models.CharField(max_length=50, null=True, verbose_name='deck'),
22+
),
23+
migrations.AddField(
24+
model_name='adminkeyfigure',
25+
name='deck_es',
26+
field=models.CharField(max_length=50, null=True, verbose_name='deck'),
27+
),
28+
migrations.AddField(
29+
model_name='adminkeyfigure',
30+
name='deck_fr',
31+
field=models.CharField(max_length=50, null=True, verbose_name='deck'),
32+
),
33+
migrations.AddField(
34+
model_name='adminkeyfigure',
35+
name='translation_module_original_language',
36+
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'),
37+
),
38+
migrations.AddField(
39+
model_name='adminkeyfigure',
40+
name='translation_module_skip_auto_translation',
41+
field=models.BooleanField(default=False, help_text='Skip auto translation operation for this entity?', verbose_name='Skip auto translation'),
42+
),
43+
migrations.AddField(
44+
model_name='keyfigure',
45+
name='deck_ar',
46+
field=models.CharField(help_text='key figure units', max_length=50, null=True, verbose_name='deck'),
47+
),
48+
migrations.AddField(
49+
model_name='keyfigure',
50+
name='deck_en',
51+
field=models.CharField(help_text='key figure units', max_length=50, null=True, verbose_name='deck'),
52+
),
53+
migrations.AddField(
54+
model_name='keyfigure',
55+
name='deck_es',
56+
field=models.CharField(help_text='key figure units', max_length=50, null=True, verbose_name='deck'),
57+
),
58+
migrations.AddField(
59+
model_name='keyfigure',
60+
name='deck_fr',
61+
field=models.CharField(help_text='key figure units', max_length=50, null=True, verbose_name='deck'),
62+
),
63+
migrations.AddField(
64+
model_name='keyfigure',
65+
name='translation_module_original_language',
66+
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'),
67+
),
68+
migrations.AddField(
69+
model_name='keyfigure',
70+
name='translation_module_skip_auto_translation',
71+
field=models.BooleanField(default=False, help_text='Skip auto translation operation for this entity?', verbose_name='Skip auto translation'),
72+
),
73+
]

‎api/serializers.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,7 @@ class Meta:
818818
)
819819

820820

821-
class EventFeaturedDocumentSerializer(ModelSerializer):
821+
class EventFeaturedDocumentSerializer(serializers.ModelSerializer):
822822
class Meta:
823823
model = EventFeaturedDocument
824824
fields = (
@@ -1245,7 +1245,7 @@ class Meta:
12451245
)
12461246

12471247

1248-
class SituationReportSerializer(ModelSerializer):
1248+
class SituationReportSerializer(serializers.ModelSerializer):
12491249
type = SituationReportTypeSerializer()
12501250
visibility_display = serializers.CharField(source="get_visibility_display", read_only=True)
12511251

0 commit comments

Comments
 (0)