Skip to content

Commit

Permalink
global: replace remaining "licence" with "license"
Browse files Browse the repository at this point in the history
* Also preserve capitalisation ("Licence" to "License" not "license").
  • Loading branch information
GraemeWatt committed Mar 8, 2024
1 parent 8849f79 commit 5f72a8f
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions hepdata/modules/records/assets/js/hepdata_resources.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
#}
Expand Down
2 changes: 1 addition & 1 deletion hepdata/modules/records/utils/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
#}
Expand Down
2 changes: 1 addition & 1 deletion hepdata/modules/theme/assets/scss/search.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
2 changes: 1 addition & 1 deletion hepdata/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@
and parsed by ``setup.py``.
"""

__version__ = "0.9.4dev20240212"
__version__ = "0.9.4dev20240308"
2 changes: 1 addition & 1 deletion scripts/clean_assets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/test_records.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5f72a8f

Please sign in to comment.