Skip to content

Commit f9c8b52

Browse files
fchapotonjarofgreen
authored andcommitted
fixing a few typos
#459
1 parent 62247ad commit f9c8b52

File tree

10 files changed

+17
-15
lines changed

10 files changed

+17
-15
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
88

99
### Fixed
1010

11+
- Some typos in docs, comments and examples
12+
- Put back some translations that were removed
1113
- Avoid deprecation warning from the ijson package. https://github.com/OpenDataServices/flatten-tool/pull/458
1214

1315
### Removed

examples/bods/schema/components.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
},
5050
"assertedBy": {
5151
"title": "Asserted by",
52-
"description": "Who is making this statement? This may be the name of the person or organisation making a self-declaration (in which case, please make sure the name field matches the organisation or person name field), or the name or description of some other party. If this statment has been verified, this may also include the name of the organisation providing verification.",
52+
"description": "Who is making this statement? This may be the name of the person or organisation making a self-declaration (in which case, please make sure the name field matches the organisation or person name field), or the name or description of some other party. If this statement has been verified, this may also include the name of the organisation providing verification.",
5353
"type": "array",
5454
"items": {
5555
"$ref": "#/definitions/Agent"
@@ -375,7 +375,7 @@
375375
},
376376
"description": {
377377
"title": "Description",
378-
"description": "A free-text description to annotate this statment or field.",
378+
"description": "A free-text description to annotate this statement or field.",
379379
"type": "string"
380380
},
381381
"transformedContent": {
@@ -489,4 +489,4 @@
489489
}
490490
}
491491
}
492-
}
492+
}

examples/bods/schema/entity-statement.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
},
8686
"dissolutionDate": {
8787
"title": "Dissolution date",
88-
"description": "If this entity is no longer active, provide the date on which it was disolved or ceased. Please provide as precise a date as possible in ISO 8601 format. When only the year or year and month is known, these can be given as YYYY or YYYY-MM.",
88+
"description": "If this entity is no longer active, provide the date on which it was dissolved or ceased. Please provide as precise a date as possible in ISO 8601 format. When only the year or year and month is known, these can be given as YYYY or YYYY-MM.",
8989
"type": "string",
9090
"pattern": "^([\\+-]?\\d{4}(?!\\d{2}\b))((-?)((0[1-9]|1[0-2])(\\3([12]\\d|0[1-9]|3[01]))?|W([0-4]\\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\\d|[12]\\d{2}|3([0-5]\\d|6[1-6])))([T\\s]((([01]\\d|2[0-3])((:?)[0-5]\\d)?|24\\:?00)([\\.,]\\d+(?!:))?)?(\\17[0-5]\\d([\\.,]\\d+)?)?([zZ]|([\\+-])([01]\\d|2[0-3]):?([0-5]\\d)?)?)?)?$",
9191
"propertyOrder": 35
@@ -131,4 +131,4 @@
131131
"statementType",
132132
"entityType"
133133
]
134-
}
134+
}

examples/bods/schema/person-statement.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"id": "person-statment.json",
2+
"id": "person-statement.json",
33
"$schema": "http://json-schema.org/draft-04/schema#",
44
"version": "0.1",
55
"type": "object",
@@ -141,4 +141,4 @@
141141
"missingPersonType"
142142
]
143143
}
144-
}
144+
}

flattentool/json_input.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ def parse(self):
333333
continue
334334

335335
self.parse_json_dict(json_dict, sheet=self.main_sheet)
336-
# only persist every 2000 objects. peristing more often slows down storing.
336+
# only persist every 2000 objects. persisting more often slows down storing.
337337
# 2000 top level objects normally not too much to store in memory.
338338
if num % 2000 == 0 and num != 0:
339339
transaction.commit()

flattentool/locale/en/LC_MESSAGES/flatten-tool.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ msgid ""
143143
msgstr ""
144144

