Skip to content

Commit

Permalink
Fix Bullentin typo + a DREF get_queryset bug
Browse files Browse the repository at this point in the history
  • Loading branch information
szabozoltan69 committed Oct 10, 2022
1 parent 698e3d7 commit 13bb549
Show file tree
Hide file tree
Showing 51 changed files with 15,237 additions and 4,119 deletions.
1,608 changes: 1,011 additions & 597 deletions api/locale/ar/LC_MESSAGES/django.po

Large diffs are not rendered by default.

1,595 changes: 1,005 additions & 590 deletions api/locale/en/LC_MESSAGES/django.po

Large diffs are not rendered by default.

1,600 changes: 1,006 additions & 594 deletions api/locale/es/LC_MESSAGES/django.po

Large diffs are not rendered by default.

1,600 changes: 1,006 additions & 594 deletions api/locale/fr/LC_MESSAGES/django.po

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion api/migrations/0070_auto_20200618_0904.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion api/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
36 changes: 28 additions & 8 deletions databank/locale/ar/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -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 "بنك بيانات"

Expand Down Expand Up @@ -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 "نظرة قطرية عامة"

Expand Down Expand Up @@ -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 "العنوان"

Expand All @@ -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 ""
33 changes: 26 additions & 7 deletions databank/locale/en/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"

Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -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"

Expand All @@ -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 ""
33 changes: 26 additions & 7 deletions databank/locale/es/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"

Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -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"

Expand All @@ -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 ""
33 changes: 26 additions & 7 deletions databank/locale/fr/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"

Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -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é"

Expand All @@ -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 ""
Loading

0 comments on commit 13bb549

Please sign in to comment.