diff --git a/hepdata/modules/records/assets/js/hepdata_resources.js b/hepdata/modules/records/assets/js/hepdata_resources.js index 65ca52c8..248b53b7 100644 --- a/hepdata/modules/records/assets/js/hepdata_resources.js +++ b/hepdata/modules/records/assets/js/hepdata_resources.js @@ -44,9 +44,9 @@ HEPDATA.hepdata_resources = (function () { return d['file_description']; }); - // Render the licence header text if required + // Render the license header text if required resource_item.append("span").text(function(d) { - return d['data_license'] && d['data_license'].url ? "license: " : ""; + return d['data_license'] && d['data_license'].url ? "License: " : ""; }); // Manage rendering of the data license value diff --git a/hepdata/modules/records/templates/hepdata_records/components/table_details.html b/hepdata/modules/records/templates/hepdata_records/components/table_details.html index aee5c4d9..1d6d2f85 100644 --- a/hepdata/modules/records/templates/hepdata_records/components/table_details.html +++ b/hepdata/modules/records/templates/hepdata_records/components/table_details.html @@ -90,7 +90,7 @@ <h4> <div class="clearfix"></div> - <p id="table_data_license" class="hidden">Licence: <span id="table_data_license_url"></span></p> + <p id="table_data_license" class="hidden">License: <span id="table_data_license_url"></span></p> <div class="clearfix"></div> diff --git a/hepdata/modules/records/templates/hepdata_records/sandbox.html b/hepdata/modules/records/templates/hepdata_records/sandbox.html index c5d22ccc..9b49cc67 100644 --- a/hepdata/modules/records/templates/hepdata_records/sandbox.html +++ b/hepdata/modules/records/templates/hepdata_records/sandbox.html @@ -15,7 +15,7 @@ ## You should have received a copy of the GNU General Public License ## along with HEPData. If not, see ## -## In applying this licence, CERN does not waive the privileges and immunities +## In applying this license, CERN does not waive the privileges and immunities ## granted to it by virtue of its status as an Intergovernmental Organization ## or submit itself to any jurisdiction. #} diff --git a/hepdata/modules/records/utils/common.py b/hepdata/modules/records/utils/common.py index 00819ae0..880d499f 100644 --- a/hepdata/modules/records/utils/common.py +++ b/hepdata/modules/records/utils/common.py @@ -270,7 +270,7 @@ def file_size_check(file_location, load_all): def generate_license_data_by_id(license_id): """ - Generates a dictionary from a license class selected by + Generates a dictionary from a License class selected by its ID from the database. :param license_id: diff --git a/hepdata/modules/submission/templates/hepdata_submission/submit.html b/hepdata/modules/submission/templates/hepdata_submission/submit.html index dce8a7fe..b7e8d15f 100644 --- a/hepdata/modules/submission/templates/hepdata_submission/submit.html +++ b/hepdata/modules/submission/templates/hepdata_submission/submit.html @@ -15,7 +15,7 @@ ## You should have received a copy of the GNU General Public License ## along with HEPData. If not, see ## -## In applying this licence, CERN does not waive the privileges and immunities +## In applying this license, CERN does not waive the privileges and immunities ## granted to it by virtue of its status as an Intergovernmental Organization ## or submit itself to any jurisdiction. #} diff --git a/hepdata/modules/theme/assets/scss/search.scss b/hepdata/modules/theme/assets/scss/search.scss index 3311f497..18ca8004 100644 --- a/hepdata/modules/theme/assets/scss/search.scss +++ b/hepdata/modules/theme/assets/scss/search.scss @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with HEPData. If not, see <http://www.gnu.org/licenses/>. * - * In applying this licence, CERN does not waive the privileges and immunities + * In applying this license, CERN does not waive the privileges and immunities * granted to it by virtue of its status as an Intergovernmental Organization * or submit itself to any jurisdiction. */ diff --git a/hepdata/version.py b/hepdata/version.py index 4b756db8..871fc63a 100644 --- a/hepdata/version.py +++ b/hepdata/version.py @@ -28,4 +28,4 @@ and parsed by ``setup.py``. """ -__version__ = "0.9.4dev20240212" +__version__ = "0.9.4dev20240308" diff --git a/scripts/clean_assets.sh b/scripts/clean_assets.sh index b0d52a4d..23bc9708 100755 --- a/scripts/clean_assets.sh +++ b/scripts/clean_assets.sh @@ -17,7 +17,7 @@ set -e # You should have received a copy of the GNU General Public License # along with HEPData. If not, see <http://www.gnu.org/licenses/>. # -# In applying this licence, CERN does not waive the privileges and immunities +# In applying this license, CERN does not waive the privileges and immunities # granted to it by virtue of its status as an Intergovernmental Organization # or submit itself to any jurisdiction. diff --git a/tests/e2e/test_records.py b/tests/e2e/test_records.py index 4a9e14a6..e0487248 100644 --- a/tests/e2e/test_records.py +++ b/tests/e2e/test_records.py @@ -616,7 +616,7 @@ def _check_record_common(browser): # Collect text of all a tags found within the resource-items resource_elements = browser.find_elements(By.CLASS_NAME, "resource-item") links = [x.text for e in resource_elements for x in e.find_elements(By.TAG_NAME, "a")] - # Check to see if the licence text appears within + # Check to see if the license text appears within assert "GPL2" not in links # Check we can select a different table/common resources