Merge pull request #1550 from IFRCGo/fix/bullentin-typo-and-a-dref-get-queryset

Fix Bullentin typo + a DREF get_queryset bug

Author: szabozoltan69

api/locale/ar/LC_MESSAGES/django.po

@@ -2472,7 +2472,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='fieldreport',
             name='bulletin',
-            field=models.IntegerField(default=0, choices=api.models.RequestChoices.choices, verbose_name='bullentin'),
+            field=models.IntegerField(default=0, choices=api.models.RequestChoices.choices, verbose_name='bulletin'),
         ),
         migrations.AlterField(
             model_name='fieldreport',

api/locale/en/LC_MESSAGES/django.po

@@ -1259,7 +1259,7 @@ class Status(models.IntegerChoices):
     visibility = models.IntegerField(choices=VisibilityChoices.choices, verbose_name=_('visibility'), default=1)
 
     # information
-    bulletin = models.IntegerField(choices=RequestChoices.choices, verbose_name=_('bullentin'), default=0)
+    bulletin = models.IntegerField(choices=RequestChoices.choices, verbose_name=_('bulletin'), default=0)
     dref = models.IntegerField(choices=RequestChoices.choices, verbose_name=_('DREF'), default=0)
     dref_amount = models.IntegerField(verbose_name=_('DREF amount'), null=True, blank=True)
     appeal = models.IntegerField(choices=RequestChoices.choices, verbose_name=_('appeal'), default=0)

api/locale/es/LC_MESSAGES/django.po

@@ -8,29 +8,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-24 07:55+0000\n"
+"POT-Creation-Date: 2022-10-08 17:57+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: databank/admin.py:40
+#: databank/admin.py:55
 msgid "COUNTRY KEY INDICATORS (SOURCE: FDRS)"
 msgstr "المؤشرات الرئيسية للبلد (المصدر:FDRS)"
 
-#: databank/admin.py:46
+#: databank/admin.py:61
 msgid "NATIONAL SOCIETY INDICATORS (SOURCE: FDRS)"
 msgstr "مؤشرات الجمعية الوطنية (المصدر:FDRS)"
 
-#: databank/admin.py:49
+#: databank/admin.py:64
 msgid "KEY CLIMATE EVENT"
 msgstr "حدث المناخ الرئيسي"
 
-#: databank/apps.py:6
+#: databank/apps.py:7
 msgid "databank"
 msgstr "بنك بيانات"
 
@@ -415,7 +416,7 @@ msgid "inform indicators data"
 msgstr "إبلاغ بيانات المؤشرات"
 
 #: databank/models.py:232 databank/models.py:248 databank/models.py:262
-#: databank/models.py:281
+#: databank/models.py:281 databank/models.py:309 databank/models.py:320
 msgid "country overview"
 msgstr "نظرة قطرية عامة"
 
@@ -463,7 +464,8 @@ msgstr "حدث العميل الرئيسي"
 msgid "Key Client Events"
 msgstr "أحداث العملاء"
 
-#: databank/models.py:283
+#: databank/models.py:283 databank/models.py:298 databank/models.py:310
+#: databank/models.py:321
 msgid "title"
 msgstr "العنوان"
 
@@ -486,3 +488,21 @@ msgstr "سجل التقويم الموسمي"
 #: databank/models.py:291
 msgid "Seasonal Calender Records"
 msgstr "سجلات التقويم الموسمية"
+
+#: databank/models.py:311
+msgid "group"
+msgstr ""
+
+#: databank/models.py:312
+#, fuzzy
+#| msgid "date end"
+msgid "date"
+msgstr "تاريخ الإنتهاء"
+
+#: databank/models.py:313
+msgid "file"
+msgstr ""
+
+#: databank/models.py:322
+msgid "url"
+msgstr ""

api/locale/fr/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-24 07:55+0000\n"
+"POT-Creation-Date: 2022-10-08 17:57+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -18,19 +18,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: databank/admin.py:40
+#: databank/admin.py:55
 msgid "COUNTRY KEY INDICATORS (SOURCE: FDRS)"
 msgstr "COUNTRY KEY INDICATORS (SOURCE: FDRS)"
 
-#: databank/admin.py:46
+#: databank/admin.py:61
 msgid "NATIONAL SOCIETY INDICATORS (SOURCE: FDRS)"
 msgstr "NATIONAL SOCIETY INDICATORS (SOURCE: FDRS)"
 
-#: databank/admin.py:49
+#: databank/admin.py:64
 msgid "KEY CLIMATE EVENT"
 msgstr "KEY CLIMATE EVENT"
 
-#: databank/apps.py:6
+#: databank/apps.py:7
 msgid "databank"
 msgstr "databank"
 
@@ -415,7 +415,7 @@ msgid "inform indicators data"
 msgstr "inform indicators data"
 
 #: databank/models.py:232 databank/models.py:248 databank/models.py:262
-#: databank/models.py:281
+#: databank/models.py:281 databank/models.py:309 databank/models.py:320
 msgid "country overview"
 msgstr "country overview"
 
@@ -463,7 +463,8 @@ msgstr "Key Client Event"
 msgid "Key Client Events"
 msgstr "Key Client Events"
 
-#: databank/models.py:283
+#: databank/models.py:283 databank/models.py:298 databank/models.py:310
+#: databank/models.py:321
 msgid "title"
 msgstr "title"
 
@@ -486,3 +487,21 @@ msgstr "Seasonal Calender Record"
 #: databank/models.py:291
 msgid "Seasonal Calender Records"
 msgstr "Seasonal Calender Records"
+
+#: databank/models.py:311
+msgid "group"
+msgstr ""
+
+#: databank/models.py:312
+#, fuzzy
+#| msgid "date end"
+msgid "date"
+msgstr "date end"
+
+#: databank/models.py:313
+msgid "file"
+msgstr ""
+
+#: databank/models.py:322
+msgid "url"
+msgstr ""

api/migrations/0070_auto_20200618_0904.py

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-24 07:55+0000\n"
+"POT-Creation-Date: 2022-10-08 17:57+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -18,19 +18,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: databank/admin.py:40
+#: databank/admin.py:55
 msgid "COUNTRY KEY INDICATORS (SOURCE: FDRS)"
 msgstr "INDICADORES CLAVES DEL PAÍS (FUENTE: FDRS)"
 
-#: databank/admin.py:46
+#: databank/admin.py:61
 msgid "NATIONAL SOCIETY INDICATORS (SOURCE: FDRS)"
 msgstr "INDICADORES DE LA SOCIEDAD NACIONAL (FUENTE: FDRS)"
 
-#: databank/admin.py:49
+#: databank/admin.py:64
 msgid "KEY CLIMATE EVENT"
 msgstr "EVENTOS CLIMÁTICOS CLAVE"
 
-#: databank/apps.py:6
+#: databank/apps.py:7
 msgid "databank"
 msgstr "base de datos"
 
@@ -415,7 +415,7 @@ msgid "inform indicators data"
 msgstr "datos indicadores de inform"
 
 #: databank/models.py:232 databank/models.py:248 databank/models.py:262
-#: databank/models.py:281
+#: databank/models.py:281 databank/models.py:309 databank/models.py:320
 msgid "country overview"
 msgstr "resumen del país"
 
@@ -463,7 +463,8 @@ msgstr "Evento de cliente clave"
 msgid "Key Client Events"
 msgstr "Eventos de cliente clave"
 
-#: databank/models.py:283
+#: databank/models.py:283 databank/models.py:298 databank/models.py:310
+#: databank/models.py:321
 msgid "title"
 msgstr "título"
 
@@ -486,3 +487,21 @@ msgstr "Registro del calendario estacional"
 #: databank/models.py:291
 msgid "Seasonal Calender Records"
 msgstr "Registros del calendario estacional"
+
+#: databank/models.py:311
+msgid "group"
+msgstr ""
+
+#: databank/models.py:312
+#, fuzzy
+#| msgid "date end"
+msgid "date"
+msgstr "fecha de finalización"
+
+#: databank/models.py:313
+msgid "file"
+msgstr ""
+
+#: databank/models.py:322
+msgid "url"
+msgstr ""

api/models.py

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-24 07:55+0000\n"
+"POT-Creation-Date: 2022-10-08 17:57+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -18,19 +18,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: databank/admin.py:40
+#: databank/admin.py:55
 msgid "COUNTRY KEY INDICATORS (SOURCE: FDRS)"
 msgstr "LES INDICATEURS CLÉS DU PAYS (SOURCE : FDRS)"
 
-#: databank/admin.py:46
+#: databank/admin.py:61
 msgid "NATIONAL SOCIETY INDICATORS (SOURCE: FDRS)"
 msgstr "LES INDICATEURS NATIONAUX DE LA SOCIÉTÉ (SOURCE : FDRS)"
 
-#: databank/admin.py:49
+#: databank/admin.py:64
 msgid "KEY CLIMATE EVENT"
 msgstr "ÉVÈNEMENT CLÉ SUR LE CLIMAT"
 
-#: databank/apps.py:6
+#: databank/apps.py:7
 msgid "databank"
 msgstr "banque de données"
 
@@ -415,7 +415,7 @@ msgid "inform indicators data"
 msgstr "renseigner les données des indicateurs"
 
 #: databank/models.py:232 databank/models.py:248 databank/models.py:262
-#: databank/models.py:281
+#: databank/models.py:281 databank/models.py:309 databank/models.py:320
 msgid "country overview"
 msgstr "aperçu du pays"
 
@@ -463,7 +463,8 @@ msgstr "Événement clé pour les clients"
 msgid "Key Client Events"
 msgstr "Événements clés pour les clients"
 
-#: databank/models.py:283
+#: databank/models.py:283 databank/models.py:298 databank/models.py:310
+#: databank/models.py:321
 msgid "title"
 msgstr "Intitulé"
 
@@ -486,3 +487,21 @@ msgstr "Calendrier saisonnier"
 #: databank/models.py:291
 msgid "Seasonal Calender Records"
 msgstr "Calendriers saisonniers"
+
+#: databank/models.py:311
+msgid "group"
+msgstr ""
+
+#: databank/models.py:312
+#, fuzzy
+#| msgid "date end"
+msgid "date"
+msgstr "date de fin"
+
+#: databank/models.py:313
+msgid "file"
+msgstr ""
+
+#: databank/models.py:322
+msgid "url"
+msgstr ""