diff options
| -rw-r--r-- | archaeological_operations/import_from_csv.py | 6 | ||||
| -rw-r--r-- | archaeological_operations/import_from_dbf.py | 6 | ||||
| -rw-r--r-- | example_project/local_settings.py.sample | 2 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html | 2 | ||||
| -rw-r--r-- | ishtar_common/templates/sheet_ope.html | 6 |
5 files changed, 11 insertions, 11 deletions
diff --git a/archaeological_operations/import_from_csv.py b/archaeological_operations/import_from_csv.py index 714825ff4..45faae632 100644 --- a/archaeological_operations/import_from_csv.py +++ b/archaeological_operations/import_from_csv.py @@ -403,18 +403,18 @@ def import_operations_csv(values, col_defs=OPE_COLS, update=True, person=None, errors = [] if error_ope: - error = "Error while recording theses operations:\n" + error = "Error while recording these operations:\n" for line_idx, args in error_ope: error += "line: " + str(line_idx) + " args: " + str(args) + '\n' errors.append(error) if error_multis: - error = "Error while recording theses multiples items attached to "\ + error = "Error while recording these multiples items attached to "\ "operation:" for line_idx, args in error_multis: error += "line: " + str(line_idx) + " args: " + str(args) + '\n' errors.append(error) if error_reversed: - error = "Error while recording theses items that depend to operation:" + error = "Error while recording these items that depend to operation:" for line_idx, args in error_reversed: error += "line: " + str(line_idx) + " args: " + str(args) + '\n' errors.append(error) diff --git a/archaeological_operations/import_from_dbf.py b/archaeological_operations/import_from_dbf.py index 1e3d6a0ea..3ce41fdfc 100644 --- a/archaeological_operations/import_from_dbf.py +++ b/archaeological_operations/import_from_dbf.py @@ -308,18 +308,18 @@ def import_operations_dbf(values, col_defs=DBF_OPE_COLS, update=False, if nb_error: errors.append(ERROR_LBLS[error_key] + str(nb_error)) if error_ope: - error = "Error while recording theses operations:\n" + error = "Error while recording these operations:\n" for line_idx, args in error_ope: error += "line: " + str(line_idx) + " args: " + str(args) + '\n' errors.append(error) if error_multis: - error = "Error while recording theses multiples items attached to "\ + error = "Error while recording these multiples items attached to "\ "operation:" for line_idx, args in error_multis: error += "line: " + str(line_idx) + " args: " + str(args) + '\n' errors.append(error) if error_reversed: - error = "Error while recording theses items that depend to operation:" + error = "Error while recording these items that depend to operation:" for line_idx, args in error_reversed: error += "line: " + str(line_idx) + " args: " + str(args) + '\n' errors.append(error) diff --git a/example_project/local_settings.py.sample b/example_project/local_settings.py.sample index 942a35df5..ee5338801 100644 --- a/example_project/local_settings.py.sample +++ b/example_project/local_settings.py.sample @@ -41,7 +41,7 @@ PROJECT_SLUG = "my-project" ALLOWED_HOSTS = [] # if your installation uses a prefix after the domain name modify and uncomment -# theses lines +# these lines # DOMAIN_PREFIX = "/ishtar-test" # LOGIN_URL = DOMAIN_PREFIX + '/accounts/login/' # LOGIN_REDIRECT_URL = DOMAIN_PREFIX + '/accounts/profile/' diff --git a/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html b/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html index 87ce5c528..d7ea16d90 100644 --- a/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html +++ b/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html @@ -105,7 +105,7 @@ if (typeof values_1_{{unique_id}} === 'undefined' || values_1_{{unique_id}}.length == 0){ $('#chart_img_{{unique_id}}').hide(); -$('#chart_{{unique_id}}').html("<p class='alert'>{% trans 'No data for theses criteria.' %}</p>"); +$('#chart_{{unique_id}}').html("<p class='alert'>{% trans 'No data for these criteria.' %}</p>"); } else { var showmarker = false; diff --git a/ishtar_common/templates/sheet_ope.html b/ishtar_common/templates/sheet_ope.html index dbe3297b3..28390af45 100644 --- a/ishtar_common/templates/sheet_ope.html +++ b/ishtar_common/templates/sheet_ope.html @@ -118,9 +118,9 @@ {% endfor %} </table> -<h3>{% trans "Recording Units"%}</h3> +<h3>{% trans "Context Records"%}</h3> <table> - <caption>{%trans "Recording Units"%}</caption> + <caption>{%trans "Context Records"%}</caption> <tr> <th>{% trans "ID" %}</th> <th>{% trans "Type" %}</th> @@ -139,7 +139,7 @@ <td class='link'><a href="#{#{%url show-record_unit record_unit.pk%}#}">{% trans "Details" %}</a></td> </tr> {% empty %} - <tr><td colspan="6" class='no_items'>{% trans "No recording unit associated to this operation" %}</td></tr> + <tr><td colspan="6" class='no_items'>{% trans "No context record associated to this operation" %}</td></tr> {% endfor %} </table> |