Skip to content

Commit 13bb549

Browse files
committed
Fix Bullentin typo + a DREF get_queryset bug
1 parent 698e3d7 commit 13bb549

File tree

51 files changed

+15237
-4119
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+15237
-4119
lines changed

api/locale/ar/LC_MESSAGES/django.po

Lines changed: 1011 additions & 597 deletions
Large diffs are not rendered by default.

api/locale/en/LC_MESSAGES/django.po

Lines changed: 1005 additions & 590 deletions
Large diffs are not rendered by default.

api/locale/es/LC_MESSAGES/django.po

Lines changed: 1006 additions & 594 deletions
Large diffs are not rendered by default.

api/locale/fr/LC_MESSAGES/django.po

Lines changed: 1006 additions & 594 deletions
Large diffs are not rendered by default.

api/migrations/0070_auto_20200618_0904.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2472,7 +2472,7 @@ class Migration(migrations.Migration):
24722472
migrations.AlterField(
24732473
model_name='fieldreport',
24742474
name='bulletin',
2475-
field=models.IntegerField(default=0, choices=api.models.RequestChoices.choices, verbose_name='bullentin'),
2475+
field=models.IntegerField(default=0, choices=api.models.RequestChoices.choices, verbose_name='bulletin'),
24762476
),
24772477
migrations.AlterField(
24782478
model_name='fieldreport',

api/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1259,7 +1259,7 @@ class Status(models.IntegerChoices):
12591259
visibility = models.IntegerField(choices=VisibilityChoices.choices, verbose_name=_('visibility'), default=1)
12601260

12611261
# information
1262-
bulletin = models.IntegerField(choices=RequestChoices.choices, verbose_name=_('bullentin'), default=0)
1262+
bulletin = models.IntegerField(choices=RequestChoices.choices, verbose_name=_('bulletin'), default=0)
12631263
dref = models.IntegerField(choices=RequestChoices.choices, verbose_name=_('DREF'), default=0)
12641264
dref_amount = models.IntegerField(verbose_name=_('DREF amount'), null=True, blank=True)
12651265
appeal = models.IntegerField(choices=RequestChoices.choices, verbose_name=_('appeal'), default=0)

databank/locale/ar/LC_MESSAGES/django.po

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,30 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-06-24 07:55+0000\n"
11+
"POT-Creation-Date: 2022-10-08 17:57+0000\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
1515
"Language: \n"
1616
"MIME-Version: 1.0\n"
1717
"Content-Type: text/plain; charset=UTF-8\n"
1818
"Content-Transfer-Encoding: 8bit\n"
19-
"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"
19+
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
20+
"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
2021

21-
#: databank/admin.py:40
22+
#: databank/admin.py:55
2223
msgid "COUNTRY KEY INDICATORS (SOURCE: FDRS)"
2324
msgstr "المؤشرات الرئيسية للبلد (المصدر:FDRS)"
2425

25-
#: databank/admin.py:46
26+
#: databank/admin.py:61
2627
msgid "NATIONAL SOCIETY INDICATORS (SOURCE: FDRS)"
2728
msgstr "مؤشرات الجمعية الوطنية (المصدر:FDRS)"
2829

29-
#: databank/admin.py:49
30+
#: databank/admin.py:64
3031
msgid "KEY CLIMATE EVENT"
3132
msgstr "حدث المناخ الرئيسي"
3233

33-
#: databank/apps.py:6
34+
#: databank/apps.py:7
3435
msgid "databank"
3536
msgstr "بنك بيانات"
3637

@@ -415,7 +416,7 @@ msgid "inform indicators data"
415416
msgstr "إبلاغ بيانات المؤشرات"
416417

417418
#: databank/models.py:232 databank/models.py:248 databank/models.py:262
418-
#: databank/models.py:281
419+
#: databank/models.py:281 databank/models.py:309 databank/models.py:320
419420
msgid "country overview"
420421
msgstr "نظرة قطرية عامة"
421422

@@ -463,7 +464,8 @@ msgstr "حدث العميل الرئيسي"
463464
msgid "Key Client Events"
464465
msgstr "أحداث العملاء"
465466

466-
#: databank/models.py:283
467+
#: databank/models.py:283 databank/models.py:298 databank/models.py:310
468+
#: databank/models.py:321
467469
msgid "title"
468470
msgstr "العنوان"
469471

@@ -486,3 +488,21 @@ msgstr "سجل التقويم الموسمي"
486488
#: databank/models.py:291
487489
msgid "Seasonal Calender Records"
488490
msgstr "سجلات التقويم الموسمية"
491+
492+
#: databank/models.py:311
493+
msgid "group"
494+
msgstr ""
495+
496+
#: databank/models.py:312
497+
#, fuzzy
498+
#| msgid "date end"
499+
msgid "date"
500+
msgstr "تاريخ الإنتهاء"
501+
502+
#: databank/models.py:313
503+
msgid "file"
504+
msgstr ""
505+
506+
#: databank/models.py:322
507+
msgid "url"
508+
msgstr ""

databank/locale/en/LC_MESSAGES/django.po

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-06-24 07:55+0000\n"
11+
"POT-Creation-Date: 2022-10-08 17:57+0000\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -18,19 +18,19 @@ msgstr ""
1818
"Content-Transfer-Encoding: 8bit\n"
1919
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
2020

21-
#: databank/admin.py:40
21+
#: databank/admin.py:55
2222
msgid "COUNTRY KEY INDICATORS (SOURCE: FDRS)"
2323
msgstr "COUNTRY KEY INDICATORS (SOURCE: FDRS)"
2424

25-
#: databank/admin.py:46
25+
#: databank/admin.py:61
2626
msgid "NATIONAL SOCIETY INDICATORS (SOURCE: FDRS)"
2727
msgstr "NATIONAL SOCIETY INDICATORS (SOURCE: FDRS)"
2828

29-
#: databank/admin.py:49
29+
#: databank/admin.py:64
3030
msgid "KEY CLIMATE EVENT"
3131
msgstr "KEY CLIMATE EVENT"
3232

33-
#: databank/apps.py:6
33+
#: databank/apps.py:7
3434
msgid "databank"
3535
msgstr "databank"
3636

@@ -415,7 +415,7 @@ msgid "inform indicators data"
415415
msgstr "inform indicators data"
416416

417417
#: databank/models.py:232 databank/models.py:248 databank/models.py:262
418-
#: databank/models.py:281
418+
#: databank/models.py:281 databank/models.py:309 databank/models.py:320
419419
msgid "country overview"
420420
msgstr "country overview"
421421

@@ -463,7 +463,8 @@ msgstr "Key Client Event"
463463
msgid "Key Client Events"
464464
msgstr "Key Client Events"
465465

466-
#: databank/models.py:283
466+
#: databank/models.py:283 databank/models.py:298 databank/models.py:310
467+
#: databank/models.py:321
467468
msgid "title"
468469
msgstr "title"
469470

@@ -486,3 +487,21 @@ msgstr "Seasonal Calender Record"
486487
#: databank/models.py:291
487488
msgid "Seasonal Calender Records"
488489
msgstr "Seasonal Calender Records"
490+
491+
#: databank/models.py:311
492+
msgid "group"
493+
msgstr ""
494+
495+
#: databank/models.py:312
496+
#, fuzzy
497+
#| msgid "date end"
498+
msgid "date"
499+
msgstr "date end"
500+
501+
#: databank/models.py:313
502+
msgid "file"
503+
msgstr ""
504+
505+
#: databank/models.py:322
506+
msgid "url"
507+
msgstr ""

databank/locale/es/LC_MESSAGES/django.po

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-06-24 07:55+0000\n"
11+
"POT-Creation-Date: 2022-10-08 17:57+0000\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -18,19 +18,19 @@ msgstr ""
1818
"Content-Transfer-Encoding: 8bit\n"
1919
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
2020

21-
#: databank/admin.py:40
21+
#: databank/admin.py:55
2222
msgid "COUNTRY KEY INDICATORS (SOURCE: FDRS)"
2323
msgstr "INDICADORES CLAVES DEL PAÍS (FUENTE: FDRS)"
2424

25-
#: databank/admin.py:46
25+
#: databank/admin.py:61
2626
msgid "NATIONAL SOCIETY INDICATORS (SOURCE: FDRS)"
2727
msgstr "INDICADORES DE LA SOCIEDAD NACIONAL (FUENTE: FDRS)"
2828

29-
#: databank/admin.py:49
29+
#: databank/admin.py:64
3030
msgid "KEY CLIMATE EVENT"
3131
msgstr "EVENTOS CLIMÁTICOS CLAVE"
3232

33-
#: databank/apps.py:6
33+
#: databank/apps.py:7
3434
msgid "databank"
3535
msgstr "base de datos"
3636

@@ -415,7 +415,7 @@ msgid "inform indicators data"
415415
msgstr "datos indicadores de inform"
416416

417417
#: databank/models.py:232 databank/models.py:248 databank/models.py:262
418-
#: databank/models.py:281
418+
#: databank/models.py:281 databank/models.py:309 databank/models.py:320
419419
msgid "country overview"
420420
msgstr "resumen del país"
421421

@@ -463,7 +463,8 @@ msgstr "Evento de cliente clave"
463463
msgid "Key Client Events"
464464
msgstr "Eventos de cliente clave"
465465

466-
#: databank/models.py:283
466+
#: databank/models.py:283 databank/models.py:298 databank/models.py:310
467+
#: databank/models.py:321
467468
msgid "title"
468469
msgstr "título"
469470

@@ -486,3 +487,21 @@ msgstr "Registro del calendario estacional"
486487
#: databank/models.py:291
487488
msgid "Seasonal Calender Records"
488489
msgstr "Registros del calendario estacional"
490+
491+
#: databank/models.py:311
492+
msgid "group"
493+
msgstr ""
494+
495+
#: databank/models.py:312
496+
#, fuzzy
497+
#| msgid "date end"
498+
msgid "date"
499+
msgstr "fecha de finalización"
500+
501+
#: databank/models.py:313
502+
msgid "file"
503+
msgstr ""
504+
505+
#: databank/models.py:322
506+
msgid "url"
507+
msgstr ""

databank/locale/fr/LC_MESSAGES/django.po

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-06-24 07:55+0000\n"
11+
"POT-Creation-Date: 2022-10-08 17:57+0000\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -18,19 +18,19 @@ msgstr ""
1818
"Content-Transfer-Encoding: 8bit\n"
1919
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
2020

21-
#: databank/admin.py:40
21+
#: databank/admin.py:55
2222
msgid "COUNTRY KEY INDICATORS (SOURCE: FDRS)"
2323
msgstr "LES INDICATEURS CLÉS DU PAYS (SOURCE : FDRS)"
2424

25-
#: databank/admin.py:46
25+
#: databank/admin.py:61
2626
msgid "NATIONAL SOCIETY INDICATORS (SOURCE: FDRS)"
2727
msgstr "LES INDICATEURS NATIONAUX DE LA SOCIÉTÉ (SOURCE : FDRS)"
2828

29-
#: databank/admin.py:49
29+
#: databank/admin.py:64
3030
msgid "KEY CLIMATE EVENT"
3131
msgstr "ÉVÈNEMENT CLÉ SUR LE CLIMAT"
3232

33-
#: databank/apps.py:6
33+
#: databank/apps.py:7
3434
msgid "databank"
3535
msgstr "banque de données"
3636

@@ -415,7 +415,7 @@ msgid "inform indicators data"
415415
msgstr "renseigner les données des indicateurs"
416416

417417
#: databank/models.py:232 databank/models.py:248 databank/models.py:262
418-
#: databank/models.py:281
418+
#: databank/models.py:281 databank/models.py:309 databank/models.py:320
419419
msgid "country overview"
420420
msgstr "aperçu du pays"
421421

@@ -463,7 +463,8 @@ msgstr "Événement clé pour les clients"
463463
msgid "Key Client Events"
464464
msgstr "Événements clés pour les clients"
465465

466-
#: databank/models.py:283
466+
#: databank/models.py:283 databank/models.py:298 databank/models.py:310
467+
#: databank/models.py:321
467468
msgid "title"
468469
msgstr "Intitulé"
469470

@@ -486,3 +487,21 @@ msgstr "Calendrier saisonnier"
486487
#: databank/models.py:291
487488
msgid "Seasonal Calender Records"
488489
msgstr "Calendriers saisonniers"
490+
491+
#: databank/models.py:311
492+
msgid "group"
493+
msgstr ""
494+
495+
#: databank/models.py:312
496+
#, fuzzy
497+
#| msgid "date end"
498+
msgid "date"
499+
msgstr "date de fin"
500+
501+
#: databank/models.py:313
502+
msgid "file"
503+
msgstr ""
504+
505+
#: databank/models.py:322
506+
msgid "url"
507+
msgstr ""

0 commit comments

Comments
 (0)