Skip to content

Commit

Permalink
Merge pull request #857 from w3c-ccg/705-gs1-us-spelling
Browse files Browse the repository at this point in the history
US English spelling of "license" on GS1 creds
  • Loading branch information
nissimsan authored Aug 29, 2023
2 parents 349bd8a + 13d27b0 commit b2e5337
Show file tree
Hide file tree
Showing 13 changed files with 129 additions and 135 deletions.
8 changes: 4 additions & 4 deletions docs/credentials-with-issuer-dependent-terms.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,15 +120,15 @@
"count": 0
},
{
"type": "GS1PrefixLicenceCredential",
"type": "GS1PrefixLicenseCredential",
"count": 0
},
{
"type": "GS1KeyCredential",
"count": 0
},
{
"type": "GS1IdentificationKeyLicenceCredential",
"type": "GS1IdentificationKeyLicenseCredential",
"count": 0
},
{
Expand All @@ -140,11 +140,11 @@
"count": 0
},
{
"type": "GS1CompanyPrefixLicenceCredential",
"type": "GS1CompanyPrefixLicenseCredential",
"count": 0
},
{
"type": "GS18PrefixLicenceCredential",
"type": "GS18PrefixLicenseCredential",
"count": 0
},
{
Expand Down
8 changes: 4 additions & 4 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -821,7 +821,7 @@ <h5>Product Identifier Verification from Company Prefix License</h5>
<figcaption>Product Identifier Verification from Company Prefix License</figcaption>
</figure>
<p>
A GS1 Member Organization issues <a href="https://w3id.org/traceability/#GS1CompanyPrefixLicenceCredential">GS1 Company Prefix Licence Credential</a> (1), which is presented to the GS1 User Company (2).
A GS1 Member Organization issues <a href="https://w3id.org/traceability/#GS1CompanyPrefixLicenseCredential">GS1 Company Prefix License Credential</a> (1), which is presented to the GS1 User Company (2).
</p>
<p>
The GS1 User Company issues <a href="https://w3id.org/traceability/#GS1KeyCredential">GS1 Key Credential</a> (3) for GTIN identification of a product.
Expand All @@ -841,7 +841,7 @@ <h5>Product Identifier Verification from Identification Key License</h5>
<figcaption>Product Identifier Verification from Identification Key License</figcaption>
</figure>
<p>
A GS1 Member Organization issues <a href="https://w3id.org/traceability/#GS1IdentificationKeyLicenceCredential">GS1 Company Identification Key Licence Credential</a> (1), which is presented to the GS1 User Company (2).
A GS1 Member Organization issues <a href="https://w3id.org/traceability/#GS1IdentificationKeyLicenseCredential">GS1 Company Identification Key License Credential</a> (1), which is presented to the GS1 User Company (2).
</p>
<p>
The GS1 User Company issues <a href="https://w3id.org/traceability/#GS1KeyCredential">GS1 Key Credential</a> (3) for GTIN identification of a product.
Expand All @@ -861,10 +861,10 @@ <h5>GS1 Prefix License Verification</h5>
<figcaption>GS1 Prefix License Verification</figcaption>
</figure>
<p>
GS1 Global Office issues <a href="https://w3id.org/traceability/#GS1PrefixLicenceCredential">GS1 Prefix Licence Credential</a> (1) about a GS1 Member Organization.
GS1 Global Office issues <a href="https://w3id.org/traceability/#GS1PrefixLicenseCredential">GS1 Prefix License Credential</a> (1) about a GS1 Member Organization.
</p>
<p>
In conjunction with verification of a GS1 User Company's claims, if the <a href="https://w3id.org/traceability/#GS1PrefixLicenceCredential">GS1 Prefix Licence Credential</a> of an issuing GS1 Member Organization is not already cached, or if a cached <a href="https://w3id.org/traceability/#GS1PrefixLicenceCredential">GS1 Prefix Licence Credential</a> has been revoked, the verifier fetches the corresponding <a href="https://w3id.org/traceability/#GS1PrefixLicenceCredential">GS1 Prefix Licence Credential</a> which is publicly avaiable from GS1 Global Office (2).
In conjunction with verification of a GS1 User Company's claims, if the <a href="https://w3id.org/traceability/#GS1PrefixLicenseCredential">GS1 Prefix License Credential</a> of an issuing GS1 Member Organization is not already cached, or if a cached <a href="https://w3id.org/traceability/#GS1PrefixLicenseCredential">GS1 Prefix License Credential</a> has been revoked, the verifier fetches the corresponding <a href="https://w3id.org/traceability/#GS1PrefixLicenseCredential">GS1 Prefix License Credential</a> which is publicly avaiable from GS1 Global Office (2).
</p>
</section>
<section>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
$linkedData:
term: GS18PrefixLicenceCredential
'@id': https://w3id.org/traceability#GS18PrefixLicenceCredential
title: GS1-8 Prefix Licence Credential
term: GS18PrefixLicenseCredential
'@id': https://w3id.org/traceability#GS18PrefixLicenseCredential
title: GS1-8 Prefix License Credential
tags:
- eCommerce
description: >-
A GS1-8 Prefix is issued by GS1 Global Office and allocated a GS1 Member Organization or to itself for the purpose of issuing GS1 identification key licences for GTIN-8s.
A GS1-8 Prefix is issued by GS1 Global Office and allocated a GS1 Member Organization or to itself for the purpose of issuing GS1 identification key licenses for GTIN-8s.
type: object
properties:
'@context':
type: array
readOnly: true
const:
- https://www.w3.org/2018/credentials/v1
- https://ref.gs1.org/gs1/vc/licence-context/
- https://ref.gs1.org/gs1/vc/license-context/
default:
- https://www.w3.org/2018/credentials/v1
- https://ref.gs1.org/gs1/vc/licence-context/
- https://ref.gs1.org/gs1/vc/license-context/
items:
type: string
enum:
- https://www.w3.org/2018/credentials/v1
- https://ref.gs1.org/gs1/vc/licence-context/
- https://ref.gs1.org/gs1/vc/license-context/
type:
type: array
readOnly: true
const:
- VerifiableCredential
- GS18PrefixLicenceCredential
- GS18PrefixLicenseCredential
default:
- VerifiableCredential
- GS18PrefixLicenceCredential
- GS18PrefixLicenseCredential
items:
type: string
enum:
- VerifiableCredential
- GS18PrefixLicenceCredential
- GS18PrefixLicenseCredential
id:
description: A resolvable URI where this credential is stored. Note that the URI contains the GS1-8 Prefix.
type: string
Expand All @@ -54,8 +54,8 @@ properties:
description: The url of the schema file to validate the shape of the json object
type: string
format: uri
example: https://w3id.org/traceability/openapi/components/schemas/credentials/GS18PrefixLicenceCredential.yml
default: https://w3id.org/traceability/openapi/components/schemas/credentials/GS18PrefixLicenceCredential.yml
example: https://w3id.org/traceability/openapi/components/schemas/credentials/GS18PrefixLicenseCredential.yml
default: https://w3id.org/traceability/openapi/components/schemas/credentials/GS18PrefixLicenseCredential.yml
readOnly: true
type:
title: Type
Expand Down Expand Up @@ -86,16 +86,16 @@ properties:
organizationName:
description: The name of the organization expressed in text.
type: string
licenceValue:
licenseValue:
description: The GS1-8 Prefix.
type: string
alternativeLicenceValue:
description: Alternative value of the licence. For most licences, the alternative value of the licence is the bridge between the U.P.C. system and the rest of the GS1 system; if the licence value starts with zero, then the alternative licence value is the same as the licence value but without the starting zero.
alternativeLicenseValue:
description: Alternative value of the license. For most licenses, the alternative value of the license is the bridge between the U.P.C. system and the rest of the GS1 system; if the license value starts with zero, then the alternative license value is the same as the license value but without the starting zero.
type: string
required:
- partyGLN
- organizationName
- licenceValue
- licenseValue
credentialStatus:
type: object
proof:
Expand All @@ -111,23 +111,23 @@ example: |-
{
"@context": [
"https://www.w3.org/2018/credentials/v1",
"https://ref.gs1.org/gs1/vc/licence-context/"
"https://ref.gs1.org/gs1/vc/license-context/"
],
"id": "https://id.gs1.org/vc/licence/gs1_8_prefix/754",
"id": "https://id.gs1.org/vc/license/gs1_8_prefix/754",
"type": [
"VerifiableCredential",
"GS18PrefixLicenceCredential"
"GS18PrefixLicenseCredential"
],
"issuer": "did:key:z6MktHQo3fRRohk44dsbE76CuiTpBmyMWq2VVjvV6aBSeE3U",
"issuanceDate": "2005-01-01T00:00:00Z",
"credentialSubject": {
"id": "did:web:www.gs1ca.org",
"partyGLN": "7541230000000",
"organizationName": "GS1 Canada",
"licenceValue": "754"
"licenseValue": "754"
},
"credentialStatus": {
"id": "https://id.gs1.org/vc/licence/status/gs1_8_prefix/754",
"id": "https://id.gs1.org/vc/license/status/gs1_8_prefix/754",
"type": "CredentialStatusList2021"
}
}
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
$linkedData:
term: GS1CompanyPrefixLicenceCredential
'@id': https://w3id.org/traceability#GS1CompanyPrefixLicenceCredential
title: GS1 Company Prefix Licence Credential
term: GS1CompanyPrefixLicenseCredential
'@id': https://w3id.org/traceability#GS1CompanyPrefixLicenseCredential
title: GS1 Company Prefix License Credential
tags:
- eCommerce
description: >-
A GS1 Company Prefix Licence is issued by a GS1 Member Organization or GS1 Global Office and allocated to a user company or to itself for the purpose of generating tier 1 GS1 identification keys.
A GS1 Company Prefix License is issued by a GS1 Member Organization or GS1 Global Office and allocated to a user company or to itself for the purpose of generating tier 1 GS1 identification keys.
type: object
properties:
'@context':
type: array
readOnly: true
const:
- https://www.w3.org/2018/credentials/v1
- https://ref.gs1.org/gs1/vc/licence-context/
- https://ref.gs1.org/gs1/vc/license-context/
default:
- https://www.w3.org/2018/credentials/v1
- https://ref.gs1.org/gs1/vc/licence-context/
- https://ref.gs1.org/gs1/vc/license-context/
items:
type: string
enum:
- https://www.w3.org/2018/credentials/v1
- https://ref.gs1.org/gs1/vc/licence-context/
- https://ref.gs1.org/gs1/vc/license-context/
type:
type: array
readOnly: true
const:
- VerifiableCredential
- GS1CompanyPrefixLicenceCredential
- GS1CompanyPrefixLicenseCredential
default:
- VerifiableCredential
- GS1CompanyPrefixLicenceCredential
- GS1CompanyPrefixLicenseCredential
items:
type: string
enum:
- VerifiableCredential
- GS1CompanyPrefixLicenceCredential
- GS1CompanyPrefixLicenseCredential
id:
description: A DID for this credential. The ID is not resolvable because the credential is sensitive information and only the user company can decide when it is presented.
type: string
Expand All @@ -54,8 +54,8 @@ properties:
description: The url of the schema file to validate the shape of the json object
type: string
format: uri
example: https://w3id.org/traceability/openapi/components/schemas/credentials/GS1CompanyPrefixLicenceCredential.yml
default: https://w3id.org/traceability/openapi/components/schemas/credentials/GS1CompanyPrefixLicenceCredential.yml
example: https://w3id.org/traceability/openapi/components/schemas/credentials/GS1CompanyPrefixLicenseCredential.yml
default: https://w3id.org/traceability/openapi/components/schemas/credentials/GS1CompanyPrefixLicenseCredential.yml
readOnly: true
type:
title: Type
Expand All @@ -74,18 +74,18 @@ properties:
description: The name of the organization expressed in text.
type: string
extendsCredential:
description: Reference to the credential that this one extends. Provides a complete chain to the GS1 Prefix or GS1-8 Prefix licence credential issued by GS1 Global Office.
description: Reference to the credential that this one extends. Provides a complete chain to the GS1 Prefix or GS1-8 Prefix license credential issued by GS1 Global Office.
type: string
licenceValue:
licenseValue:
description: The GS1 Prefix.
type: string
alternativeLicenceValue:
description: Alternative value of the licence. For most licences, the alternative value of the licence is the bridge between the U.P.C. system and the rest of the GS1 system; if the licence value starts with zero, then the alternative licence value is the same as the licence value but without the starting zero.
alternativeLicenseValue:
description: Alternative value of the license. For most licenses, the alternative value of the license is the bridge between the U.P.C. system and the rest of the GS1 system; if the license value starts with zero, then the alternative license value is the same as the license value but without the starting zero.
type: string
required:
- partyGLN
- organizationName
- licenceValue
- licenseValue
credentialStatus:
type: object
proof:
Expand All @@ -101,21 +101,21 @@ example: |-
{
"@context": [
"https://www.w3.org/2018/credentials/v1",
"https://ref.gs1.org/gs1/vc/licence-context/"
"https://ref.gs1.org/gs1/vc/license-context/"
],
"id": "did:example:b6d13abe-464d-4bb9-a568-b6d81efd57e3",
"type": [
"VerifiableCredential",
"GS1CompanyPrefixLicenceCredential"
"GS1CompanyPrefixLicenseCredential"
],
"issuer": "did:key:z6MktHQo3fRRohk44dsbE76CuiTpBmyMWq2VVjvV6aBSeE3U",
"issuanceDate": "2020-11-19T14:56:37Z",
"credentialSubject": {
"id": "did:web:www.example.ca",
"partyGLN": "7541234000006",
"organizationName": "Example Company",
"extendsCredential": "https://id.gs1.org/vc/licence/gs1_prefix/754",
"licenceValue": "7541234"
"extendsCredential": "https://id.gs1.org/vc/license/gs1_prefix/754",
"licenseValue": "7541234"
},
"credentialStatus": {
"id": "https://www.gs1ca.org/credentials/gs1_company_prefix/status/7541234",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ properties:
description: URI of the party to which the authority to declare data is delegated.
type: string
delegation:
description: References to the licence or key credentials that have been delegated to the credential subject. Within GS1, provides a complete chain to the GS1 Prefix licence credential issued by GS1 Global Office. If a URI is to a licence credential, all keys within the licence are delegated to the credential subject. If a key entry is incomplete (e.g., the delegation is for serial-level data but only the GTIN key credential is provided), all additional attributes below the path in the key are delegated to the credential subject. The delegation URIs do not need to be resolvable, and the fact that this credential is presented does not require that the delegation credentials be presented as well. It is up to the holder to decide whether to present the delegation credentials alongside this one.
description: References to the license or key credentials that have been delegated to the credential subject. Within GS1, provides a complete chain to the GS1 Prefix license credential issued by GS1 Global Office. If a URI is to a license credential, all keys within the license are delegated to the credential subject. If a key entry is incomplete (e.g., the delegation is for serial-level data but only the GTIN key credential is provided), all additional attributes below the path in the key are delegated to the credential subject. The delegation URIs do not need to be resolvable, and the fact that this credential is presented does not require that the delegation credentials be presented as well. It is up to the holder to decide whether to present the delegation credentials alongside this one.
type: array
items:
type: string
Expand Down
Loading

0 comments on commit b2e5337

Please sign in to comment.