Skip to content

Commit

Permalink
Use plural verbiage for multiple orgs as appropriate.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jeremyroman
jeremyroman committed Apr 25, 2024
1 parent dcf4e58 commit dc2ea64
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
16 changes: 8 additions & 8 deletions __tests__/__snapshots__/get-user-status.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ exports[`Multiple entities, all unverified 1`] = `
"context": "Participation",
"description": "@johndoetw participates on behalf of an unverified entity",
"isNothing": false,
"longDescription": "@johndoetw is part of the contoso1 and contoso2 GitHub organizations, but they all have not yet been verified. Hold tight while we sort this out on our end! If you are a spec editor, follow <a href="https://github.com/whatwg/participate.whatwg.org#process-for-editors">these instructions</a> to verify this entity.",
"longDescription": "@johndoetw is part of the contoso1 and contoso2 GitHub organizations, but they all have not yet been verified. Hold tight while we sort this out on our end! If you are a spec editor, follow <a href="https://github.com/whatwg/participate.whatwg.org#process-for-editors">these instructions</a> to verify those organizations.",
"state": "pending",
"target_url": "https://participate.whatwg.org/agreement-status?user=johndoetw&repo=console",
}
Expand All @@ -258,7 +258,7 @@ exports[`Multiple entities, all unverified 2`] = `
"context": "Participation",
"description": "@johndoetw participates on behalf of an unverified entity",
"isNothing": false,
"longDescription": "@johndoetw is part of the contoso1 and contoso2 GitHub organizations, but they all have not yet been verified. Hold tight while we sort this out on our end! If you are a spec editor, follow <a href="https://github.com/whatwg/participate.whatwg.org#process-for-editors">these instructions</a> to verify this entity.",
"longDescription": "@johndoetw is part of the contoso1 and contoso2 GitHub organizations, but they all have not yet been verified. Hold tight while we sort this out on our end! If you are a spec editor, follow <a href="https://github.com/whatwg/participate.whatwg.org#process-for-editors">these instructions</a> to verify those organizations.",
"state": "pending",
"target_url": "https://participate.whatwg.org/agreement-status?user=johndoetw&repo=console&pull=120",
}
Expand Down Expand Up @@ -401,7 +401,7 @@ exports[`Via entity, participating in all workstreams, unverified 1`] = `
"context": "Participation",
"description": "@johndoetw participates on behalf of an unverified entity",
"isNothing": false,
"longDescription": "@johndoetw is part of the contoso GitHub organization, but it has not yet been verified. Hold tight while we sort this out on our end! If you are a spec editor, follow <a href="https://github.com/whatwg/participate.whatwg.org#process-for-editors">these instructions</a> to verify this entity.",
"longDescription": "@johndoetw is part of the contoso GitHub organization, but it has not yet been verified. Hold tight while we sort this out on our end! If you are a spec editor, follow <a href="https://github.com/whatwg/participate.whatwg.org#process-for-editors">these instructions</a> to verify this organization.",
"state": "pending",
"target_url": "https://participate.whatwg.org/agreement-status?user=johndoetw&repo=console",
}
Expand All @@ -412,7 +412,7 @@ exports[`Via entity, participating in all workstreams, unverified 2`] = `
"context": "Participation",
"description": "@johndoetw participates on behalf of an unverified entity",
"isNothing": false,
"longDescription": "@johndoetw is part of the contoso GitHub organization, but it has not yet been verified. Hold tight while we sort this out on our end! If you are a spec editor, follow <a href="https://github.com/whatwg/participate.whatwg.org#process-for-editors">these instructions</a> to verify this entity.",
"longDescription": "@johndoetw is part of the contoso GitHub organization, but it has not yet been verified. Hold tight while we sort this out on our end! If you are a spec editor, follow <a href="https://github.com/whatwg/participate.whatwg.org#process-for-editors">these instructions</a> to verify this organization.",
"state": "pending",
"target_url": "https://participate.whatwg.org/agreement-status?user=johndoetw&repo=console&pull=120",
}
Expand Down Expand Up @@ -445,7 +445,7 @@ exports[`Via entity, participating in other workstreams but not that one, unveri
"context": "Participation",
"description": "@johndoetw participates on behalf of an unverified entity",
"isNothing": false,
"longDescription": "@johndoetw is part of the contoso GitHub organization, but it has not yet been verified. Hold tight while we sort this out on our end! If you are a spec editor, follow <a href="https://github.com/whatwg/participate.whatwg.org#process-for-editors">these instructions</a> to verify this entity.",
"longDescription": "@johndoetw is part of the contoso GitHub organization, but it has not yet been verified. Hold tight while we sort this out on our end! If you are a spec editor, follow <a href="https://github.com/whatwg/participate.whatwg.org#process-for-editors">these instructions</a> to verify this organization.",
"state": "pending",
"target_url": "https://participate.whatwg.org/agreement-status?user=johndoetw&repo=console",
}
Expand All @@ -456,7 +456,7 @@ exports[`Via entity, participating in other workstreams but not that one, unveri
"context": "Participation",
"description": "@johndoetw participates on behalf of an unverified entity",
"isNothing": false,
"longDescription": "@johndoetw is part of the contoso GitHub organization, but it has not yet been verified. Hold tight while we sort this out on our end! If you are a spec editor, follow <a href="https://github.com/whatwg/participate.whatwg.org#process-for-editors">these instructions</a> to verify this entity.",
"longDescription": "@johndoetw is part of the contoso GitHub organization, but it has not yet been verified. Hold tight while we sort this out on our end! If you are a spec editor, follow <a href="https://github.com/whatwg/participate.whatwg.org#process-for-editors">these instructions</a> to verify this organization.",
"state": "pending",
"target_url": "https://participate.whatwg.org/agreement-status?user=johndoetw&repo=console&pull=120",
}
Expand Down Expand Up @@ -489,7 +489,7 @@ exports[`Via entity, participating in that particular workstream, unverified 1`]
"context": "Participation",
"description": "@johndoetw participates on behalf of an unverified entity",
"isNothing": false,
"longDescription": "@johndoetw is part of the contoso GitHub organization, but it has not yet been verified. Hold tight while we sort this out on our end! If you are a spec editor, follow <a href="https://github.com/whatwg/participate.whatwg.org#process-for-editors">these instructions</a> to verify this entity.",
"longDescription": "@johndoetw is part of the contoso GitHub organization, but it has not yet been verified. Hold tight while we sort this out on our end! If you are a spec editor, follow <a href="https://github.com/whatwg/participate.whatwg.org#process-for-editors">these instructions</a> to verify this organization.",
"state": "pending",
"target_url": "https://participate.whatwg.org/agreement-status?user=johndoetw&repo=console",
}
Expand All @@ -500,7 +500,7 @@ exports[`Via entity, participating in that particular workstream, unverified 2`]
"context": "Participation",
"description": "@johndoetw participates on behalf of an unverified entity",
"isNothing": false,
"longDescription": "@johndoetw is part of the contoso GitHub organization, but it has not yet been verified. Hold tight while we sort this out on our end! If you are a spec editor, follow <a href="https://github.com/whatwg/participate.whatwg.org#process-for-editors">these instructions</a> to verify this entity.",
"longDescription": "@johndoetw is part of the contoso GitHub organization, but it has not yet been verified. Hold tight while we sort this out on our end! If you are a spec editor, follow <a href="https://github.com/whatwg/participate.whatwg.org#process-for-editors">these instructions</a> to verify this organization.",
"state": "pending",
"target_url": "https://participate.whatwg.org/agreement-status?user=johndoetw&repo=console&pull=120",
}
Expand Down
4 changes: 2 additions & 2 deletions lib/get-user-status.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ function statusEntity(submitterGitHubID, repoName, targetURL, entity) {
}

function statusEntitiesUnverified(submitterGitHubID, targetURL, entities) {
const { orgs, word, pronoun, haveVerb } = entityVerbiage(entities);
const { orgs, word, pronoun, pronoun2, haveVerb } = entityVerbiage(entities);

return {
state: "pending",
Expand All @@ -138,7 +138,7 @@ function statusEntitiesUnverified(submitterGitHubID, targetURL, entities) {
context: "Participation",

isNothing: false,
longDescription: html`@${submitterGitHubID} is part of the ${orgs} GitHub ${word}, but ${pronoun} ${haveVerb} not yet been verified. Hold tight while we sort this out on our end! If you are a spec editor, follow <a href="${config.verifyInstructionsURL}">these instructions</a> to verify this entity.`
longDescription: html`@${submitterGitHubID} is part of the ${orgs} GitHub ${word}, but ${pronoun} ${haveVerb} not yet been verified. Hold tight while we sort this out on our end! If you are a spec editor, follow <a href="${config.verifyInstructionsURL}">these instructions</a> to verify ${pronoun2} ${word}.`
};
}

Expand Down

0 comments on commit dc2ea64

Please sign in to comment.