From 224d0ef60e44a45d7cd9a67bbf0db37c431017ed Mon Sep 17 00:00:00 2001 From: Denis Ah-Kang Date: Tue, 5 Sep 2023 18:46:20 +0400 Subject: [PATCH 1/4] /Submission/ now redirects to /submissions/ --- lib/l10n-en_GB.js | 4 ++-- lib/rules.json | 8 ++++---- lib/rules/headers/dl.js | 3 +-- lib/rules/headers/shortname.js | 3 +-- lib/rules/headers/subm-logo.js | 2 +- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/lib/l10n-en_GB.js b/lib/l10n-en_GB.js index b144c6c2c..0d85277da 100644 --- a/lib/l10n-en_GB.js +++ b/lib/l10n-en_GB.js @@ -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:
${expected}
', diff --git a/lib/rules.json b/lib/rules.json index 7bdc82a7c..6c712ddb9 100644 --- a/lib/rules.json +++ b/lib/rules.json @@ -29,14 +29,14 @@ "rules": { "divClassHead": true, "logo": true, - "submlogo": "In addition to the W3C logo, use this logo:
\"W3C
Include this source code:
<a href=\"https://www.w3.org/Submission/\"><img height=\"48\" width=\"211\" alt=\"W3C Member Submission\" src=\"https://www.w3.org/Icons/member_subm\"/></a>
", + "submlogo": "In addition to the W3C logo, use this logo:
\"W3C
Include this source code:
<a href=\"https://www.w3.org/submissions/\"><img height=\"48\" width=\"211\" alt=\"W3C Member Submission\" src=\"https://www.w3.org/Icons/member_subm\"/></a>
", "title": true, "versionNumber": [""], "dateState": ["Member Submission", ""], "docIDFormat": true, "docIDOrder": true, - "docIDThisVersion": "The syntax of a “This Version” URI must be https://www.w3.org/Submission/YYYY/SUBM-shortname-YYYYMMDD/.", - "docIDLatestVersion": "The syntax of a “Latest Version” URI must be https://www.w3.org/Submission/shortname/.", + "docIDThisVersion": "The syntax of a “This Version” URI must be https://www.w3.org/submissions/YYYY/SUBM-shortname-YYYYMMDD/.", + "docIDLatestVersion": "The syntax of a “Latest Version” URI must be https://www.w3.org/submissions/shortname/.", "docIDDate": true, "editorSection": true, "altRepresentations": ["SUBM"], @@ -56,7 +56,7 @@ "rules": { "sotd": true, "boilerplateTRDoc": true, - "boilerplateSUBM": "It must include this boilerplate text (with links to the published Submission and Team Comment):
By publishing this document, W3C acknowledges that the Submitting Members 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 W3C Process. A W3C Team Comment has been published in conjunction with this Member Submission. Publication of acknowledged Member Submissions at the W3C site is one of the benefits of W3C Membership. Please consult the requirements associated with Member Submissions of section 3.3 of the W3C Patent Policy. Please consult the complete list of acknowledged W3C Member Submissions.
Include this source code:
<p>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>.</p>
", + "boilerplateSUBM": "It must include this boilerplate text (with links to the published Submission and Team Comment):
By publishing this document, W3C acknowledges that the Submitting Members 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 W3C Process. A W3C Team Comment has been published in conjunction with this Member Submission. Publication of acknowledged Member Submissions at the W3C site is one of the benefits of W3C Membership. Please consult the requirements associated with Member Submissions of section 3.3 of the W3C Patent Policy. Please consult the complete list of acknowledged W3C Member Submissions.
Include this source code:
<p>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>.</p>
", "customParagraph": true, "knownDisclosureNumber": true, "datesFormat": true diff --git a/lib/rules/headers/dl.js b/lib/rules/headers/dl.js index 57b22e81b..5a5015f97 100644 --- a/lib/rules/headers/dl.js +++ b/lib/rules/headers/dl.js @@ -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'); diff --git a/lib/rules/headers/shortname.js b/lib/rules/headers/shortname.js index 8432f538f..1f906f9fb 100644 --- a/lib/rules/headers/shortname.js +++ b/lib/rules/headers/shortname.js @@ -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(); diff --git a/lib/rules/headers/subm-logo.js b/lib/rules/headers/subm-logo.js index 1b91a6d20..8ac1ede32 100644 --- a/lib/rules/headers/subm-logo.js +++ b/lib/rules/headers/subm-logo.js @@ -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 ( From 40885a430da2ca881ff6115c8f190e1dddc2c2a6 Mon Sep 17 00:00:00 2001 From: Denis Ah-Kang Date: Tue, 5 Sep 2023 18:56:04 +0400 Subject: [PATCH 2/4] fix tests --- test/doc-views/SUBM/MEM-SUBM.js | 12 ++++++------ test/doc-views/specBase.js | 7 ++++--- test/docs/metadata/ttml-imsc1.html | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/test/doc-views/SUBM/MEM-SUBM.js b/test/doc-views/SUBM/MEM-SUBM.js index 57ab2b901..cf32ebc58 100644 --- a/test/doc-views/SUBM/MEM-SUBM.js +++ b/test/doc-views/SUBM/MEM-SUBM.js @@ -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: { @@ -94,7 +94,7 @@ export default { ...good.sotd, submission: { ...good.sotd.submission, - submissionLink: 'https://fake-url/Submission', + submissionLink: 'https://fake-url/submissions', }, }, }, @@ -105,7 +105,7 @@ export default { submission: { ...good.sotd.submission, submissionMemberLink: - 'https://fake-url/Submission/2020/02/', + 'https://fake-url/submissions/2020/02/', }, }, }, @@ -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/', }, }, }, diff --git a/test/doc-views/specBase.js b/test/doc-views/specBase.js index b23cbac4e..f06491f3b 100644 --- a/test/doc-views/specBase.js +++ b/test/doc-views/specBase.js @@ -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', diff --git a/test/docs/metadata/ttml-imsc1.html b/test/docs/metadata/ttml-imsc1.html index f17d82ee4..5d261253d 100644 --- a/test/docs/metadata/ttml-imsc1.html +++ b/test/docs/metadata/ttml-imsc1.html @@ -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). TTML Text and Image Profiles for Internet Media Subtitles and Captions (Member Submission, 07 June 2013)", + "SUBM": "World Wide Web Consortium (W3C). TTML Text and Image Profiles for Internet Media Subtitles and Captions (Member Submission, 07 June 2013)", "CEA-608": "Line-21 Data Services, ANSI/CEA Standard.", "CEA-708": "Digital Television (DTV) Closed Captioning, ANSI/CEA Standard.", "CFF": "Digital Entertainment Content Ecosystem (DECE). Common File Format & Media Formats Specification (CFF) Version 2.2.", From 0e66cfa34408db40ec32233ee80fcb0736be1023 Mon Sep 17 00:00:00 2001 From: Denis Ah-Kang Date: Tue, 5 Sep 2023 19:34:44 +0400 Subject: [PATCH 3/4] fix tests --- lib/rules/sotd/submission.js | 6 +++--- test/doc-views/specBase.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/rules/sotd/submission.js b/lib/rules/sotd/submission.js index d5ce8d52f..ac225cdb6 100644 --- a/lib/rules/sotd/submission.js +++ b/lib/rules/sotd/submission.js @@ -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; @@ -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; diff --git a/test/doc-views/specBase.js b/test/doc-views/specBase.js index f06491f3b..5437b6e52 100644 --- a/test/doc-views/specBase.js +++ b/test/doc-views/specBase.js @@ -120,7 +120,7 @@ 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/submissions', + submissionLink: 'https://www.w3.org/submissions/', submissionMemberLink: 'https://www.w3.org/submissions/2020/02/', submissionComment: 'https://www.w3.org/submissions/2020/02/Comment/', From 7b2497a58da58e9b05795aca4ddd679b4733ed17 Mon Sep 17 00:00:00 2001 From: Denis Ah-Kang Date: Tue, 5 Sep 2023 19:41:51 +0400 Subject: [PATCH 4/4] fix doc --- lib/rules.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/rules.json b/lib/rules.json index 6c712ddb9..9662cc955 100644 --- a/lib/rules.json +++ b/lib/rules.json @@ -56,7 +56,7 @@ "rules": { "sotd": true, "boilerplateTRDoc": true, - "boilerplateSUBM": "It must include this boilerplate text (with links to the published Submission and Team Comment):
By publishing this document, W3C acknowledges that the Submitting Members 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 W3C Process. A W3C Team Comment has been published in conjunction with this Member Submission. Publication of acknowledged Member Submissions at the W3C site is one of the benefits of W3C Membership. Please consult the requirements associated with Member Submissions of section 3.3 of the W3C Patent Policy. Please consult the complete list of acknowledged W3C Member Submissions.
Include this source code:
<p>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>.</p>
", + "boilerplateSUBM": "It must include this boilerplate text (with links to the published Submission and Team Comment):
By publishing this document, W3C acknowledges that the Submitting Members 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 W3C Process. A W3C Team Comment has been published in conjunction with this Member Submission. Publication of acknowledged Member Submissions at the W3C site is one of the benefits of W3C Membership. Please consult the requirements associated with Member Submissions of section 3.3 of the W3C Patent Policy. Please consult the complete list of acknowledged W3C Member Submissions.
Include this source code:
<p>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>.</p>
", "customParagraph": true, "knownDisclosureNumber": true, "datesFormat": true