diff --git a/.gitignore b/.gitignore
index 62ebce9a2b0723b5c84c54dd7af7ffe1a6cbf135..7d3ea64034c9d63a10d2e86b5ed3ecc843ac0632 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
.ansible
*.pyc
.coverage
+.idea
.pytest_cache
internewshid/local_settings.py
internewshid/private_settings.py
diff --git a/internewshid/chn_spreadsheet/importer.py b/internewshid/chn_spreadsheet/importer.py
index c41da837b07cb314cf459479adfa0ed393b5332b..88cdb3b18a022d8f300ee2104da282f702d8adff 100644
--- a/internewshid/chn_spreadsheet/importer.py
+++ b/internewshid/chn_spreadsheet/importer.py
@@ -167,14 +167,14 @@ class Importer(object):
# The exception will have different formats:
# Example of failure during transport.items.create():
# {
- # 'enumerator': [ErrorDetail(string='Ensure this field has no more than 190 characters.', code='max_length')],
+ # 'contributor': [ErrorDetail(string='Ensure this field has no more than 190 characters.', code='max_length')],
# 'status_code': 400,
# 'item': {
# 'timestamp': datetime.datetime(2018, 8, 9, 12, 14, 26, 766000, tzinfo=tzoffset(None, 21600)),
# 'body': 'the community members want more food.',
# 'gender': 'female',
# 'location': 'Camp 4',
- # 'enumerator': '<a very long string>',
+ # 'contributor': '<a very long string>',
# 'external_id': '97f61035-6feb-40a1-9e7e-15c0f65cfdb5'
# }
# }
diff --git a/internewshid/chn_spreadsheet/tests/importer_tests.py b/internewshid/chn_spreadsheet/tests/importer_tests.py
index 688aa7300600faef2e879a425d21a5bfaf87f023..f891e6a07c06ff5300c066de965d4264ce9fcfe9 100644
--- a/internewshid/chn_spreadsheet/tests/importer_tests.py
+++ b/internewshid/chn_spreadsheet/tests/importer_tests.py
@@ -410,14 +410,14 @@ def test_save_rows_creates_item_with_term(importer):
@pytest.mark.django_db
-def test_save_rows_handles_invalid_enumerator(importer):
- invalid_enumerator = "Yakub=Aara smart card no point in Kialla hoi lay smart card hoday yan gor Sara Thor Sara ,hetalli bolli aara loi bolla nosir ,zodi aara Thor Sara oi tum aara smart card loi tum .Aara tum Thor asi day yan bishi manshe zani ar bishi goba asi ,Bormar shorkari aarari zeyan hor yan oilday hetarar bolor hota .kinto hetarar aarari forok gorid day ,zodi Burmar shor karotum soyi ensaf takito aarari Thor Sara nohoito"
+def test_save_rows_handles_invalid_contributor(importer):
+ invalid_contributor = "Yakub=Aara smart card no point in Kialla hoi lay smart card hoday yan gor Sara Thor Sara ,hetalli bolli aara loi bolla nosir ,zodi aara Thor Sara oi tum aara smart card loi tum .Aara tum Thor asi day yan bishi manshe zani ar bishi goba asi ,Bormar shorkari aarari zeyan hor yan oilday hetarar bolor hota .kinto hetarar aarari forok gorid day ,zodi Burmar shor karotum soyi ensaf takito aarari Thor Sara nohoito"
objects = [
{
'body': "Text",
'timestamp': datetime.datetime(2014, 7, 21),
- 'enumerator': invalid_enumerator,
+ 'contributor': invalid_contributor,
'terms': [],
'_row_number': 29,
}
@@ -427,7 +427,7 @@ def test_save_rows_handles_invalid_enumerator(importer):
{
'name': 'Ennumerator',
'type': 'text',
- 'field': 'enumerator',
+ 'field': 'contributor',
},
]
@@ -436,7 +436,7 @@ def test_save_rows_handles_invalid_enumerator(importer):
assert str(excinfo.value) == (
"There was a problem with row 29 of the spreadsheet:\n"
- "Column: 'Ennumerator' (enumerator)\n"
+ "Column: 'Ennumerator' (contributor)\n"
"Error (max_length): 'Ensure this field has no more "
"than 190 characters.'\n\n"
"Value: Yakub=Aara smart card no point in "
@@ -524,7 +524,7 @@ def test_duplicate_records_not_imported(importer):
{
'body': "Text",
'timestamp': datetime.datetime(2014, 7, 21),
- 'enumerator': 'Mohammed',
+ 'contributor': 'Mohammed',
'terms': [],
'_row_number': 1,
}
@@ -538,7 +538,7 @@ def test_duplicate_records_not_imported(importer):
{
'body': "Text",
'timestamp': datetime.datetime(2014, 7, 21),
- 'enumerator': 'Mohammed',
+ 'contributor': 'Mohammed',
'terms': [],
'_row_number': 1,
},
@@ -546,7 +546,7 @@ def test_duplicate_records_not_imported(importer):
{
'body': "Another bit of Text",
'timestamp': datetime.datetime(2014, 7, 21),
- 'enumerator': 'Mohammed',
+ 'contributor': 'Mohammed',
'terms': [],
'_row_number': 2,
}
@@ -567,7 +567,7 @@ def test_can_save_rows_without_terms(importer):
{
'body': "Text",
'timestamp': datetime.datetime(2014, 7, 21),
- 'enumerator': 'Mohammed',
+ 'contributor': 'Mohammed',
'_row_number': 1,
}
]
diff --git a/internewshid/data_layer/migrations/0024_auto_20200319_2342.py b/internewshid/data_layer/migrations/0024_auto_20200319_2342.py
new file mode 100644
index 0000000000000000000000000000000000000000..d2fd33a3b6552adc30a3a1ee42558cbb7763ffcb
--- /dev/null
+++ b/internewshid/data_layer/migrations/0024_auto_20200319_2342.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.11 on 2020-03-19 17:42
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('data_layer', '0023_auto_20200309_1832'),
+ ]
+
+ operations = [
+ migrations.RenameField(
+ model_name='message',
+ old_name='enumerator',
+ new_name='contributor',
+ ),
+ ]
diff --git a/internewshid/data_layer/models.py b/internewshid/data_layer/models.py
index faceb19a91982d2f283e2c0b3da476b769c1b7e2..4208eeb29125c74de97dcdc42a7040a256df0a42 100644
--- a/internewshid/data_layer/models.py
+++ b/internewshid/data_layer/models.py
@@ -47,7 +47,7 @@ class Message(DataLayerModel):
sub_location = models.CharField(max_length=100, blank=True)
gender = models.CharField(max_length=100, blank=True)
age = models.CharField(max_length=100, blank=True)
- enumerator = models.CharField(max_length=190, blank=True)
+ contributor = models.CharField(max_length=190, blank=True)
collection_type = models.CharField(max_length=190, blank=True)
external_id = models.CharField(max_length=80, blank=True)
diff --git a/internewshid/data_layer/tests/factories.py b/internewshid/data_layer/tests/factories.py
index 771b630407ec27ae34a930b9971f06eb8995dedb..1e98141c63fbd33b2eed6e985ceea39e4ff491fa 100644
--- a/internewshid/data_layer/tests/factories.py
+++ b/internewshid/data_layer/tests/factories.py
@@ -17,7 +17,7 @@ class ItemFactory(DjangoModelFactory):
translation = fuzzy.FuzzyText()
age = fuzzy.FuzzyText()
gender = fuzzy.FuzzyText()
- enumerator = fuzzy.FuzzyText()
+ contributor = fuzzy.FuzzyText()
collection_type = fuzzy.FuzzyText()
location = fuzzy.FuzzyText()
timestamp = fuzzy.FuzzyDateTime(
diff --git a/internewshid/hid/apps.py b/internewshid/hid/apps.py
index 21a54f69a3c5442d0fcac9d1d465e92cd36e130b..85b17b56796aa5e2d8446fc30b4eecf8c9254a71 100644
--- a/internewshid/hid/apps.py
+++ b/internewshid/hid/apps.py
@@ -11,7 +11,7 @@ class HidAppConfig(AppConfig):
AgeRangeFilter,
CategoryFilter,
CollectionTypeFilter,
- EnumeratorFilter,
+ ContributorFilter,
ExternalIdFilter,
FeedbackTypeFilter,
GenderFilter,
@@ -33,7 +33,7 @@ class HidAppConfig(AppConfig):
register_filter('sub_location', SubLocationFilter())
register_filter('gender', GenderFilter())
register_filter('age_range', AgeRangeFilter())
- register_filter('enumerator', EnumeratorFilter())
+ register_filter('contributor', ContributorFilter())
register_filter('collection_type', CollectionTypeFilter())
register_filter('tags', TagsFilter())
register_filter('feedback_type', FeedbackTypeFilter())
diff --git a/internewshid/hid/filters.py b/internewshid/hid/filters.py
index f5db25f835b179cee773f3a75d798664620e893b..1f9f6ab7fa4a8c0e73dc4ce86f21c7e093ee3431 100644
--- a/internewshid/hid/filters.py
+++ b/internewshid/hid/filters.py
@@ -70,12 +70,12 @@ class AgeRangeFilter(object):
filters['terms_or'] = filters.get('terms_or', []) + age_range_terms
-class EnumeratorFilter(object):
+class ContributorFilter(object):
def apply(self, filters, query_dict, **kwargs):
- enumerator = query_dict.get('enumerator', None)
- if enumerator is not None:
- filters.update(enumerator=enumerator)
+ contributor = query_dict.get('contributor', None)
+ if contributor is not None:
+ filters.update(contributor=contributor)
class CollectionTypeFilter(object):
diff --git a/internewshid/hid/fixtures/bangladesh-refugee-crisis.json b/internewshid/hid/fixtures/bangladesh-refugee-crisis.json
index 8d0fc6731201289a08481396fa086f7b5bc6fdfc..65f7f62e8d13e7d030e2be24b4295b381863d03d 100644
--- a/internewshid/hid/fixtures/bangladesh-refugee-crisis.json
+++ b/internewshid/hid/fixtures/bangladesh-refugee-crisis.json
@@ -72,7 +72,7 @@
"name": "feedback",
"page": 1,
"position": 2,
- "settings": "{\"label\":\"Feedback\",\"columns\":[\"select_item\",\"timestamp\",\"body\",\"translation\",\"category\",\"tags\",\"feedback_type\",\"gender\",\"age_range\",\"location\",\"sub_location\",\"enumerator\",\"collection_type\"],\"filters\":{\"terms\":[]},\"dynamic_filters\":[\"time_range\",\"category\",\"tags\",\"gender\",\"feedback_type\",\"age_range\",\"location\",\"sub_location\",\"enumerator\",\"collection_type\",\"search\"],\"categories\":[\"bangladesh-refugee-crisis-sectors\"]}",
+ "settings": "{\"label\":\"Feedback\",\"columns\":[\"select_item\",\"timestamp\",\"body\",\"translation\",\"category\",\"tags\",\"feedback_type\",\"gender\",\"age_range\",\"location\",\"sub_location\",\"contributor\",\"collection_type\"],\"filters\":{\"terms\":[]},\"dynamic_filters\":[\"time_range\",\"category\",\"tags\",\"gender\",\"feedback_type\",\"age_range\",\"location\",\"sub_location\",\"contributor\",\"collection_type\",\"search\"],\"categories\":[\"bangladesh-refugee-crisis-sectors\"]}",
"tab_type": "view-and-edit-table"
},
"model": "tabbed_page.tabinstance",
diff --git a/internewshid/hid/fixtures/drc.json b/internewshid/hid/fixtures/drc.json
index 08e77c8df9c81574f0e91657e46a4273d9197de5..d7a8935635bc51cedeba3b62d29e06bf924d6690 100644
--- a/internewshid/hid/fixtures/drc.json
+++ b/internewshid/hid/fixtures/drc.json
@@ -61,7 +61,7 @@
{
"fields": {
"label": "kobo",
- "profile": "{\"name\":\"Kobo\",\"format\":\"excel\",\"label\":\"kobo\",\"skip_header\":2,\"taxonomies\":{},\"columns\":[{\"field\":\"timestamp\",\"type\":\"date\",\"name\":\"start\",\"date_format\":\"%Y-%m-%dT%H: %M: %S.%f%z\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"end\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"username\"},{\"field\":\"body\",\"type\":\"text\",\"name\":\"What is the feedback or rumour?\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"date\"},{\"field\":\"gender\",\"type\":\"text\",\"name\":\"gender\"},{\"field\":\"age\",\"type\":\"text\",\"name\":\"Age\"},{\"field\":\"location\",\"type\":\"text\",\"name\":\"Location\"},{\"field\":\"enumerator\",\"type\":\"text\",\"name\":\"comment\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"_id\"},{\"field\":\"external_id\",\"type\":\"text\",\"name\":\"_uuid\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"_submission_time\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"_validation_status\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"_index\"}]}"
+ "profile": "{\"name\":\"Kobo\",\"format\":\"excel\",\"label\":\"kobo\",\"skip_header\":2,\"taxonomies\":{},\"columns\":[{\"field\":\"timestamp\",\"type\":\"date\",\"name\":\"start\",\"date_format\":\"%Y-%m-%dT%H: %M: %S.%f%z\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"end\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"username\"},{\"field\":\"body\",\"type\":\"text\",\"name\":\"What is the feedback or rumour?\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"date\"},{\"field\":\"gender\",\"type\":\"text\",\"name\":\"gender\"},{\"field\":\"age\",\"type\":\"text\",\"name\":\"Age\"},{\"field\":\"location\",\"type\":\"text\",\"name\":\"Location\"},{\"field\":\"contributor\",\"type\":\"text\",\"name\":\"comment\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"_id\"},{\"field\":\"external_id\",\"type\":\"text\",\"name\":\"_uuid\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"_submission_time\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"_validation_status\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"_index\"}]}"
},
"model": "chn_spreadsheet.sheetprofile",
"pk": 3
@@ -88,7 +88,7 @@
"name": "feedback",
"page": 1,
"position": 2,
- "settings": "{\"label\":\"Feedback\",\"columns\":[\"select_item\",\"timestamp\",\"body\",\"translation\",\"category\",\"tags\",\"feedback_type\",\"gender\",\"age\",\"location\",\"enumerator\",\"source\",\"external_id\"],\"filters\":{\"terms\":[]},\"dynamic_filters\":[\"time_range\",\"category\",\"tags\",\"gender\",\"feedback_type\",\"age_range\",\"location\",\"enumerator\",\"source\",\"external_id\"],\"categories\":[\"drc\"]}",
+ "settings": "{\"label\":\"Feedback\",\"columns\":[\"select_item\",\"timestamp\",\"body\",\"translation\",\"category\",\"tags\",\"feedback_type\",\"gender\",\"age\",\"location\",\"contributor\",\"source\",\"external_id\"],\"filters\":{\"terms\":[]},\"dynamic_filters\":[\"time_range\",\"category\",\"tags\",\"gender\",\"feedback_type\",\"age_range\",\"location\",\"contributor\",\"source\",\"external_id\"],\"categories\":[\"drc\"]}",
"tab_type": "view-and-edit-table"
},
"model": "tabbed_page.tabinstance",
diff --git a/internewshid/hid/fixtures/spreadsheet-profiles.json b/internewshid/hid/fixtures/spreadsheet-profiles.json
index 4b1d16be23aa54cce991a40eef89922dbe918d1c..355a0177ba87b3e7da9390334bc5002dfabbb81f 100644
--- a/internewshid/hid/fixtures/spreadsheet-profiles.json
+++ b/internewshid/hid/fixtures/spreadsheet-profiles.json
@@ -4,7 +4,7 @@
"pk": 3,
"fields": {
"label": "kobo",
- "profile": "{\"name\": \"Kobo\", \"format\": \"excel\", \"label\": \"kobo\", \"skip_header\": 2, \"taxonomies\": {}, \"columns\": [{\"field\": \"timestamp\", \"type\": \"date\", \"name\": \"start\", \"date_format\": \"%Y-%m-%dT%H: %M: %S.%f%z\"}, {\"field\": \"ignore\", \"type\": \"ignore\", \"name\": \"end\"}, {\"field\": \"ignore\", \"type\": \"ignore\", \"name\": \"username\"}, {\"field\": \"body\", \"type\": \"text\", \"name\": \"What is the feedback or rumour?\"}, {\"field\": \"ignore\", \"type\": \"ignore\", \"name\": \"date\"}, {\"field\": \"gender\", \"type\": \"text\", \"name\": \"gender\"}, {\"field\": \"terms\", \"type\": \"taxonomy\", \"name\": \"Age\", \"taxonomy\": \"age-ranges\"}, {\"field\": \"location\", \"type\": \"text\", \"name\": \"Location\"}, {\"field\": \"sub_location\", \"type\": \"text\", \"name\": \"Sub-Location\"}, {\"field\": \"enumerator\", \"type\": \"text\", \"name\": \"comment\"}, {\"field\": \"ignore\", \"type\": \"ignore\", \"name\": \"_id\"}, {\"field\": \"external_id\", \"type\": \"text\", \"name\": \"_uuid\"}, {\"field\": \"ignore\", \"type\": \"ignore\", \"name\": \"_submission_time\"}, {\"field\": \"ignore\", \"type\": \"ignore\", \"name\": \"_validation_status\"}, {\"field\": \"ignore\", \"type\": \"ignore\", \"name\": \"_index\"}, {\"field\": \"terms\", \"type\": \"taxonomy\", \"name\": \"tags\", \"taxonomy\": \"tags\"}]}"
+ "profile": "{\"name\": \"Kobo\", \"format\": \"excel\", \"label\": \"kobo\", \"skip_header\": 2, \"taxonomies\": {}, \"columns\": [{\"field\": \"timestamp\", \"type\": \"date\", \"name\": \"start\", \"date_format\": \"%Y-%m-%dT%H: %M: %S.%f%z\"}, {\"field\": \"ignore\", \"type\": \"ignore\", \"name\": \"end\"}, {\"field\": \"ignore\", \"type\": \"ignore\", \"name\": \"username\"}, {\"field\": \"body\", \"type\": \"text\", \"name\": \"What is the feedback or rumour?\"}, {\"field\": \"ignore\", \"type\": \"ignore\", \"name\": \"date\"}, {\"field\": \"gender\", \"type\": \"text\", \"name\": \"gender\"}, {\"field\": \"terms\", \"type\": \"taxonomy\", \"name\": \"Age\", \"taxonomy\": \"age-ranges\"}, {\"field\": \"location\", \"type\": \"text\", \"name\": \"Location\"}, {\"field\": \"sub_location\", \"type\": \"text\", \"name\": \"Sub-Location\"}, {\"field\": \"contributor\", \"type\": \"text\", \"name\": \"comment\"}, {\"field\": \"ignore\", \"type\": \"ignore\", \"name\": \"_id\"}, {\"field\": \"external_id\", \"type\": \"text\", \"name\": \"_uuid\"}, {\"field\": \"ignore\", \"type\": \"ignore\", \"name\": \"_submission_time\"}, {\"field\": \"ignore\", \"type\": \"ignore\", \"name\": \"_validation_status\"}, {\"field\": \"ignore\", \"type\": \"ignore\", \"name\": \"_index\"}, {\"field\": \"terms\", \"type\": \"taxonomy\", \"name\": \"tags\", \"taxonomy\": \"tags\"}]}"
}
}
]
diff --git a/internewshid/hid/fixtures/sudan.json b/internewshid/hid/fixtures/sudan.json
index e2165ce639702d8b87ce8cad9daf6eea84a482e4..dc933f4582d48a36ad03d4a6f0993d68fc1b24e7 100644
--- a/internewshid/hid/fixtures/sudan.json
+++ b/internewshid/hid/fixtures/sudan.json
@@ -61,7 +61,7 @@
{
"fields": {
"label": "kobo",
- "profile": "{\"name\":\"Kobo\",\"format\":\"excel\",\"label\":\"kobo\",\"skip_header\":2,\"taxonomies\":{},\"columns\":[{\"field\":\"timestamp\",\"type\":\"date\",\"name\":\"start\",\"date_format\":\"%Y-%m-%dT%H: %M: %S.%f%z\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"end\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"username\"},{\"field\":\"body\",\"type\":\"text\",\"name\":\"What is the feedback or rumour?\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"date\"},{\"field\":\"gender\",\"type\":\"text\",\"name\":\"gender\"},{\"field\":\"age\",\"type\":\"text\",\"name\":\"Age\"},{\"field\":\"location\",\"type\":\"text\",\"name\":\"Location\"},{\"field\":\"enumerator\",\"type\":\"text\",\"name\":\"comment\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"_id\"},{\"field\":\"external_id\",\"type\":\"text\",\"name\":\"_uuid\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"_submission_time\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"_validation_status\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"_index\"}]}"
+ "profile": "{\"name\":\"Kobo\",\"format\":\"excel\",\"label\":\"kobo\",\"skip_header\":2,\"taxonomies\":{},\"columns\":[{\"field\":\"timestamp\",\"type\":\"date\",\"name\":\"start\",\"date_format\":\"%Y-%m-%dT%H: %M: %S.%f%z\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"end\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"username\"},{\"field\":\"body\",\"type\":\"text\",\"name\":\"What is the feedback or rumour?\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"date\"},{\"field\":\"gender\",\"type\":\"text\",\"name\":\"gender\"},{\"field\":\"age\",\"type\":\"text\",\"name\":\"Age\"},{\"field\":\"location\",\"type\":\"text\",\"name\":\"Location\"},{\"field\":\"contributor\",\"type\":\"text\",\"name\":\"comment\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"_id\"},{\"field\":\"external_id\",\"type\":\"text\",\"name\":\"_uuid\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"_submission_time\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"_validation_status\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"_index\"}]}"
},
"model": "chn_spreadsheet.sheetprofile",
"pk": 3
@@ -89,7 +89,7 @@
"name": "feedback",
"page": 1,
"position": 2,
- "settings": "{\"label\":\"Feedback\",\"columns\":[\"select_item\",\"timestamp\",\"body\",\"translation\",\"category\",\"tags\",\"feedback_type\",\"gender\",\"age\",\"location\",\"enumerator\",\"collection_type\",\"external_id\"],\"filters\":{\"terms\":[]},\"dynamic_filters\":[\"time_range\",\"category\",\"tags\",\"gender\",\"feedback_type\",\"age_range\",\"location\",\"enumerator\",\"collection_type\",\"external_id\"],\"categories\":[\"sudan\"]}",
+ "settings": "{\"label\":\"Feedback\",\"columns\":[\"select_item\",\"timestamp\",\"body\",\"translation\",\"category\",\"tags\",\"feedback_type\",\"gender\",\"age\",\"location\",\"contributor\",\"collection_type\",\"external_id\"],\"filters\":{\"terms\":[]},\"dynamic_filters\":[\"time_range\",\"category\",\"tags\",\"gender\",\"feedback_type\",\"age_range\",\"location\",\"contributor\",\"collection_type\",\"external_id\"],\"categories\":[\"sudan\"]}",
"tab_type": "view-and-edit-table"
},
"model": "tabbed_page.tabinstance",
diff --git a/internewshid/hid/fixtures/uganda.json b/internewshid/hid/fixtures/uganda.json
index 8af12958bf7fa73ea4ff797eaceb968312e86e32..6ae7a9205a69e5ceab59de198d42311bc428adb4 100644
--- a/internewshid/hid/fixtures/uganda.json
+++ b/internewshid/hid/fixtures/uganda.json
@@ -61,7 +61,7 @@
{
"fields": {
"label": "kobo",
- "profile": "{\"name\":\"Kobo\",\"format\":\"excel\",\"label\":\"kobo\",\"skip_header\":2,\"taxonomies\":{},\"columns\":[{\"field\":\"timestamp\",\"type\":\"date\",\"name\":\"start\",\"date_format\":\"%Y-%m-%dT%H: %M: %S.%f%z\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"end\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"username\"},{\"field\":\"body\",\"type\":\"text\",\"name\":\"What is the feedback or rumour?\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"date\"},{\"field\":\"gender\",\"type\":\"text\",\"name\":\"gender\"},{\"field\":\"age\",\"type\":\"text\",\"name\":\"Age\"},{\"field\":\"location\",\"type\":\"text\",\"name\":\"Location\"},{\"field\":\"enumerator\",\"type\":\"text\",\"name\":\"comment\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"_id\"},{\"field\":\"external_id\",\"type\":\"text\",\"name\":\"_uuid\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"_submission_time\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"_validation_status\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"_index\"}]}"
+ "profile": "{\"name\":\"Kobo\",\"format\":\"excel\",\"label\":\"kobo\",\"skip_header\":2,\"taxonomies\":{},\"columns\":[{\"field\":\"timestamp\",\"type\":\"date\",\"name\":\"start\",\"date_format\":\"%Y-%m-%dT%H: %M: %S.%f%z\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"end\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"username\"},{\"field\":\"body\",\"type\":\"text\",\"name\":\"What is the feedback or rumour?\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"date\"},{\"field\":\"gender\",\"type\":\"text\",\"name\":\"gender\"},{\"field\":\"age\",\"type\":\"text\",\"name\":\"Age\"},{\"field\":\"location\",\"type\":\"text\",\"name\":\"Location\"},{\"field\":\"contributor\",\"type\":\"text\",\"name\":\"comment\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"_id\"},{\"field\":\"external_id\",\"type\":\"text\",\"name\":\"_uuid\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"_submission_time\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"_validation_status\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"_index\"}]}"
},
"model": "chn_spreadsheet.sheetprofile",
"pk": 3
@@ -74,7 +74,7 @@
"model": "chn_spreadsheet.sheetprofile",
"pk": 4
},
- {"model": "chn_spreadsheet.sheetprofile", "pk": 5, "fields": {"label": "kobo_master", "profile": "{\"name\":\"(Redundant)\",\"format\":\"excel\",\"label\":\"kobo_master\",\"skip_header\":1,\"taxonomies\":{},\"columns\":[{\"field\":\"timestamp\",\"type\":\"date\",\"name\":\"Date\",\"date_format\":\"%Y-%m-%dT%H: %M: %S.%f%z\"},{\"field\":\"body\",\"type\":\"text\",\"name\":\"Feedback\"},{\"field\":\"translation\",\"type\":\"text\",\"name\":\"Translation\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"Theme\"},{\"field\":\"terms\",\"type\":\"taxonomy\",\"name\":\"Tags\",\"taxonomy\":\"tags\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"FB Category\"},{\"field\":\"gender\",\"type\":\"text\",\"name\":\"Gender\"},{\"field\":\"age\",\"type\":\"text\",\"name\":\"Age\"},{\"field\":\"location\",\"type\":\"text\",\"name\":\"Location\"},{\"field\":\"enumerator\",\"type\":\"text\",\"name\":\"Ennumerator\"},{\"field\":\"source\",\"type\":\"text\",\"name\":\"Source\"}]}"}},
+ {"model": "chn_spreadsheet.sheetprofile", "pk": 5, "fields": {"label": "kobo_master", "profile": "{\"name\":\"(Redundant)\",\"format\":\"excel\",\"label\":\"kobo_master\",\"skip_header\":1,\"taxonomies\":{},\"columns\":[{\"field\":\"timestamp\",\"type\":\"date\",\"name\":\"Date\",\"date_format\":\"%Y-%m-%dT%H: %M: %S.%f%z\"},{\"field\":\"body\",\"type\":\"text\",\"name\":\"Feedback\"},{\"field\":\"translation\",\"type\":\"text\",\"name\":\"Translation\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"Theme\"},{\"field\":\"terms\",\"type\":\"taxonomy\",\"name\":\"Tags\",\"taxonomy\":\"tags\"},{\"field\":\"ignore\",\"type\":\"ignore\",\"name\":\"FB Category\"},{\"field\":\"gender\",\"type\":\"text\",\"name\":\"Gender\"},{\"field\":\"age\",\"type\":\"text\",\"name\":\"Age\"},{\"field\":\"location\",\"type\":\"text\",\"name\":\"Location\"},{\"field\":\"contributor\",\"type\":\"text\",\"name\":\"Ennumerator\"},{\"field\":\"source\",\"type\":\"text\",\"name\":\"Source\"}]}"}},
{
"fields": {
"name": "main"
@@ -89,7 +89,7 @@
"name": "feedback",
"page": 1,
"position": 2,
- "settings": "{\"label\":\"Feedback\",\"columns\":[\"select_item\",\"timestamp\",\"body\",\"translation\",\"category\",\"tags\",\"feedback_type\",\"gender\",\"age\",\"location\",\"enumerator\",\"source\",\"external_id\"],\"filters\":{\"terms\":[]},\"dynamic_filters\":[\"time_range\",\"category\",\"tags\",\"gender\",\"feedback_type\",\"age_range\",\"location\",\"enumerator\",\"source\",\"external_id\"],\"categories\":[\"uganda\"]}",
+ "settings": "{\"label\":\"Feedback\",\"columns\":[\"select_item\",\"timestamp\",\"body\",\"translation\",\"category\",\"tags\",\"feedback_type\",\"gender\",\"age\",\"location\",\"contributor\",\"source\",\"external_id\"],\"filters\":{\"terms\":[]},\"dynamic_filters\":[\"time_range\",\"category\",\"tags\",\"gender\",\"feedback_type\",\"age_range\",\"location\",\"contributor\",\"source\",\"external_id\"],\"categories\":[\"uganda\"]}",
"tab_type": "view-and-edit-table"
},
"model": "tabbed_page.tabinstance",
diff --git a/internewshid/hid/forms/item.py b/internewshid/hid/forms/item.py
index 72d56dfb193cec12abc86109c48deee5139846bb..c62595c9d77eb1e0d5aaf951168a0eda8d2b1b3f 100644
--- a/internewshid/hid/forms/item.py
+++ b/internewshid/hid/forms/item.py
@@ -29,7 +29,7 @@ class AddEditItemForm(forms.Form):
widget=forms.Textarea,
required=False
)
- enumerator = forms.CharField(
+ contributor = forms.CharField(
widget=forms.Textarea,
required=False
)
diff --git a/internewshid/hid/tables.py b/internewshid/hid/tables.py
index 1f1548a0aaf36483b4109e7c0eac9fcc2be7161e..e19d79a4978b8046524407af13037d89bc7f338c 100644
--- a/internewshid/hid/tables.py
+++ b/internewshid/hid/tables.py
@@ -95,10 +95,10 @@ class ItemTable(tables.Table):
verbose_name=_('Sub-Location'),
attrs={'th': {'id': 'header-sub-location'}}
)
- enumerator = tables.TemplateColumn(
- template_name='hid/enumerator_column.html',
- verbose_name=_('Enumerator'),
- attrs={'th': {'id': 'header-enumerator'}}
+ contributor = tables.TemplateColumn(
+ template_name='hid/contributor_column.html',
+ verbose_name=_('Contributor'),
+ attrs={'th': {'id': 'header-contributor'}}
)
collection_type = tables.TemplateColumn(
template_name='hid/collection_type_column.html',
diff --git a/internewshid/hid/tabs/view_and_edit_table.py b/internewshid/hid/tabs/view_and_edit_table.py
index f92c1f4ebc4f8d50bbd6be45ec06caa14f6ff650..d2ae357f45510cc40c22918db4ec070af0920e46 100644
--- a/internewshid/hid/tabs/view_and_edit_table.py
+++ b/internewshid/hid/tabs/view_and_edit_table.py
@@ -93,9 +93,9 @@ class ViewAndEditTableTab(object):
if genders and genders == 'All Genders':
filters.pop('gender')
- enumerators = filters.get('enumerator')
- if enumerators and enumerators == 'All Enumerators':
- filters.pop('enumerator')
+ contributors = filters.get('contributor')
+ if contributors and contributors == 'All Contributors':
+ filters.pop('contributor')
collection_type = filters.get('collection_type')
if collection_type and collection_type == 'All Collection Types':
@@ -196,9 +196,9 @@ class ViewAndEditTableTab(object):
genders = transport_items.list_options('gender')
return {'items': genders}
- def _get_enumerator_options(self, items_list, **kwargs):
- enumerators = transport_items.list_options('enumerator')
- return {'items': enumerators}
+ def _get_contributor_options(self, items_list, **kwargs):
+ contributors = transport_items.list_options('contributor')
+ return {'items': contributors}
def _get_collection_type_options(self, items_list, **kwargs):
collection_types = transport_items.list_options('collection_type')
@@ -256,7 +256,7 @@ class ViewAndEditTableTab(object):
location_options = self._get_location_options(items, **kwargs)
sub_location_options = self._get_sub_location_options(items, **kwargs)
gender_options = self._get_gender_options(items, **kwargs)
- enumerator_options = self._get_enumerator_options(items, **kwargs)
+ contributor_options = self._get_contributor_options(items, **kwargs)
collection_type_options = self._get_collection_type_options(items, **kwargs)
feedback_type_options = self._get_feedback_type_options()
age_range_options = self._get_age_range_options()
@@ -296,7 +296,7 @@ class ViewAndEditTableTab(object):
'locations': location_options,
'sub_locations': sub_location_options,
'gender': gender_options,
- 'enumerator': enumerator_options,
+ 'contributor': contributor_options,
'collection_type_filters': collection_type_options,
'next': reverse('tabbed-page', kwargs={
'name': tab_instance.page.name,
diff --git a/internewshid/hid/templates/hid/add_edit_item.html b/internewshid/hid/templates/hid/add_edit_item.html
index e72256e95d798b00b0e3793b4a158e3fb66c3689..978552679cb55b908b028e0fe62f40e52143dd1c 100644
--- a/internewshid/hid/templates/hid/add_edit_item.html
+++ b/internewshid/hid/templates/hid/add_edit_item.html
@@ -160,15 +160,15 @@
</div>
{% endif %}
- {% if form.enumerator %}
- <div class="item-enumerator {% if form.enumerator.errors %}has-error{% endif %}">
+ {% if form.contributor %}
+ <div class="item-contributor {% if form.contributor.errors %}has-error{% endif %}">
<label>
- {% trans "Enumerator" %}
- {% if form.enumerator.errors %}
- <span class='help-block'>({{ form.enumerator.errors|join:", " }})</span>
+ {% trans "Contributor" %}
+ {% if form.contributor.errors %}
+ <span class='help-block'>({{ form.contributor.errors|join:", " }})</span>
{% endif %}
</label>
- {{ form.enumerator|add_class:'form-control'|attr:"Enumerator"|attr:"rows:1"|attr:"cols:1"|attr:"style:resize:none;" }}
+ {{ form.contributor|add_class:'form-control'|attr:"Contributor"|attr:"rows:1"|attr:"cols:1"|attr:"style:resize:none;" }}
</div>
{% endif %}
diff --git a/internewshid/hid/templates/hid/enumerator_column.html b/internewshid/hid/templates/hid/contributor_column.html
similarity index 62%
rename from internewshid/hid/templates/hid/enumerator_column.html
rename to internewshid/hid/templates/hid/contributor_column.html
index dc45fb1c466f3069eee2e20277c5dd3473086b20..54e024f07a653b0ffb9441ae3e7eeb38b51e6846 100644
--- a/internewshid/hid/templates/hid/enumerator_column.html
+++ b/internewshid/hid/templates/hid/contributor_column.html
@@ -1 +1 @@
-<a href='{% url "edit-item" item_id=record.id %}?next={{ request.path }}'>{{ record.enumerator }}</a>
+<a href='{% url "edit-item" item_id=record.id %}?next={{ request.path }}'>{{ record.contributor }}</a>
diff --git a/internewshid/hid/templates/hid/tabs/filters/contributor.html b/internewshid/hid/templates/hid/tabs/filters/contributor.html
new file mode 100644
index 0000000000000000000000000000000000000000..2e5f7a3841d1d904365245e48fa4ce8ab0f0e81e
--- /dev/null
+++ b/internewshid/hid/templates/hid/tabs/filters/contributor.html
@@ -0,0 +1,12 @@
+{% if contributor.items %}
+ {% load i18n %}
+ <div class="filter-contributor input-group">
+ <label class="control-label" for="contributor-selector">{% trans "Contributor" %}</label>
+ <select id="contributor-selector" name="contributor" class="form-control">
+ <option value="All Contributors" selected="selected">{% trans "All Contributors" %}</option>
+ {% for contributor in contributor.items %}
+ <option value="{{ contributor }}"{% if contributor == request.GET.contributor %} selected="selected"{% endif %}>{{ contributor }}</option>
+ {% endfor %}
+ </select>
+ </div>
+{% endif %}
diff --git a/internewshid/hid/templates/hid/tabs/filters/enumerator.html b/internewshid/hid/templates/hid/tabs/filters/enumerator.html
deleted file mode 100644
index 22bf08b4580559ddc4f112ab33574c7f7e6f07fa..0000000000000000000000000000000000000000
--- a/internewshid/hid/templates/hid/tabs/filters/enumerator.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% if enumerator.items %}
- {% load i18n %}
- <div class="filter-enumerator input-group">
- <label class="control-label" for="enumerator-selector">{% trans "Enumerator" %}</label>
- <select id="enumerator-selector" name="enumerator" class="form-control">
- <option value="All Enumerators" selected="selected">{% trans "All Enumerators" %}</option>
- {% for enumerator in enumerator.items %}
- <option value="{{ enumerator }}"{% if enumerator == request.GET.enumerator %} selected="selected"{% endif %}>{{ enumerator }}</option>
- {% endfor %}
- </select>
- </div>
-{% endif %}
diff --git a/internewshid/hid/views/item.py b/internewshid/hid/views/item.py
index d32b5ea95daba85440ec46c14840698d9d1aa59a..bbdc26fe0a20d482c90a80aaf7431e8e3d0f30e1 100644
--- a/internewshid/hid/views/item.py
+++ b/internewshid/hid/views/item.py
@@ -160,7 +160,7 @@ class AddEditItemView(FormView):
'location': self.item.get('location', ''),
'sub_location': self.item.get('sub_location', ''),
'gender': self.item.get('gender', ''),
- 'enumerator': self.item.get('enumerator', ''),
+ 'contributor': self.item.get('contributor', ''),
'collection_type': self.item.get('collection_type', ''),
'timestamp': self.item['timestamp'],
'next': self.request.GET.get(
diff --git a/internewshid/media/less/view-edit.less b/internewshid/media/less/view-edit.less
index 5b7d5604603663aaf7fc79568c497441acdef8b0..d15245fec51e27756824041a62835c69e5048a79 100644
--- a/internewshid/media/less/view-edit.less
+++ b/internewshid/media/less/view-edit.less
@@ -188,7 +188,7 @@ thead{
&#header-age{width: 4em}
&#header-location{width: 8%}
&#header-sub-location{width: 8%}
- &#header-enumerator{width: 9em}
+ &#header-contributor{width: 9em}
&#header-collection-type{width: 6%}
}
diff --git a/internewshid/rest_api/serializers.py b/internewshid/rest_api/serializers.py
index 178d08aa8d0dd45a14698d57a1fdd5ad19ac7a12..8109d7f967332f12098f35c0b3a7bb9920eecfa4 100644
--- a/internewshid/rest_api/serializers.py
+++ b/internewshid/rest_api/serializers.py
@@ -138,7 +138,7 @@ class ItemExportSerializer(ItemSerializer):
'age',
'body',
'collection_type',
- 'enumerator',
+ 'contributor',
'external_id',
'gender',
'location',
diff --git a/internewshid/rest_api/tests/item_export_tests.py b/internewshid/rest_api/tests/item_export_tests.py
index 2e35bb64e49370aafdffd5ffd3c90ec73dd7689e..a010352ccfc5b4806aad057678f3e3c07962922a 100644
--- a/internewshid/rest_api/tests/item_export_tests.py
+++ b/internewshid/rest_api/tests/item_export_tests.py
@@ -32,7 +32,7 @@ def test_item_exporter(client):
'row',
'age',
'body',
- 'enumerator',
+ 'contributor',
'external_id',
'gender',
'location',
diff --git a/internewshid/rest_api/tests/item_list_view_tests.py b/internewshid/rest_api/tests/item_list_view_tests.py
index 3e83d37fbe0bf4fac66a9efa303ef488e1dff31d..0a4d96cf80d2803e8d84983903a1cf975ad1ce59 100644
--- a/internewshid/rest_api/tests/item_list_view_tests.py
+++ b/internewshid/rest_api/tests/item_list_view_tests.py
@@ -156,18 +156,18 @@ def test_filter_by_location():
@pytest.mark.django_db
-def test_filter_by_enumerator():
+def test_filter_by_contributor():
create_item(
body='item1',
- enumerator='Yasmin')
+ contributor='Yasmin')
create_item(
body='item2',
- enumerator='Collected by ....Mohammed yousuf@ Mohammed Ullah'
+ contributor='Collected by ....Mohammed yousuf@ Mohammed Ullah'
)
payload = get(
data={
- 'enumerator': 'Collected by ....Mohammed yousuf@ Mohammed Ullah',
+ 'contributor': 'Collected by ....Mohammed yousuf@ Mohammed Ullah',
}
).data
diff --git a/internewshid/rest_api/views.py b/internewshid/rest_api/views.py
index 846630dfb51aaf6859b1e890001ed79ec8ab7462..cadbe9d89c8a49d89757b451529762747e1028e9 100644
--- a/internewshid/rest_api/views.py
+++ b/internewshid/rest_api/views.py
@@ -32,7 +32,7 @@ class ItemViewSet(viewsets.ModelViewSet, BulkDestroyModelMixin):
'sub_location',
'gender',
'age',
- 'enumerator',
+ 'contributor',
'collection_type',
'timestamp',
)
@@ -110,9 +110,9 @@ class ItemViewSet(viewsets.ModelViewSet, BulkDestroyModelMixin):
if from_age is not None and to_age is not None:
items = items.filter(age__range=[from_age, to_age])
- enumerator = self.request.query_params.get('enumerator', None)
- if enumerator is not None:
- items = items.filter(enumerator__icontains=enumerator)
+ contributor = self.request.query_params.get('contributor', None)
+ if contributor is not None:
+ items = items.filter(contributor__icontains=contributor)
collection_type = self.request.query_params.get('collection_type', None)
if collection_type is not None:
diff --git a/internewshid/transport/tests/item_list_options_tests.py b/internewshid/transport/tests/item_list_options_tests.py
index 5eb0c8995e435135826980b8dd78bf954e877b89..1d509cd7f47f6dd413b71cf0a45a1c4972520f7b 100644
--- a/internewshid/transport/tests/item_list_options_tests.py
+++ b/internewshid/transport/tests/item_list_options_tests.py
@@ -62,31 +62,31 @@ def test_list_options_for_location_exclude_blank():
@pytest.mark.django_db
-def test_list_options_for_enumerator_retrieved_all_options():
+def test_list_options_for_contributor_retrieved_all_options():
items = G(Item, n=5)
- expected_enumerators = [an_item.enumerator for an_item in items]
- actual_enumerators = list(list_options('enumerator'))
- assert expected_enumerators == actual_enumerators
+ expected_contributors = [an_item.contributor for an_item in items]
+ actual_contributors = list(list_options('contributor'))
+ assert expected_contributors == actual_contributors
@pytest.mark.django_db
-def test_list_options_for_enumerator_unique():
- G(Item, enumerator='Rojina Akter', n=2)
- G(Item, enumerator='Nur Ankis', n=2)
- G(Item, enumerator='Rashada')
- expected_enumerators = ['Nur Ankis', 'Rashada', 'Rojina Akter', ]
- actual_enumerators = list(list_options('enumerator'))
- assert expected_enumerators == actual_enumerators
+def test_list_options_for_contributor_unique():
+ G(Item, contributor='Rojina Akter', n=2)
+ G(Item, contributor='Nur Ankis', n=2)
+ G(Item, contributor='Rashada')
+ expected_contributors = ['Nur Ankis', 'Rashada', 'Rojina Akter', ]
+ actual_contributors = list(list_options('contributor'))
+ assert expected_contributors == actual_contributors
@pytest.mark.django_db
-def test_list_options_for_enumerator_exclude_blank():
- items = G(Item, enumerator='', n=2)
- items.extend(G(Item, enumerator='Nur Ankis', n=2))
- items.append(G(Item, enumerator='Rashada'))
- expected_enumerators = ['Nur Ankis', 'Rashada']
- actual_enumerators = list(list_options('enumerator'))
- assert expected_enumerators == actual_enumerators
+def test_list_options_for_contributor_exclude_blank():
+ items = G(Item, contributor='', n=2)
+ items.extend(G(Item, contributor='Nur Ankis', n=2))
+ items.append(G(Item, contributor='Rashada'))
+ expected_contributors = ['Nur Ankis', 'Rashada']
+ actual_contributors = list(list_options('contributor'))
+ assert expected_contributors == actual_contributors
@pytest.mark.django_db
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 9a66b72fa1112e58eab8ce0351bb3a02e7dd833d..84314eece52ca40f5bee934171c4d46db81b1581 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -223,8 +223,8 @@ msgstr ""
#: internewshid/hid/tables.py:89
#: internewshid/hid/templates/hid/add_edit_item.html:158
-#: internewshid/hid/templates/hid/tabs/filters/enumerator.html:4
-msgid "Enumerator"
+#: internewshid/hid/templates/hid/tabs/filters/contributor.html:4
+msgid "Contributor"
msgstr ""
#: internewshid/hid/tables.py:94
@@ -470,8 +470,8 @@ msgstr ""
msgid "All Collection Types"
msgstr ""
-#: internewshid/hid/templates/hid/tabs/filters/enumerator.html:6
-msgid "All Enumerators"
+#: internewshid/hid/templates/hid/tabs/filters/contributor.html:6
+msgid "All Contributors"
msgstr ""
#: internewshid/hid/templates/hid/tabs/filters/external_id.html:4
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 644c28877014a0605fe001a1eb5148de9e6cfe8c..c3742bdd5d0bb4b47eab63e8c6bd49e0601bf892 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -220,8 +220,8 @@ msgstr ""
#: internewshid/hid/tables.py:89
#: internewshid/hid/templates/hid/add_edit_item.html:158
-#: internewshid/hid/templates/hid/tabs/filters/enumerator.html:4
-msgid "Enumerator"
+#: internewshid/hid/templates/hid/tabs/filters/contributor.html:4
+msgid "Contributor"
msgstr "Recenseur"
#: internewshid/hid/tables.py:94
@@ -467,8 +467,8 @@ msgstr "Tous les thèmes"
msgid "All Collection Types"
msgstr ""
-#: internewshid/hid/templates/hid/tabs/filters/enumerator.html:6
-msgid "All Enumerators"
+#: internewshid/hid/templates/hid/tabs/filters/contributor.html:6
+msgid "All Contributors"
msgstr "Tous les recenseurs"
#: internewshid/hid/templates/hid/tabs/filters/external_id.html:4