Skip to content
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

/Submission/ now redirects to /submissions/ #1772

Merged
merged 4 commits into from
Sep 5, 2023
Merged

/Submission/ now redirects to /submissions/ #1772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
224d0ef
/Submission/ now redirects to /submissions/
deniak Sep 5, 2023
40885a4
fix tests
deniak Sep 5, 2023
0e66cfa
fix tests
deniak Sep 5, 2023
7b2497a
fix doc
deniak Sep 5, 2023
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
4 changes: 2 additions & 2 deletions lib/l10n-en_GB.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,9 @@ export const messages = {
'sotd.submission.no-submission-text': 'No member submission paragraph.',
'sotd.submission.link-text': "Missing link '${href}' with text '${text}'.",
'sotd.submission.no-sm-link':
"Missing link 'https://www.w3.org/Submission/...' with text 'Submitting Members'.",
"Missing link 'https://www.w3.org/submissions/...' with text 'Submitting Members'.",
'sotd.submission.no-tc-link':
"Missing link 'https://www.w3.org/Submission/...' with text 'W3C Team Comment'.",
"Missing link 'https://www.w3.org/submissions/...' with text 'W3C Team Comment'.",
// sotd/stability
'sotd.stability.no-stability':
'No stability warning paragraph. Expected text: <blockquote>${expected}</blockquote>',
Expand Down
8 changes: 4 additions & 4 deletions lib/rules.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
"rules": {
"divClassHead": true,
"logo": true,
"submlogo": "In addition to the W3C logo, use this logo:<div class=\"boilerplate\"> <a href=\"https://www.w3.org/Submission/\"> <img alt=\"W3C Member Submission\" src=\"https://www.w3.org/Icons/member_subm\" height=\"48\" width=\"211\"> </a> </div> <div class=\"source\"> <span style=\"font-style: italic\">Include this source code</span>:<br><code>&lt;a href=\"https://www.w3.org/Submission/\"&gt;&lt;img height=\"48\" width=\"211\" alt=\"W3C Member Submission\" src=\"https://www.w3.org/Icons/member_subm\"/&gt;&lt;/a&gt;</code></div>",
"submlogo": "In addition to the W3C logo, use this logo:<div class=\"boilerplate\"> <a href=\"https://www.w3.org/submissions/\"> <img alt=\"W3C Member Submission\" src=\"https://www.w3.org/Icons/member_subm\" height=\"48\" width=\"211\"> </a> </div> <div class=\"source\"> <span style=\"font-style: italic\">Include this source code</span>:<br><code>&lt;a href=\"https://www.w3.org/submissions/\"&gt;&lt;img height=\"48\" width=\"211\" alt=\"W3C Member Submission\" src=\"https://www.w3.org/Icons/member_subm\"/&gt;&lt;/a&gt;</code></div>",
"title": true,
"versionNumber": [""],
"dateState": ["Member Submission", ""],
"docIDFormat": true,
"docIDOrder": true,
"docIDThisVersion": "The syntax of a “This Version” URI <span class=\"rfc2119\">must</span> be <code>https://www.w3.org/Submission/YYYY/SUBM-shortname-YYYYMMDD/</code>.",
"docIDLatestVersion": "The syntax of a “Latest Version” URI <span class=\"rfc2119\">must</span> be <code>https://www.w3.org/Submission/shortname/</code>.",
"docIDThisVersion": "The syntax of a “This Version” URI <span class=\"rfc2119\">must</span> be <code>https://www.w3.org/submissions/YYYY/SUBM-shortname-YYYYMMDD/</code>.",
"docIDLatestVersion": "The syntax of a “Latest Version” URI <span class=\"rfc2119\">must</span> be <code>https://www.w3.org/submissions/shortname/</code>.",
"docIDDate": true,
"editorSection": true,
"altRepresentations": ["SUBM"],
Expand All @@ -56,7 +56,7 @@
"rules": {
"sotd": true,
"boilerplateTRDoc": true,
"boilerplateSUBM": "It <span class=\"rfc2119\">must</span> include this boilerplate text (with links to the published Submission and Team Comment): <blockquote class=\"boilerplate\"> By publishing this document, W3C acknowledges that the <a href=\"https://www.w3.org/Submission/@@@submissiondoc@@@\">Submitting Members</a> have made a formal Submission request to W3C for discussion. Publication of this document by W3C indicates no endorsement of its content by W3C, nor that W3C has, is, or will be allocating any resources to the issues addressed by it. This document is not the product of a chartered W3C group, but is published as potential input to the <a href=\"https://www.w3.org/Consortium/Process\">W3C Process</a>. A <a href=\"https://www.w3.org/Submission/@@@teamcomment@@@\">W3C Team Comment</a> has been published in conjunction with this Member Submission. Publication of acknowledged Member Submissions at the W3C site is one of the benefits of <a href=\"https://www.w3.org/Consortium/Prospectus/Joining\">W3C Membership</a>. Please consult the requirements associated with Member Submissions of <a href=\"https://www.w3.org/Consortium/Patent-Policy/#sec-submissions\">section 3.3 of the W3C Patent Policy</a>. Please consult the complete <a href=\"https://www.w3.org/Submission\">list of acknowledged W3C Member Submissions</a>.</blockquote> <div class=\"source\"> <span style=\"font-style: italic\">Include this source code</span>:<br><code>&lt;p&gt;By publishing this document, W3C acknowledges that the &lt;a href=\"https://www.w3.org/Submission/@@@submissiondoc@@@\"&gt;Submitting Members&lt;/a&gt; have made a formal Submission request to W3C for discussion. Publication of this document by W3C indicates no endorsement of its content by W3C, nor that W3C has, is, or will be allocating any resources to the issues addressed by it. This document is not the product of a chartered W3C group, but is published as potential input to the &lt;a href=\"https://www.w3.org/Consortium/Process\"&gt;W3C Process&lt;/a&gt;. A &lt;a href=\"https://www.w3.org/Submission/@@@teamcomment@@@\"&gt;W3C Team Comment&lt;/a&gt; has been published in conjunction with this Member Submission. Publication of acknowledged Member Submissions at the W3C site is one of the benefits of &lt;a href=\"https://www.w3.org/Consortium/Prospectus/Joining\"&gt;W3C Membership&lt;/a&gt;. Please consult the requirements associated with Member Submissions of &lt;a href=\"https://www.w3.org/Consortium/Patent-Policy/#sec-submissions\"&gt;section 3.3 of the W3C Patent Policy&lt;/a&gt;. Please consult the complete &lt;a href=\"https://www.w3.org/Submission\"&gt;list of acknowledged W3C Member Submissions&lt;/a&gt;.&lt;/p&gt;</code></div>",
"boilerplateSUBM": "It <span class=\"rfc2119\">must</span> include this boilerplate text (with links to the published Submission and Team Comment): <blockquote class=\"boilerplate\"> By publishing this document, W3C acknowledges that the <a href=\"https://www.w3.org/submissions/@@@submissiondoc@@@\">Submitting Members</a> have made a formal Submission request to W3C for discussion. Publication of this document by W3C indicates no endorsement of its content by W3C, nor that W3C has, is, or will be allocating any resources to the issues addressed by it. This document is not the product of a chartered W3C group, but is published as potential input to the <a href=\"https://www.w3.org/Consortium/Process\">W3C Process</a>. A <a href=\"https://www.w3.org/submissions/@@@teamcomment@@@\">W3C Team Comment</a> has been published in conjunction with this Member Submission. Publication of acknowledged Member Submissions at the W3C site is one of the benefits of <a href=\"https://www.w3.org/Consortium/Prospectus/Joining\">W3C Membership</a>. Please consult the requirements associated with Member Submissions of <a href=\"https://www.w3.org/Consortium/Patent-Policy/#sec-submissions\">section 3.3 of the W3C Patent Policy</a>. Please consult the complete <a href=\"https://www.w3.org/submissions/\">list of acknowledged W3C Member Submissions</a>.</blockquote> <div class=\"source\"> <span style=\"font-style: italic\">Include this source code</span>:<br><code>&lt;p&gt;By publishing this document, W3C acknowledges that the &lt;a href=\"https://www.w3.org/submissions/@@@submissiondoc@@@\"&gt;Submitting Members&lt;/a&gt; have made a formal Submission request to W3C for discussion. Publication of this document by W3C indicates no endorsement of its content by W3C, nor that W3C has, is, or will be allocating any resources to the issues addressed by it. This document is not the product of a chartered W3C group, but is published as potential input to the &lt;a href=\"https://www.w3.org/Consortium/Process\"&gt;W3C Process&lt;/a&gt;. A &lt;a href=\"https://www.w3.org/submissions/@@@teamcomment@@@\"&gt;W3C Team Comment&lt;/a&gt; has been published in conjunction with this Member Submission. Publication of acknowledged Member Submissions at the W3C site is one of the benefits of &lt;a href=\"https://www.w3.org/Consortium/Prospectus/Joining\"&gt;W3C Membership&lt;/a&gt;. Please consult the requirements associated with Member Submissions of &lt;a href=\"https://www.w3.org/Consortium/Patent-Policy/#sec-submissions\"&gt;section 3.3 of the W3C Patent Policy&lt;/a&gt;. Please consult the complete &lt;a href=\"https://www.w3.org/submissions/\"&gt;list of acknowledged W3C Member Submissions&lt;/a&gt;.&lt;/p&gt;</code></div>",
"customParagraph": true,
"knownDisclosureNumber": true,
"datesFormat": true
Expand Down
3 changes: 1 addition & 2 deletions lib/rules/headers/dl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ export async function check(sr, done) {
let topLevel = 'TR';
let thisURI = '';

if (subType === 'member') topLevel = 'Submission';
else if (subType === 'team') topLevel = 'TeamSubmission';
if (subType === 'member') topLevel = 'submissions';

const dts = sr.extractHeaders();
if (!dts.This) sr.error(self, 'this-version');
Expand Down
3 changes: 1 addition & 2 deletions lib/rules/headers/shortname.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ export async function check(sr, done) {
let topLevel = 'TR';
let thisURI = '';

if (subType === 'member') topLevel = 'Submission';
else if (subType === 'team') topLevel = 'TeamSubmission';
if (subType === 'member') topLevel = 'submissions';

const dts = sr.extractHeaders();

Expand Down
2 changes: 1 addition & 1 deletion lib/rules/headers/subm-logo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export function check(sr, done) {
member: {
alt: 'W3C Member Submission',
src: /^(https:)?\/\/www\.w3\.org\/Icons\/member_subm(\.png|\.gif)?$/,
href: /^(https:)?\/\/www\.w3\.org\/Submission\/?$/,
href: /^(https:)?\/\/www\.w3\.org\/submissions\/?$/,
},
};
if (
Expand Down
6 changes: 3 additions & 3 deletions lib/rules/sotd/submission.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export function check(sr, done) {
'https://www.w3.org/Consortium/Prospectus/Joining';
const w3cPP =
'https://www.w3.org/Consortium/Patent-Policy/#sec-submissions';
const w3cSubm = 'https://www.w3.org/Submission';
const w3cSubm = 'https://www.w3.org/submissions/';
let foundW3CProcess = false;
let foundW3CMembership = false;
let foundPP = false;
Expand Down Expand Up @@ -90,14 +90,14 @@ export function check(sr, done) {
return;
}
if (
href.indexOf(`${w3cSubm}/`) === 0 &&
href.indexOf(`${w3cSubm}`) === 0 &&
text === 'Submitting Members'
) {
foundSubmMembers = true;
return;
}
if (
href.indexOf(`${w3cSubm}/`) === 0 &&
href.indexOf(`${w3cSubm}`) === 0 &&
text === 'W3C Team Comment'
) {
foundComment = true;
Expand Down
12 changes: 6 additions & 6 deletions test/doc-views/SUBM/MEM-SUBM.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ const good = {
},
dl: {
...data.dl,
topLevel: 'Submission',
topLevel: 'submissions',
latestVersion: {
...data.dl.latestVersion,
docType: 'Submission',
textDocType: 'Submission',
docType: 'submissions',
textDocType: 'submissions',
},
},
config: {
Expand Down Expand Up @@ -94,7 +94,7 @@ export default {
...good.sotd,
submission: {
...good.sotd.submission,
submissionLink: 'https://fake-url/Submission',
submissionLink: 'https://fake-url/submissions',
},
},
},
Expand All @@ -105,7 +105,7 @@ export default {
submission: {
...good.sotd.submission,
submissionMemberLink:
'https://fake-url/Submission/2020/02/',
'https://fake-url/submissions/2020/02/',
},
},
},
Expand All @@ -116,7 +116,7 @@ export default {
submission: {
...good.sotd.submission,
submissionComment:
'https://fake-url/Submission/2020/02/Comment/',
'https://fake-url/submissions/2020/02/Comment/',
},
},
},
Expand Down
7 changes: 4 additions & 3 deletions test/doc-views/specBase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,10 @@ export const data = {
processLink: 'https://www.w3.org/Consortium/Process',
membershipLink: 'https://www.w3.org/Consortium/Prospectus/Joining',
ppLink: 'https://www.w3.org/Consortium/Patent-Policy/#sec-submissions',
submissionLink: 'https://www.w3.org/Submission',
submissionMemberLink: 'https://www.w3.org/Submission/2020/02/',
submissionComment: 'https://www.w3.org/Submission/2020/02/Comment/',
submissionLink: 'https://www.w3.org/submissions/',
submissionMemberLink: 'https://www.w3.org/submissions/2020/02/',
submissionComment:
'https://www.w3.org/submissions/2020/02/Comment/',
},

rescindText1: 'chosen to rescind',
Expand Down
2 changes: 1 addition & 1 deletion test/docs/metadata/ttml-imsc1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
"subjectPrefix": "[imsc]",
"edDraftURI": "https://rawgit.com/w3c/imsc1/master/spec/ttml-ww-profiles.html",
"localBiblio": {
"SUBM": "World Wide Web Consortium (W3C). <a href='https://www.w3.org/Submission/2013/SUBM-ttml-ww-profiles-20130607/'>TTML Text and Image Profiles for Internet Media Subtitles and Captions</a> (Member Submission, 07 June 2013)",
"SUBM": "World Wide Web Consortium (W3C). <a href='https://www.w3.org/submissions/2013/SUBM-ttml-ww-profiles-20130607/'>TTML Text and Image Profiles for Internet Media Subtitles and Captions</a> (Member Submission, 07 June 2013)",
"CEA-608": "<a href='https://www.ce.org/Standards/Standard-Listings/R4-3-Television-Data-Systems-Subcommittee/Line-21-Data-Service.aspx'>Line-21 Data Services</a>, ANSI/CEA Standard.",
"CEA-708": "<a href='https://www.ce.org/Standards/Standard-Listings/R4-3-Television-Data-Systems-Subcommittee/CEA-708-D.aspx'>Digital Television (DTV) Closed Captioning</a>, ANSI/CEA Standard.",
"CFF": "Digital Entertainment Content Ecosystem (DECE). <a href='https://uvcentral.com/page/ultraviolet-online-guide-homepage'>Common File Format & Media Formats Specification (CFF) Version 2.2</a>.",
Expand Down