Skip to content

Commit cdf72da

Browse files
pascalfleurypascalfleury
authored
Revert "migrated schema to use CurrencyCode, CountryCode, and LanguageCode (#4547)" (#4623)
This reverts commit fc08d1a.
1 parent 8b9edbd commit cdf72da

File tree

8 files changed

+33
-58
lines changed

8 files changed

+33
-58
lines changed

‎data/ext/health-lifesci/med-health-core.ttl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1433,7 +1433,7 @@
14331433
rdfs:comment "The currency (in 3-letter) of the drug cost. See: http://en.wikipedia.org/wiki/ISO_4217. " ;
14341434
:domainIncludes :DrugCost ;
14351435
:isPartOf <https://health-lifesci.schema.org> ;
1436-
:rangeIncludes :CurrencyCode .
1436+
:rangeIncludes :Text .
14371437

14381438
:costOrigin a rdf:Property ;
14391439
rdfs:label "costOrigin" ;

‎data/ext/pending/issue-1688.ttl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
:Person ;
3333
:isPartOf <https://pending.schema.org> ;
3434
:rangeIncludes :Language,
35-
:LanguageCode ;
35+
:Text ;
3636
:source <https://github.com/schemaorg/schemaorg/issues/1688>;
3737
:contributor <https://schema.org/docs/collab/TP> ;
3838
rdfs:comment "Of a [[Person]], and less typically of an [[Organization]], to indicate a known language. We do not distinguish skill levels or reading/writing/speaking/signing here. Use language codes from the [IETF BCP 47 standard](http://tools.ietf.org/html/bcp47)." .

‎data/ext/pending/issue-2110.ttl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
:domainIncludes :BroadcastEvent ;
1010
:isPartOf <https://pending.schema.org> ;
1111
:rangeIncludes :Language,
12-
:LanguageCode ;
12+
:Text ;
1313
:source <https://github.com/schemaorg/schemaorg/issues/2110> ;
1414
rdfs:comment "Languages in which subtitles/captions are available, in [IETF BCP 47 standard format](http://tools.ietf.org/html/bcp47)." .
1515

‎data/ext/pending/issue-2381.ttl‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
rdfs:label "hasMerchantReturnPolicy" ;
9797
:domainIncludes :Organization,
9898
:Product,
99-
:Offer ;
99+
:Offer ;
100100
:isPartOf <https://pending.schema.org> ;
101101
:rangeIncludes :MerchantReturnPolicy ;
102102
:source <https://github.com/schemaorg/schemaorg/issues/2288> ;
@@ -113,11 +113,11 @@
113113
:merchantReturnDays a rdf:Property ;
114114
rdfs:label "merchantReturnDays" ;
115115
:domainIncludes :MerchantReturnPolicy,
116-
:MerchantReturnPolicySeasonalOverride ;
116+
:MerchantReturnPolicySeasonalOverride ;
117117
:isPartOf <https://pending.schema.org> ;
118118
:rangeIncludes :Integer,
119-
:Date,
120-
:DateTime ;
119+
:Date,
120+
:DateTime ;
121121
:source <https://github.com/schemaorg/schemaorg/issues/2288> ;
122122
rdfs:comment "Specifies either a fixed return date or the number of days (from the delivery date) that a product can be returned. Used when the [[returnPolicyCategory]] property is specified as [[MerchantReturnFiniteReturnWindow]]." .
123123

@@ -148,12 +148,12 @@
148148
:returnPolicyCategory a rdf:Property ;
149149
rdfs:label "returnPolicyCategory" ;
150150
:domainIncludes :MerchantReturnPolicy,
151-
:MerchantReturnPolicySeasonalOverride ;
151+
:MerchantReturnPolicySeasonalOverride ;
152152
:isPartOf <https://pending.schema.org> ;
153153
:rangeIncludes :MerchantReturnEnumeration ;
154154
:source <https://github.com/schemaorg/schemaorg/issues/2288> ;
155155
rdfs:comment "Specifies an applicable return policy (from an enumeration)." .
156-
156+
157157
:ReturnMethodEnumeration a rdfs:Class ;
158158
rdfs:label "ReturnMethodEnumeration" ;
159159
:isPartOf <https://pending.schema.org> ;
@@ -221,7 +221,7 @@
221221
:isPartOf <https://pending.schema.org> ;
222222
:source <https://github.com/schemaorg/schemaorg/issues/2880> ;
223223
rdfs:comment "Specifies that product returns are free of charge for the customer." .
224-
224+
225225
:returnMethod a rdf:Property ;
226226
rdfs:label "returnMethod" ;
227227
:domainIncludes :MerchantReturnPolicy, :MerchantReturnPolicySeasonalOverride ;
@@ -234,7 +234,8 @@
234234
rdfs:label "returnPolicyCountry" ;
235235
:domainIncludes :MerchantReturnPolicy ;
236236
:isPartOf <https://pending.schema.org> ;
237-
:rangeIncludes :Country, :CountryCode ;
237+
:rangeIncludes :Country,
238+
:Text ;
238239
:source <https://github.com/schemaorg/schemaorg/issues/2880> ;
239240
rdfs:comment "The country where the product has to be sent to for returns, for example \"Ireland\" using the [[name]] property of [[Country]]. You can also provide the two-letter [ISO 3166-1 alpha-2 country code](http://en.wikipedia.org/wiki/ISO_3166-1). Note that this can be different from the country where the product was originally shipped from or sent to." .
240241

@@ -283,7 +284,7 @@
283284
:domainIncludes :MerchantReturnPolicy, :MerchantReturnPolicySeasonalOverride ;
284285
:isPartOf <https://pending.schema.org> ;
285286
:rangeIncludes :MonetaryAmount,
286-
:Number ;
287+
:Number ;
287288
:source <https://github.com/schemaorg/schemaorg/issues/2880> ;
288289
rdfs:comment "Use [[MonetaryAmount]] to specify a fixed restocking fee for product returns, or use [[Number]] to specify a percentage of the product price paid by the customer." .
289290

@@ -326,5 +327,5 @@
326327
:source <https://github.com/schemaorg/schemaorg/issues/2880> ;
327328
rdfs:comment "Seasonal override of a return policy." .
328329

329-
330+
330331

‎data/ext/pending/issue-3001.ttl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
rdfs:label "applicableCountry" ;
99
:domainIncludes :MerchantReturnPolicy ;
1010
:isPartOf <https://pending.schema.org> ;
11-
:rangeIncludes :Country, :CountryCode ;
11+
:rangeIncludes :Country,
12+
:Text ;
1213
:source <https://github.com/schemaorg/schemaorg/issues/3001> ;
1314
rdfs:comment "A country where a particular merchant return policy applies to, for example the two-letter ISO 3166-1 alpha-2 country code." .
1415

‎data/ext/pending/issue-4546.ttl‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎data/ext/pending/issue-991.ttl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
owl:equivalentProperty unece:ProcessingCountry ;
1212
:domainIncludes :Product ;
1313
:isPartOf <https://pending.schema.org> ;
14-
:rangeIncludes :CountryCode ;
14+
:rangeIncludes :Text ;
1515
:source <https://github.com/schemaorg/schemaorg/issues/991> ;
1616
rdfs:comment "The place where the item (typically [[Product]]) was last processed and tested before importation." .
1717
# GS1 include "ingredient", but we don't model those explicitly yet.
@@ -21,7 +21,7 @@
2121
owl:equivalentProperty unece:finalAssemblyCountry ;
2222
:domainIncludes :Product ;
2323
:isPartOf <https://pending.schema.org> ;
24-
:rangeIncludes :CountryCode ;
24+
:rangeIncludes :Text ;
2525
:source <https://github.com/schemaorg/schemaorg/issues/991> ;
2626
owl:equivalentProperty unece:finalAssemblyCountry ;
2727
rdfs:comment "The place where the product was assembled." .

‎data/schema.ttl‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4258,7 +4258,8 @@ See also the <a href="/docs/hotels.html">dedicated document on the use of schema
42584258
:GeoCoordinates,
42594259
:GeoShape,
42604260
:PostalAddress ;
4261-
:rangeIncludes :CountryCode, :Country ;
4261+
:rangeIncludes :Country,
4262+
:Text ;
42624263
:source <https://github.com/schemaorg/schemaorg/issues/2506> .
42634264

42644265
:addressLocality a rdf:Property ;
@@ -4655,7 +4656,7 @@ See also the <a href="/docs/hotels.html">dedicated document on the use of schema
46554656
:ServiceChannel,
46564657
:TouristAttraction ;
46574658
:rangeIncludes :Language,
4658-
:LanguageCode .
4659+
:Text .
46594660

46604661
:availableThrough a rdf:Property ;
46614662
rdfs:label "availableThrough" ;
@@ -5330,13 +5331,13 @@ See also the <a href="/docs/hotels.html">dedicated document on the use of schema
53305331
rdfs:label "countriesNotSupported" ;
53315332
rdfs:comment "Countries for which the application is not supported. You can also provide the two-letter ISO 3166-1 alpha-2 country code." ;
53325333
:domainIncludes :SoftwareApplication ;
5333-
:rangeIncludes :CountryCode, :Country .
5334+
:rangeIncludes :Text .
53345335

53355336
:countriesSupported a rdf:Property ;
53365337
rdfs:label "countriesSupported" ;
53375338
rdfs:comment "Countries for which the application is supported. You can also provide the two-letter ISO 3166-1 alpha-2 country code." ;
53385339
:domainIncludes :SoftwareApplication ;
5339-
:rangeIncludes :CountryCode, :Country .
5340+
:rangeIncludes :Text .
53405341

53415342
:countryOfOrigin a rdf:Property ;
53425343
rdfs:label "countryOfOrigin" ;
@@ -5352,7 +5353,7 @@ In the case of products, the country of origin of the product. The exact interpr
53525353
:TVEpisode,
53535354
:TVSeason,
53545355
:TVSeries ;
5355-
:rangeIncludes :CountryCode, :Country .
5356+
:rangeIncludes :Country .
53565357

53575358
:course a rdf:Property ;
53585359
rdfs:label "course" ;
@@ -5423,7 +5424,7 @@ In the case of products, the country of origin of the product. The exact interpr
54235424
rdfs:label "currenciesAccepted" ;
54245425
rdfs:comment "The currency accepted.\\n\\nUse standard formats: [ISO 4217 currency format](http://en.wikipedia.org/wiki/ISO_4217), e.g. \"USD\"; [Ticker symbol](https://en.wikipedia.org/wiki/List_of_cryptocurrencies) for cryptocurrencies, e.g. \"BTC\"; well known names for [Local Exchange Trading Systems](https://en.wikipedia.org/wiki/Local_exchange_trading_system) (LETS) and other currency types, e.g. \"Ithaca HOUR\"." ;
54255426
:domainIncludes :LocalBusiness ;
5426-
:rangeIncludes :CurrencyCode .
5427+
:rangeIncludes :Text .
54275428

54285429
:currency a rdf:Property ;
54295430
rdfs:label "currency" ;
@@ -5432,7 +5433,7 @@ In the case of products, the country of origin of the product. The exact interpr
54325433
:domainIncludes :DatedMoneySpecification,
54335434
:MonetaryAmount,
54345435
:MonetaryAmountDistribution ;
5435-
:rangeIncludes :CurrencyCode .
5436+
:rangeIncludes :Text .
54365437

54375438
:customer a rdf:Property ;
54385439
rdfs:label "customer" ;
@@ -5719,7 +5720,7 @@ Dateline summaries are oriented more towards human readers than towards automate
57195720
rdfs:label "discountCurrency" ;
57205721
rdfs:comment "The currency of the discount.\\n\\nUse standard formats: [ISO 4217 currency format](http://en.wikipedia.org/wiki/ISO_4217), e.g. \"USD\"; [Ticker symbol](https://en.wikipedia.org/wiki/List_of_cryptocurrencies) for cryptocurrencies, e.g. \"BTC\"; well known names for [Local Exchange Trading Systems](https://en.wikipedia.org/wiki/Local_exchange_trading_system) (LETS) and other currency types, e.g. \"Ithaca HOUR\"." ;
57215722
:domainIncludes :Order ;
5722-
:rangeIncludes :CurrencyCode .
5723+
:rangeIncludes :Text .
57235724

57245725
:discusses a rdf:Property ;
57255726
rdfs:label "discusses" ;
@@ -6995,7 +6996,7 @@ In the context of [[ShippingService]], use the [[ServicePeriod]] format, that co
69956996
rdfs:subPropertyOf :instrument ;
69966997
:domainIncludes :CommunicateAction,
69976998
:WriteAction ;
6998-
:rangeIncludes :Language, :LanguageCode ;
6999+
:rangeIncludes :Language ;
69997000
:supersededBy :inLanguage .
70007001

70017002
:lastReviewed a rdf:Property ;
@@ -7450,7 +7451,7 @@ In the context of [[ShippingService]], use the [[ServicePeriod]] format, that co
74507451
rdfs:label "nationality" ;
74517452
rdfs:comment "Nationality of the person." ;
74527453
:domainIncludes :Person ;
7453-
:rangeIncludes :CountryCode, :Country .
7454+
:rangeIncludes :Country .
74547455

74557456
:netWorth a rdf:Property ;
74567457
rdfs:label "netWorth" ;
@@ -8188,7 +8189,7 @@ Note: for historical reasons, any textual label and formal code provided as a li
81888189
:Reservation,
81898190
:Ticket,
81908191
:TradeAction ;
8191-
:rangeIncludes :CurrencyCode .
8192+
:rangeIncludes :Text .
81928193
81938194
:priceRange a rdf:Property ;
81948195
rdfs:label "priceRange" ;
@@ -8779,7 +8780,7 @@ While such policies are most typically expressed in natural language, sometimes
87798780
rdfs:comment "The currency (coded using [ISO 4217](http://en.wikipedia.org/wiki/ISO_4217)) used for the main salary information in this job posting or for this employee." ;
87808781
:domainIncludes :EmployeeRole,
87818782
:JobPosting ;
8782-
:rangeIncludes :CurrencyCode .
8783+
:rangeIncludes :Text .
87838784
87848785
:sameAs a rdf:Property ;
87858786
rdfs:label "sameAs" ;
@@ -9286,7 +9287,7 @@ we define a supporting type, [[SpeakableSpecification]] which is defined to be
92869287
:ScreeningEvent,
92879288
:TVEpisode ;
92889289
:rangeIncludes :Language,
9289-
:LanguageCode .
9290+
:Text .
92909291

92919292
:successorOf a rdf:Property ;
92929293
rdfs:label "successorOf" ;
@@ -10371,7 +10372,7 @@ Unregistered or niche encoding and file formats can be indicated instead via the
1037110372
:Event,
1037210373
:WriteAction ;
1037310374
:rangeIncludes :Language,
10374-
:LanguageCode .
10375+
:Text .
1037510376

1037610377
:incentiveCompensation a rdf:Property ;
1037710378
rdfs:label "incentiveCompensation" ;

0 commit comments

Comments
 (0)