145145
#: flattentool/json_input.py:193
146-
msgid "Etiher json_filename or root_json_dict must be supplied"
146+
msgid "Either json_filename or root_json_dict must be supplied"
147147
msgstr ""
148148

149149
#: flattentool/json_input.py:198
@@ -216,7 +216,7 @@ msgstr ""
216216

217217
#: flattentool/schema.py:390
218218
msgid ""
219-
"Unknown type_set: {}, did you forget to explicity set the \"type\" key on"
219+
"Unknown type_set: {}, did you forget to explicitly set the \"type\" key on"
220220
" \"items\"?"
221221
msgstr ""
222222

flattentool/locale/es/LC_MESSAGES/flatten-tool.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ msgstr ""
174174
"como una lista en un archivo o mediante un esquema)"
175175

176176
#: flattentool/json_input.py:193
177-
msgid "Etiher json_filename or root_json_dict must be supplied"
177+
msgid "Either json_filename or root_json_dict must be supplied"
178178
msgstr "Se debe proporcionar el r json_filename o root_json_dict"
179179

180180
#: flattentool/json_input.py:198
@@ -261,7 +261,7 @@ msgstr ""
261261

262262
#: flattentool/schema.py:390
263263
msgid ""
264-
"Unknown type_set: {}, did you forget to explicity set the \"type\" key on "
264+
"Unknown type_set: {}, did you forget to explicitly set the \"type\" key on "
265265
"\"items\"?"
266266
msgstr ""
267267
"Type_set desconocido: {}, ¿olvidó establecer explícitamente la clave "

flattentool/tests/fixtures/SOURCES

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ License: http://data.gc.ca/eng/open-government-licence-canada
1515

1616
fundingproviders-grants_fixed_2_grants.json
1717
Source: Edited version of data from http://data.threesixtygiving.org/dataset/welcome-trust-grants-awarded
18-
(converted to different formats; key "Grants" changed to "grants"; truncated to two releases; personal and organization indentifiers replaced)
18+
(converted to different formats; key "Grants" changed to "grants"; truncated to two releases; personal and organization identifiers replaced)
1919
License: Creative Commons Attribution

flattentool/tests/fixtures/release-schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@
643643
"Transaction": {
644644
"type": "object",
645645
"title": "Transaction Information",
646-
"description": "A spending transaction related to the contracting process. Draws upon the data models of the [Budget Data Package](https://github.com/openspending/budget-data-package/blob/master/specification.md) and the [International Aid Transpareny Initiative](http://iatistandard.org/activity-standard/iati-activities/iati-activity/transaction/) and should be used to cross-reference to more detailed information held using a Budget Data Package, IATI file, or to provide enough information to allow a user to manually or automatically cross-reference with some other published source of transactional spending data.",
646+
"description": "A spending transaction related to the contracting process. Draws upon the data models of the [Budget Data Package](https://github.com/openspending/budget-data-package/blob/master/specification.md) and the [International Aid Transparency Initiative](http://iatistandard.org/activity-standard/iati-activities/iati-activity/transaction/) and should be used to cross-reference to more detailed information held using a Budget Data Package, IATI file, or to provide enough information to allow a user to manually or automatically cross-reference with some other published source of transactional spending data.",
647647
"required": ["id"],
648648
"properties": {
649649
"id":{

flattentool/tests/test_output.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def test_blank_sheets(tmpdir):
4242
wb = openpyxl.load_workbook(tmpdir.join("release.xlsx").strpath)
4343
assert wb.sheetnames == ["release"]
4444
rows = list(wb["release"].rows)
45-
# openpyxl fixed this bug but earler versions of python are stuck with it.
45+
# openpyxl fixed this bug but earlier versions of python are stuck with it.
4646
# remove when we no longer support 3.5
4747
if sys.version_info >= (3, 6, 0):
4848
assert len(rows) == 0

0 commit comments

Comments
 (0)