Skip to content

Internationalized formats #408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 28, 2017
Merged

Internationalized formats #408

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c93f166
Internationalized resource identifiers
handrews Sep 14, 2017
7c55c19
Internationalized domain names
handrews Sep 15, 2017
f41559f
Internationalized email addresses
handrews Sep 14, 2017
7d7c293
Put ipv4 and ipv6 under "IP addresses"
handrews Sep 15, 2017
211ab4d
Always use "hostname" for formats.
handrews Sep 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
125 changes: 83 additions & 42 deletions jsonschema-validation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,12 @@
<!ENTITY RFC2673 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.2673.xml">
<!ENTITY RFC3339 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.3339.xml">
<!ENTITY RFC3986 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.3986.xml">
<!ENTITY RFC3987 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.3987.xml">
<!ENTITY RFC4291 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.4291.xml">
<!ENTITY RFC5322 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.5322.xml">
<!ENTITY RFC5890 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.5890.xml">
<!ENTITY RFC5891 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.5891.xml">
<!ENTITY RFC6531 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.6531.xml">
<!ENTITY RFC6570 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.6570.xml">
<!ENTITY RFC6901 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.6901.xml">
<!ENTITY RFC7159 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.7159.xml">
Expand Down Expand Up @@ -950,68 +954,97 @@
</t>
</section>

<section title="email">
<section title="Email addresses">
<t>
This attribute applies to string instances.
</t>
<t>
A string instance is valid against this attribute if it is a valid
Internet email address as defined by <xref target="RFC5322">RFC 5322,
section 3.4.1</xref>.
</t>
</section>
<section title="hostname">
<t>
This attribute applies to string instances.
</t>
<t>
A string instance is valid against this attribute if it is a valid
representation for an Internet host name, as defined by <xref
target="RFC1034">RFC 1034, section 3.1</xref>.
</t>
</section>

<section title="ipv4">
<t>
This attribute applies to string instances.
These attributes apply to string instances.
</t>
<t>
A string instance is valid against this attribute if it is a valid
representation of an IPv4 address according to the "dotted-quad" ABNF
syntax as defined in <xref target="RFC2673">RFC 2673, section
3.2</xref>.
A string instance is valid against these attributes if it is a valid
Internet email address as follows:
<list style="hanging">
<t hangText="email">
As defined by <xref target="RFC5322">RFC 5322, section 3.4.1</xref>.
</t>
<t hangText="idn-email">
As defined by <xref target="RFC6531">RFC 6531</xref>
</t>
</list>
Note that all strings valid against the "email" attribute are also
valid against the "idn-email" attribute.
</t>
</section>

<section title="ipv6">
<section title="Hostnames">
<t>
This attribute applies to string instances.
These attributes apply to string instances.
</t>
<t>
A string instance is valid against this attribute if it is a valid
representation of an IPv6 address as defined in
<xref target="RFC4291">RFC 4291, section 2.2</xref>.
A string instance is valid against these attributes if it is a valid
representation for an Internet hostname as follows:
<list style="hanging">
<t hangText="hostname">
As defined by <xref target="RFC1034">RFC 1034, section 3.1</xref>,
including host names produced using the Punycode algorithm
specified in <xref target="RFC5891">RFC 5891, section 4.4</xref>.
</t>
<t hangText="idn-hostname">
As defined by either RFC 1034 as for hostname, or an
internationalized hostname as defined by
<xref target="RFC5890">RFC 5890, section 2.3.2.3</xref>.
</t>
</list>
Note that all strings valid against the "hostname" attribute are also
valid against the "idn-hostname" attribute.
</t>
</section>

<section title="uri">
<section title="IP addresses">
<t>
This attribute applies to string instances.
These attributes apply to string instances.
</t>
<t>
A string instance is valid against this attribute if it is a valid URI,
according to <xref target="RFC3986"/>.
A string instance is valid against these attributes if it is a valid
representation of an IP address as follows:
<list style="hanging">
<t hangText="ipv4">
An IPv4 address according to the "dotted-quad" ABNF
syntax as defined in
<xref target="RFC2673">RFC 2673, section 3.2</xref>.
</t>
<t hangText="ipv6">
An IPv6 address as defined in
<xref target="RFC4291">RFC 4291, section 2.2</xref>.
</t>
</list>
</t>
</section>

<section title="uri-reference">
<section title="Resource identifiers">
<t>
This attribute applies to string instances.
These attributes apply to string instances.
</t>
<t>
A string instance is valid against this attribute if it is a valid URI
Reference (either a URI or a relative-reference),
according to <xref target="RFC3986"/>.
<list style="hanging">
<t hangText="uri">
A string instance is valid against this attribute if it is
a valid URI, according to <xref target="RFC3986"/>.
</t>
<t hangText="uri-reference">
A string instance is valid against this attribute if it is a valid URI
Reference (either a URI or a relative-reference),
according to <xref target="RFC3986"/>.
</t>
<t hangText="iri">
A string instance is valid against this attribute if it is
a valid IRI, according to <xref target="RFC3987"/>.
</t>
<t hangText="iri-reference">
A string instance is valid against this attribute if it is a valid IRI
Reference (either an IRI or a relative-reference),
according to <xref target="RFC3987"/>.
</t>
</list>
Note that all valid URIs are valid IRIs, and all valid URI References are
also valid IRI References.
</t>
</section>

Expand All @@ -1023,6 +1056,10 @@
A string instance is valid against this attribute if it is a valid URI Template
(of any level), according to <xref target="RFC6570"/>.
</t>
<t>
Note that URI Templates may be used for IRIs; there is no separate
IRI Template specification.
</t>
</section>

<section title="json-pointer">
Expand Down Expand Up @@ -1209,8 +1246,12 @@
&RFC2673;
&RFC3339;
&RFC3986;
&RFC3987;
&RFC4291;
&RFC5890;
&RFC5891;
&RFC6570;
&RFC6531;
&RFC6901;
&RFC7159;
&RFC5322;
Expand Down