From fe26f46d905901e6880762a89232879e3dd5ff8d Mon Sep 17 00:00:00 2001 From: nsdeschenes Date: Fri, 12 Mar 2021 08:36:01 -0400 Subject: [PATCH 01/21] affiliation error messages refactored --- ...-affiliation-connections-by-org-id.test.js | 4 +- ...affiliation-connections-by-user-id.test.js | 4 +- .../load-affiliation-connections-by-org-id.js | 6 +- ...load-affiliation-connections-by-user-id.js | 6 +- .../__tests__/invite-user-to-org.test.js | 22 ++- .../__tests__/remove-user-from-org.test.js | 16 +- .../__tests__/update-user-role.test.js | 30 ++-- .../mutations/invite-user-to-org.js | 24 +-- .../mutations/remove-user-from-org.js | 29 ++-- .../affiliation/mutations/update-user-role.js | 36 ++-- api-js/src/locale/en/messages.js | 53 ++++-- api-js/src/locale/en/messages.po | 163 +++++++++++------- api-js/src/locale/fr/messages.js | 32 +++- api-js/src/locale/fr/messages.po | 147 ++++++++++------ 14 files changed, 361 insertions(+), 211 deletions(-) diff --git a/api-js/src/affiliation/loaders/__tests__/load-affiliation-connections-by-org-id.test.js b/api-js/src/affiliation/loaders/__tests__/load-affiliation-connections-by-org-id.test.js index 55cfa1dfb..e71ae9ea9 100644 --- a/api-js/src/affiliation/loaders/__tests__/load-affiliation-connections-by-org-id.test.js +++ b/api-js/src/affiliation/loaders/__tests__/load-affiliation-connections-by-org-id.test.js @@ -836,7 +836,7 @@ describe('given the load affiliations by org id function', () => { await affiliationLoader({ orgId: org._id, ...connectionArgs }) } catch (err) { expect(err).toEqual( - new Error('Unable to query affiliations. Please try again.'), + new Error('Unable to query affiliation(s). Please try again.'), ) } @@ -870,7 +870,7 @@ describe('given the load affiliations by org id function', () => { await affiliationLoader({ orgId: org._id, ...connectionArgs }) } catch (err) { expect(err).toEqual( - new Error('Unable to load affiliations. Please try again.'), + new Error('Unable to load affiliation(s). Please try again.'), ) } diff --git a/api-js/src/affiliation/loaders/__tests__/load-affiliation-connections-by-user-id.test.js b/api-js/src/affiliation/loaders/__tests__/load-affiliation-connections-by-user-id.test.js index 3775e3333..df0fba3c8 100644 --- a/api-js/src/affiliation/loaders/__tests__/load-affiliation-connections-by-user-id.test.js +++ b/api-js/src/affiliation/loaders/__tests__/load-affiliation-connections-by-user-id.test.js @@ -4403,7 +4403,7 @@ describe('given the load affiliations by user id function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to query affiliations. Please try again.'), + new Error('Unable to query affiliation(s). Please try again.'), ) } @@ -4441,7 +4441,7 @@ describe('given the load affiliations by user id function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load affiliations. Please try again.'), + new Error('Unable to load affiliation(s). Please try again.'), ) } diff --git a/api-js/src/affiliation/loaders/load-affiliation-connections-by-org-id.js b/api-js/src/affiliation/loaders/load-affiliation-connections-by-org-id.js index e914874a7..6002ff10d 100644 --- a/api-js/src/affiliation/loaders/load-affiliation-connections-by-org-id.js +++ b/api-js/src/affiliation/loaders/load-affiliation-connections-by-org-id.js @@ -218,7 +218,9 @@ export const affiliationConnectionLoaderByOrgId = ( console.error( `Database error occurred while user: ${userKey} was trying to query affiliations in affiliationConnectionLoaderByOrgId, error: ${err}`, ) - throw new Error(i18n._(t`Unable to query affiliations. Please try again.`)) + throw new Error( + i18n._(t`Unable to query affiliation(s). Please try again.`), + ) } let filteredAffiliations @@ -228,7 +230,7 @@ export const affiliationConnectionLoaderByOrgId = ( console.error( `Cursor error occurred while user: ${userKey} was trying to gather affiliations in affiliationConnectionLoaderByOrgId, error: ${err}`, ) - throw new Error(i18n._(t`Unable to load affiliations. Please try again.`)) + throw new Error(i18n._(t`Unable to load affiliation(s). Please try again.`)) } if (filteredAffiliations.affiliations.length === 0) { diff --git a/api-js/src/affiliation/loaders/load-affiliation-connections-by-user-id.js b/api-js/src/affiliation/loaders/load-affiliation-connections-by-user-id.js index 428c537cc..e42932cb5 100644 --- a/api-js/src/affiliation/loaders/load-affiliation-connections-by-user-id.js +++ b/api-js/src/affiliation/loaders/load-affiliation-connections-by-user-id.js @@ -399,7 +399,9 @@ export const affiliationConnectionLoaderByUserId = ( console.error( `Database error occurred while user: ${userKey} was trying to query affiliations in affiliationConnectionLoaderByUserId, error: ${err}`, ) - throw new Error(i18n._(t`Unable to query affiliations. Please try again.`)) + throw new Error( + i18n._(t`Unable to query affiliation(s). Please try again.`), + ) } let filteredAffiliations @@ -409,7 +411,7 @@ export const affiliationConnectionLoaderByUserId = ( console.error( `Cursor error occurred while user: ${userKey} was trying to gather affiliations in affiliationConnectionLoaderByUserId, error: ${err}`, ) - throw new Error(i18n._(t`Unable to load affiliations. Please try again.`)) + throw new Error(i18n._(t`Unable to load affiliation(s). Please try again.`)) } if (filteredAffiliations.affiliations.length === 0) { diff --git a/api-js/src/affiliation/mutations/__tests__/invite-user-to-org.test.js b/api-js/src/affiliation/mutations/__tests__/invite-user-to-org.test.js index eb84fbb1d..386dc6626 100644 --- a/api-js/src/affiliation/mutations/__tests__/invite-user-to-org.test.js +++ b/api-js/src/affiliation/mutations/__tests__/invite-user-to-org.test.js @@ -1072,9 +1072,7 @@ describe('invite user to org', () => { ) const error = [ - new GraphQLError( - 'Unable to invite yourself to an org. Please try again.', - ), + new GraphQLError('Unable to invite yourself to an org.'), ] expect(response.errors).toEqual(error) @@ -1143,7 +1141,7 @@ describe('invite user to org', () => { ) const error = [ - new GraphQLError('Unable to invite user. Please try again.'), + new GraphQLError('Unable to invite user to unknown organization.'), ] expect(response.errors).toEqual(error) @@ -1237,7 +1235,9 @@ describe('invite user to org', () => { ) const error = [ - new GraphQLError('Unable to invite user. Please try again.'), + new GraphQLError( + 'Permission Denied: Please contact organization admin for help with user invitations.', + ), ] expect(response.errors).toEqual(error) @@ -1335,7 +1335,9 @@ describe('invite user to org', () => { ) const error = [ - new GraphQLError('Unable to invite user. Please try again.'), + new GraphQLError( + 'Permission Denied: Please contact organization admin for help with user invitations.', + ), ] expect(response.errors).toEqual(error) @@ -1433,7 +1435,9 @@ describe('invite user to org', () => { ) const error = [ - new GraphQLError('Unable to invite user. Please try again.'), + new GraphQLError( + 'Permission Denied: Please contact organization admin for help with user invitations.', + ), ] expect(response.errors).toEqual(error) @@ -1551,7 +1555,9 @@ describe('invite user to org', () => { ) const error = [ - new GraphQLError('Unable to invite user. Please try again.'), + new GraphQLError( + 'Unable to add user to organization. Please try again.', + ), ] expect(response.errors).toEqual(error) diff --git a/api-js/src/affiliation/mutations/__tests__/remove-user-from-org.test.js b/api-js/src/affiliation/mutations/__tests__/remove-user-from-org.test.js index 41a52f3e5..81eee94df 100644 --- a/api-js/src/affiliation/mutations/__tests__/remove-user-from-org.test.js +++ b/api-js/src/affiliation/mutations/__tests__/remove-user-from-org.test.js @@ -587,7 +587,7 @@ describe('removing a user from an organization', () => { const error = [ new GraphQLError( - 'Unable to remove user from organization. Please try again.', + 'Unable to remove user from unknown organization.', ), ] @@ -654,7 +654,7 @@ describe('removing a user from an organization', () => { const error = [ new GraphQLError( - 'Unable to remove user from organization. Please try again.', + 'Permission Denied: Please contact organization admin for help with removing users.', ), ] @@ -721,7 +721,7 @@ describe('removing a user from an organization', () => { const error = [ new GraphQLError( - 'Unable to remove user from organization. Please try again.', + 'Unable to remove a user that already does not belong to this organization.', ), ] @@ -788,7 +788,7 @@ describe('removing a user from an organization', () => { const error = [ new GraphQLError( - 'Unable to remove user from organization. Please try again.', + 'Permission Denied: Please contact organization admin for help with removing users.', ), ] @@ -854,9 +854,7 @@ describe('removing a user from an organization', () => { ) const error = [ - new GraphQLError( - 'Unable to remove user from organization. Please try again.', - ), + new GraphQLError('Unable to remove user from organization.'), ] expect(response.errors).toEqual(error) @@ -923,7 +921,7 @@ describe('removing a user from an organization', () => { const error = [ new GraphQLError( - 'Unable to remove user from organization. Please try again.', + 'Unable to remove unknown user from organization.', ), ] @@ -997,7 +995,7 @@ describe('removing a user from an organization', () => { const error = [ new GraphQLError( - 'Unable to remove user from organization. Please try again.', + 'Unable to remove user from this organization. Please try again.', ), ] diff --git a/api-js/src/affiliation/mutations/__tests__/update-user-role.test.js b/api-js/src/affiliation/mutations/__tests__/update-user-role.test.js index 858863333..c8065ad2f 100644 --- a/api-js/src/affiliation/mutations/__tests__/update-user-role.test.js +++ b/api-js/src/affiliation/mutations/__tests__/update-user-role.test.js @@ -581,11 +581,7 @@ describe('update a users role', () => { }, ) - const error = [ - new GraphQLError( - 'Unable to update your own role. Please try again.', - ), - ] + const error = [new GraphQLError('Unable to update your own role.')] expect(response.errors).toEqual(error) expect(consoleOutput).toEqual([ @@ -636,7 +632,7 @@ describe('update a users role', () => { ) const error = [ - new GraphQLError('Unable to update users role. Please try again.'), + new GraphQLError('Unable to update unknown users role.'), ] expect(response.errors).toEqual(error) @@ -688,7 +684,9 @@ describe('update a users role', () => { ) const error = [ - new GraphQLError('Unable to update users role. Please try again.'), + new GraphQLError( + 'Unable to update users role, in unknown organization.', + ), ] expect(response.errors).toEqual(error) @@ -747,7 +745,9 @@ describe('update a users role', () => { ) const error = [ - new GraphQLError('Unable to update users role. Please try again.'), + new GraphQLError( + 'Permission Denied: Please contact organization admin for help with user role changes.', + ), ] expect(response.errors).toEqual(error) @@ -832,7 +832,9 @@ describe('update a users role', () => { ) const error = [ - new GraphQLError('Unable to update users role. Please try again.'), + new GraphQLError( + 'Permission Denied: Please contact organization admin for help with user role changes.', + ), ] expect(response.errors).toEqual(error) @@ -892,7 +894,7 @@ describe('update a users role', () => { const error = [ new GraphQLError( - 'Unable to update users role. Please invite user to the organization.', + 'Unable to update users role that does not belong to this org. Please invite user to the organization.', ), ] @@ -963,7 +965,7 @@ describe('update a users role', () => { const error = [ new GraphQLError( - 'Unable to update users role. Please try again.', + 'Permission Denied: Please contact organization admin for help with updating users roles.', ), ] @@ -1034,7 +1036,7 @@ describe('update a users role', () => { const error = [ new GraphQLError( - 'Unable to update users role. Please try again.', + 'Permission Denied: Please contact organization admin for help with updating users roles.', ), ] @@ -1106,7 +1108,7 @@ describe('update a users role', () => { const error = [ new GraphQLError( - 'Unable to update users role. Please try again.', + 'Permission Denied: Please contact organization admin for help with updating users roles.', ), ] @@ -1175,7 +1177,7 @@ describe('update a users role', () => { const error = [ new GraphQLError( - 'Unable to update users role. Please try again.', + 'Permission Denied: Please contact organization admin for help with updating users roles.', ), ] diff --git a/api-js/src/affiliation/mutations/invite-user-to-org.js b/api-js/src/affiliation/mutations/invite-user-to-org.js index 10036a3fc..81e4ed517 100644 --- a/api-js/src/affiliation/mutations/invite-user-to-org.js +++ b/api-js/src/affiliation/mutations/invite-user-to-org.js @@ -7,8 +7,8 @@ import { LanguageEnums, RoleEnums } from '../../enums' export const inviteUserToOrg = new mutationWithClientMutationId({ name: 'InviteUserToOrg', description: `This mutation allows admins and higher to invite users to any of their - organizations, if the invited user does not have an account, they will be - able to sign-up and be assigned to that organization in one mutation.`, +organizations, if the invited user does not have an account, they will be +able to sign-up and be assigned to that organization in one mutation.`, inputFields: () => ({ userName: { type: GraphQLNonNull(GraphQLEmailAddress), @@ -32,9 +32,7 @@ export const inviteUserToOrg = new mutationWithClientMutationId({ type: GraphQLString, description: 'Informs the user if the invite or invite email was successfully sent.', - resolve: async (payload) => { - return payload.status - }, + resolve: ({ status }) => status, }, }), mutateAndGetPayload: async ( @@ -64,9 +62,7 @@ export const inviteUserToOrg = new mutationWithClientMutationId({ console.warn( `User: ${userKey} attempted to invite themselves to ${orgId}.`, ) - throw new Error( - i18n._(t`Unable to invite yourself to an org. Please try again.`), - ) + throw new Error(i18n._(t`Unable to invite yourself to an org.`)) } // Check to see if requested org exists @@ -76,7 +72,7 @@ export const inviteUserToOrg = new mutationWithClientMutationId({ console.warn( `User: ${userKey} attempted to invite user: ${userName} to ${orgId} however there is no org associated with that id.`, ) - throw new Error(i18n._(t`Unable to invite user. Please try again.`)) + throw new Error(i18n._(t`Unable to invite user to unknown organization.`)) } // Check to see requesting users permission to the org is @@ -90,7 +86,11 @@ export const inviteUserToOrg = new mutationWithClientMutationId({ console.warn( `User: ${userKey} attempted to invite user: ${userName} to org: ${org._key} with role: ${requestedRole} but does not have permission to do so.`, ) - throw new Error(i18n._(t`Unable to invite user. Please try again.`)) + throw new Error( + i18n._( + t`Permission Denied: Please contact organization admin for help with user invitations.`, + ), + ) } // Check to see if requested user exists @@ -145,7 +145,9 @@ export const inviteUserToOrg = new mutationWithClientMutationId({ console.error( `Transaction step error occurred while user: ${userKey} attempted to invite user: ${requestedUser._key} to org: ${org.slug}, error: ${err}`, ) - throw new Error(i18n._(t`Unable to invite user. Please try again.`)) + throw new Error( + i18n._(t`Unable to add user to organization. Please try again.`), + ) } await sendOrgInviteEmail({ diff --git a/api-js/src/affiliation/mutations/remove-user-from-org.js b/api-js/src/affiliation/mutations/remove-user-from-org.js index a83322b65..e512c563e 100644 --- a/api-js/src/affiliation/mutations/remove-user-from-org.js +++ b/api-js/src/affiliation/mutations/remove-user-from-org.js @@ -4,21 +4,22 @@ import { t } from '@lingui/macro' export const removeUserFromOrg = new mutationWithClientMutationId({ name: 'RemoveUserFromOrg', - description: '', + description: + 'This mutation allows admins or higher to remove users from any organizations they belong to.', inputFields: () => ({ userId: { type: GraphQLNonNull(GraphQLID), - description: '', + description: 'The user id of the user to be removed.', }, orgId: { type: GraphQLNonNull(GraphQLID), - description: '', + description: 'The organization that the user is to be removed from.', }, }), outputFields: () => ({ status: { type: GraphQLString, - description: '', + description: 'Informs the user if the user was removed successfully.', resolve: ({ status }) => status, }, }), @@ -49,7 +50,7 @@ export const removeUserFromOrg = new mutationWithClientMutationId({ `User: ${userKey} attempted to remove user: ${requestedUserKey} from org: ${requestedOrgKey}, however no org with that id could be found.`, ) throw new Error( - i18n._(t`Unable to remove user from organization. Please try again.`), + i18n._(t`Unable to remove user from unknown organization.`), ) } @@ -59,9 +60,7 @@ export const removeUserFromOrg = new mutationWithClientMutationId({ console.warn( `User: ${userKey} attempted to remove user: ${requestedUserKey} from org: ${requestedOrg._key}, however they do not have the permission to remove users.`, ) - throw new Error( - i18n._(t`Unable to remove user from organization. Please try again.`), - ) + throw new Error(i18n._(t`Unable to remove user from organization.`)) } // Get requested user @@ -71,7 +70,7 @@ export const removeUserFromOrg = new mutationWithClientMutationId({ `User: ${userKey} attempted to remove user: ${requestedUserKey} from org: ${requestedOrg._key}, however no user with that id could be found.`, ) throw new Error( - i18n._(t`Unable to remove user from organization. Please try again.`), + i18n._(t`Unable to remove unknown user from organization.`), ) } @@ -88,7 +87,9 @@ export const removeUserFromOrg = new mutationWithClientMutationId({ `Database error occurred when user: ${userKey} attempted to check the current permission of user: ${requestedUser._key} to see if they could be removed.`, ) throw new Error( - i18n._(t`Unable to remove user from organization. Please try again.`), + i18n._( + t`Unable to remove user from this organization. Please try again.`, + ), ) } @@ -97,7 +98,9 @@ export const removeUserFromOrg = new mutationWithClientMutationId({ `User: ${userKey} attempted to remove user: ${requestedUser._key}, but they do not have any affiliations to org: ${requestedOrg._key}.`, ) throw new Error( - i18n._(t`Unable to remove user from organization. Please try again.`), + i18n._( + t`Unable to remove a user that already does not belong to this organization.`, + ), ) } @@ -167,7 +170,9 @@ export const removeUserFromOrg = new mutationWithClientMutationId({ `User: ${userKey} attempted to remove user: ${requestedUser._key} from org: ${requestedOrg._key}, but they do not have the right permission.`, ) throw new Error( - i18n._(t`Unable to remove user from organization. Please try again.`), + i18n._( + t`Permission Denied: Please contact organization admin for help with removing users.`, + ), ) } }, diff --git a/api-js/src/affiliation/mutations/update-user-role.js b/api-js/src/affiliation/mutations/update-user-role.js index 381c3040f..bec38bf72 100644 --- a/api-js/src/affiliation/mutations/update-user-role.js +++ b/api-js/src/affiliation/mutations/update-user-role.js @@ -7,8 +7,8 @@ import { RoleEnums } from '../../enums' export const updateUserRole = new mutationWithClientMutationId({ name: 'UpdateUserRole', description: `This mutation allows super admins, and admins of the given organization to - update the permission level of a given user that already belongs to the - given organization.`, +update the permission level of a given user that already belongs to the +given organization.`, inputFields: () => ({ userName: { type: GraphQLNonNull(GraphQLEmailAddress), @@ -60,9 +60,7 @@ export const updateUserRole = new mutationWithClientMutationId({ console.warn( `User: ${userKey} attempted to update their own role in org: ${orgId}.`, ) - throw new Error( - i18n._(t`Unable to update your own role. Please try again.`), - ) + throw new Error(i18n._(t`Unable to update your own role.`)) } // Check to see if requested user exists @@ -72,7 +70,7 @@ export const updateUserRole = new mutationWithClientMutationId({ console.warn( `User: ${userKey} attempted to update a user: ${userName} role in org: ${orgId}, however there is no user associated with that user name.`, ) - throw new Error(i18n._(t`Unable to update users role. Please try again.`)) + throw new Error(i18n._(t`Unable to update unknown users role.`)) } // Check to see if org exists @@ -82,7 +80,9 @@ export const updateUserRole = new mutationWithClientMutationId({ console.warn( `User: ${userKey} attempted to update a user: ${requestedUser._key} role in org: ${orgId}, however there is no org associated with that id.`, ) - throw new Error(i18n._(t`Unable to update users role. Please try again.`)) + throw new Error( + i18n._(t`Unable to update users role, in unknown organization.`), + ) } // Check requesting users permission @@ -92,7 +92,11 @@ export const updateUserRole = new mutationWithClientMutationId({ console.warn( `User: ${userKey} attempted to update a user: ${requestedUser._key} role in org: ${org.slug}, however they do not have permission to do so.`, ) - throw new Error(i18n._(t`Unable to update users role. Please try again.`)) + throw new Error( + i18n._( + t`Permission Denied: Please contact organization admin for help with user role changes.`, + ), + ) } // Get users current permission level @@ -116,7 +120,7 @@ export const updateUserRole = new mutationWithClientMutationId({ ) throw new Error( i18n._( - t`Unable to update users role. Please invite user to the organization.`, + t`Unable to update users role that does not belong to this org. Please invite user to the organization.`, ), ) } @@ -150,7 +154,9 @@ export const updateUserRole = new mutationWithClientMutationId({ `User: ${userKey} attempted to lower user: ${requestedUser._key} from ${affiliation.permission} to: admin.`, ) throw new Error( - i18n._(t`Unable to update users role. Please try again.`), + i18n._( + t`Permission Denied: Please contact organization admin for help with updating users roles.`, + ), ) } @@ -169,7 +175,9 @@ export const updateUserRole = new mutationWithClientMutationId({ `User: ${userKey} attempted to lower user: ${requestedUser._key} from ${affiliation.permission} to: user.`, ) throw new Error( - i18n._(t`Unable to update users role. Please try again.`), + i18n._( + t`Permission Denied: Please contact organization admin for help with updating users roles.`, + ), ) } @@ -182,7 +190,11 @@ export const updateUserRole = new mutationWithClientMutationId({ console.warn( `User: ${userKey} attempted to lower user: ${requestedUser._key} from ${affiliation.permission} to: ${role}.`, ) - throw new Error(i18n._(t`Unable to update users role. Please try again.`)) + throw new Error( + i18n._( + t`Permission Denied: Please contact organization admin for help with updating users roles.`, + ), + ) } try { diff --git a/api-js/src/locale/en/messages.js b/api-js/src/locale/en/messages.js index eb1f4aae0..0d1ab4068 100644 --- a/api-js/src/locale/en/messages.js +++ b/api-js/src/locale/en/messages.js @@ -74,6 +74,14 @@ 'Password was successfully reset.': 'Password was successfully reset.', 'Password was successfully updated.': 'Password was successfully updated.', 'Passwords do not match.': 'Passwords do not match.', + 'Permission Denied: Please contact organization admin for help with removing users.': + 'Permission Denied: Please contact organization admin for help with removing users.', + 'Permission Denied: Please contact organization admin for help with updating users roles.': + 'Permission Denied: Please contact organization admin for help with updating users roles.', + 'Permission Denied: Please contact organization admin for help with user invitations.': + 'Permission Denied: Please contact organization admin for help with user invitations.', + 'Permission Denied: Please contact organization admin for help with user role changes.': + 'Permission Denied: Please contact organization admin for help with user role changes.', 'Permission check error. Unable to request domain information.': 'Permission check error. Unable to request domain information.', 'Permission error, not an admin for this user.': @@ -283,28 +291,32 @@ 'Unable to find verified domain. Please try again.', 'Unable to find verified organization. Please try again.': 'Unable to find verified organization. Please try again.', + 'Unable to invite user to unknown organization.': + 'Unable to invite user to unknown organization.', 'Unable to invite user. Please try again.': 'Unable to invite user. Please try again.', - 'Unable to invite yourself to an org. Please try again.': - 'Unable to invite yourself to an org. Please try again.', - 'Unable to load affiliations. Please try again.': - 'Unable to load affiliations. Please try again.', - 'Unable to load dkim failures. Please try again.': - 'Unable to load dkim failures. Please try again.', + 'Unable to invite yourself to an org.': + 'Unable to invite yourself to an org.', + 'Unable to load affiliation(s). Please try again.': + 'Unable to load affiliation(s). Please try again.', + 'Unable to load dkim failure(s). Please try again.': + 'Unable to load dkim failure(s). Please try again.', 'Unable to load dkim guidance tags. Please try again.': 'Unable to load dkim guidance tags. Please try again.', 'Unable to load dkim results. Please try again.': 'Unable to load dkim results. Please try again.', 'Unable to load dkim scans. Please try again.': 'Unable to load dkim scans. Please try again.', - 'Unable to load dmarc failures. Please try again.': - 'Unable to load dmarc failures. Please try again.', + 'Unable to load dmarc failure(s). Please try again.': + 'Unable to load dmarc failure(s). Please try again.', 'Unable to load dmarc guidance tags. Please try again.': 'Unable to load dmarc guidance tags. Please try again.', 'Unable to load dmarc scans. Please try again.': 'Unable to load dmarc scans. Please try again.', 'Unable to load dmarc summaries. Please try again.': 'Unable to load dmarc summaries. Please try again.', + 'Unable to load dmarc summary(ies). Please try again.': + 'Unable to load dmarc summary(ies). Please try again.', 'Unable to load domains. Please try again.': 'Unable to load domains. Please try again.', 'Unable to load full passes. Please try again.': @@ -333,18 +345,28 @@ 'Unable to load verified organizations. Please try again.', 'Unable to load web summary. Please try again.': 'Unable to load web summary. Please try again.', - 'Unable to query affiliations. Please try again.': - 'Unable to query affiliations. Please try again.', + 'Unable to query affiliation(s). Please try again.': + 'Unable to query affiliation(s). Please try again.', 'Unable to query domains. Please try again.': 'Unable to query domains. Please try again.', 'Unable to query organizations. Please try again.': 'Unable to query organizations. Please try again.', + 'Unable to remove a user that already does not belong to this organization.': + 'Unable to remove a user that already does not belong to this organization.', 'Unable to remove domain. Please try again.': 'Unable to remove domain. Please try again.', 'Unable to remove organization. Please try again.': 'Unable to remove organization. Please try again.', + 'Unable to remove unknown user from organization.': + 'Unable to remove unknown user from organization.', + 'Unable to remove user from organization.': + 'Unable to remove user from organization.', 'Unable to remove user from organization. Please try again.': 'Unable to remove user from organization. Please try again.', + 'Unable to remove user from this organization. Please try again.': + 'Unable to remove user from this organization. Please try again.', + 'Unable to remove user from unknown organization.': + 'Unable to remove user from unknown organization.', 'Unable to request a on time scan on this domain.': 'Unable to request a on time scan on this domain.', 'Unable to reset password. Please try again.': @@ -383,12 +405,15 @@ 'Unable to update password. Please try again.', 'Unable to update profile. Please try again.': 'Unable to update profile. Please try again.', - 'Unable to update users role. Please invite user to the organization.': - 'Unable to update users role. Please invite user to the organization.', + 'Unable to update unknown users role.': + 'Unable to update unknown users role.', + 'Unable to update users role that does not belong to this org. Please invite user to the organization.': + 'Unable to update users role that does not belong to this org. Please invite user to the organization.', + 'Unable to update users role, in unknown organization.': + 'Unable to update users role, in unknown organization.', 'Unable to update users role. Please try again.': 'Unable to update users role. Please try again.', - 'Unable to update your own role. Please try again.': - 'Unable to update your own role. Please try again.', + 'Unable to update your own role.': 'Unable to update your own role.', 'Unable to verify account. Please request a new email.': 'Unable to verify account. Please request a new email.', 'Unable to verify account. Please try again.': diff --git a/api-js/src/locale/en/messages.po b/api-js/src/locale/en/messages.po index 690e8f722..e4793eb86 100644 --- a/api-js/src/locale/en/messages.po +++ b/api-js/src/locale/en/messages.po @@ -90,10 +90,11 @@ msgid "Organization name already in use, please choose another and try again." msgstr "Organization name already in use, please choose another and try again." #: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:46 +#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:48 msgid "Passing both `first` and `last` to paginate the `DkimFailureTable` connection is not supported." msgstr "Passing both `first` and `last` to paginate the `DkimFailureTable` connection is not supported." -#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:46 +#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:48 msgid "Passing both `first` and `last` to paginate the `DmarcFailureTable` connection is not supported." msgstr "Passing both `first` and `last` to paginate the `DmarcFailureTable` connection is not supported." @@ -187,6 +188,24 @@ msgstr "Password was successfully updated." msgid "Passwords do not match." msgstr "Passwords do not match." +#: src/affiliation/mutations/remove-user-from-org.js:174 +msgid "Permission Denied: Please contact organization admin for help with removing users." +msgstr "Permission Denied: Please contact organization admin for help with removing users." + +#: src/affiliation/mutations/update-user-role.js:158 +#: src/affiliation/mutations/update-user-role.js:179 +#: src/affiliation/mutations/update-user-role.js:195 +msgid "Permission Denied: Please contact organization admin for help with updating users roles." +msgstr "Permission Denied: Please contact organization admin for help with updating users roles." + +#: src/affiliation/mutations/invite-user-to-org.js:91 +msgid "Permission Denied: Please contact organization admin for help with user invitations." +msgstr "Permission Denied: Please contact organization admin for help with user invitations." + +#: src/affiliation/mutations/update-user-role.js:97 +msgid "Permission Denied: Please contact organization admin for help with user role changes." +msgstr "Permission Denied: Please contact organization admin for help with user role changes." + #: src/auth/check-domain-permission.js:22 #: src/auth/check-domain-permission.js:43 #: src/auth/check-domain-permission.js:54 @@ -208,11 +227,11 @@ msgstr "Phone number has been successfully set, you will receive a verification msgid "Profile successfully updated." msgstr "Profile successfully updated." -#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:69 +#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:71 msgid "Requesting `{amount}` records on the `DkimFailureTable` connection exceeds the `{argSet}` limit of 100 records." msgstr "Requesting `{amount}` records on the `DkimFailureTable` connection exceeds the `{argSet}` limit of 100 records." -#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:69 +#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:71 msgid "Requesting `{amount}` records on the `DmarcFailureTable` connection exceeds the `{argSet}` limit of 100 records." msgstr "Requesting `{amount}` records on the `DmarcFailureTable` connection exceeds the `{argSet}` limit of 100 records." @@ -293,7 +312,7 @@ msgstr "Successfully dispatched one time scan." msgid "Successfully email verified account, and set TFA send method to email." msgstr "Successfully email verified account, and set TFA send method to email." -#: src/affiliation/mutations/invite-user-to-org.js:172 +#: src/affiliation/mutations/invite-user-to-org.js:174 msgid "Successfully invited user to organization, and sent notification email." msgstr "Successfully invited user to organization, and sent notification email." @@ -305,7 +324,7 @@ msgstr "Successfully removed domain: {0} from {1}." msgid "Successfully removed organization: {0}." msgstr "Successfully removed organization: {0}." -#: src/affiliation/mutations/remove-user-from-org.js:163 +#: src/affiliation/mutations/remove-user-from-org.js:166 msgid "Successfully removed user from organization." msgstr "Successfully removed user from organization." @@ -475,27 +494,28 @@ msgstr "Unable to find verified domain. Please try again." msgid "Unable to find verified organization. Please try again." msgstr "Unable to find verified organization. Please try again." -#: src/affiliation/mutations/invite-user-to-org.js:79 -#: src/affiliation/mutations/invite-user-to-org.js:93 -#: src/affiliation/mutations/invite-user-to-org.js:148 -#: src/affiliation/mutations/invite-user-to-org.js:163 +#: src/affiliation/mutations/invite-user-to-org.js:75 +msgid "Unable to invite user to unknown organization." +msgstr "Unable to invite user to unknown organization." + +#: src/affiliation/mutations/invite-user-to-org.js:165 msgid "Unable to invite user. Please try again." msgstr "Unable to invite user. Please try again." -#: src/affiliation/mutations/invite-user-to-org.js:68 -msgid "Unable to invite yourself to an org. Please try again." -msgstr "Unable to invite yourself to an org. Please try again." +#: src/affiliation/mutations/invite-user-to-org.js:65 +msgid "Unable to invite yourself to an org." +msgstr "Unable to invite yourself to an org." -#: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:231 -#: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:412 -msgid "Unable to load affiliations. Please try again." -msgstr "Unable to load affiliations. Please try again." +#: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:233 +#: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:414 +msgid "Unable to load affiliation(s). Please try again." +msgstr "Unable to load affiliation(s). Please try again." -#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:15 -#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:139 -#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:149 -msgid "Unable to load dkim failures. Please try again." -msgstr "Unable to load dkim failures. Please try again." +#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:16 +#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:142 +#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:154 +msgid "Unable to load dkim failure(s). Please try again." +msgstr "Unable to load dkim failure(s). Please try again." #: src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js:242 #: src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js:254 @@ -512,11 +532,11 @@ msgstr "Unable to load dkim results. Please try again." msgid "Unable to load dkim scans. Please try again." msgstr "Unable to load dkim scans. Please try again." -#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:15 -#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:139 -#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:149 -msgid "Unable to load dmarc failures. Please try again." -msgstr "Unable to load dmarc failures. Please try again." +#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:16 +#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:142 +#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:154 +msgid "Unable to load dmarc failure(s). Please try again." +msgstr "Unable to load dmarc failure(s). Please try again." #: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:242 #: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:254 @@ -528,8 +548,6 @@ msgstr "Unable to load dmarc guidance tags. Please try again." msgid "Unable to load dmarc scans. Please try again." msgstr "Unable to load dmarc scans. Please try again." -#: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:417 -#: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:429 #: src/dmarc-summaries/loaders/load-dmarc-sum-edge-by-domain-id-period.js:21 #: src/dmarc-summaries/loaders/load-dmarc-sum-edge-by-domain-id-period.js:33 #: src/dmarc-summaries/loaders/load-yearly-dmarc-sum-edges.js:19 @@ -537,6 +555,11 @@ msgstr "Unable to load dmarc scans. Please try again." msgid "Unable to load dmarc summaries. Please try again." msgstr "Unable to load dmarc summaries. Please try again." +#: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:417 +#: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:429 +msgid "Unable to load dmarc summary(ies). Please try again." +msgstr "Unable to load dmarc summary(ies). Please try again." + #: src/domain/loaders/load-domain-connections-by-organizations-id.js:313 #: src/domain/loaders/load-domain-connections-by-organizations-id.js:323 #: src/domain/loaders/load-domain-connections-by-user-id.js:346 @@ -615,10 +638,10 @@ msgstr "Unable to load verified organizations. Please try again." msgid "Unable to load web summary. Please try again." msgstr "Unable to load web summary. Please try again." -#: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:221 -#: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:402 -msgid "Unable to query affiliations. Please try again." -msgstr "Unable to query affiliations. Please try again." +#: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:222 +#: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:403 +msgid "Unable to query affiliation(s). Please try again." +msgstr "Unable to query affiliation(s). Please try again." #: src/domain/loaders/load-domain-connections-by-user-id.js:336 msgid "Unable to query domains. Please try again." @@ -628,6 +651,10 @@ msgstr "Unable to query domains. Please try again." msgid "Unable to query organizations. Please try again." msgstr "Unable to query organizations. Please try again." +#: src/affiliation/mutations/remove-user-from-org.js:102 +msgid "Unable to remove a user that already does not belong to this organization." +msgstr "Unable to remove a user that already does not belong to this organization." + #: src/domain/mutations/remove-domain.js:58 #: src/domain/mutations/remove-domain.js:69 #: src/domain/mutations/remove-domain.js:80 @@ -649,17 +676,27 @@ msgstr "Unable to remove domain. Please try again." msgid "Unable to remove organization. Please try again." msgstr "Unable to remove organization. Please try again." -#: src/affiliation/mutations/remove-user-from-org.js:52 +#: src/affiliation/mutations/remove-user-from-org.js:73 +msgid "Unable to remove unknown user from organization." +msgstr "Unable to remove unknown user from organization." + #: src/affiliation/mutations/remove-user-from-org.js:63 -#: src/affiliation/mutations/remove-user-from-org.js:74 -#: src/affiliation/mutations/remove-user-from-org.js:91 -#: src/affiliation/mutations/remove-user-from-org.js:100 -#: src/affiliation/mutations/remove-user-from-org.js:143 -#: src/affiliation/mutations/remove-user-from-org.js:154 -#: src/affiliation/mutations/remove-user-from-org.js:170 +msgid "Unable to remove user from organization." +msgstr "Unable to remove user from organization." + +#: src/affiliation/mutations/remove-user-from-org.js:146 +#: src/affiliation/mutations/remove-user-from-org.js:157 msgid "Unable to remove user from organization. Please try again." msgstr "Unable to remove user from organization. Please try again." +#: src/affiliation/mutations/remove-user-from-org.js:91 +msgid "Unable to remove user from this organization. Please try again." +msgstr "Unable to remove user from this organization. Please try again." + +#: src/affiliation/mutations/remove-user-from-org.js:53 +msgid "Unable to remove user from unknown organization." +msgstr "Unable to remove user from unknown organization." + #: src/domain/mutations/request-scan.js:61 #: src/domain/mutations/request-scan.js:73 msgid "Unable to request a on time scan on this domain." @@ -760,25 +797,27 @@ msgstr "Unable to update password. Please try again." msgid "Unable to update profile. Please try again." msgstr "Unable to update profile. Please try again." -#: src/affiliation/mutations/update-user-role.js:119 -msgid "Unable to update users role. Please invite user to the organization." -msgstr "Unable to update users role. Please invite user to the organization." - -#: src/affiliation/mutations/update-user-role.js:75 -#: src/affiliation/mutations/update-user-role.js:85 -#: src/affiliation/mutations/update-user-role.js:95 -#: src/affiliation/mutations/update-user-role.js:110 -#: src/affiliation/mutations/update-user-role.js:153 -#: src/affiliation/mutations/update-user-role.js:172 -#: src/affiliation/mutations/update-user-role.js:185 -#: src/affiliation/mutations/update-user-role.js:201 -#: src/affiliation/mutations/update-user-role.js:210 +#: src/affiliation/mutations/update-user-role.js:73 +msgid "Unable to update unknown users role." +msgstr "Unable to update unknown users role." + +#: src/affiliation/mutations/update-user-role.js:123 +msgid "Unable to update users role that does not belong to this org. Please invite user to the organization." +msgstr "Unable to update users role that does not belong to this org. Please invite user to the organization." + +#: src/affiliation/mutations/update-user-role.js:84 +msgid "Unable to update users role, in unknown organization." +msgstr "Unable to update users role, in unknown organization." + +#: src/affiliation/mutations/update-user-role.js:114 +#: src/affiliation/mutations/update-user-role.js:213 +#: src/affiliation/mutations/update-user-role.js:222 msgid "Unable to update users role. Please try again." msgstr "Unable to update users role. Please try again." -#: src/affiliation/mutations/update-user-role.js:64 -msgid "Unable to update your own role. Please try again." -msgstr "Unable to update your own role. Please try again." +#: src/affiliation/mutations/update-user-role.js:63 +msgid "Unable to update your own role." +msgstr "Unable to update your own role." #: src/user/mutations/verify-account.js:67 #: src/user/mutations/verify-account.js:77 @@ -806,7 +845,7 @@ msgstr "Unable to verify organization. Please try again." msgid "User could not be queried." msgstr "User could not be queried." -#: src/affiliation/mutations/update-user-role.js:218 +#: src/affiliation/mutations/update-user-role.js:230 msgid "User role was updated successfully." msgstr "User role was updated successfully." @@ -818,11 +857,11 @@ msgstr "Username already in use." msgid "Username not available, please try another." msgstr "Username not available, please try another." -#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:37 +#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:39 msgid "You must provide a `first` or `last` value to properly paginate the `DkimFailureTable` connection." msgstr "You must provide a `first` or `last` value to properly paginate the `DkimFailureTable` connection." -#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:37 +#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:39 msgid "You must provide a `first` or `last` value to properly paginate the `DmarcFailureTable` connection." msgstr "You must provide a `first` or `last` value to properly paginate the `DmarcFailureTable` connection." @@ -905,8 +944,8 @@ msgstr "You must provide a `year` value to access the `dmarcSummaries` connectio #: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:121 #: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:212 -#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:84 -#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:84 +#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:86 +#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:86 #: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:212 #: src/dmarc-summaries/loaders/load-full-pass-connections-by-sum-id.js:84 #: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:84 @@ -932,11 +971,11 @@ msgstr "You must provide a `year` value to access the `dmarcSummaries` connectio msgid "`{argSet}` must be of type `number` not `{typeSet}`." msgstr "`{argSet}` must be of type `number` not `{typeSet}`." -#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:58 +#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:60 msgid "`{argSet}` on the `DkimFailureTable` connection cannot be less than zero." msgstr "`{argSet}` on the `DkimFailureTable` connection cannot be less than zero." -#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:58 +#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:60 msgid "`{argSet}` on the `DmarcFailureTable` connection cannot be less than zero." msgstr "`{argSet}` on the `DmarcFailureTable` connection cannot be less than zero." diff --git a/api-js/src/locale/fr/messages.js b/api-js/src/locale/fr/messages.js index 63baeee25..876948ef2 100644 --- a/api-js/src/locale/fr/messages.js +++ b/api-js/src/locale/fr/messages.js @@ -60,6 +60,14 @@ 'Password was successfully reset.': 'todo', 'Password was successfully updated.': 'todo', 'Passwords do not match.': 'todo', + 'Permission Denied: Please contact organization admin for help with removing users.': + 'todo', + 'Permission Denied: Please contact organization admin for help with updating users roles.': + 'todo', + 'Permission Denied: Please contact organization admin for help with user invitations.': + 'todo', + 'Permission Denied: Please contact organization admin for help with user role changes.': + 'todo', 'Permission check error. Unable to request domain information.': 'todo', 'Permission error, not an admin for this user.': 'todo', 'Phone number has been successfully set, you will receive a verification text message shortly.': @@ -139,17 +147,19 @@ 'Unable to find user. Please try again.': 'todo', 'Unable to find verified domain. Please try again.': 'todo', 'Unable to find verified organization. Please try again.': 'todo', + 'Unable to invite user to unknown organization.': 'todo', 'Unable to invite user. Please try again.': 'todo', - 'Unable to invite yourself to an org. Please try again.': 'todo', - 'Unable to load affiliations. Please try again.': 'todo', - 'Unable to load dkim failures. Please try again.': 'todo', + 'Unable to invite yourself to an org.': 'todo', + 'Unable to load affiliation(s). Please try again.': 'todo', + 'Unable to load dkim failure(s). Please try again.': 'todo', 'Unable to load dkim guidance tags. Please try again.': 'todo', 'Unable to load dkim results. Please try again.': 'todo', 'Unable to load dkim scans. Please try again.': 'todo', - 'Unable to load dmarc failures. Please try again.': 'todo', + 'Unable to load dmarc failure(s). Please try again.': 'todo', 'Unable to load dmarc guidance tags. Please try again.': 'todo', 'Unable to load dmarc scans. Please try again.': 'todo', 'Unable to load dmarc summaries. Please try again.': 'todo', + 'Unable to load dmarc summary(ies). Please try again.': 'todo', 'Unable to load domains. Please try again.': 'todo', 'Unable to load full passes. Please try again.': 'todo', 'Unable to load https guidance tags. Please try again.': 'todo', @@ -164,12 +174,18 @@ 'Unable to load verified domains. Please try again.': 'todo', 'Unable to load verified organizations. Please try again.': 'todo', 'Unable to load web summary. Please try again.': 'todo', - 'Unable to query affiliations. Please try again.': 'todo', + 'Unable to query affiliation(s). Please try again.': 'todo', 'Unable to query domains. Please try again.': 'todo', 'Unable to query organizations. Please try again.': 'todo', + 'Unable to remove a user that already does not belong to this organization.': + 'todo', 'Unable to remove domain. Please try again.': 'todo', 'Unable to remove organization. Please try again.': 'todo', + 'Unable to remove unknown user from organization.': 'todo', + 'Unable to remove user from organization.': 'todo', 'Unable to remove user from organization. Please try again.': 'todo', + 'Unable to remove user from this organization. Please try again.': 'todo', + 'Unable to remove user from unknown organization.': 'todo', 'Unable to request a on time scan on this domain.': 'todo', 'Unable to reset password. Please try again.': 'todo', 'Unable to select dmarc reports for this period and year.': 'todo', @@ -194,10 +210,12 @@ 'todo', 'Unable to update password. Please try again.': 'todo', 'Unable to update profile. Please try again.': 'todo', - 'Unable to update users role. Please invite user to the organization.': + 'Unable to update unknown users role.': 'todo', + 'Unable to update users role that does not belong to this org. Please invite user to the organization.': 'todo', + 'Unable to update users role, in unknown organization.': 'todo', 'Unable to update users role. Please try again.': 'todo', - 'Unable to update your own role. Please try again.': 'todo', + 'Unable to update your own role.': 'todo', 'Unable to verify account. Please request a new email.': 'todo', 'Unable to verify account. Please try again.': 'todo', 'Unable to verify if user is an admin, please try again.': 'todo', diff --git a/api-js/src/locale/fr/messages.po b/api-js/src/locale/fr/messages.po index df842578a..4c7274269 100644 --- a/api-js/src/locale/fr/messages.po +++ b/api-js/src/locale/fr/messages.po @@ -90,10 +90,11 @@ msgid "Organization name already in use, please choose another and try again." msgstr "todo" #: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:46 +#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:48 msgid "Passing both `first` and `last` to paginate the `DkimFailureTable` connection is not supported." msgstr "todo" -#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:46 +#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:48 msgid "Passing both `first` and `last` to paginate the `DmarcFailureTable` connection is not supported." msgstr "todo" @@ -187,6 +188,24 @@ msgstr "todo" msgid "Passwords do not match." msgstr "todo" +#: src/affiliation/mutations/remove-user-from-org.js:174 +msgid "Permission Denied: Please contact organization admin for help with removing users." +msgstr "todo" + +#: src/affiliation/mutations/update-user-role.js:158 +#: src/affiliation/mutations/update-user-role.js:179 +#: src/affiliation/mutations/update-user-role.js:195 +msgid "Permission Denied: Please contact organization admin for help with updating users roles." +msgstr "todo" + +#: src/affiliation/mutations/invite-user-to-org.js:91 +msgid "Permission Denied: Please contact organization admin for help with user invitations." +msgstr "todo" + +#: src/affiliation/mutations/update-user-role.js:97 +msgid "Permission Denied: Please contact organization admin for help with user role changes." +msgstr "todo" + #: src/auth/check-domain-permission.js:22 #: src/auth/check-domain-permission.js:43 #: src/auth/check-domain-permission.js:54 @@ -208,11 +227,11 @@ msgstr "todo" msgid "Profile successfully updated." msgstr "todo" -#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:69 +#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:71 msgid "Requesting `{amount}` records on the `DkimFailureTable` connection exceeds the `{argSet}` limit of 100 records." msgstr "todo" -#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:69 +#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:71 msgid "Requesting `{amount}` records on the `DmarcFailureTable` connection exceeds the `{argSet}` limit of 100 records." msgstr "todo" @@ -293,7 +312,7 @@ msgstr "todo" msgid "Successfully email verified account, and set TFA send method to email." msgstr "todo" -#: src/affiliation/mutations/invite-user-to-org.js:172 +#: src/affiliation/mutations/invite-user-to-org.js:174 msgid "Successfully invited user to organization, and sent notification email." msgstr "todo" @@ -305,7 +324,7 @@ msgstr "todo" msgid "Successfully removed organization: {0}." msgstr "todo" -#: src/affiliation/mutations/remove-user-from-org.js:163 +#: src/affiliation/mutations/remove-user-from-org.js:166 msgid "Successfully removed user from organization." msgstr "todo" @@ -475,26 +494,27 @@ msgstr "todo" msgid "Unable to find verified organization. Please try again." msgstr "todo" -#: src/affiliation/mutations/invite-user-to-org.js:79 -#: src/affiliation/mutations/invite-user-to-org.js:93 -#: src/affiliation/mutations/invite-user-to-org.js:148 -#: src/affiliation/mutations/invite-user-to-org.js:163 +#: src/affiliation/mutations/invite-user-to-org.js:75 +msgid "Unable to invite user to unknown organization." +msgstr "todo" + +#: src/affiliation/mutations/invite-user-to-org.js:165 msgid "Unable to invite user. Please try again." msgstr "todo" -#: src/affiliation/mutations/invite-user-to-org.js:68 -msgid "Unable to invite yourself to an org. Please try again." +#: src/affiliation/mutations/invite-user-to-org.js:65 +msgid "Unable to invite yourself to an org." msgstr "todo" -#: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:231 -#: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:412 -msgid "Unable to load affiliations. Please try again." +#: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:233 +#: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:414 +msgid "Unable to load affiliation(s). Please try again." msgstr "todo" -#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:15 -#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:139 -#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:149 -msgid "Unable to load dkim failures. Please try again." +#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:16 +#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:142 +#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:154 +msgid "Unable to load dkim failure(s). Please try again." msgstr "todo" #: src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js:242 @@ -512,10 +532,10 @@ msgstr "todo" msgid "Unable to load dkim scans. Please try again." msgstr "todo" -#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:15 -#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:139 -#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:149 -msgid "Unable to load dmarc failures. Please try again." +#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:16 +#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:142 +#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:154 +msgid "Unable to load dmarc failure(s). Please try again." msgstr "todo" #: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:242 @@ -528,8 +548,6 @@ msgstr "todo" msgid "Unable to load dmarc scans. Please try again." msgstr "todo" -#: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:417 -#: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:429 #: src/dmarc-summaries/loaders/load-dmarc-sum-edge-by-domain-id-period.js:21 #: src/dmarc-summaries/loaders/load-dmarc-sum-edge-by-domain-id-period.js:33 #: src/dmarc-summaries/loaders/load-yearly-dmarc-sum-edges.js:19 @@ -537,6 +555,11 @@ msgstr "todo" msgid "Unable to load dmarc summaries. Please try again." msgstr "todo" +#: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:417 +#: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:429 +msgid "Unable to load dmarc summary(ies). Please try again." +msgstr "todo" + #: src/domain/loaders/load-domain-connections-by-organizations-id.js:313 #: src/domain/loaders/load-domain-connections-by-organizations-id.js:323 #: src/domain/loaders/load-domain-connections-by-user-id.js:346 @@ -615,9 +638,9 @@ msgstr "todo" msgid "Unable to load web summary. Please try again." msgstr "todo" -#: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:221 -#: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:402 -msgid "Unable to query affiliations. Please try again." +#: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:222 +#: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:403 +msgid "Unable to query affiliation(s). Please try again." msgstr "todo" #: src/domain/loaders/load-domain-connections-by-user-id.js:336 @@ -628,6 +651,10 @@ msgstr "todo" msgid "Unable to query organizations. Please try again." msgstr "todo" +#: src/affiliation/mutations/remove-user-from-org.js:102 +msgid "Unable to remove a user that already does not belong to this organization." +msgstr "todo" + #: src/domain/mutations/remove-domain.js:58 #: src/domain/mutations/remove-domain.js:69 #: src/domain/mutations/remove-domain.js:80 @@ -649,17 +676,27 @@ msgstr "todo" msgid "Unable to remove organization. Please try again." msgstr "todo" -#: src/affiliation/mutations/remove-user-from-org.js:52 +#: src/affiliation/mutations/remove-user-from-org.js:73 +msgid "Unable to remove unknown user from organization." +msgstr "todo" + #: src/affiliation/mutations/remove-user-from-org.js:63 -#: src/affiliation/mutations/remove-user-from-org.js:74 -#: src/affiliation/mutations/remove-user-from-org.js:91 -#: src/affiliation/mutations/remove-user-from-org.js:100 -#: src/affiliation/mutations/remove-user-from-org.js:143 -#: src/affiliation/mutations/remove-user-from-org.js:154 -#: src/affiliation/mutations/remove-user-from-org.js:170 +msgid "Unable to remove user from organization." +msgstr "todo" + +#: src/affiliation/mutations/remove-user-from-org.js:146 +#: src/affiliation/mutations/remove-user-from-org.js:157 msgid "Unable to remove user from organization. Please try again." msgstr "todo" +#: src/affiliation/mutations/remove-user-from-org.js:91 +msgid "Unable to remove user from this organization. Please try again." +msgstr "todo" + +#: src/affiliation/mutations/remove-user-from-org.js:53 +msgid "Unable to remove user from unknown organization." +msgstr "todo" + #: src/domain/mutations/request-scan.js:61 #: src/domain/mutations/request-scan.js:73 msgid "Unable to request a on time scan on this domain." @@ -760,24 +797,26 @@ msgstr "todo" msgid "Unable to update profile. Please try again." msgstr "todo" -#: src/affiliation/mutations/update-user-role.js:119 -msgid "Unable to update users role. Please invite user to the organization." +#: src/affiliation/mutations/update-user-role.js:73 +msgid "Unable to update unknown users role." +msgstr "todo" + +#: src/affiliation/mutations/update-user-role.js:123 +msgid "Unable to update users role that does not belong to this org. Please invite user to the organization." +msgstr "todo" + +#: src/affiliation/mutations/update-user-role.js:84 +msgid "Unable to update users role, in unknown organization." msgstr "todo" -#: src/affiliation/mutations/update-user-role.js:75 -#: src/affiliation/mutations/update-user-role.js:85 -#: src/affiliation/mutations/update-user-role.js:95 -#: src/affiliation/mutations/update-user-role.js:110 -#: src/affiliation/mutations/update-user-role.js:153 -#: src/affiliation/mutations/update-user-role.js:172 -#: src/affiliation/mutations/update-user-role.js:185 -#: src/affiliation/mutations/update-user-role.js:201 -#: src/affiliation/mutations/update-user-role.js:210 +#: src/affiliation/mutations/update-user-role.js:114 +#: src/affiliation/mutations/update-user-role.js:213 +#: src/affiliation/mutations/update-user-role.js:222 msgid "Unable to update users role. Please try again." msgstr "todo" -#: src/affiliation/mutations/update-user-role.js:64 -msgid "Unable to update your own role. Please try again." +#: src/affiliation/mutations/update-user-role.js:63 +msgid "Unable to update your own role." msgstr "todo" #: src/user/mutations/verify-account.js:67 @@ -806,7 +845,7 @@ msgstr "todo" msgid "User could not be queried." msgstr "todo" -#: src/affiliation/mutations/update-user-role.js:218 +#: src/affiliation/mutations/update-user-role.js:230 msgid "User role was updated successfully." msgstr "todo" @@ -818,11 +857,11 @@ msgstr "todo" msgid "Username not available, please try another." msgstr "todo" -#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:37 +#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:39 msgid "You must provide a `first` or `last` value to properly paginate the `DkimFailureTable` connection." msgstr "todo" -#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:37 +#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:39 msgid "You must provide a `first` or `last` value to properly paginate the `DmarcFailureTable` connection." msgstr "todo" @@ -905,8 +944,8 @@ msgstr "todo" #: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:121 #: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:212 -#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:84 -#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:84 +#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:86 +#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:86 #: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:212 #: src/dmarc-summaries/loaders/load-full-pass-connections-by-sum-id.js:84 #: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:84 @@ -932,11 +971,11 @@ msgstr "todo" msgid "`{argSet}` must be of type `number` not `{typeSet}`." msgstr "todo" -#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:58 +#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:60 msgid "`{argSet}` on the `DkimFailureTable` connection cannot be less than zero." msgstr "todo" -#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:58 +#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:60 msgid "`{argSet}` on the `DmarcFailureTable` connection cannot be less than zero." msgstr "todo" From d01572c1b24100104023ef11708b89c55e0d06c2 Mon Sep 17 00:00:00 2001 From: nsdeschenes Date: Fri, 12 Mar 2021 09:10:43 -0400 Subject: [PATCH 02/21] dmarc summaries error messages refactored --- ...dkim-failure-connections-by-sum-id.test.js | 6 +- ...marc-failure-connections-by-sum-id.test.js | 6 +- ...d-dmarc-sum-connections-by-user-id.test.js | 8 +- ...dmarc-sum-edge-by-domain-id-period.test.js | 4 +- .../load-dmarc-summary-by-key.test.js | 4 +- ...ad-full-pass-connections-by-sum-id.test.js | 6 +- ...-spf-failure-connections-by-sum-id.test.js | 6 +- .../load-start-date-from-period.test.js | 4 +- .../load-yearly-dmarc-sum-edges.test.js | 4 +- ...load-dkim-failure-connections-by-sum-id.js | 12 ++- ...oad-dmarc-failure-connections-by-sum-id.js | 12 ++- .../load-dmarc-sum-connections-by-user-id.js | 4 +- ...load-dmarc-sum-edge-by-domain-id-period.js | 4 +- .../loaders/load-dmarc-summary-by-key.js | 4 +- .../load-full-pass-connections-by-sum-id.js | 6 +- .../load-spf-failure-connections-by-sum-id.js | 12 ++- .../loaders/load-start-date-from-period.js | 4 +- .../loaders/load-yearly-dmarc-sum-edges.js | 4 +- .../__tests__/find-my-dmarc-summaries.test.js | 2 +- api-js/src/locale/en/messages.js | 30 ++++--- api-js/src/locale/en/messages.po | 85 +++++++++---------- api-js/src/locale/fr/messages.js | 15 ++-- api-js/src/locale/fr/messages.po | 81 +++++++++--------- 23 files changed, 171 insertions(+), 152 deletions(-) diff --git a/api-js/src/dmarc-summaries/loaders/__tests__/load-dkim-failure-connections-by-sum-id.test.js b/api-js/src/dmarc-summaries/loaders/__tests__/load-dkim-failure-connections-by-sum-id.test.js index d8e725058..b9a2a66b2 100644 --- a/api-js/src/dmarc-summaries/loaders/__tests__/load-dkim-failure-connections-by-sum-id.test.js +++ b/api-js/src/dmarc-summaries/loaders/__tests__/load-dkim-failure-connections-by-sum-id.test.js @@ -585,7 +585,7 @@ describe('given the dkimFailureLoaderConnectionsBySumId loader', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load dkim failures. Please try again.'), + new Error('Unable to load DKIM failure data. Please try again.'), ) } @@ -618,7 +618,7 @@ describe('given the dkimFailureLoaderConnectionsBySumId loader', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load dkim failures. Please try again.'), + new Error('Unable to load DKIM failure data. Please try again.'), ) } @@ -653,7 +653,7 @@ describe('given the dkimFailureLoaderConnectionsBySumId loader', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load dkim failures. Please try again.'), + new Error('Unable to load DKIM failure data. Please try again.'), ) } diff --git a/api-js/src/dmarc-summaries/loaders/__tests__/load-dmarc-failure-connections-by-sum-id.test.js b/api-js/src/dmarc-summaries/loaders/__tests__/load-dmarc-failure-connections-by-sum-id.test.js index 2fedbd80b..7bbee9573 100644 --- a/api-js/src/dmarc-summaries/loaders/__tests__/load-dmarc-failure-connections-by-sum-id.test.js +++ b/api-js/src/dmarc-summaries/loaders/__tests__/load-dmarc-failure-connections-by-sum-id.test.js @@ -576,7 +576,7 @@ describe('given the dmarcFailureLoaderConnectionsBySumId loader', () => { await connectionLoader({ ...connectionArgs }) } catch (err) { expect(err).toEqual( - new Error('Unable to load dmarc failures. Please try again.'), + new Error('Unable to load DMARC failure data. Please try again.'), ) } @@ -609,7 +609,7 @@ describe('given the dmarcFailureLoaderConnectionsBySumId loader', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load dmarc failures. Please try again.'), + new Error('Unable to load DMARC failure data. Please try again.'), ) } @@ -644,7 +644,7 @@ describe('given the dmarcFailureLoaderConnectionsBySumId loader', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load dmarc failures. Please try again.'), + new Error('Unable to load DMARC failure data. Please try again.'), ) } diff --git a/api-js/src/dmarc-summaries/loaders/__tests__/load-dmarc-sum-connections-by-user-id.test.js b/api-js/src/dmarc-summaries/loaders/__tests__/load-dmarc-sum-connections-by-user-id.test.js index 3da67b7d8..8152800a1 100644 --- a/api-js/src/dmarc-summaries/loaders/__tests__/load-dmarc-sum-connections-by-user-id.test.js +++ b/api-js/src/dmarc-summaries/loaders/__tests__/load-dmarc-sum-connections-by-user-id.test.js @@ -3043,7 +3043,9 @@ describe('given the dmarcSumLoaderConnectionsByUserId function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load dmarc summaries. Please try again.'), + new Error( + 'Unable to load DMARC summary data. Please try again.', + ), ) } @@ -3082,7 +3084,9 @@ describe('given the dmarcSumLoaderConnectionsByUserId function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load dmarc summaries. Please try again.'), + new Error( + 'Unable to load DMARC summary data. Please try again.', + ), ) } diff --git a/api-js/src/dmarc-summaries/loaders/__tests__/load-dmarc-sum-edge-by-domain-id-period.test.js b/api-js/src/dmarc-summaries/loaders/__tests__/load-dmarc-sum-edge-by-domain-id-period.test.js index ff2b8baed..73c965509 100644 --- a/api-js/src/dmarc-summaries/loaders/__tests__/load-dmarc-sum-edge-by-domain-id-period.test.js +++ b/api-js/src/dmarc-summaries/loaders/__tests__/load-dmarc-sum-edge-by-domain-id-period.test.js @@ -122,7 +122,7 @@ describe('given the dmarcSummaryEdgeLoaderByDomainIdPeriod loader', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load dmarc summaries. Please try again.'), + new Error('Unable to load DMARC summary data. Please try again.'), ) } @@ -153,7 +153,7 @@ describe('given the dmarcSummaryEdgeLoaderByDomainIdPeriod loader', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load dmarc summaries. Please try again.'), + new Error('Unable to load DMARC summary data. Please try again.'), ) } diff --git a/api-js/src/dmarc-summaries/loaders/__tests__/load-dmarc-summary-by-key.test.js b/api-js/src/dmarc-summaries/loaders/__tests__/load-dmarc-summary-by-key.test.js index 39c3e1db0..fb920251c 100644 --- a/api-js/src/dmarc-summaries/loaders/__tests__/load-dmarc-summary-by-key.test.js +++ b/api-js/src/dmarc-summaries/loaders/__tests__/load-dmarc-summary-by-key.test.js @@ -194,7 +194,7 @@ describe('given the dmarcSumLoaderByKey dataloader', () => { await loader.load('1234') } catch (err) { expect(err).toEqual( - new Error('Unable to find dmarc summary. Please try again.'), + new Error('Unable to find DMARC summary data. Please try again.'), ) } expect(consoleOutput).toEqual([ @@ -216,7 +216,7 @@ describe('given the dmarcSumLoaderByKey dataloader', () => { await loader.load('1234') } catch (err) { expect(err).toEqual( - new Error('Unable to find dmarc summary. Please try again.'), + new Error('Unable to find DMARC summary data. Please try again.'), ) } diff --git a/api-js/src/dmarc-summaries/loaders/__tests__/load-full-pass-connections-by-sum-id.test.js b/api-js/src/dmarc-summaries/loaders/__tests__/load-full-pass-connections-by-sum-id.test.js index d81fe1586..cb04189e3 100644 --- a/api-js/src/dmarc-summaries/loaders/__tests__/load-full-pass-connections-by-sum-id.test.js +++ b/api-js/src/dmarc-summaries/loaders/__tests__/load-full-pass-connections-by-sum-id.test.js @@ -581,7 +581,7 @@ describe('given the fullPassLoaderConnectionsBySumId loader', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load full passes. Please try again.'), + new Error('Unable to load full pass data. Please try again.'), ) } @@ -614,7 +614,7 @@ describe('given the fullPassLoaderConnectionsBySumId loader', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load full passes. Please try again.'), + new Error('Unable to load full pass data. Please try again.'), ) } @@ -649,7 +649,7 @@ describe('given the fullPassLoaderConnectionsBySumId loader', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load full passes. Please try again.'), + new Error('Unable to load full pass data. Please try again.'), ) } diff --git a/api-js/src/dmarc-summaries/loaders/__tests__/load-spf-failure-connections-by-sum-id.test.js b/api-js/src/dmarc-summaries/loaders/__tests__/load-spf-failure-connections-by-sum-id.test.js index f97fbb9d8..9855a274a 100644 --- a/api-js/src/dmarc-summaries/loaders/__tests__/load-spf-failure-connections-by-sum-id.test.js +++ b/api-js/src/dmarc-summaries/loaders/__tests__/load-spf-failure-connections-by-sum-id.test.js @@ -583,7 +583,7 @@ describe('given the spfFailureLoaderConnectionsBySumId loader', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load spf failures. Please try again.'), + new Error('Unable to load SPF failure data. Please try again.'), ) } @@ -616,7 +616,7 @@ describe('given the spfFailureLoaderConnectionsBySumId loader', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load spf failures. Please try again.'), + new Error('Unable to load SPF failure data. Please try again.'), ) } @@ -651,7 +651,7 @@ describe('given the spfFailureLoaderConnectionsBySumId loader', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load spf failures. Please try again.'), + new Error('Unable to load SPF failure data. Please try again.'), ) } diff --git a/api-js/src/dmarc-summaries/loaders/__tests__/load-start-date-from-period.test.js b/api-js/src/dmarc-summaries/loaders/__tests__/load-start-date-from-period.test.js index 9984dcf71..da1a2a143 100644 --- a/api-js/src/dmarc-summaries/loaders/__tests__/load-start-date-from-period.test.js +++ b/api-js/src/dmarc-summaries/loaders/__tests__/load-start-date-from-period.test.js @@ -134,7 +134,7 @@ describe('given the loadStartDateFromPeriod', () => { } catch (err) { expect(err).toEqual( new Error( - 'Unable to select dmarc reports for this period and year.', + 'Unable to select DMARC report(s) for this period and year.', ), ) } @@ -171,7 +171,7 @@ describe('given the loadStartDateFromPeriod', () => { } catch (err) { expect(err).toEqual( new Error( - 'Unable to select dmarc reports for this period and year.', + 'Unable to select DMARC report(s) for this period and year.', ), ) } diff --git a/api-js/src/dmarc-summaries/loaders/__tests__/load-yearly-dmarc-sum-edges.test.js b/api-js/src/dmarc-summaries/loaders/__tests__/load-yearly-dmarc-sum-edges.test.js index 6da9c07d7..6bdd38f11 100644 --- a/api-js/src/dmarc-summaries/loaders/__tests__/load-yearly-dmarc-sum-edges.test.js +++ b/api-js/src/dmarc-summaries/loaders/__tests__/load-yearly-dmarc-sum-edges.test.js @@ -160,7 +160,7 @@ describe('given the dmarcYearlySumEdgeLoader loader', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load dmarc summaries. Please try again.'), + new Error('Unable to load DMARC summary data. Please try again.'), ) } @@ -187,7 +187,7 @@ describe('given the dmarcYearlySumEdgeLoader loader', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load dmarc summaries. Please try again.'), + new Error('Unable to load DMARC summary data. Please try again.'), ) } diff --git a/api-js/src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js b/api-js/src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js index 3a3bd7064..2fba9e686 100644 --- a/api-js/src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js +++ b/api-js/src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js @@ -12,7 +12,9 @@ export const dkimFailureLoaderConnectionsBySumId = ( console.warn( `SummaryId was undefined when user: ${userKey} attempted to load dkim failures in dkimFailureLoaderConnectionsBySumId.`, ) - throw new Error(i18n._(t`Unable to load dkim failures. Please try again.`)) + throw new Error( + i18n._(t`Unable to load DKIM failure data. Please try again.`), + ) } let afterTemplate = aql`` @@ -136,7 +138,9 @@ export const dkimFailureLoaderConnectionsBySumId = ( console.error( `Database error occurred while user: ${userKey} was trying to gather dkim failures in dkimFailureLoaderConnectionsBySumId, error: ${err}`, ) - throw new Error(i18n._(t`Unable to load dkim failures. Please try again.`)) + throw new Error( + i18n._(t`Unable to load DKIM failure data. Please try again.`), + ) } let dkimFailureInfo @@ -146,7 +150,9 @@ export const dkimFailureLoaderConnectionsBySumId = ( console.error( `Cursor error occurred while user: ${userKey} was trying to gather dkim failures in dkimFailureLoaderConnectionsBySumId, error: ${err}`, ) - throw new Error(i18n._(t`Unable to load dkim failures. Please try again.`)) + throw new Error( + i18n._(t`Unable to load DKIM failure data. Please try again.`), + ) } if (dkimFailureInfo.dkimFailures.length === 0) { diff --git a/api-js/src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js b/api-js/src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js index 8877fc709..93700ed75 100644 --- a/api-js/src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js +++ b/api-js/src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js @@ -12,7 +12,9 @@ export const dmarcFailureLoaderConnectionsBySumId = ( console.warn( `SummaryId was undefined when user: ${userKey} attempted to load dmarc failures in dmarcFailureLoaderConnectionsBySumId.`, ) - throw new Error(i18n._(t`Unable to load dmarc failures. Please try again.`)) + throw new Error( + i18n._(t`Unable to load DMARC failure data. Please try again.`), + ) } let afterTemplate = aql`` @@ -136,7 +138,9 @@ export const dmarcFailureLoaderConnectionsBySumId = ( console.error( `Database error occurred while user: ${userKey} was trying to gather dmarc failures in dmarcFailureLoaderConnectionsBySumId, error: ${err}`, ) - throw new Error(i18n._(t`Unable to load dmarc failures. Please try again.`)) + throw new Error( + i18n._(t`Unable to load DMARC failure data. Please try again.`), + ) } let dmarcFailureInfo @@ -146,7 +150,9 @@ export const dmarcFailureLoaderConnectionsBySumId = ( console.error( `Cursor error occurred while user: ${userKey} was trying to gather dmarc failures in dmarcFailureLoaderConnectionsBySumId, error: ${err}`, ) - throw new Error(i18n._(t`Unable to load dmarc failures. Please try again.`)) + throw new Error( + i18n._(t`Unable to load DMARC failure data. Please try again.`), + ) } if (dmarcFailureInfo.dmarcFailures.length === 0) { diff --git a/api-js/src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js b/api-js/src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js index 4173d4626..088caa2ee 100644 --- a/api-js/src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js +++ b/api-js/src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js @@ -414,7 +414,7 @@ export const dmarcSumLoaderConnectionsByUserId = ( `Database error occurred while user: ${userKey} was trying to gather dmarc summaries in dmarcSumLoaderConnectionsByUserId, error: ${err}`, ) throw new Error( - i18n._(t`Unable to load dmarc summaries. Please try again.`), + i18n._(t`Unable to load DMARC summary data. Please try again.`), ) } @@ -426,7 +426,7 @@ export const dmarcSumLoaderConnectionsByUserId = ( `Cursor error occurred while user: ${userKey} was trying to gather dmarc summaries in dmarcSumLoaderConnectionsByUserId, error: ${err}`, ) throw new Error( - i18n._(t`Unable to load dmarc summaries. Please try again.`), + i18n._(t`Unable to load DMARC summary data. Please try again.`), ) } diff --git a/api-js/src/dmarc-summaries/loaders/load-dmarc-sum-edge-by-domain-id-period.js b/api-js/src/dmarc-summaries/loaders/load-dmarc-sum-edge-by-domain-id-period.js index 7811f4f08..58443fd88 100644 --- a/api-js/src/dmarc-summaries/loaders/load-dmarc-sum-edge-by-domain-id-period.js +++ b/api-js/src/dmarc-summaries/loaders/load-dmarc-sum-edge-by-domain-id-period.js @@ -18,7 +18,7 @@ export const dmarcSummaryEdgeLoaderByDomainIdPeriod = ( `Database error occurred when user: ${userKey} attempted to load dmarc summaries for domain: ${domainId}, period: ${startDate}, ${err}`, ) throw new Error( - i18n._(t`Unable to load dmarc summaries. Please try again.`), + i18n._(t`Unable to load DMARC summary data. Please try again.`), ) } @@ -30,7 +30,7 @@ export const dmarcSummaryEdgeLoaderByDomainIdPeriod = ( `Cursor error occurred when user: ${userKey} attempted to load dmarc summaries for domain: ${domainId}, period: ${startDate}, ${err}`, ) throw new Error( - i18n._(t`Unable to load dmarc summaries. Please try again.`), + i18n._(t`Unable to load DMARC summary data. Please try again.`), ) } diff --git a/api-js/src/dmarc-summaries/loaders/load-dmarc-summary-by-key.js b/api-js/src/dmarc-summaries/loaders/load-dmarc-summary-by-key.js index 943719917..862f516b4 100644 --- a/api-js/src/dmarc-summaries/loaders/load-dmarc-summary-by-key.js +++ b/api-js/src/dmarc-summaries/loaders/load-dmarc-summary-by-key.js @@ -33,7 +33,7 @@ export const dmarcSumLoaderByKey = (query, userKey, i18n) => `Database error occurred when user: ${userKey} running dmarcSumLoaderByKey: ${err}`, ) throw new Error( - i18n._(t`Unable to find dmarc summary. Please try again.`), + i18n._(t`Unable to find DMARC summary data. Please try again.`), ) } @@ -47,7 +47,7 @@ export const dmarcSumLoaderByKey = (query, userKey, i18n) => `Cursor error occurred when user: ${userKey} running dmarcSumLoaderByKey: ${err}`, ) throw new Error( - i18n._(t`Unable to find dmarc summary. Please try again.`), + i18n._(t`Unable to find DMARC summary data. Please try again.`), ) } diff --git a/api-js/src/dmarc-summaries/loaders/load-full-pass-connections-by-sum-id.js b/api-js/src/dmarc-summaries/loaders/load-full-pass-connections-by-sum-id.js index fdfc40450..b9eec9f6a 100644 --- a/api-js/src/dmarc-summaries/loaders/load-full-pass-connections-by-sum-id.js +++ b/api-js/src/dmarc-summaries/loaders/load-full-pass-connections-by-sum-id.js @@ -12,7 +12,7 @@ export const fullPassLoaderConnectionsBySumId = ( console.warn( `SummaryId was undefined when user: ${userKey} attempted to load full passes in fullPassLoaderConnectionsBySumId.`, ) - throw new Error(i18n._(t`Unable to load full passes. Please try again.`)) + throw new Error(i18n._(t`Unable to load full pass data. Please try again.`)) } let afterTemplate = aql`` @@ -136,7 +136,7 @@ export const fullPassLoaderConnectionsBySumId = ( console.error( `Database error occurred while user: ${userKey} was trying to gather full passes in fullPassLoaderConnectionsBySumId, error: ${err}`, ) - throw new Error(i18n._(t`Unable to load full passes. Please try again.`)) + throw new Error(i18n._(t`Unable to load full pass data. Please try again.`)) } let fullPassInfo @@ -146,7 +146,7 @@ export const fullPassLoaderConnectionsBySumId = ( console.error( `Cursor error occurred while user: ${userKey} was trying to gather full passes in fullPassLoaderConnectionsBySumId, error: ${err}`, ) - throw new Error(i18n._(t`Unable to load full passes. Please try again.`)) + throw new Error(i18n._(t`Unable to load full pass data. Please try again.`)) } if (fullPassInfo.fullPasses.length === 0) { diff --git a/api-js/src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js b/api-js/src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js index fef74854d..01c21f89e 100644 --- a/api-js/src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js +++ b/api-js/src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js @@ -12,7 +12,9 @@ export const spfFailureLoaderConnectionsBySumId = ( console.warn( `SummaryId was undefined when user: ${userKey} attempted to load spf failures in spfFailureLoaderConnectionsBySumId.`, ) - throw new Error(i18n._(t`Unable to load spf failures. Please try again.`)) + throw new Error( + i18n._(t`Unable to load SPF failure data. Please try again.`), + ) } let afterTemplate = aql`` @@ -136,7 +138,9 @@ export const spfFailureLoaderConnectionsBySumId = ( console.error( `Database error occurred while user: ${userKey} was trying to gather spf failures in spfFailureLoaderConnectionsBySumId, error: ${err}`, ) - throw new Error(i18n._(t`Unable to load spf failures. Please try again.`)) + throw new Error( + i18n._(t`Unable to load SPF failure data. Please try again.`), + ) } let spfFailureInfo @@ -146,7 +150,9 @@ export const spfFailureLoaderConnectionsBySumId = ( console.error( `Cursor error occurred while user: ${userKey} was trying to gather spf failures in spfFailureLoaderConnectionsBySumId, error: ${err}`, ) - throw new Error(i18n._(t`Unable to load spf failures. Please try again.`)) + throw new Error( + i18n._(t`Unable to load SPF failure data. Please try again.`), + ) } if (spfFailureInfo.spfFailures.length === 0) { diff --git a/api-js/src/dmarc-summaries/loaders/load-start-date-from-period.js b/api-js/src/dmarc-summaries/loaders/load-start-date-from-period.js index abdffdbfa..b9546b59c 100644 --- a/api-js/src/dmarc-summaries/loaders/load-start-date-from-period.js +++ b/api-js/src/dmarc-summaries/loaders/load-start-date-from-period.js @@ -31,7 +31,7 @@ export const loadStartDateFromPeriod = (moment, userKey, i18n) => ({ `User: ${userKey} attempted to load startDate that is out of range period: ${period}, year: ${year}`, ) throw new Error( - i18n._(t`Unable to select dmarc reports for this period and year.`), + i18n._(t`Unable to select DMARC report(s) for this period and year.`), ) } @@ -46,7 +46,7 @@ export const loadStartDateFromPeriod = (moment, userKey, i18n) => ({ `User: ${userKey} attempted to load startDate that is out of range period: ${period}, year: ${year}`, ) throw new Error( - i18n._(t`Unable to select dmarc reports for this period and year.`), + i18n._(t`Unable to select DMARC report(s) for this period and year.`), ) } diff --git a/api-js/src/dmarc-summaries/loaders/load-yearly-dmarc-sum-edges.js b/api-js/src/dmarc-summaries/loaders/load-yearly-dmarc-sum-edges.js index 66acc5657..1337d62db 100644 --- a/api-js/src/dmarc-summaries/loaders/load-yearly-dmarc-sum-edges.js +++ b/api-js/src/dmarc-summaries/loaders/load-yearly-dmarc-sum-edges.js @@ -16,7 +16,7 @@ export const dmarcYearlySumEdgeLoader = (query, userKey, i18n) => async ({ `Database error occurred when user: ${userKey} attempted to load yearly dmarc summaries for domain: ${domainId}, ${err}`, ) throw new Error( - i18n._(t`Unable to load dmarc summaries. Please try again.`), + i18n._(t`Unable to load DMARC summary data. Please try again.`), ) } @@ -28,7 +28,7 @@ export const dmarcYearlySumEdgeLoader = (query, userKey, i18n) => async ({ `Cursor error occurred when user: ${userKey} attempted to load yearly dmarc summaries for domain: ${domainId}, ${err}`, ) throw new Error( - i18n._(t`Unable to load dmarc summaries. Please try again.`), + i18n._(t`Unable to load DMARC summary data. Please try again.`), ) } diff --git a/api-js/src/dmarc-summaries/queries/__tests__/find-my-dmarc-summaries.test.js b/api-js/src/dmarc-summaries/queries/__tests__/find-my-dmarc-summaries.test.js index 87c7aeb79..b243fc843 100644 --- a/api-js/src/dmarc-summaries/queries/__tests__/find-my-dmarc-summaries.test.js +++ b/api-js/src/dmarc-summaries/queries/__tests__/find-my-dmarc-summaries.test.js @@ -366,7 +366,7 @@ describe('given the findMyDmarcSummaries query', () => { ) const error = [ new GraphQLError( - `Unable to load dmarc summaries. Please try again.`, + `Unable to load DMARC summary data. Please try again.`, ), ] diff --git a/api-js/src/locale/en/messages.js b/api-js/src/locale/en/messages.js index 0d1ab4068..cda716c60 100644 --- a/api-js/src/locale/en/messages.js +++ b/api-js/src/locale/en/messages.js @@ -253,6 +253,8 @@ 'Unable to create organization. Please try again.', 'Unable to dispatch one time scan. Please try again.': 'Unable to dispatch one time scan. Please try again.', + 'Unable to find DMARC summary data. Please try again.': + 'Unable to find DMARC summary data. Please try again.', 'Unable to find dkim guidance tags. Please try again.': 'Unable to find dkim guidance tags. Please try again.', 'Unable to find dkim result. Please try again.': @@ -263,8 +265,6 @@ 'Unable to find dmarc guidance tags. Please try again.', 'Unable to find dmarc scan. Please try again.': 'Unable to find dmarc scan. Please try again.', - 'Unable to find dmarc summary. Please try again.': - 'Unable to find dmarc summary. Please try again.', 'Unable to find domain. Please try again.': 'Unable to find domain. Please try again.', 'Unable to find https guidance tags. Please try again.': @@ -297,30 +297,30 @@ 'Unable to invite user. Please try again.', 'Unable to invite yourself to an org.': 'Unable to invite yourself to an org.', + 'Unable to load DKIM failure data. Please try again.': + 'Unable to load DKIM failure data. Please try again.', + 'Unable to load DMARC failure data. Please try again.': + 'Unable to load DMARC failure data. Please try again.', + 'Unable to load DMARC summary data. Please try again.': + 'Unable to load DMARC summary data. Please try again.', + 'Unable to load SPF failure data. Please try again.': + 'Unable to load SPF failure data. Please try again.', 'Unable to load affiliation(s). Please try again.': 'Unable to load affiliation(s). Please try again.', - 'Unable to load dkim failure(s). Please try again.': - 'Unable to load dkim failure(s). Please try again.', 'Unable to load dkim guidance tags. Please try again.': 'Unable to load dkim guidance tags. Please try again.', 'Unable to load dkim results. Please try again.': 'Unable to load dkim results. Please try again.', 'Unable to load dkim scans. Please try again.': 'Unable to load dkim scans. Please try again.', - 'Unable to load dmarc failure(s). Please try again.': - 'Unable to load dmarc failure(s). Please try again.', 'Unable to load dmarc guidance tags. Please try again.': 'Unable to load dmarc guidance tags. Please try again.', 'Unable to load dmarc scans. Please try again.': 'Unable to load dmarc scans. Please try again.', - 'Unable to load dmarc summaries. Please try again.': - 'Unable to load dmarc summaries. Please try again.', - 'Unable to load dmarc summary(ies). Please try again.': - 'Unable to load dmarc summary(ies). Please try again.', 'Unable to load domains. Please try again.': 'Unable to load domains. Please try again.', - 'Unable to load full passes. Please try again.': - 'Unable to load full passes. Please try again.', + 'Unable to load full pass data. Please try again.': + 'Unable to load full pass data. Please try again.', 'Unable to load https guidance tags. Please try again.': 'Unable to load https guidance tags. Please try again.', 'Unable to load https scans. Please try again.': @@ -329,8 +329,6 @@ 'Unable to load mail summary. Please try again.', 'Unable to load organizations. Please try again.': 'Unable to load organizations. Please try again.', - 'Unable to load spf failures. Please try again.': - 'Unable to load spf failures. Please try again.', 'Unable to load spf guidance tags. Please try again.': 'Unable to load spf guidance tags. Please try again.', 'Unable to load spf scans. Please try again.': @@ -373,6 +371,10 @@ 'Unable to reset password. Please try again.', 'Unable to select dmarc reports for this period and year.': 'Unable to select dmarc reports for this period and year.', + 'Unable to select DMARC report(s) for this period and year.': + 'Unable to select DMARC report(s) for this period and year.', + 'Unable to send TFA code, please try again.': + 'Unable to send TFA code, please try again.', 'Unable to send org invite email. Please try again.': 'Unable to send org invite email. Please try again.', 'Unable to send password reset email. Please try again.': diff --git a/api-js/src/locale/en/messages.po b/api-js/src/locale/en/messages.po index e4793eb86..c9447f53d 100644 --- a/api-js/src/locale/en/messages.po +++ b/api-js/src/locale/en/messages.po @@ -102,7 +102,7 @@ msgstr "Passing both `first` and `last` to paginate the `DmarcFailureTable` conn msgid "Passing both `first` and `last` to paginate the `FullPassTable` connection is not supported." msgstr "Passing both `first` and `last` to paginate the `FullPassTable` connection is not supported." -#: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:46 +#: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:48 msgid "Passing both `first` and `last` to paginate the `SpfFailureTable` connection is not supported." msgstr "Passing both `first` and `last` to paginate the `SpfFailureTable` connection is not supported." @@ -239,7 +239,7 @@ msgstr "Requesting `{amount}` records on the `DmarcFailureTable` connection exce msgid "Requesting `{amount}` records on the `FullPassTable` connection exceeds the `{argSet}` limit of 100 records." msgstr "Requesting `{amount}` records on the `FullPassTable` connection exceeds the `{argSet}` limit of 100 records." -#: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:69 +#: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:71 msgid "Requesting `{amount}` records on the `SpfFailureTable` connection exceeds the `{argSet}` limit of 100 records." msgstr "Requesting `{amount}` records on the `SpfFailureTable` connection exceeds the `{argSet}` limit of 100 records." @@ -389,6 +389,11 @@ msgstr "Unable to create organization. Please try again." msgid "Unable to dispatch one time scan. Please try again." msgstr "Unable to dispatch one time scan. Please try again." +#: src/dmarc-summaries/loaders/load-dmarc-summary-by-key.js:36 +#: src/dmarc-summaries/loaders/load-dmarc-summary-by-key.js:50 +msgid "Unable to find DMARC summary data. Please try again." +msgstr "Unable to find DMARC summary data. Please try again." + #: src/guidance-tag/loaders/load-dkim-guidance-tags.js:18 #: src/guidance-tag/loaders/load-dkim-guidance-tags.js:32 msgid "Unable to find dkim guidance tags. Please try again." @@ -414,11 +419,6 @@ msgstr "Unable to find dmarc guidance tags. Please try again." msgid "Unable to find dmarc scan. Please try again." msgstr "Unable to find dmarc scan. Please try again." -#: src/dmarc-summaries/loaders/load-dmarc-summary-by-key.js:36 -#: src/dmarc-summaries/loaders/load-dmarc-summary-by-key.js:50 -msgid "Unable to find dmarc summary. Please try again." -msgstr "Unable to find dmarc summary. Please try again." - #: src/domain/loaders/load-domain-by-domain.js:18 #: src/domain/loaders/load-domain-by-domain.js:30 #: src/domain/loaders/load-domain-by-key.js:18 @@ -506,17 +506,38 @@ msgstr "Unable to invite user. Please try again." msgid "Unable to invite yourself to an org." msgstr "Unable to invite yourself to an org." +#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:16 +#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:142 +#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:154 +msgid "Unable to load DKIM failure data. Please try again." +msgstr "Unable to load DKIM failure data. Please try again." + +#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:16 +#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:142 +#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:154 +msgid "Unable to load DMARC failure data. Please try again." +msgstr "Unable to load DMARC failure data. Please try again." + +#: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:417 +#: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:429 +#: src/dmarc-summaries/loaders/load-dmarc-sum-edge-by-domain-id-period.js:21 +#: src/dmarc-summaries/loaders/load-dmarc-sum-edge-by-domain-id-period.js:33 +#: src/dmarc-summaries/loaders/load-yearly-dmarc-sum-edges.js:19 +#: src/dmarc-summaries/loaders/load-yearly-dmarc-sum-edges.js:31 +msgid "Unable to load DMARC summary data. Please try again." +msgstr "Unable to load DMARC summary data. Please try again." + +#: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:16 +#: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:142 +#: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:154 +msgid "Unable to load SPF failure data. Please try again." +msgstr "Unable to load SPF failure data. Please try again." + #: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:233 #: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:414 msgid "Unable to load affiliation(s). Please try again." msgstr "Unable to load affiliation(s). Please try again." -#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:16 -#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:142 -#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:154 -msgid "Unable to load dkim failure(s). Please try again." -msgstr "Unable to load dkim failure(s). Please try again." - #: src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js:242 #: src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js:254 msgid "Unable to load dkim guidance tags. Please try again." @@ -532,12 +553,6 @@ msgstr "Unable to load dkim results. Please try again." msgid "Unable to load dkim scans. Please try again." msgstr "Unable to load dkim scans. Please try again." -#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:16 -#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:142 -#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:154 -msgid "Unable to load dmarc failure(s). Please try again." -msgstr "Unable to load dmarc failure(s). Please try again." - #: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:242 #: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:254 msgid "Unable to load dmarc guidance tags. Please try again." @@ -548,18 +563,6 @@ msgstr "Unable to load dmarc guidance tags. Please try again." msgid "Unable to load dmarc scans. Please try again." msgstr "Unable to load dmarc scans. Please try again." -#: src/dmarc-summaries/loaders/load-dmarc-sum-edge-by-domain-id-period.js:21 -#: src/dmarc-summaries/loaders/load-dmarc-sum-edge-by-domain-id-period.js:33 -#: src/dmarc-summaries/loaders/load-yearly-dmarc-sum-edges.js:19 -#: src/dmarc-summaries/loaders/load-yearly-dmarc-sum-edges.js:31 -msgid "Unable to load dmarc summaries. Please try again." -msgstr "Unable to load dmarc summaries. Please try again." - -#: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:417 -#: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:429 -msgid "Unable to load dmarc summary(ies). Please try again." -msgstr "Unable to load dmarc summary(ies). Please try again." - #: src/domain/loaders/load-domain-connections-by-organizations-id.js:313 #: src/domain/loaders/load-domain-connections-by-organizations-id.js:323 #: src/domain/loaders/load-domain-connections-by-user-id.js:346 @@ -572,8 +575,8 @@ msgstr "Unable to load domains. Please try again." #: src/dmarc-summaries/loaders/load-full-pass-connections-by-sum-id.js:15 #: src/dmarc-summaries/loaders/load-full-pass-connections-by-sum-id.js:139 #: src/dmarc-summaries/loaders/load-full-pass-connections-by-sum-id.js:149 -msgid "Unable to load full passes. Please try again." -msgstr "Unable to load full passes. Please try again." +msgid "Unable to load full pass data. Please try again." +msgstr "Unable to load full pass data. Please try again." #: src/guidance-tag/loaders/load-https-guidance-tags-connections.js:242 #: src/guidance-tag/loaders/load-https-guidance-tags-connections.js:254 @@ -596,12 +599,6 @@ msgstr "Unable to load mail summary. Please try again." msgid "Unable to load organizations. Please try again." msgstr "Unable to load organizations. Please try again." -#: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:15 -#: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:139 -#: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:149 -msgid "Unable to load spf failures. Please try again." -msgstr "Unable to load spf failures. Please try again." - #: src/guidance-tag/loaders/load-spf-guidance-tags-connections.js:242 #: src/guidance-tag/loaders/load-spf-guidance-tags-connections.js:254 msgid "Unable to load spf guidance tags. Please try again." @@ -711,8 +708,8 @@ msgstr "Unable to reset password. Please try again." #: src/dmarc-summaries/loaders/load-start-date-from-period.js:34 #: src/dmarc-summaries/loaders/load-start-date-from-period.js:49 -msgid "Unable to select dmarc reports for this period and year." -msgstr "Unable to select dmarc reports for this period and year." +msgid "Unable to select DMARC report(s) for this period and year." +msgstr "Unable to select DMARC report(s) for this period and year." #: src/notify/notify-send-org-invite-create-account.js:31 #: src/notify/notify-send-org-invite-email.js:26 @@ -869,7 +866,7 @@ msgstr "You must provide a `first` or `last` value to properly paginate the `Dma msgid "You must provide a `first` or `last` value to properly paginate the `FullPassTable` connection." msgstr "You must provide a `first` or `last` value to properly paginate the `FullPassTable` connection." -#: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:37 +#: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:39 msgid "You must provide a `first` or `last` value to properly paginate the `SpfFailureTable` connection." msgstr "You must provide a `first` or `last` value to properly paginate the `SpfFailureTable` connection." @@ -948,7 +945,7 @@ msgstr "You must provide a `year` value to access the `dmarcSummaries` connectio #: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:86 #: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:212 #: src/dmarc-summaries/loaders/load-full-pass-connections-by-sum-id.js:84 -#: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:84 +#: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:86 #: src/domain/loaders/load-domain-connections-by-organizations-id.js:169 #: src/domain/loaders/load-domain-connections-by-user-id.js:177 #: src/email-scan/loaders/load-dkim-connections-by-domain-id.js:167 @@ -983,7 +980,7 @@ msgstr "`{argSet}` on the `DmarcFailureTable` connection cannot be less than zer msgid "`{argSet}` on the `FullPassTable` connection cannot be less than zero." msgstr "`{argSet}` on the `FullPassTable` connection cannot be less than zero." -#: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:58 +#: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:60 msgid "`{argSet}` on the `SpfFailureTable` connection cannot be less than zero." msgstr "`{argSet}` on the `SpfFailureTable` connection cannot be less than zero." diff --git a/api-js/src/locale/fr/messages.js b/api-js/src/locale/fr/messages.js index 876948ef2..2bef974ba 100644 --- a/api-js/src/locale/fr/messages.js +++ b/api-js/src/locale/fr/messages.js @@ -128,12 +128,12 @@ 'Unable to create domain. Please try again.': 'todo', 'Unable to create organization. Please try again.': 'todo', 'Unable to dispatch one time scan. Please try again.': 'todo', + 'Unable to find DMARC summary data. Please try again.': 'todo', 'Unable to find dkim guidance tags. Please try again.': 'todo', 'Unable to find dkim result. Please try again.': 'todo', 'Unable to find dkim scan. Please try again.': 'todo', 'Unable to find dmarc guidance tags. Please try again.': 'todo', 'Unable to find dmarc scan. Please try again.': 'todo', - 'Unable to find dmarc summary. Please try again.': 'todo', 'Unable to find domain. Please try again.': 'todo', 'Unable to find https guidance tags. Please try again.': 'todo', 'Unable to find https scan. Please try again.': 'todo', @@ -150,23 +150,22 @@ 'Unable to invite user to unknown organization.': 'todo', 'Unable to invite user. Please try again.': 'todo', 'Unable to invite yourself to an org.': 'todo', + 'Unable to load DKIM failure data. Please try again.': 'todo', + 'Unable to load DMARC failure data. Please try again.': 'todo', + 'Unable to load DMARC summary data. Please try again.': 'todo', + 'Unable to load SPF failure data. Please try again.': 'todo', 'Unable to load affiliation(s). Please try again.': 'todo', - 'Unable to load dkim failure(s). Please try again.': 'todo', 'Unable to load dkim guidance tags. Please try again.': 'todo', 'Unable to load dkim results. Please try again.': 'todo', 'Unable to load dkim scans. Please try again.': 'todo', - 'Unable to load dmarc failure(s). Please try again.': 'todo', 'Unable to load dmarc guidance tags. Please try again.': 'todo', 'Unable to load dmarc scans. Please try again.': 'todo', - 'Unable to load dmarc summaries. Please try again.': 'todo', - 'Unable to load dmarc summary(ies). Please try again.': 'todo', 'Unable to load domains. Please try again.': 'todo', - 'Unable to load full passes. Please try again.': 'todo', + 'Unable to load full pass data. Please try again.': 'todo', 'Unable to load https guidance tags. Please try again.': 'todo', 'Unable to load https scans. Please try again.': 'todo', 'Unable to load mail summary. Please try again.': 'todo', 'Unable to load organizations. Please try again.': 'todo', - 'Unable to load spf failures. Please try again.': 'todo', 'Unable to load spf guidance tags. Please try again.': 'todo', 'Unable to load spf scans. Please try again.': 'todo', 'Unable to load ssl guidance tags. Please try again.': 'todo', @@ -189,6 +188,8 @@ 'Unable to request a on time scan on this domain.': 'todo', 'Unable to reset password. Please try again.': 'todo', 'Unable to select dmarc reports for this period and year.': 'todo', + 'Unable to select DMARC report(s) for this period and year.': 'todo', + 'Unable to send TFA code, please try again.': 'todo', 'Unable to send org invite email. Please try again.': 'todo', 'Unable to send password reset email. Please try again.': 'todo', 'Unable to send two factor authentication message. Please try again.': diff --git a/api-js/src/locale/fr/messages.po b/api-js/src/locale/fr/messages.po index 4c7274269..18a1d5547 100644 --- a/api-js/src/locale/fr/messages.po +++ b/api-js/src/locale/fr/messages.po @@ -102,7 +102,7 @@ msgstr "todo" msgid "Passing both `first` and `last` to paginate the `FullPassTable` connection is not supported." msgstr "todo" -#: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:46 +#: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:48 msgid "Passing both `first` and `last` to paginate the `SpfFailureTable` connection is not supported." msgstr "todo" @@ -239,7 +239,7 @@ msgstr "todo" msgid "Requesting `{amount}` records on the `FullPassTable` connection exceeds the `{argSet}` limit of 100 records." msgstr "todo" -#: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:69 +#: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:71 msgid "Requesting `{amount}` records on the `SpfFailureTable` connection exceeds the `{argSet}` limit of 100 records." msgstr "todo" @@ -389,6 +389,11 @@ msgstr "todo" msgid "Unable to dispatch one time scan. Please try again." msgstr "todo" +#: src/dmarc-summaries/loaders/load-dmarc-summary-by-key.js:36 +#: src/dmarc-summaries/loaders/load-dmarc-summary-by-key.js:50 +msgid "Unable to find DMARC summary data. Please try again." +msgstr "todo" + #: src/guidance-tag/loaders/load-dkim-guidance-tags.js:18 #: src/guidance-tag/loaders/load-dkim-guidance-tags.js:32 msgid "Unable to find dkim guidance tags. Please try again." @@ -414,11 +419,6 @@ msgstr "todo" msgid "Unable to find dmarc scan. Please try again." msgstr "todo" -#: src/dmarc-summaries/loaders/load-dmarc-summary-by-key.js:36 -#: src/dmarc-summaries/loaders/load-dmarc-summary-by-key.js:50 -msgid "Unable to find dmarc summary. Please try again." -msgstr "todo" - #: src/domain/loaders/load-domain-by-domain.js:18 #: src/domain/loaders/load-domain-by-domain.js:30 #: src/domain/loaders/load-domain-by-key.js:18 @@ -506,15 +506,36 @@ msgstr "todo" msgid "Unable to invite yourself to an org." msgstr "todo" -#: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:233 -#: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:414 -msgid "Unable to load affiliation(s). Please try again." -msgstr "todo" - #: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:16 #: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:142 #: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:154 -msgid "Unable to load dkim failure(s). Please try again." +msgid "Unable to load DKIM failure data. Please try again." +msgstr "todo" + +#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:16 +#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:142 +#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:154 +msgid "Unable to load DMARC failure data. Please try again." +msgstr "todo" + +#: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:417 +#: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:429 +#: src/dmarc-summaries/loaders/load-dmarc-sum-edge-by-domain-id-period.js:21 +#: src/dmarc-summaries/loaders/load-dmarc-sum-edge-by-domain-id-period.js:33 +#: src/dmarc-summaries/loaders/load-yearly-dmarc-sum-edges.js:19 +#: src/dmarc-summaries/loaders/load-yearly-dmarc-sum-edges.js:31 +msgid "Unable to load DMARC summary data. Please try again." +msgstr "todo" + +#: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:16 +#: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:142 +#: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:154 +msgid "Unable to load SPF failure data. Please try again." +msgstr "todo" + +#: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:233 +#: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:414 +msgid "Unable to load affiliation(s). Please try again." msgstr "todo" #: src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js:242 @@ -532,12 +553,6 @@ msgstr "todo" msgid "Unable to load dkim scans. Please try again." msgstr "todo" -#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:16 -#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:142 -#: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:154 -msgid "Unable to load dmarc failure(s). Please try again." -msgstr "todo" - #: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:242 #: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:254 msgid "Unable to load dmarc guidance tags. Please try again." @@ -548,18 +563,6 @@ msgstr "todo" msgid "Unable to load dmarc scans. Please try again." msgstr "todo" -#: src/dmarc-summaries/loaders/load-dmarc-sum-edge-by-domain-id-period.js:21 -#: src/dmarc-summaries/loaders/load-dmarc-sum-edge-by-domain-id-period.js:33 -#: src/dmarc-summaries/loaders/load-yearly-dmarc-sum-edges.js:19 -#: src/dmarc-summaries/loaders/load-yearly-dmarc-sum-edges.js:31 -msgid "Unable to load dmarc summaries. Please try again." -msgstr "todo" - -#: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:417 -#: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:429 -msgid "Unable to load dmarc summary(ies). Please try again." -msgstr "todo" - #: src/domain/loaders/load-domain-connections-by-organizations-id.js:313 #: src/domain/loaders/load-domain-connections-by-organizations-id.js:323 #: src/domain/loaders/load-domain-connections-by-user-id.js:346 @@ -572,7 +575,7 @@ msgstr "todo" #: src/dmarc-summaries/loaders/load-full-pass-connections-by-sum-id.js:15 #: src/dmarc-summaries/loaders/load-full-pass-connections-by-sum-id.js:139 #: src/dmarc-summaries/loaders/load-full-pass-connections-by-sum-id.js:149 -msgid "Unable to load full passes. Please try again." +msgid "Unable to load full pass data. Please try again." msgstr "todo" #: src/guidance-tag/loaders/load-https-guidance-tags-connections.js:242 @@ -596,12 +599,6 @@ msgstr "todo" msgid "Unable to load organizations. Please try again." msgstr "todo" -#: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:15 -#: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:139 -#: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:149 -msgid "Unable to load spf failures. Please try again." -msgstr "todo" - #: src/guidance-tag/loaders/load-spf-guidance-tags-connections.js:242 #: src/guidance-tag/loaders/load-spf-guidance-tags-connections.js:254 msgid "Unable to load spf guidance tags. Please try again." @@ -711,7 +708,7 @@ msgstr "todo" #: src/dmarc-summaries/loaders/load-start-date-from-period.js:34 #: src/dmarc-summaries/loaders/load-start-date-from-period.js:49 -msgid "Unable to select dmarc reports for this period and year." +msgid "Unable to select DMARC report(s) for this period and year." msgstr "todo" #: src/notify/notify-send-org-invite-create-account.js:31 @@ -869,7 +866,7 @@ msgstr "todo" msgid "You must provide a `first` or `last` value to properly paginate the `FullPassTable` connection." msgstr "todo" -#: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:37 +#: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:39 msgid "You must provide a `first` or `last` value to properly paginate the `SpfFailureTable` connection." msgstr "todo" @@ -948,7 +945,7 @@ msgstr "todo" #: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:86 #: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:212 #: src/dmarc-summaries/loaders/load-full-pass-connections-by-sum-id.js:84 -#: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:84 +#: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:86 #: src/domain/loaders/load-domain-connections-by-organizations-id.js:169 #: src/domain/loaders/load-domain-connections-by-user-id.js:177 #: src/email-scan/loaders/load-dkim-connections-by-domain-id.js:167 @@ -983,7 +980,7 @@ msgstr "todo" msgid "`{argSet}` on the `FullPassTable` connection cannot be less than zero." msgstr "todo" -#: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:58 +#: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:60 msgid "`{argSet}` on the `SpfFailureTable` connection cannot be less than zero." msgstr "todo" From 0164e5a746dba0bb63ec0b713d89e6b13d0402e7 Mon Sep 17 00:00:00 2001 From: nsdeschenes Date: Fri, 12 Mar 2021 09:36:16 -0400 Subject: [PATCH 03/21] domain error messages refactored --- .../__tests__/load-domain-by-domain.test.js | 4 +- .../__tests__/load-domain-by-key.test.js | 4 +- .../__tests__/load-domain-conn-org-id.test.js | 4 +- ...load-domain-connections-by-user-id.test.js | 4 +- .../domain/loaders/load-domain-by-domain.js | 4 +- .../src/domain/loaders/load-domain-by-key.js | 4 +- ...-domain-connections-by-organizations-id.js | 4 +- .../load-domain-connections-by-user-id.js | 4 +- .../mutations/__tests__/create-domain.test.js | 8 +- .../mutations/__tests__/remove-domain.test.js | 14 +- .../mutations/__tests__/request-scan.test.js | 6 +- .../mutations/__tests__/update-domain.test.js | 10 +- api-js/src/domain/mutations/create-domain.js | 10 +- api-js/src/domain/mutations/remove-domain.js | 18 ++- api-js/src/domain/mutations/request-scan.js | 6 +- api-js/src/domain/mutations/update-domain.js | 16 ++- .../domain/objects/__tests__/domain.test.js | 4 +- api-js/src/domain/objects/domain.js | 4 +- .../__tests__/find-domain-by-domain.test.js | 10 +- .../domain/queries/find-domain-by-domain.js | 10 +- api-js/src/locale/en/messages.js | 42 ++++-- api-js/src/locale/en/messages.po | 126 +++++++++++------- api-js/src/locale/fr/messages.js | 29 +++- api-js/src/locale/fr/messages.po | 122 +++++++++++------ 24 files changed, 306 insertions(+), 161 deletions(-) diff --git a/api-js/src/domain/loaders/__tests__/load-domain-by-domain.test.js b/api-js/src/domain/loaders/__tests__/load-domain-by-domain.test.js index 2489e210e..9b63ff602 100644 --- a/api-js/src/domain/loaders/__tests__/load-domain-by-domain.test.js +++ b/api-js/src/domain/loaders/__tests__/load-domain-by-domain.test.js @@ -111,7 +111,7 @@ describe('given a domainLoaderByDomain dataloader', () => { await loader.load(expectedDomain.domain) } catch (err) { expect(err).toEqual( - new Error('Unable to find domain. Please try again.'), + new Error('Unable to load domain. Please try again.'), ) } @@ -141,7 +141,7 @@ describe('given a domainLoaderByDomain dataloader', () => { await loader.load(expectedDomain.domain) } catch (err) { expect(err).toEqual( - new Error('Unable to find domain. Please try again.'), + new Error('Unable to load domain. Please try again.'), ) } diff --git a/api-js/src/domain/loaders/__tests__/load-domain-by-key.test.js b/api-js/src/domain/loaders/__tests__/load-domain-by-key.test.js index fc5bda204..5596a6711 100644 --- a/api-js/src/domain/loaders/__tests__/load-domain-by-key.test.js +++ b/api-js/src/domain/loaders/__tests__/load-domain-by-key.test.js @@ -113,7 +113,7 @@ describe('given a domainLoaderByKey dataloader', () => { await loader.load(expectedDomain._key) } catch (err) { expect(err).toEqual( - new Error('Unable to find domain. Please try again.'), + new Error('Unable to load domain. Please try again.'), ) } @@ -143,7 +143,7 @@ describe('given a domainLoaderByKey dataloader', () => { await loader.load(expectedDomain._key) } catch (err) { expect(err).toEqual( - new Error('Unable to find domain. Please try again.'), + new Error('Unable to load domain. Please try again.'), ) } diff --git a/api-js/src/domain/loaders/__tests__/load-domain-conn-org-id.test.js b/api-js/src/domain/loaders/__tests__/load-domain-conn-org-id.test.js index 6566ed754..3a193c9e1 100644 --- a/api-js/src/domain/loaders/__tests__/load-domain-conn-org-id.test.js +++ b/api-js/src/domain/loaders/__tests__/load-domain-conn-org-id.test.js @@ -2258,7 +2258,7 @@ describe('given the load domain connection using org id function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load domains. Please try again.'), + new Error('Unable to load domain(s). Please try again.'), ) } @@ -2295,7 +2295,7 @@ describe('given the load domain connection using org id function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load domains. Please try again.'), + new Error('Unable to load domain(s). Please try again.'), ) } diff --git a/api-js/src/domain/loaders/__tests__/load-domain-connections-by-user-id.test.js b/api-js/src/domain/loaders/__tests__/load-domain-connections-by-user-id.test.js index e4e20f087..616043696 100644 --- a/api-js/src/domain/loaders/__tests__/load-domain-connections-by-user-id.test.js +++ b/api-js/src/domain/loaders/__tests__/load-domain-connections-by-user-id.test.js @@ -2170,7 +2170,7 @@ describe('given the load domain connections by user id function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to query domains. Please try again.'), + new Error('Unable to query domain(s). Please try again.'), ) } @@ -2206,7 +2206,7 @@ describe('given the load domain connections by user id function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load domains. Please try again.'), + new Error('Unable to load domain(s). Please try again.'), ) } diff --git a/api-js/src/domain/loaders/load-domain-by-domain.js b/api-js/src/domain/loaders/load-domain-by-domain.js index b9cb8247f..b670e3223 100644 --- a/api-js/src/domain/loaders/load-domain-by-domain.js +++ b/api-js/src/domain/loaders/load-domain-by-domain.js @@ -15,7 +15,7 @@ export const domainLoaderByDomain = (query, userKey, i18n) => console.error( `Database error occurred when user: ${userKey} running domainLoaderByDomain: ${err}`, ) - throw new Error(i18n._(t`Unable to find domain. Please try again.`)) + throw new Error(i18n._(t`Unable to load domain. Please try again.`)) } const domainMap = {} @@ -27,7 +27,7 @@ export const domainLoaderByDomain = (query, userKey, i18n) => console.error( `Cursor error occurred when user: ${userKey} running domainLoaderByDomain: ${err}`, ) - throw new Error(i18n._(t`Unable to find domain. Please try again.`)) + throw new Error(i18n._(t`Unable to load domain. Please try again.`)) } return domains.map((domain) => domainMap[domain]) diff --git a/api-js/src/domain/loaders/load-domain-by-key.js b/api-js/src/domain/loaders/load-domain-by-key.js index 5ae53996c..e7c2a6a97 100644 --- a/api-js/src/domain/loaders/load-domain-by-key.js +++ b/api-js/src/domain/loaders/load-domain-by-key.js @@ -15,7 +15,7 @@ export const domainLoaderByKey = (query, userKey, i18n) => console.error( `Database error occurred when user: ${userKey} running domainLoaderByKey: ${err}`, ) - throw new Error(i18n._(t`Unable to find domain. Please try again.`)) + throw new Error(i18n._(t`Unable to load domain. Please try again.`)) } const domainMap = {} @@ -27,7 +27,7 @@ export const domainLoaderByKey = (query, userKey, i18n) => console.error( `Cursor error occurred when user: ${userKey} running domainLoaderByKey: ${err}`, ) - throw new Error(i18n._(t`Unable to find domain. Please try again.`)) + throw new Error(i18n._(t`Unable to load domain. Please try again.`)) } return ids.map((id) => domainMap[id]) diff --git a/api-js/src/domain/loaders/load-domain-connections-by-organizations-id.js b/api-js/src/domain/loaders/load-domain-connections-by-organizations-id.js index 14ea1b065..8dd961228 100644 --- a/api-js/src/domain/loaders/load-domain-connections-by-organizations-id.js +++ b/api-js/src/domain/loaders/load-domain-connections-by-organizations-id.js @@ -310,7 +310,7 @@ export const domainLoaderConnectionsByOrgId = ( console.error( `Database error occurred while user: ${userKey} was trying to gather domains in loadDomainConnectionsByOrgId, error: ${err}`, ) - throw new Error(i18n._(t`Unable to load domains. Please try again.`)) + throw new Error(i18n._(t`Unable to load domain(s). Please try again.`)) } let domainsInfo @@ -320,7 +320,7 @@ export const domainLoaderConnectionsByOrgId = ( console.error( `Cursor error occurred while user: ${userKey} was trying to gather domains in loadDomainConnectionsByOrgId, error: ${err}`, ) - throw new Error(i18n._(t`Unable to load domains. Please try again.`)) + throw new Error(i18n._(t`Unable to load domain(s). Please try again.`)) } if (domainsInfo.domains.length === 0) { diff --git a/api-js/src/domain/loaders/load-domain-connections-by-user-id.js b/api-js/src/domain/loaders/load-domain-connections-by-user-id.js index 7992ad3e7..806553593 100644 --- a/api-js/src/domain/loaders/load-domain-connections-by-user-id.js +++ b/api-js/src/domain/loaders/load-domain-connections-by-user-id.js @@ -333,7 +333,7 @@ export const domainLoaderConnectionsByUserId = ( console.error( `Database error occurred while user: ${userKey} was trying to query domains in loadDomainsByUser, error: ${err}`, ) - throw new Error(i18n._(t`Unable to query domains. Please try again.`)) + throw new Error(i18n._(t`Unable to query domain(s). Please try again.`)) } let domainsInfo @@ -343,7 +343,7 @@ export const domainLoaderConnectionsByUserId = ( console.error( `Cursor error occurred while user: ${userKey} was trying to gather domains in loadDomainsByUser, error: ${err}`, ) - throw new Error(i18n._(t`Unable to load domains. Please try again.`)) + throw new Error(i18n._(t`Unable to load domain(s). Please try again.`)) } if (domainsInfo.domains.length === 0) { diff --git a/api-js/src/domain/mutations/__tests__/create-domain.test.js b/api-js/src/domain/mutations/__tests__/create-domain.test.js index 5d2a032cc..b6fa91e8f 100644 --- a/api-js/src/domain/mutations/__tests__/create-domain.test.js +++ b/api-js/src/domain/mutations/__tests__/create-domain.test.js @@ -1125,7 +1125,9 @@ describe('create a domain', () => { ) const error = [ - new GraphQLError('Unable to create domain. Please try again.'), + new GraphQLError( + 'Unable to create domain in unknown organization.', + ), ] expect(response.errors).toEqual(error) @@ -1197,7 +1199,9 @@ describe('create a domain', () => { ) const error = [ - new GraphQLError('Unable to create domain. Please try again.'), + new GraphQLError( + 'Permission Denied: Please contact organization user for help with creating domain.', + ), ] expect(response.errors).toEqual(error) diff --git a/api-js/src/domain/mutations/__tests__/remove-domain.test.js b/api-js/src/domain/mutations/__tests__/remove-domain.test.js index e5c5fc5b7..3604a4cd9 100644 --- a/api-js/src/domain/mutations/__tests__/remove-domain.test.js +++ b/api-js/src/domain/mutations/__tests__/remove-domain.test.js @@ -1367,7 +1367,7 @@ describe('removing a domain', () => { ) const error = [ - new GraphQLError('Unable to remove domain. Please try again.'), + new GraphQLError('Unable to remove unknown domain.'), ] expect(response.errors).toEqual(error) @@ -1423,7 +1423,7 @@ describe('removing a domain', () => { ) const error = [ - new GraphQLError('Unable to remove domain. Please try again.'), + new GraphQLError('Unable to remove domain from unknown organization.'), ] expect(response.errors).toEqual(error) @@ -1520,7 +1520,7 @@ describe('removing a domain', () => { ) const error = [ - new GraphQLError('Unable to remove domain. Please try again.'), + new GraphQLError('Permission Denied: Please contact super admin for help with removing domain.'), ] expect(response.errors).toEqual(error) @@ -1579,7 +1579,7 @@ describe('removing a domain', () => { ) const error = [ - new GraphQLError('Unable to remove domain. Please try again.'), + new GraphQLError('Permission Denied: Please contact super admin for help with removing domain.'), ] expect(response.errors).toEqual(error) @@ -1631,7 +1631,7 @@ describe('removing a domain', () => { ) const error = [ - new GraphQLError('Unable to remove domain. Please try again.'), + new GraphQLError('Permission Denied: Please contact super admin for help with removing domain.'), ] expect(response.errors).toEqual(error) @@ -1729,7 +1729,7 @@ describe('removing a domain', () => { ) const error = [ - new GraphQLError('Unable to remove domain. Please try again.'), + new GraphQLError('Permission Denied: Please contact organization admin for help with removing domain.'), ] expect(response.errors).toEqual(error) @@ -1781,7 +1781,7 @@ describe('removing a domain', () => { ) const error = [ - new GraphQLError('Unable to remove domain. Please try again.'), + new GraphQLError('Permission Denied: Please contact organization admin for help with removing domain.'), ] expect(response.errors).toEqual(error) diff --git a/api-js/src/domain/mutations/__tests__/request-scan.test.js b/api-js/src/domain/mutations/__tests__/request-scan.test.js index dbbb36f57..7f255c493 100644 --- a/api-js/src/domain/mutations/__tests__/request-scan.test.js +++ b/api-js/src/domain/mutations/__tests__/request-scan.test.js @@ -500,7 +500,7 @@ describe('requesting a one time scan', () => { const error = [ new GraphQLError( - 'Unable to request a on time scan on this domain.', + 'Unable to request a on time scan on an unknown domain.', ), ] @@ -586,7 +586,7 @@ describe('requesting a one time scan', () => { const error = [ new GraphQLError( - 'Unable to request a on time scan on this domain.', + 'Permission Denied: Please contact organization user for help with scanning this domain.', ), ] @@ -645,7 +645,7 @@ describe('requesting a one time scan', () => { const error = [ new GraphQLError( - 'Unable to request a on time scan on this domain.', + 'Permission Denied: Please contact organization user for help with scanning this domain.', ), ] diff --git a/api-js/src/domain/mutations/__tests__/update-domain.test.js b/api-js/src/domain/mutations/__tests__/update-domain.test.js index 147c7de70..1cd7e26bd 100644 --- a/api-js/src/domain/mutations/__tests__/update-domain.test.js +++ b/api-js/src/domain/mutations/__tests__/update-domain.test.js @@ -807,7 +807,7 @@ describe('updating a domain', () => { ) const error = [ - new GraphQLError('Unable to update domain. Please try again.'), + new GraphQLError('Unable to update unknown domain.'), ] expect(response.errors).toEqual(error) @@ -877,7 +877,7 @@ describe('updating a domain', () => { ) const error = [ - new GraphQLError('Unable to update domain. Please try again.'), + new GraphQLError('Unable to update domain in an unknown org.'), ] expect(response.errors).toEqual(error) @@ -1011,7 +1011,7 @@ describe('updating a domain', () => { ) const error = [ - new GraphQLError('Unable to update domain. Please try again.'), + new GraphQLError('Permission Denied: Please contact organization user for help with updating this domain.'), ] expect(response.errors).toEqual(error) @@ -1083,7 +1083,7 @@ describe('updating a domain', () => { ) const error = [ - new GraphQLError('Unable to update domain. Please try again.'), + new GraphQLError('Permission Denied: Please contact organization user for help with updating this domain.'), ] expect(response.errors).toEqual(error) @@ -1183,7 +1183,7 @@ describe('updating a domain', () => { ) const error = [ - new GraphQLError('Unable to update domain. Please try again.'), + new GraphQLError('Unable to update domain that does not belong to the given organization.'), ] expect(response.errors).toEqual(error) diff --git a/api-js/src/domain/mutations/create-domain.js b/api-js/src/domain/mutations/create-domain.js index 61f8298d9..cb27920b1 100644 --- a/api-js/src/domain/mutations/create-domain.js +++ b/api-js/src/domain/mutations/create-domain.js @@ -66,7 +66,9 @@ export const createDomain = new mutationWithClientMutationId({ console.warn( `User: ${userKey} attempted to create a domain to an organization: ${orgId} that does not exist.`, ) - throw new Error(i18n._(t`Unable to create domain. Please try again.`)) + throw new Error( + i18n._(t`Unable to create domain in unknown organization.`), + ) } // Check to see if user belongs to org @@ -80,7 +82,11 @@ export const createDomain = new mutationWithClientMutationId({ console.warn( `User: ${userKey} attempted to create a domain in: ${org.slug}, however they do not have permission to do so.`, ) - throw new Error(i18n._(t`Unable to create domain. Please try again.`)) + throw new Error( + i18n._( + t`Permission Denied: Please contact organization user for help with creating domain.`, + ), + ) } const insertDomain = { diff --git a/api-js/src/domain/mutations/remove-domain.js b/api-js/src/domain/mutations/remove-domain.js index 8c0ee2a87..c4892f675 100644 --- a/api-js/src/domain/mutations/remove-domain.js +++ b/api-js/src/domain/mutations/remove-domain.js @@ -55,7 +55,7 @@ export const removeDomain = new mutationWithClientMutationId({ console.warn( `User: ${userKey} attempted to remove ${domainId} however no domain is associated with that id.`, ) - throw new Error(i18n._(t`Unable to remove domain. Please try again.`)) + throw new Error(i18n._(t`Unable to remove unknown domain.`)) } // Get Org from db @@ -66,7 +66,9 @@ export const removeDomain = new mutationWithClientMutationId({ console.warn( `User: ${userKey} attempted to remove ${domain.slug} in org: ${orgId} however there is no organization associated with that id.`, ) - throw new Error(i18n._(t`Unable to remove domain. Please try again.`)) + throw new Error( + i18n._(t`Unable to remove domain from unknown organization.`), + ) } // Get permission @@ -77,14 +79,22 @@ export const removeDomain = new mutationWithClientMutationId({ console.warn( `User: ${userKey} attempted to remove ${domain.slug} in ${org.slug} but does not have permission to remove a domain from a verified check org.`, ) - throw new Error(i18n._(t`Unable to remove domain. Please try again.`)) + throw new Error( + i18n._( + t`Permission Denied: Please contact super admin for help with removing domain.`, + ), + ) } if (permission !== 'super_admin' && permission !== 'admin') { console.warn( `User: ${userKey} attempted to remove ${domain.slug} in ${org.slug} however they do not have permission in that org.`, ) - throw new Error(i18n._(t`Unable to remove domain. Please try again.`)) + throw new Error( + i18n._( + t`Permission Denied: Please contact organization admin for help with removing domain.`, + ), + ) } // Check to see if more than one organization has a claim to this domain diff --git a/api-js/src/domain/mutations/request-scan.js b/api-js/src/domain/mutations/request-scan.js index e948a7ab7..6ad1fa70f 100644 --- a/api-js/src/domain/mutations/request-scan.js +++ b/api-js/src/domain/mutations/request-scan.js @@ -58,7 +58,7 @@ export const requestScan = new mutationWithClientMutationId({ `User: ${userKey} attempted to step a one time scan on: ${requestedDomain} however domain cannot be found.`, ) throw new Error( - i18n._(t`Unable to request a on time scan on this domain.`), + i18n._(t`Unable to request a on time scan on an unknown domain.`), ) } @@ -70,7 +70,9 @@ export const requestScan = new mutationWithClientMutationId({ `User: ${userKey} attempted to step a one time scan on: ${domain.domain} however they do not have permission to do so.`, ) throw new Error( - i18n._(t`Unable to request a on time scan on this domain.`), + i18n._( + t`Permission Denied: Please contact organization user for help with scanning this domain.`, + ), ) } diff --git a/api-js/src/domain/mutations/update-domain.js b/api-js/src/domain/mutations/update-domain.js index 65d1f1282..8ebf77899 100644 --- a/api-js/src/domain/mutations/update-domain.js +++ b/api-js/src/domain/mutations/update-domain.js @@ -71,7 +71,7 @@ export const updateDomain = new mutationWithClientMutationId({ console.warn( `User: ${userKey} attempted to update domain: ${domainId}, however there is no domain associated with that id.`, ) - throw new Error(i18n._(t`Unable to update domain. Please try again.`)) + throw new Error(i18n._(t`Unable to update unknown domain.`)) } // Check to see if org exists @@ -81,7 +81,7 @@ export const updateDomain = new mutationWithClientMutationId({ console.warn( `User: ${userKey} attempted to update domain: ${domainId} for org: ${orgId}, however there is no org associated with that id.`, ) - throw new Error(i18n._(t`Unable to update domain. Please try again.`)) + throw new Error(i18n._(t`Unable to update domain in an unknown org.`)) } // Check permission @@ -95,7 +95,11 @@ export const updateDomain = new mutationWithClientMutationId({ console.warn( `User: ${userKey} attempted to update domain: ${domainId} for org: ${orgId}, however they do not have permission in that org.`, ) - throw new Error(i18n._(t`Unable to update domain. Please try again.`)) + throw new Error( + i18n._( + t`Permission Denied: Please contact organization user for help with updating this domain.`, + ), + ) } // Check to see if org has a claim to this domain @@ -117,7 +121,11 @@ export const updateDomain = new mutationWithClientMutationId({ console.warn( `User: ${userKey} attempted to update domain: ${domainId} for org: ${orgId}, however that org has no claims to that domain.`, ) - throw new Error(i18n._(t`Unable to update domain. Please try again.`)) + throw new Error( + i18n._( + t`Unable to update domain that does not belong to the given organization.`, + ), + ) } // Generate list of collections names diff --git a/api-js/src/domain/objects/__tests__/domain.test.js b/api-js/src/domain/objects/__tests__/domain.test.js index 13ba2f6fb..9eecacf08 100644 --- a/api-js/src/domain/objects/__tests__/domain.test.js +++ b/api-js/src/domain/objects/__tests__/domain.test.js @@ -508,7 +508,7 @@ describe('given the domain object', () => { ), ).rejects.toEqual( new Error( - 'Unable to retrieve dmarc report information for: test1.gc.ca', + 'Unable to retrieve DMARC report information for: test1.gc.ca', ), ) @@ -606,7 +606,7 @@ describe('given the domain object', () => { ), ).rejects.toEqual( new Error( - 'Unable to retrieve dmarc report information for: test1.gc.ca', + 'Unable to retrieve DMARC report information for: test1.gc.ca', ), ) expect(consoleOutput).toEqual([ diff --git a/api-js/src/domain/objects/domain.js b/api-js/src/domain/objects/domain.js index 2e07be590..934e6464c 100644 --- a/api-js/src/domain/objects/domain.js +++ b/api-js/src/domain/objects/domain.js @@ -123,7 +123,7 @@ export const domainType = new GraphQLObjectType({ `User: ${userKey} attempted to access dmarc report period data for ${_key}, but does not belong to an org with ownership.`, ) throw new Error( - `Unable to retrieve dmarc report information for: ${domain}`, + `Unable to retrieve DMARC report information for: ${domain}`, ) } @@ -163,7 +163,7 @@ export const domainType = new GraphQLObjectType({ `User: ${userKey} attempted to access dmarc report period data for ${_key}, but does not belong to an org with ownership.`, ) throw new Error( - `Unable to retrieve dmarc report information for: ${domain}`, + `Unable to retrieve DMARC report information for: ${domain}`, ) } diff --git a/api-js/src/domain/queries/__tests__/find-domain-by-domain.test.js b/api-js/src/domain/queries/__tests__/find-domain-by-domain.test.js index 482ac6591..cb8621c1e 100644 --- a/api-js/src/domain/queries/__tests__/find-domain-by-domain.test.js +++ b/api-js/src/domain/queries/__tests__/find-domain-by-domain.test.js @@ -95,7 +95,7 @@ describe('given findDomainByDomain query', () => { afterAll(async () => { await drop() }) - + describe('given successful domain retrieval', () => { beforeEach(async () => { await collections.affiliations.save({ @@ -238,9 +238,7 @@ describe('given findDomainByDomain query', () => { ) const error = [ - new GraphQLError( - `No domain with the provided domain could be found.`, - ), + new GraphQLError(`Unable to find the requested domain.`), ] expect(response.errors).toEqual(error) @@ -331,7 +329,9 @@ describe('given findDomainByDomain query', () => { ) const error = [ - new GraphQLError(`Could not retrieve specified domain.`), + new GraphQLError( + `Permission Denied: Please contact organization user for help with retrieving this domain.`, + ), ] expect(response.errors).toEqual(error) diff --git a/api-js/src/domain/queries/find-domain-by-domain.js b/api-js/src/domain/queries/find-domain-by-domain.js index 0949881a5..cc9cb5701 100644 --- a/api-js/src/domain/queries/find-domain-by-domain.js +++ b/api-js/src/domain/queries/find-domain-by-domain.js @@ -34,9 +34,7 @@ export const findDomainByDomain = { if (typeof domain === 'undefined') { console.warn(`User ${user._key} could not retrieve domain.`) - throw new Error( - i18n._(t`No domain with the provided domain could be found.`), - ) + throw new Error(i18n._(t`Unable to find the requested domain.`)) } // Check user permission for domain access @@ -44,7 +42,11 @@ export const findDomainByDomain = { if (!permitted) { console.warn(`User ${user._key} could not retrieve domain.`) - throw new Error(i18n._(t`Could not retrieve specified domain.`)) + throw new Error( + i18n._( + t`Permission Denied: Please contact organization user for help with retrieving this domain.`, + ), + ) } console.info( diff --git a/api-js/src/locale/en/messages.js b/api-js/src/locale/en/messages.js index cda716c60..8f36b1c38 100644 --- a/api-js/src/locale/en/messages.js +++ b/api-js/src/locale/en/messages.js @@ -8,8 +8,6 @@ 'Authentication error. Please sign in.', 'Cannot query affiliations on organization without admin permission or higher.': 'Cannot query affiliations on organization without admin permission or higher.', - 'Could not retrieve specified domain.': - 'Could not retrieve specified domain.', 'Could not retrieve specified organization.': 'Could not retrieve specified organization.', 'Error when retrieving dmarc report information. Please try again.': @@ -24,8 +22,6 @@ 'Invalid token, please request a new one.', 'New passwords do not match. Please try again.': 'New passwords do not match. Please try again.', - 'No domain with the provided domain could be found.': - 'No domain with the provided domain could be found.', 'No organization with the provided slug could be found.': 'No organization with the provided slug could be found.', 'No verified domain with the provided domain could be found.': @@ -74,6 +70,8 @@ 'Password was successfully reset.': 'Password was successfully reset.', 'Password was successfully updated.': 'Password was successfully updated.', 'Passwords do not match.': 'Passwords do not match.', + 'Permission Denied: Please contact organization admin for help with removing domain.': + 'Permission Denied: Please contact organization admin for help with removing domain.', 'Permission Denied: Please contact organization admin for help with removing users.': 'Permission Denied: Please contact organization admin for help with removing users.', 'Permission Denied: Please contact organization admin for help with updating users roles.': @@ -82,6 +80,16 @@ 'Permission Denied: Please contact organization admin for help with user invitations.', 'Permission Denied: Please contact organization admin for help with user role changes.': 'Permission Denied: Please contact organization admin for help with user role changes.', + 'Permission Denied: Please contact organization user for help with creating domain.': + 'Permission Denied: Please contact organization user for help with creating domain.', + 'Permission Denied: Please contact organization user for help with retrieving this domain.': + 'Permission Denied: Please contact organization user for help with retrieving this domain.', + 'Permission Denied: Please contact organization user for help with scanning this domain.': + 'Permission Denied: Please contact organization user for help with scanning this domain.', + 'Permission Denied: Please contact organization user for help with updating this domain.': + 'Permission Denied: Please contact organization user for help with updating this domain.', + 'Permission Denied: Please contact super admin for help with removing domain.': + 'Permission Denied: Please contact super admin for help with removing domain.', 'Permission check error. Unable to request domain information.': 'Permission check error. Unable to request domain information.', 'Permission error, not an admin for this user.': @@ -247,6 +255,8 @@ 'Unable to authenticate. Please try again.', 'Unable to check permission. Please try again.': 'Unable to check permission. Please try again.', + 'Unable to create domain in unknown organization.': + 'Unable to create domain in unknown organization.', 'Unable to create domain. Please try again.': 'Unable to create domain. Please try again.', 'Unable to create organization. Please try again.': @@ -265,8 +275,6 @@ 'Unable to find dmarc guidance tags. Please try again.', 'Unable to find dmarc scan. Please try again.': 'Unable to find dmarc scan. Please try again.', - 'Unable to find domain. Please try again.': - 'Unable to find domain. Please try again.', 'Unable to find https guidance tags. Please try again.': 'Unable to find https guidance tags. Please try again.', 'Unable to find https scan. Please try again.': @@ -283,6 +291,8 @@ 'Unable to find ssl scan. Please try again.', 'Unable to find summary. Please try again.': 'Unable to find summary. Please try again.', + 'Unable to find the requested domain.': + 'Unable to find the requested domain.', 'Unable to find user affiliation(s). Please try again.': 'Unable to find user affiliation(s). Please try again.', 'Unable to find user. Please try again.': @@ -317,6 +327,10 @@ 'Unable to load dmarc guidance tags. Please try again.', 'Unable to load dmarc scans. Please try again.': 'Unable to load dmarc scans. Please try again.', + 'Unable to load domain(s). Please try again.': + 'Unable to load domain(s). Please try again.', + 'Unable to load domain. Please try again.': + 'Unable to load domain. Please try again.', 'Unable to load domains. Please try again.': 'Unable to load domains. Please try again.', 'Unable to load full pass data. Please try again.': @@ -345,16 +359,19 @@ 'Unable to load web summary. Please try again.', 'Unable to query affiliation(s). Please try again.': 'Unable to query affiliation(s). Please try again.', - 'Unable to query domains. Please try again.': - 'Unable to query domains. Please try again.', + 'Unable to query domain(s). Please try again.': + 'Unable to query domain(s). Please try again.', 'Unable to query organizations. Please try again.': 'Unable to query organizations. Please try again.', 'Unable to remove a user that already does not belong to this organization.': 'Unable to remove a user that already does not belong to this organization.', + 'Unable to remove domain from unknown organization.': + 'Unable to remove domain from unknown organization.', 'Unable to remove domain. Please try again.': 'Unable to remove domain. Please try again.', 'Unable to remove organization. Please try again.': 'Unable to remove organization. Please try again.', + 'Unable to remove unknown domain.': 'Unable to remove unknown domain.', 'Unable to remove unknown user from organization.': 'Unable to remove unknown user from organization.', 'Unable to remove user from organization.': @@ -365,8 +382,8 @@ 'Unable to remove user from this organization. Please try again.', 'Unable to remove user from unknown organization.': 'Unable to remove user from unknown organization.', - 'Unable to request a on time scan on this domain.': - 'Unable to request a on time scan on this domain.', + 'Unable to request a on time scan on an unknown domain.': + 'Unable to request a on time scan on an unknown domain.', 'Unable to reset password. Please try again.': 'Unable to reset password. Please try again.', 'Unable to select dmarc reports for this period and year.': @@ -391,6 +408,10 @@ 'Unable to sign up. Please try again.', 'Unable to two factor authenticate. Please try again.': 'Unable to two factor authenticate. Please try again.', + 'Unable to update domain in an unknown org.': + 'Unable to update domain in an unknown org.', + 'Unable to update domain that does not belong to the given organization.': + 'Unable to update domain that does not belong to the given organization.', 'Unable to update domain. Please try again.': 'Unable to update domain. Please try again.', 'Unable to update organization. Please try again.': @@ -407,6 +428,7 @@ 'Unable to update password. Please try again.', 'Unable to update profile. Please try again.': 'Unable to update profile. Please try again.', + 'Unable to update unknown domain.': 'Unable to update unknown domain.', 'Unable to update unknown users role.': 'Unable to update unknown users role.', 'Unable to update users role that does not belong to this org. Please invite user to the organization.': diff --git a/api-js/src/locale/en/messages.po b/api-js/src/locale/en/messages.po index c9447f53d..c79ea65ad 100644 --- a/api-js/src/locale/en/messages.po +++ b/api-js/src/locale/en/messages.po @@ -33,10 +33,6 @@ msgstr "Authentication error. Please sign in." msgid "Cannot query affiliations on organization without admin permission or higher." msgstr "Cannot query affiliations on organization without admin permission or higher." -#: src/domain/queries/find-domain-by-domain.js:47 -msgid "Could not retrieve specified domain." -msgstr "Could not retrieve specified domain." - #: src/organization/queries/find-organization-by-slug.js:49 msgid "Could not retrieve specified organization." msgstr "Could not retrieve specified organization." @@ -68,10 +64,6 @@ msgstr "Invalid token, please request a new one." msgid "New passwords do not match. Please try again." msgstr "New passwords do not match. Please try again." -#: src/domain/queries/find-domain-by-domain.js:38 -msgid "No domain with the provided domain could be found." -msgstr "No domain with the provided domain could be found." - #: src/organization/queries/find-organization-by-slug.js:40 #: src/verified-organizations/queries/find-verified-organization-by-slug.js:34 msgid "No organization with the provided slug could be found." @@ -188,6 +180,10 @@ msgstr "Password was successfully updated." msgid "Passwords do not match." msgstr "Passwords do not match." +#: src/domain/mutations/remove-domain.js:95 +msgid "Permission Denied: Please contact organization admin for help with removing domain." +msgstr "Permission Denied: Please contact organization admin for help with removing domain." + #: src/affiliation/mutations/remove-user-from-org.js:174 msgid "Permission Denied: Please contact organization admin for help with removing users." msgstr "Permission Denied: Please contact organization admin for help with removing users." @@ -206,6 +202,26 @@ msgstr "Permission Denied: Please contact organization admin for help with user msgid "Permission Denied: Please contact organization admin for help with user role changes." msgstr "Permission Denied: Please contact organization admin for help with user role changes." +#: src/domain/mutations/create-domain.js:87 +msgid "Permission Denied: Please contact organization user for help with creating domain." +msgstr "Permission Denied: Please contact organization user for help with creating domain." + +#: src/domain/queries/find-domain-by-domain.js:47 +msgid "Permission Denied: Please contact organization user for help with retrieving this domain." +msgstr "Permission Denied: Please contact organization user for help with retrieving this domain." + +#: src/domain/mutations/request-scan.js:74 +msgid "Permission Denied: Please contact organization user for help with scanning this domain." +msgstr "Permission Denied: Please contact organization user for help with scanning this domain." + +#: src/domain/mutations/update-domain.js:100 +msgid "Permission Denied: Please contact organization user for help with updating this domain." +msgstr "Permission Denied: Please contact organization user for help with updating this domain." + +#: src/domain/mutations/remove-domain.js:84 +msgid "Permission Denied: Please contact super admin for help with removing domain." +msgstr "Permission Denied: Please contact super admin for help with removing domain." + #: src/auth/check-domain-permission.js:22 #: src/auth/check-domain-permission.js:43 #: src/auth/check-domain-permission.js:54 @@ -304,7 +320,7 @@ msgstr "Requesting {amount} records on the `spf` connection exceeds the `{argSet msgid "Requesting {amount} records on the `ssl` connection exceeds the `{argSet}` limit of 100 records." msgstr "Requesting {amount} records on the `ssl` connection exceeds the `{argSet}` limit of 100 records." -#: src/domain/mutations/request-scan.js:132 +#: src/domain/mutations/request-scan.js:134 msgid "Successfully dispatched one time scan." msgstr "Successfully dispatched one time scan." @@ -316,7 +332,7 @@ msgstr "Successfully email verified account, and set TFA send method to email." msgid "Successfully invited user to organization, and sent notification email." msgstr "Successfully invited user to organization, and sent notification email." -#: src/domain/mutations/remove-domain.js:228 +#: src/domain/mutations/remove-domain.js:238 msgid "Successfully removed domain: {0} from {1}." msgstr "Successfully removed domain: {0} from {1}." @@ -368,11 +384,13 @@ msgstr "Unable to authenticate. Please try again." msgid "Unable to check permission. Please try again." msgstr "Unable to check permission. Please try again." -#: src/domain/mutations/create-domain.js:69 -#: src/domain/mutations/create-domain.js:83 -#: src/domain/mutations/create-domain.js:115 -#: src/domain/mutations/create-domain.js:124 -#: src/domain/mutations/create-domain.js:175 +#: src/domain/mutations/create-domain.js:70 +msgid "Unable to create domain in unknown organization." +msgstr "Unable to create domain in unknown organization." + +#: src/domain/mutations/create-domain.js:121 +#: src/domain/mutations/create-domain.js:130 +#: src/domain/mutations/create-domain.js:181 msgid "Unable to create domain. Please try again." msgstr "Unable to create domain. Please try again." @@ -383,9 +401,9 @@ msgstr "Unable to create domain. Please try again." msgid "Unable to create organization. Please try again." msgstr "Unable to create organization. Please try again." -#: src/domain/mutations/request-scan.js:95 -#: src/domain/mutations/request-scan.js:109 -#: src/domain/mutations/request-scan.js:123 +#: src/domain/mutations/request-scan.js:97 +#: src/domain/mutations/request-scan.js:111 +#: src/domain/mutations/request-scan.js:125 msgid "Unable to dispatch one time scan. Please try again." msgstr "Unable to dispatch one time scan. Please try again." @@ -419,13 +437,6 @@ msgstr "Unable to find dmarc guidance tags. Please try again." msgid "Unable to find dmarc scan. Please try again." msgstr "Unable to find dmarc scan. Please try again." -#: src/domain/loaders/load-domain-by-domain.js:18 -#: src/domain/loaders/load-domain-by-domain.js:30 -#: src/domain/loaders/load-domain-by-key.js:18 -#: src/domain/loaders/load-domain-by-key.js:30 -msgid "Unable to find domain. Please try again." -msgstr "Unable to find domain. Please try again." - #: src/guidance-tag/loaders/load-https-guidance-tags.js:18 #: src/guidance-tag/loaders/load-https-guidance-tags.js:32 msgid "Unable to find https guidance tags. Please try again." @@ -468,6 +479,10 @@ msgstr "Unable to find ssl scan. Please try again." msgid "Unable to find summary. Please try again." msgstr "Unable to find summary. Please try again." +#: src/domain/queries/find-domain-by-domain.js:37 +msgid "Unable to find the requested domain." +msgstr "Unable to find the requested domain." + #: src/affiliation/loaders/load-affiliation-by-key.js:21 #: src/affiliation/loaders/load-affiliation-by-key.js:35 msgid "Unable to find user affiliation(s). Please try again." @@ -566,6 +581,16 @@ msgstr "Unable to load dmarc scans. Please try again." #: src/domain/loaders/load-domain-connections-by-organizations-id.js:313 #: src/domain/loaders/load-domain-connections-by-organizations-id.js:323 #: src/domain/loaders/load-domain-connections-by-user-id.js:346 +msgid "Unable to load domain(s). Please try again." +msgstr "Unable to load domain(s). Please try again." + +#: src/domain/loaders/load-domain-by-domain.js:18 +#: src/domain/loaders/load-domain-by-domain.js:30 +#: src/domain/loaders/load-domain-by-key.js:18 +#: src/domain/loaders/load-domain-by-key.js:30 +msgid "Unable to load domain. Please try again." +msgstr "Unable to load domain. Please try again." + #: src/domain/queries/find-my-domains.js:48 #: src/verified-domains/loaders/load-verified-domain-connections.js:302 #: src/verified-domains/loaders/load-verified-domain-connections.js:312 @@ -641,8 +666,8 @@ msgid "Unable to query affiliation(s). Please try again." msgstr "Unable to query affiliation(s). Please try again." #: src/domain/loaders/load-domain-connections-by-user-id.js:336 -msgid "Unable to query domains. Please try again." -msgstr "Unable to query domains. Please try again." +msgid "Unable to query domain(s). Please try again." +msgstr "Unable to query domain(s). Please try again." #: src/organization/loaders/load-organization-connections-by-user-id.js:428 msgid "Unable to query organizations. Please try again." @@ -652,15 +677,15 @@ msgstr "Unable to query organizations. Please try again." msgid "Unable to remove a user that already does not belong to this organization." msgstr "Unable to remove a user that already does not belong to this organization." -#: src/domain/mutations/remove-domain.js:58 -#: src/domain/mutations/remove-domain.js:69 -#: src/domain/mutations/remove-domain.js:80 -#: src/domain/mutations/remove-domain.js:87 -#: src/domain/mutations/remove-domain.js:100 -#: src/domain/mutations/remove-domain.js:171 -#: src/domain/mutations/remove-domain.js:188 -#: src/domain/mutations/remove-domain.js:209 -#: src/domain/mutations/remove-domain.js:220 +#: src/domain/mutations/remove-domain.js:70 +msgid "Unable to remove domain from unknown organization." +msgstr "Unable to remove domain from unknown organization." + +#: src/domain/mutations/remove-domain.js:110 +#: src/domain/mutations/remove-domain.js:181 +#: src/domain/mutations/remove-domain.js:198 +#: src/domain/mutations/remove-domain.js:219 +#: src/domain/mutations/remove-domain.js:230 msgid "Unable to remove domain. Please try again." msgstr "Unable to remove domain. Please try again." @@ -673,6 +698,10 @@ msgstr "Unable to remove domain. Please try again." msgid "Unable to remove organization. Please try again." msgstr "Unable to remove organization. Please try again." +#: src/domain/mutations/remove-domain.js:58 +msgid "Unable to remove unknown domain." +msgstr "Unable to remove unknown domain." + #: src/affiliation/mutations/remove-user-from-org.js:73 msgid "Unable to remove unknown user from organization." msgstr "Unable to remove unknown user from organization." @@ -695,9 +724,8 @@ msgid "Unable to remove user from unknown organization." msgstr "Unable to remove user from unknown organization." #: src/domain/mutations/request-scan.js:61 -#: src/domain/mutations/request-scan.js:73 -msgid "Unable to request a on time scan on this domain." -msgstr "Unable to request a on time scan on this domain." +msgid "Unable to request a on time scan on an unknown domain." +msgstr "Unable to request a on time scan on an unknown domain." #: src/user/mutations/reset-password.js:63 #: src/user/mutations/reset-password.js:77 @@ -748,13 +776,17 @@ msgstr "Unable to sign up. Please try again." msgid "Unable to two factor authenticate. Please try again." msgstr "Unable to two factor authenticate. Please try again." -#: src/domain/mutations/update-domain.js:74 #: src/domain/mutations/update-domain.js:84 -#: src/domain/mutations/update-domain.js:98 -#: src/domain/mutations/update-domain.js:113 -#: src/domain/mutations/update-domain.js:120 -#: src/domain/mutations/update-domain.js:153 -#: src/domain/mutations/update-domain.js:163 +msgid "Unable to update domain in an unknown org." +msgstr "Unable to update domain in an unknown org." + +#: src/domain/mutations/update-domain.js:126 +msgid "Unable to update domain that does not belong to the given organization." +msgstr "Unable to update domain that does not belong to the given organization." + +#: src/domain/mutations/update-domain.js:117 +#: src/domain/mutations/update-domain.js:161 +#: src/domain/mutations/update-domain.js:171 msgid "Unable to update domain. Please try again." msgstr "Unable to update domain. Please try again." @@ -794,6 +826,10 @@ msgstr "Unable to update password. Please try again." msgid "Unable to update profile. Please try again." msgstr "Unable to update profile. Please try again." +#: src/domain/mutations/update-domain.js:74 +msgid "Unable to update unknown domain." +msgstr "Unable to update unknown domain." + #: src/affiliation/mutations/update-user-role.js:73 msgid "Unable to update unknown users role." msgstr "Unable to update unknown users role." diff --git a/api-js/src/locale/fr/messages.js b/api-js/src/locale/fr/messages.js index 2bef974ba..aa3c04d18 100644 --- a/api-js/src/locale/fr/messages.js +++ b/api-js/src/locale/fr/messages.js @@ -5,7 +5,6 @@ 'Authentication error. Please sign in.': 'todo', 'Cannot query affiliations on organization without admin permission or higher.': 'todo', - 'Could not retrieve specified domain.': 'todo', 'Could not retrieve specified organization.': 'todo', 'Error when retrieving dmarc report information. Please try again.': 'todo', 'If an account with this username is found, a password reset link will be found in your inbox.': @@ -15,7 +14,6 @@ 'Incorrect username or password. Please try again.': 'todo', 'Invalid token, please request a new one.': 'todo', 'New passwords do not match. Please try again.': 'todo', - 'No domain with the provided domain could be found.': 'todo', 'No organization with the provided slug could be found.': 'todo', 'No verified domain with the provided domain could be found.': 'todo', 'Organization has already been verified.': 'todo', @@ -60,6 +58,8 @@ 'Password was successfully reset.': 'todo', 'Password was successfully updated.': 'todo', 'Passwords do not match.': 'todo', + 'Permission Denied: Please contact organization admin for help with removing domain.': + 'todo', 'Permission Denied: Please contact organization admin for help with removing users.': 'todo', 'Permission Denied: Please contact organization admin for help with updating users roles.': @@ -68,6 +68,16 @@ 'todo', 'Permission Denied: Please contact organization admin for help with user role changes.': 'todo', + 'Permission Denied: Please contact organization user for help with creating domain.': + 'todo', + 'Permission Denied: Please contact organization user for help with retrieving this domain.': + 'todo', + 'Permission Denied: Please contact organization user for help with scanning this domain.': + 'todo', + 'Permission Denied: Please contact organization user for help with updating this domain.': + 'todo', + 'Permission Denied: Please contact super admin for help with removing domain.': + 'todo', 'Permission check error. Unable to request domain information.': 'todo', 'Permission error, not an admin for this user.': 'todo', 'Phone number has been successfully set, you will receive a verification text message shortly.': @@ -125,6 +135,7 @@ 'Two factor code length is incorrect. Please try again.': 'todo', 'Unable to authenticate. Please try again.': 'todo', 'Unable to check permission. Please try again.': 'todo', + 'Unable to create domain in unknown organization.': 'todo', 'Unable to create domain. Please try again.': 'todo', 'Unable to create organization. Please try again.': 'todo', 'Unable to dispatch one time scan. Please try again.': 'todo', @@ -134,7 +145,6 @@ 'Unable to find dkim scan. Please try again.': 'todo', 'Unable to find dmarc guidance tags. Please try again.': 'todo', 'Unable to find dmarc scan. Please try again.': 'todo', - 'Unable to find domain. Please try again.': 'todo', 'Unable to find https guidance tags. Please try again.': 'todo', 'Unable to find https scan. Please try again.': 'todo', 'Unable to find organization. Please try again.': 'todo', @@ -143,6 +153,7 @@ 'Unable to find ssl guidance tags. Please try again.': 'todo', 'Unable to find ssl scan. Please try again.': 'todo', 'Unable to find summary. Please try again.': 'todo', + 'Unable to find the requested domain.': 'todo', 'Unable to find user affiliation(s). Please try again.': 'todo', 'Unable to find user. Please try again.': 'todo', 'Unable to find verified domain. Please try again.': 'todo', @@ -160,6 +171,8 @@ 'Unable to load dkim scans. Please try again.': 'todo', 'Unable to load dmarc guidance tags. Please try again.': 'todo', 'Unable to load dmarc scans. Please try again.': 'todo', + 'Unable to load domain(s). Please try again.': 'todo', + 'Unable to load domain. Please try again.': 'todo', 'Unable to load domains. Please try again.': 'todo', 'Unable to load full pass data. Please try again.': 'todo', 'Unable to load https guidance tags. Please try again.': 'todo', @@ -174,18 +187,20 @@ 'Unable to load verified organizations. Please try again.': 'todo', 'Unable to load web summary. Please try again.': 'todo', 'Unable to query affiliation(s). Please try again.': 'todo', - 'Unable to query domains. Please try again.': 'todo', + 'Unable to query domain(s). Please try again.': 'todo', 'Unable to query organizations. Please try again.': 'todo', 'Unable to remove a user that already does not belong to this organization.': 'todo', + 'Unable to remove domain from unknown organization.': 'todo', 'Unable to remove domain. Please try again.': 'todo', 'Unable to remove organization. Please try again.': 'todo', + 'Unable to remove unknown domain.': 'todo', 'Unable to remove unknown user from organization.': 'todo', 'Unable to remove user from organization.': 'todo', 'Unable to remove user from organization. Please try again.': 'todo', 'Unable to remove user from this organization. Please try again.': 'todo', 'Unable to remove user from unknown organization.': 'todo', - 'Unable to request a on time scan on this domain.': 'todo', + 'Unable to request a on time scan on an unknown domain.': 'todo', 'Unable to reset password. Please try again.': 'todo', 'Unable to select dmarc reports for this period and year.': 'todo', 'Unable to select DMARC report(s) for this period and year.': 'todo', @@ -199,6 +214,9 @@ 'Unable to sign in, please try again.': 'todo', 'Unable to sign up. Please try again.': 'todo', 'Unable to two factor authenticate. Please try again.': 'todo', + 'Unable to update domain in an unknown org.': 'todo', + 'Unable to update domain that does not belong to the given organization.': + 'todo', 'Unable to update domain. Please try again.': 'todo', 'Unable to update organization. Please try again.': 'todo', 'Unable to update password, authentication error occurred, please sign in again.': @@ -211,6 +229,7 @@ 'todo', 'Unable to update password. Please try again.': 'todo', 'Unable to update profile. Please try again.': 'todo', + 'Unable to update unknown domain.': 'todo', 'Unable to update unknown users role.': 'todo', 'Unable to update users role that does not belong to this org. Please invite user to the organization.': 'todo', diff --git a/api-js/src/locale/fr/messages.po b/api-js/src/locale/fr/messages.po index 18a1d5547..2fb17ce3a 100644 --- a/api-js/src/locale/fr/messages.po +++ b/api-js/src/locale/fr/messages.po @@ -33,10 +33,6 @@ msgstr "todo" msgid "Cannot query affiliations on organization without admin permission or higher." msgstr "todo" -#: src/domain/queries/find-domain-by-domain.js:47 -msgid "Could not retrieve specified domain." -msgstr "todo" - #: src/organization/queries/find-organization-by-slug.js:49 msgid "Could not retrieve specified organization." msgstr "todo" @@ -68,10 +64,6 @@ msgstr "todo" msgid "New passwords do not match. Please try again." msgstr "todo" -#: src/domain/queries/find-domain-by-domain.js:38 -msgid "No domain with the provided domain could be found." -msgstr "todo" - #: src/organization/queries/find-organization-by-slug.js:40 #: src/verified-organizations/queries/find-verified-organization-by-slug.js:34 msgid "No organization with the provided slug could be found." @@ -188,6 +180,10 @@ msgstr "todo" msgid "Passwords do not match." msgstr "todo" +#: src/domain/mutations/remove-domain.js:95 +msgid "Permission Denied: Please contact organization admin for help with removing domain." +msgstr "todo" + #: src/affiliation/mutations/remove-user-from-org.js:174 msgid "Permission Denied: Please contact organization admin for help with removing users." msgstr "todo" @@ -206,6 +202,26 @@ msgstr "todo" msgid "Permission Denied: Please contact organization admin for help with user role changes." msgstr "todo" +#: src/domain/mutations/create-domain.js:87 +msgid "Permission Denied: Please contact organization user for help with creating domain." +msgstr "todo" + +#: src/domain/queries/find-domain-by-domain.js:47 +msgid "Permission Denied: Please contact organization user for help with retrieving this domain." +msgstr "todo" + +#: src/domain/mutations/request-scan.js:74 +msgid "Permission Denied: Please contact organization user for help with scanning this domain." +msgstr "todo" + +#: src/domain/mutations/update-domain.js:100 +msgid "Permission Denied: Please contact organization user for help with updating this domain." +msgstr "todo" + +#: src/domain/mutations/remove-domain.js:84 +msgid "Permission Denied: Please contact super admin for help with removing domain." +msgstr "todo" + #: src/auth/check-domain-permission.js:22 #: src/auth/check-domain-permission.js:43 #: src/auth/check-domain-permission.js:54 @@ -304,7 +320,7 @@ msgstr "todo" msgid "Requesting {amount} records on the `ssl` connection exceeds the `{argSet}` limit of 100 records." msgstr "todo" -#: src/domain/mutations/request-scan.js:132 +#: src/domain/mutations/request-scan.js:134 msgid "Successfully dispatched one time scan." msgstr "todo" @@ -316,7 +332,7 @@ msgstr "todo" msgid "Successfully invited user to organization, and sent notification email." msgstr "todo" -#: src/domain/mutations/remove-domain.js:228 +#: src/domain/mutations/remove-domain.js:238 msgid "Successfully removed domain: {0} from {1}." msgstr "todo" @@ -368,11 +384,13 @@ msgstr "todo" msgid "Unable to check permission. Please try again." msgstr "todo" -#: src/domain/mutations/create-domain.js:69 -#: src/domain/mutations/create-domain.js:83 -#: src/domain/mutations/create-domain.js:115 -#: src/domain/mutations/create-domain.js:124 -#: src/domain/mutations/create-domain.js:175 +#: src/domain/mutations/create-domain.js:70 +msgid "Unable to create domain in unknown organization." +msgstr "todo" + +#: src/domain/mutations/create-domain.js:121 +#: src/domain/mutations/create-domain.js:130 +#: src/domain/mutations/create-domain.js:181 msgid "Unable to create domain. Please try again." msgstr "todo" @@ -383,9 +401,9 @@ msgstr "todo" msgid "Unable to create organization. Please try again." msgstr "todo" -#: src/domain/mutations/request-scan.js:95 -#: src/domain/mutations/request-scan.js:109 -#: src/domain/mutations/request-scan.js:123 +#: src/domain/mutations/request-scan.js:97 +#: src/domain/mutations/request-scan.js:111 +#: src/domain/mutations/request-scan.js:125 msgid "Unable to dispatch one time scan. Please try again." msgstr "todo" @@ -419,13 +437,6 @@ msgstr "todo" msgid "Unable to find dmarc scan. Please try again." msgstr "todo" -#: src/domain/loaders/load-domain-by-domain.js:18 -#: src/domain/loaders/load-domain-by-domain.js:30 -#: src/domain/loaders/load-domain-by-key.js:18 -#: src/domain/loaders/load-domain-by-key.js:30 -msgid "Unable to find domain. Please try again." -msgstr "todo" - #: src/guidance-tag/loaders/load-https-guidance-tags.js:18 #: src/guidance-tag/loaders/load-https-guidance-tags.js:32 msgid "Unable to find https guidance tags. Please try again." @@ -468,6 +479,10 @@ msgstr "todo" msgid "Unable to find summary. Please try again." msgstr "todo" +#: src/domain/queries/find-domain-by-domain.js:37 +msgid "Unable to find the requested domain." +msgstr "todo" + #: src/affiliation/loaders/load-affiliation-by-key.js:21 #: src/affiliation/loaders/load-affiliation-by-key.js:35 msgid "Unable to find user affiliation(s). Please try again." @@ -566,6 +581,16 @@ msgstr "todo" #: src/domain/loaders/load-domain-connections-by-organizations-id.js:313 #: src/domain/loaders/load-domain-connections-by-organizations-id.js:323 #: src/domain/loaders/load-domain-connections-by-user-id.js:346 +msgid "Unable to load domain(s). Please try again." +msgstr "todo" + +#: src/domain/loaders/load-domain-by-domain.js:18 +#: src/domain/loaders/load-domain-by-domain.js:30 +#: src/domain/loaders/load-domain-by-key.js:18 +#: src/domain/loaders/load-domain-by-key.js:30 +msgid "Unable to load domain. Please try again." +msgstr "todo" + #: src/domain/queries/find-my-domains.js:48 #: src/verified-domains/loaders/load-verified-domain-connections.js:302 #: src/verified-domains/loaders/load-verified-domain-connections.js:312 @@ -641,7 +666,7 @@ msgid "Unable to query affiliation(s). Please try again." msgstr "todo" #: src/domain/loaders/load-domain-connections-by-user-id.js:336 -msgid "Unable to query domains. Please try again." +msgid "Unable to query domain(s). Please try again." msgstr "todo" #: src/organization/loaders/load-organization-connections-by-user-id.js:428 @@ -652,15 +677,15 @@ msgstr "todo" msgid "Unable to remove a user that already does not belong to this organization." msgstr "todo" -#: src/domain/mutations/remove-domain.js:58 -#: src/domain/mutations/remove-domain.js:69 -#: src/domain/mutations/remove-domain.js:80 -#: src/domain/mutations/remove-domain.js:87 -#: src/domain/mutations/remove-domain.js:100 -#: src/domain/mutations/remove-domain.js:171 -#: src/domain/mutations/remove-domain.js:188 -#: src/domain/mutations/remove-domain.js:209 -#: src/domain/mutations/remove-domain.js:220 +#: src/domain/mutations/remove-domain.js:70 +msgid "Unable to remove domain from unknown organization." +msgstr "todo" + +#: src/domain/mutations/remove-domain.js:110 +#: src/domain/mutations/remove-domain.js:181 +#: src/domain/mutations/remove-domain.js:198 +#: src/domain/mutations/remove-domain.js:219 +#: src/domain/mutations/remove-domain.js:230 msgid "Unable to remove domain. Please try again." msgstr "todo" @@ -673,6 +698,10 @@ msgstr "todo" msgid "Unable to remove organization. Please try again." msgstr "todo" +#: src/domain/mutations/remove-domain.js:58 +msgid "Unable to remove unknown domain." +msgstr "todo" + #: src/affiliation/mutations/remove-user-from-org.js:73 msgid "Unable to remove unknown user from organization." msgstr "todo" @@ -695,8 +724,7 @@ msgid "Unable to remove user from unknown organization." msgstr "todo" #: src/domain/mutations/request-scan.js:61 -#: src/domain/mutations/request-scan.js:73 -msgid "Unable to request a on time scan on this domain." +msgid "Unable to request a on time scan on an unknown domain." msgstr "todo" #: src/user/mutations/reset-password.js:63 @@ -748,13 +776,17 @@ msgstr "todo" msgid "Unable to two factor authenticate. Please try again." msgstr "todo" -#: src/domain/mutations/update-domain.js:74 #: src/domain/mutations/update-domain.js:84 -#: src/domain/mutations/update-domain.js:98 -#: src/domain/mutations/update-domain.js:113 -#: src/domain/mutations/update-domain.js:120 -#: src/domain/mutations/update-domain.js:153 -#: src/domain/mutations/update-domain.js:163 +msgid "Unable to update domain in an unknown org." +msgstr "todo" + +#: src/domain/mutations/update-domain.js:126 +msgid "Unable to update domain that does not belong to the given organization." +msgstr "todo" + +#: src/domain/mutations/update-domain.js:117 +#: src/domain/mutations/update-domain.js:161 +#: src/domain/mutations/update-domain.js:171 msgid "Unable to update domain. Please try again." msgstr "todo" @@ -794,6 +826,10 @@ msgstr "todo" msgid "Unable to update profile. Please try again." msgstr "todo" +#: src/domain/mutations/update-domain.js:74 +msgid "Unable to update unknown domain." +msgstr "todo" + #: src/affiliation/mutations/update-user-role.js:73 msgid "Unable to update unknown users role." msgstr "todo" From ae5beeed1b0406ac034b2ca1e2c15f56e167ed93 Mon Sep 17 00:00:00 2001 From: nsdeschenes Date: Fri, 12 Mar 2021 09:56:46 -0400 Subject: [PATCH 04/21] email scan error messages refactored --- .../__tests__/load-dkim-by-key.test.js | 4 +- ...load-dkim-connections-by-domain-id.test.js | 16 +- .../__tests__/load-dkim-result-by-key.test.js | 4 +- ...kim-results-connections-by-dkim-id.test.js | 16 +- .../__tests__/load-dmarc-by-key.test.js | 4 +- ...oad-dmarc-connections-by-domain-id.test.js | 16 +- .../loaders/__tests__/load-spf-by-key.test.js | 4 +- .../load-spf-connections-by-domain-id.test.js | 16 +- .../email-scan/loaders/load-dkim-by-key.js | 4 +- .../load-dkim-connections-by-domain-id.js | 14 +- .../loaders/load-dkim-result-by-key.js | 8 +- ...oad-dkim-results-connections-by-dkim-id.js | 12 +- .../email-scan/loaders/load-dmarc-by-key.js | 4 +- .../load-dmarc-connections-by-domain-id.js | 12 +- .../src/email-scan/loaders/load-spf-by-key.js | 4 +- .../load-spf-connections-by-domain-id.js | 12 +- api-js/src/email-scan/objects/dkim-result.js | 6 +- api-js/src/email-scan/objects/dkim.js | 6 +- api-js/src/email-scan/objects/dmarc.js | 2 +- api-js/src/email-scan/objects/spf.js | 2 +- api-js/src/locale/en/messages.js | 124 +++++------ api-js/src/locale/en/messages.po | 198 +++++++++--------- api-js/src/locale/fr/messages.js | 67 +++--- api-js/src/locale/fr/messages.po | 192 ++++++++--------- 24 files changed, 375 insertions(+), 372 deletions(-) diff --git a/api-js/src/email-scan/loaders/__tests__/load-dkim-by-key.test.js b/api-js/src/email-scan/loaders/__tests__/load-dkim-by-key.test.js index 339432af5..f29714823 100644 --- a/api-js/src/email-scan/loaders/__tests__/load-dkim-by-key.test.js +++ b/api-js/src/email-scan/loaders/__tests__/load-dkim-by-key.test.js @@ -111,7 +111,7 @@ describe('given the dkimLoaderByKey function', () => { await loader.load('1') } catch (err) { expect(err).toEqual( - new Error('Unable to find dkim scan. Please try again.'), + new Error('Unable to find DKIM scan(s). Please try again.'), ) } @@ -134,7 +134,7 @@ describe('given the dkimLoaderByKey function', () => { await loader.load('1') } catch (err) { expect(err).toEqual( - new Error('Unable to find dkim scan. Please try again.'), + new Error('Unable to find DKIM scan(s). Please try again.'), ) } diff --git a/api-js/src/email-scan/loaders/__tests__/load-dkim-connections-by-domain-id.test.js b/api-js/src/email-scan/loaders/__tests__/load-dkim-connections-by-domain-id.test.js index 5bb5c46a7..dc3a80f77 100644 --- a/api-js/src/email-scan/loaders/__tests__/load-dkim-connections-by-domain-id.test.js +++ b/api-js/src/email-scan/loaders/__tests__/load-dkim-connections-by-domain-id.test.js @@ -718,7 +718,7 @@ describe('when given the load dkim connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'You must provide a `first` or `last` value to properly paginate the `dkim` connection.', + 'You must provide a `first` or `last` value to properly paginate the `DKIM` connection.', ), ) } @@ -750,7 +750,7 @@ describe('when given the load dkim connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Passing both `first` and `last` to paginate the `dkim` connection is not supported.', + 'Passing both `first` and `last` to paginate the `DKIM` connection is not supported.', ), ) } @@ -782,7 +782,7 @@ describe('when given the load dkim connection function', () => { } catch (err) { expect(err).toEqual( new Error( - '`first` on the `dkim` connection cannot be less than zero.', + '`first` on the `DKIM` connection cannot be less than zero.', ), ) } @@ -813,7 +813,7 @@ describe('when given the load dkim connection function', () => { } catch (err) { expect(err).toEqual( new Error( - '`last` on the `dkim` connection cannot be less than zero.', + '`last` on the `DKIM` connection cannot be less than zero.', ), ) } @@ -846,7 +846,7 @@ describe('when given the load dkim connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Requesting 500 records on the `dkim` connection exceeds the `first` limit of 100 records.', + 'Requesting 500 records on the `DKIM` connection exceeds the `first` limit of 100 records.', ), ) } @@ -877,7 +877,7 @@ describe('when given the load dkim connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Requesting 500 records on the `dkim` connection exceeds the `last` limit of 100 records.', + 'Requesting 500 records on the `DKIM` connection exceeds the `last` limit of 100 records.', ), ) } @@ -984,7 +984,7 @@ describe('when given the load dkim connection function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load dkim scans. Please try again.'), + new Error('Unable to load DKIM scan(s). Please try again.'), ) } @@ -1019,7 +1019,7 @@ describe('when given the load dkim connection function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load dkim scans. Please try again.'), + new Error('Unable to load DKIM scan(s). Please try again.'), ) } diff --git a/api-js/src/email-scan/loaders/__tests__/load-dkim-result-by-key.test.js b/api-js/src/email-scan/loaders/__tests__/load-dkim-result-by-key.test.js index 4a05c1fbf..d3559a4c4 100644 --- a/api-js/src/email-scan/loaders/__tests__/load-dkim-result-by-key.test.js +++ b/api-js/src/email-scan/loaders/__tests__/load-dkim-result-by-key.test.js @@ -111,7 +111,7 @@ describe('given the dkimResultLoaderByKey function', () => { await loader.load('1') } catch (err) { expect(err).toEqual( - new Error('Unable to find dkim result. Please try again.'), + new Error('Unable to find DKIM result(s). Please try again.'), ) } @@ -134,7 +134,7 @@ describe('given the dkimResultLoaderByKey function', () => { await loader.load('1') } catch (err) { expect(err).toEqual( - new Error('Unable to find dkim result. Please try again.'), + new Error('Unable to find DKIM result(s). Please try again.'), ) } diff --git a/api-js/src/email-scan/loaders/__tests__/load-dkim-results-connections-by-dkim-id.test.js b/api-js/src/email-scan/loaders/__tests__/load-dkim-results-connections-by-dkim-id.test.js index 14df37537..d22d7f160 100644 --- a/api-js/src/email-scan/loaders/__tests__/load-dkim-results-connections-by-dkim-id.test.js +++ b/api-js/src/email-scan/loaders/__tests__/load-dkim-results-connections-by-dkim-id.test.js @@ -740,7 +740,7 @@ describe('when given the load dkim results connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'You must provide a `first` or `last` value to properly paginate the `dkimResults` connection.', + 'You must provide a `first` or `last` value to properly paginate the `DKIMResults` connection.', ), ) } @@ -771,7 +771,7 @@ describe('when given the load dkim results connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Passing both `first` and `last` to paginate the `dkimResults` connection is not supported.', + 'Passing both `first` and `last` to paginate the `DKIMResults` connection is not supported.', ), ) } @@ -802,7 +802,7 @@ describe('when given the load dkim results connection function', () => { } catch (err) { expect(err).toEqual( new Error( - '`first` on the `dkimResults` connection cannot be less than zero.', + '`first` on the `DKIMResults` connection cannot be less than zero.', ), ) } @@ -832,7 +832,7 @@ describe('when given the load dkim results connection function', () => { } catch (err) { expect(err).toEqual( new Error( - '`last` on the `dkimResults` connection cannot be less than zero.', + '`last` on the `DKIMResults` connection cannot be less than zero.', ), ) } @@ -864,7 +864,7 @@ describe('when given the load dkim results connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Requesting 1000 records on the `dkimResults` connection exceeds the `first` limit of 100 records.', + 'Requesting 1000 records on the `DKIMResults` connection exceeds the `first` limit of 100 records.', ), ) } @@ -894,7 +894,7 @@ describe('when given the load dkim results connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Requesting 500 records on the `dkimResults` connection exceeds the `last` limit of 100 records.', + 'Requesting 500 records on the `DKIMResults` connection exceeds the `last` limit of 100 records.', ), ) } @@ -1000,7 +1000,7 @@ describe('when given the load dkim results connection function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load dkim results. Please try again.'), + new Error('Unable to load DKIM result(s). Please try again.'), ) } @@ -1035,7 +1035,7 @@ describe('when given the load dkim results connection function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load dkim results. Please try again.'), + new Error('Unable to load DKIM result(s). Please try again.'), ) } diff --git a/api-js/src/email-scan/loaders/__tests__/load-dmarc-by-key.test.js b/api-js/src/email-scan/loaders/__tests__/load-dmarc-by-key.test.js index 0db73d316..2ab021d5e 100644 --- a/api-js/src/email-scan/loaders/__tests__/load-dmarc-by-key.test.js +++ b/api-js/src/email-scan/loaders/__tests__/load-dmarc-by-key.test.js @@ -110,7 +110,7 @@ describe('given the dmarcLoaderByKey function', () => { await loader.load('1') } catch (err) { expect(err).toEqual( - new Error('Unable to find dmarc scan. Please try again.'), + new Error('Unable to find DMARC scan(s). Please try again.'), ) } @@ -133,7 +133,7 @@ describe('given the dmarcLoaderByKey function', () => { await loader.load('1') } catch (err) { expect(err).toEqual( - new Error('Unable to find dmarc scan. Please try again.'), + new Error('Unable to find DMARC scan(s). Please try again.'), ) } diff --git a/api-js/src/email-scan/loaders/__tests__/load-dmarc-connections-by-domain-id.test.js b/api-js/src/email-scan/loaders/__tests__/load-dmarc-connections-by-domain-id.test.js index 7b145c3d5..a712bd11c 100644 --- a/api-js/src/email-scan/loaders/__tests__/load-dmarc-connections-by-domain-id.test.js +++ b/api-js/src/email-scan/loaders/__tests__/load-dmarc-connections-by-domain-id.test.js @@ -1119,7 +1119,7 @@ describe('when given the load dmarc connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'You must provide a `first` or `last` value to properly paginate the `dmarc` connection.', + 'You must provide a `first` or `last` value to properly paginate the `DMARC` connection.', ), ) } @@ -1150,7 +1150,7 @@ describe('when given the load dmarc connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Passing both `first` and `last` to paginate the `dmarc` connection is not supported.', + 'Passing both `first` and `last` to paginate the `DMARC` connection is not supported.', ), ) } @@ -1181,7 +1181,7 @@ describe('when given the load dmarc connection function', () => { } catch (err) { expect(err).toEqual( new Error( - '`first` on the `dmarc` connection cannot be less than zero.', + '`first` on the `DMARC` connection cannot be less than zero.', ), ) } @@ -1211,7 +1211,7 @@ describe('when given the load dmarc connection function', () => { } catch (err) { expect(err).toEqual( new Error( - '`last` on the `dmarc` connection cannot be less than zero.', + '`last` on the `DMARC` connection cannot be less than zero.', ), ) } @@ -1243,7 +1243,7 @@ describe('when given the load dmarc connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Requesting 1000 records on the `dmarc` connection exceeds the `first` limit of 100 records.', + 'Requesting 1000 records on the `DMARC` connection exceeds the `first` limit of 100 records.', ), ) } @@ -1273,7 +1273,7 @@ describe('when given the load dmarc connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Requesting 200 records on the `dmarc` connection exceeds the `last` limit of 100 records.', + 'Requesting 200 records on the `DMARC` connection exceeds the `last` limit of 100 records.', ), ) } @@ -1380,7 +1380,7 @@ describe('when given the load dmarc connection function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load dmarc scans. Please try again.'), + new Error('Unable to load DMARC scan(s). Please try again.'), ) } @@ -1416,7 +1416,7 @@ describe('when given the load dmarc connection function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load dmarc scans. Please try again.'), + new Error('Unable to load DMARC scan(s). Please try again.'), ) } diff --git a/api-js/src/email-scan/loaders/__tests__/load-spf-by-key.test.js b/api-js/src/email-scan/loaders/__tests__/load-spf-by-key.test.js index ef2504077..e21e1cd10 100644 --- a/api-js/src/email-scan/loaders/__tests__/load-spf-by-key.test.js +++ b/api-js/src/email-scan/loaders/__tests__/load-spf-by-key.test.js @@ -110,7 +110,7 @@ describe('given the spfLoaderByKey function', () => { await loader.load('1') } catch (err) { expect(err).toEqual( - new Error('Unable to find spf scan. Please try again.'), + new Error('Unable to find SPF scan(s). Please try again.'), ) } @@ -133,7 +133,7 @@ describe('given the spfLoaderByKey function', () => { await loader.load('1') } catch (err) { expect(err).toEqual( - new Error('Unable to find spf scan. Please try again.'), + new Error('Unable to find SPF scan(s). Please try again.'), ) } diff --git a/api-js/src/email-scan/loaders/__tests__/load-spf-connections-by-domain-id.test.js b/api-js/src/email-scan/loaders/__tests__/load-spf-connections-by-domain-id.test.js index c8523d05f..02b2c8997 100644 --- a/api-js/src/email-scan/loaders/__tests__/load-spf-connections-by-domain-id.test.js +++ b/api-js/src/email-scan/loaders/__tests__/load-spf-connections-by-domain-id.test.js @@ -1017,7 +1017,7 @@ describe('when given the load spf connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'You must provide a `first` or `last` value to properly paginate the `spf` connection.', + 'You must provide a `first` or `last` value to properly paginate the `SPF` connection.', ), ) } @@ -1048,7 +1048,7 @@ describe('when given the load spf connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Passing both `first` and `last` to paginate the `spf` connection is not supported.', + 'Passing both `first` and `last` to paginate the `SPF` connection is not supported.', ), ) } @@ -1079,7 +1079,7 @@ describe('when given the load spf connection function', () => { } catch (err) { expect(err).toEqual( new Error( - '`first` on the `spf` connection cannot be less than zero.', + '`first` on the `SPF` connection cannot be less than zero.', ), ) } @@ -1109,7 +1109,7 @@ describe('when given the load spf connection function', () => { } catch (err) { expect(err).toEqual( new Error( - '`last` on the `spf` connection cannot be less than zero.', + '`last` on the `SPF` connection cannot be less than zero.', ), ) } @@ -1141,7 +1141,7 @@ describe('when given the load spf connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Requesting 1000 records on the `spf` connection exceeds the `first` limit of 100 records.', + 'Requesting 1000 records on the `SPF` connection exceeds the `first` limit of 100 records.', ), ) } @@ -1171,7 +1171,7 @@ describe('when given the load spf connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Requesting 500 records on the `spf` connection exceeds the `last` limit of 100 records.', + 'Requesting 500 records on the `SPF` connection exceeds the `last` limit of 100 records.', ), ) } @@ -1278,7 +1278,7 @@ describe('when given the load spf connection function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load spf scans. Please try again.'), + new Error('Unable to load SPF scan(s). Please try again.'), ) } @@ -1314,7 +1314,7 @@ describe('when given the load spf connection function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load spf scans. Please try again.'), + new Error('Unable to load SPF scan(s). Please try again.'), ) } diff --git a/api-js/src/email-scan/loaders/load-dkim-by-key.js b/api-js/src/email-scan/loaders/load-dkim-by-key.js index dea772a83..c3f77a06a 100644 --- a/api-js/src/email-scan/loaders/load-dkim-by-key.js +++ b/api-js/src/email-scan/loaders/load-dkim-by-key.js @@ -15,7 +15,7 @@ export const dkimLoaderByKey = (query, userKey, i18n) => console.error( `Database error occurred when user: ${userKey} running dkimLoaderByKey: ${err}`, ) - throw new Error(i18n._(t`Unable to find dkim scan. Please try again.`)) + throw new Error(i18n._(t`Unable to find DKIM scan(s). Please try again.`)) } const dkimMap = {} @@ -27,7 +27,7 @@ export const dkimLoaderByKey = (query, userKey, i18n) => console.error( `Cursor error occurred when user: ${userKey} running dkimLoaderByKey: ${err}`, ) - throw new Error(i18n._(t`Unable to find dkim scan. Please try again.`)) + throw new Error(i18n._(t`Unable to find DKIM scan(s). Please try again.`)) } return keys.map((key) => dkimMap[key]) diff --git a/api-js/src/email-scan/loaders/load-dkim-connections-by-domain-id.js b/api-js/src/email-scan/loaders/load-dkim-connections-by-domain-id.js index 79683fda9..bfc17e3c5 100644 --- a/api-js/src/email-scan/loaders/load-dkim-connections-by-domain-id.js +++ b/api-js/src/email-scan/loaders/load-dkim-connections-by-domain-id.js @@ -108,7 +108,7 @@ export const dkimLoaderConnectionsByDomainId = ( ) throw new Error( i18n._( - t`You must provide a \`first\` or \`last\` value to properly paginate the \`dkim\` connection.`, + t`You must provide a \`first\` or \`last\` value to properly paginate the \`DKIM\` connection.`, ), ) } else if (typeof first !== 'undefined' && typeof last !== 'undefined') { @@ -117,7 +117,7 @@ export const dkimLoaderConnectionsByDomainId = ( ) throw new Error( i18n._( - t`Passing both \`first\` and \`last\` to paginate the \`dkim\` connection is not supported.`, + t`Passing both \`first\` and \`last\` to paginate the \`DKIM\` connection is not supported.`, ), ) } else if (typeof first === 'number' || typeof last === 'number') { @@ -129,7 +129,7 @@ export const dkimLoaderConnectionsByDomainId = ( ) throw new Error( i18n._( - t`\`${argSet}\` on the \`dkim\` connection cannot be less than zero.`, + t`\`${argSet}\` on the \`DKIM\` connection cannot be less than zero.`, ), ) } else if (first > 100 || last > 100) { @@ -140,7 +140,7 @@ export const dkimLoaderConnectionsByDomainId = ( ) throw new Error( i18n._( - t`Requesting ${amount} records on the \`dkim\` connection exceeds the \`${argSet}\` limit of 100 records.`, + t`Requesting ${amount} records on the \`DKIM\` connection exceeds the \`${argSet}\` limit of 100 records.`, ), ) } else if (typeof first !== 'undefined' && typeof last === 'undefined') { @@ -153,7 +153,7 @@ export const dkimLoaderConnectionsByDomainId = ( ) throw new Error( i18n._( - t`Passing both \`first\` and \`last\` to paginate the \`dkim\` connection is not supported.`, + t`Passing both \`first\` and \`last\` to paginate the \`DKIM\` connection is not supported.`, ), ) } @@ -265,7 +265,7 @@ export const dkimLoaderConnectionsByDomainId = ( console.error( `Database error occurred while user: ${userKey} was trying to get dkim information for ${domainId}, error: ${err}`, ) - throw new Error(i18n._(t`Unable to load dkim scans. Please try again.`)) + throw new Error(i18n._(t`Unable to load DKIM scan(s). Please try again.`)) } let dkimScanInfo @@ -275,7 +275,7 @@ export const dkimLoaderConnectionsByDomainId = ( console.error( `Cursor error occurred while user: ${userKey} was trying to get dkim information for ${domainId}, error: ${err}`, ) - throw new Error(i18n._(t`Unable to load dkim scans. Please try again.`)) + throw new Error(i18n._(t`Unable to load DKIM scan(s). Please try again.`)) } if (dkimScanInfo.dkimScans.length === 0) { diff --git a/api-js/src/email-scan/loaders/load-dkim-result-by-key.js b/api-js/src/email-scan/loaders/load-dkim-result-by-key.js index e75f80236..8b32f8ce8 100644 --- a/api-js/src/email-scan/loaders/load-dkim-result-by-key.js +++ b/api-js/src/email-scan/loaders/load-dkim-result-by-key.js @@ -15,7 +15,9 @@ export const dkimResultLoaderByKey = (query, userKey, i18n) => console.error( `Database error occurred when user: ${userKey} running dkimResultLoaderByKey: ${err}`, ) - throw new Error(i18n._(t`Unable to find dkim result. Please try again.`)) + throw new Error( + i18n._(t`Unable to find DKIM result(s). Please try again.`), + ) } const dkimResultMap = {} @@ -27,7 +29,9 @@ export const dkimResultLoaderByKey = (query, userKey, i18n) => console.error( `Cursor error occurred when user: ${userKey} running dkimResultLoaderByKey: ${err}`, ) - throw new Error(i18n._(t`Unable to find dkim result. Please try again.`)) + throw new Error( + i18n._(t`Unable to find DKIM result(s). Please try again.`), + ) } return keys.map((key) => dkimResultMap[key]) diff --git a/api-js/src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js b/api-js/src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js index a8c441d3e..ff3aa0eea 100644 --- a/api-js/src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js +++ b/api-js/src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js @@ -83,7 +83,7 @@ export const dkimResultsLoaderConnectionByDkimId = ( ) throw new Error( i18n._( - t`You must provide a \`first\` or \`last\` value to properly paginate the \`dkimResults\` connection.`, + t`You must provide a \`first\` or \`last\` value to properly paginate the \`DKIMResults\` connection.`, ), ) } else if (typeof first !== 'undefined' && typeof last !== 'undefined') { @@ -92,7 +92,7 @@ export const dkimResultsLoaderConnectionByDkimId = ( ) throw new Error( i18n._( - t`Passing both \`first\` and \`last\` to paginate the \`dkimResults\` connection is not supported.`, + t`Passing both \`first\` and \`last\` to paginate the \`DKIMResults\` connection is not supported.`, ), ) } else if (typeof first === 'number' || typeof last === 'number') { @@ -104,7 +104,7 @@ export const dkimResultsLoaderConnectionByDkimId = ( ) throw new Error( i18n._( - t`\`${argSet}\` on the \`dkimResults\` connection cannot be less than zero.`, + t`\`${argSet}\` on the \`DKIMResults\` connection cannot be less than zero.`, ), ) } else if (first > 100 || last > 100) { @@ -115,7 +115,7 @@ export const dkimResultsLoaderConnectionByDkimId = ( ) throw new Error( i18n._( - t`Requesting ${amount} records on the \`dkimResults\` connection exceeds the \`${argSet}\` limit of 100 records.`, + t`Requesting ${amount} records on the \`DKIMResults\` connection exceeds the \`${argSet}\` limit of 100 records.`, ), ) } else if (typeof first !== 'undefined' && typeof last === 'undefined') { @@ -241,7 +241,7 @@ export const dkimResultsLoaderConnectionByDkimId = ( console.error( `Database error occurred while user: ${userKey} was trying to get dkim result information for ${dkimId}, error: ${err}`, ) - throw new Error(i18n._(t`Unable to load dkim results. Please try again.`)) + throw new Error(i18n._(t`Unable to load DKIM result(s). Please try again.`)) } let dkimResultsInfo @@ -251,7 +251,7 @@ export const dkimResultsLoaderConnectionByDkimId = ( console.error( `Cursor error occurred while user: ${userKey} was trying to get dkim result information for ${dkimId}, error: ${err}`, ) - throw new Error(i18n._(t`Unable to load dkim results. Please try again.`)) + throw new Error(i18n._(t`Unable to load DKIM result(s). Please try again.`)) } if (dkimResultsInfo.dkimResults.length === 0) { diff --git a/api-js/src/email-scan/loaders/load-dmarc-by-key.js b/api-js/src/email-scan/loaders/load-dmarc-by-key.js index db596c933..fcc8302a7 100644 --- a/api-js/src/email-scan/loaders/load-dmarc-by-key.js +++ b/api-js/src/email-scan/loaders/load-dmarc-by-key.js @@ -15,7 +15,7 @@ export const dmarcLoaderByKey = (query, userKey, i18n) => console.error( `Database error occurred when user: ${userKey} running dmarcLoaderByKey: ${err}`, ) - throw new Error(i18n._(t`Unable to find dmarc scan. Please try again.`)) + throw new Error(i18n._(t`Unable to find DMARC scan(s). Please try again.`)) } const dmarcMap = {} @@ -27,7 +27,7 @@ export const dmarcLoaderByKey = (query, userKey, i18n) => console.error( `Cursor error occurred when user: ${userKey} running dmarcLoaderByKey: ${err}`, ) - throw new Error(i18n._(t`Unable to find dmarc scan. Please try again.`)) + throw new Error(i18n._(t`Unable to find DMARC scan(s). Please try again.`)) } return keys.map((key) => dmarcMap[key]) }) diff --git a/api-js/src/email-scan/loaders/load-dmarc-connections-by-domain-id.js b/api-js/src/email-scan/loaders/load-dmarc-connections-by-domain-id.js index 2dec6c182..3c811eab1 100644 --- a/api-js/src/email-scan/loaders/load-dmarc-connections-by-domain-id.js +++ b/api-js/src/email-scan/loaders/load-dmarc-connections-by-domain-id.js @@ -132,7 +132,7 @@ export const dmarcLoaderConnectionsByDomainId = ( ) throw new Error( i18n._( - t`You must provide a \`first\` or \`last\` value to properly paginate the \`dmarc\` connection.`, + t`You must provide a \`first\` or \`last\` value to properly paginate the \`DMARC\` connection.`, ), ) } else if (typeof first !== 'undefined' && typeof last !== 'undefined') { @@ -141,7 +141,7 @@ export const dmarcLoaderConnectionsByDomainId = ( ) throw new Error( i18n._( - t`Passing both \`first\` and \`last\` to paginate the \`dmarc\` connection is not supported.`, + t`Passing both \`first\` and \`last\` to paginate the \`DMARC\` connection is not supported.`, ), ) } else if (typeof first === 'number' || typeof last === 'number') { @@ -154,7 +154,7 @@ export const dmarcLoaderConnectionsByDomainId = ( ) throw new Error( i18n._( - t`\`${argSet}\` on the \`dmarc\` connection cannot be less than zero.`, + t`\`${argSet}\` on the \`DMARC\` connection cannot be less than zero.`, ), ) } else if (first > 100 || last > 100) { @@ -165,7 +165,7 @@ export const dmarcLoaderConnectionsByDomainId = ( ) throw new Error( i18n._( - t`Requesting ${amount} records on the \`dmarc\` connection exceeds the \`${argSet}\` limit of 100 records.`, + t`Requesting ${amount} records on the \`DMARC\` connection exceeds the \`${argSet}\` limit of 100 records.`, ), ) } else if (typeof first !== 'undefined' && typeof last === 'undefined') { @@ -305,7 +305,7 @@ export const dmarcLoaderConnectionsByDomainId = ( console.error( `Database error occurred while user: ${userKey} was trying to get dmarc information for ${domainId}, error: ${err}`, ) - throw new Error(i18n._(t`Unable to load dmarc scans. Please try again.`)) + throw new Error(i18n._(t`Unable to load DMARC scan(s). Please try again.`)) } let dmarcScanInfo @@ -315,7 +315,7 @@ export const dmarcLoaderConnectionsByDomainId = ( console.error( `Cursor error occurred while user: ${userKey} was trying to get dmarc information for ${domainId}, error: ${err}`, ) - throw new Error(i18n._(t`Unable to load dmarc scans. Please try again.`)) + throw new Error(i18n._(t`Unable to load DMARC scan(s). Please try again.`)) } if (dmarcScanInfo.dmarcScans.length === 0) { diff --git a/api-js/src/email-scan/loaders/load-spf-by-key.js b/api-js/src/email-scan/loaders/load-spf-by-key.js index 3de6329ba..ba3cff060 100644 --- a/api-js/src/email-scan/loaders/load-spf-by-key.js +++ b/api-js/src/email-scan/loaders/load-spf-by-key.js @@ -15,7 +15,7 @@ export const spfLoaderByKey = (query, userKey, i18n) => console.error( `Database error occurred when user: ${userKey} running spfLoaderByKey: ${err}`, ) - throw new Error(i18n._(t`Unable to find spf scan. Please try again.`)) + throw new Error(i18n._(t`Unable to find SPF scan(s). Please try again.`)) } const spfMap = {} @@ -27,7 +27,7 @@ export const spfLoaderByKey = (query, userKey, i18n) => console.error( `Cursor error occurred when user: ${userKey} running spfLoaderByKey: ${err}`, ) - throw new Error(i18n._(t`Unable to find spf scan. Please try again.`)) + throw new Error(i18n._(t`Unable to find SPF scan(s). Please try again.`)) } return keys.map((key) => spfMap[key]) diff --git a/api-js/src/email-scan/loaders/load-spf-connections-by-domain-id.js b/api-js/src/email-scan/loaders/load-spf-connections-by-domain-id.js index 29d25261d..0f40f17ad 100644 --- a/api-js/src/email-scan/loaders/load-spf-connections-by-domain-id.js +++ b/api-js/src/email-scan/loaders/load-spf-connections-by-domain-id.js @@ -126,7 +126,7 @@ export const spfLoaderConnectionsByDomainId = ( ) throw new Error( i18n._( - t`You must provide a \`first\` or \`last\` value to properly paginate the \`spf\` connection.`, + t`You must provide a \`first\` or \`last\` value to properly paginate the \`SPF\` connection.`, ), ) } else if (typeof first !== 'undefined' && typeof last !== 'undefined') { @@ -135,7 +135,7 @@ export const spfLoaderConnectionsByDomainId = ( ) throw new Error( i18n._( - t`Passing both \`first\` and \`last\` to paginate the \`spf\` connection is not supported.`, + t`Passing both \`first\` and \`last\` to paginate the \`SPF\` connection is not supported.`, ), ) } else if (typeof first === 'number' || typeof last === 'number') { @@ -147,7 +147,7 @@ export const spfLoaderConnectionsByDomainId = ( ) throw new Error( i18n._( - t`\`${argSet}\` on the \`spf\` connection cannot be less than zero.`, + t`\`${argSet}\` on the \`SPF\` connection cannot be less than zero.`, ), ) } else if (first > 100 || last > 100) { @@ -158,7 +158,7 @@ export const spfLoaderConnectionsByDomainId = ( ) throw new Error( i18n._( - t`Requesting ${amount} records on the \`spf\` connection exceeds the \`${argSet}\` limit of 100 records.`, + t`Requesting ${amount} records on the \`SPF\` connection exceeds the \`${argSet}\` limit of 100 records.`, ), ) } else if (typeof first !== 'undefined' && typeof last === 'undefined') { @@ -291,7 +291,7 @@ export const spfLoaderConnectionsByDomainId = ( console.error( `Database error occurred while user: ${userKey} was trying to get spf information for ${domainId}, error: ${err}`, ) - throw new Error(i18n._(t`Unable to load spf scans. Please try again.`)) + throw new Error(i18n._(t`Unable to load SPF scan(s). Please try again.`)) } let spfScanInfo @@ -301,7 +301,7 @@ export const spfLoaderConnectionsByDomainId = ( console.error( `Cursor error occurred while user: ${userKey} was trying to get spf information for ${domainId}, error: ${err}`, ) - throw new Error(i18n._(t`Unable to load spf scans. Please try again.`)) + throw new Error(i18n._(t`Unable to load SPF scan(s). Please try again.`)) } if (spfScanInfo.spfScans.length === 0) { diff --git a/api-js/src/email-scan/objects/dkim-result.js b/api-js/src/email-scan/objects/dkim-result.js index 7a624aa72..b72a03f8c 100644 --- a/api-js/src/email-scan/objects/dkim-result.js +++ b/api-js/src/email-scan/objects/dkim-result.js @@ -17,7 +17,7 @@ export const dkimResultType = new GraphQLObjectType({ id: globalIdField('dkimResult'), dkim: { type: dkimType, - description: 'The dkim scan information that this result belongs to.', + description: 'The DKIM scan information that this result belongs to.', resolve: async ({ dkimId }, _, { loaders: { dkimLoaderByKey } }) => { const dkimKey = dkimId.split('/')[1] const dkim = await dkimLoaderByKey.load(dkimKey) @@ -137,7 +137,7 @@ export const dkimResultType = new GraphQLObjectType({ }, }), interfaces: [nodeInterface], - description: 'Individual scans results for the given dkim selector.', + description: 'Individual scans results for the given DKIM selector.', }) export const dkimResultConnection = connectionDefinitions({ @@ -147,7 +147,7 @@ export const dkimResultConnection = connectionDefinitions({ totalCount: { type: GraphQLInt, description: - 'The total amount of dkim results related to a given domain.', + 'The total amount of DKIM results related to a given domain.', resolve: ({ totalCount }) => totalCount, }, }), diff --git a/api-js/src/email-scan/objects/dkim.js b/api-js/src/email-scan/objects/dkim.js index ca597b33b..715141ced 100644 --- a/api-js/src/email-scan/objects/dkim.js +++ b/api-js/src/email-scan/objects/dkim.js @@ -35,11 +35,11 @@ export const dkimType = new GraphQLObjectType({ args: { orderBy: { type: dkimResultOrder, - description: 'Ordering options for dkim result connections.', + description: 'Ordering options for DKIM result connections.', }, ...connectionArgs, }, - description: 'Individual scans results for each dkim selector.', + description: 'Individual scans results for each DKIM selector.', resolve: async ( { _id }, args, @@ -67,7 +67,7 @@ export const dkimConnection = connectionDefinitions({ connectionFields: () => ({ totalCount: { type: GraphQLInt, - description: 'The total amount of dkim scans related to a given domain.', + description: 'The total amount of DKIM scans related to a given domain.', resolve: ({ totalCount }) => totalCount, }, }), diff --git a/api-js/src/email-scan/objects/dmarc.js b/api-js/src/email-scan/objects/dmarc.js index 8fbf8566a..49ad7dc10 100644 --- a/api-js/src/email-scan/objects/dmarc.js +++ b/api-js/src/email-scan/objects/dmarc.js @@ -162,7 +162,7 @@ export const dmarcConnection = connectionDefinitions({ connectionFields: () => ({ totalCount: { type: GraphQLInt, - description: 'The total amount of dmarc scans related to a given domain.', + description: 'The total amount of DMARC scans related to a given domain.', resolve: ({ totalCount }) => totalCount, }, }), diff --git a/api-js/src/email-scan/objects/spf.js b/api-js/src/email-scan/objects/spf.js index 0f23f1a3f..3bb4d0269 100644 --- a/api-js/src/email-scan/objects/spf.js +++ b/api-js/src/email-scan/objects/spf.js @@ -157,7 +157,7 @@ export const spfConnection = connectionDefinitions({ connectionFields: () => ({ totalCount: { type: GraphQLInt, - description: 'The total amount of spf scans related to a given domain.', + description: 'The total amount of SPF scans related to a given domain.', resolve: ({ totalCount }) => totalCount, }, }), diff --git a/api-js/src/locale/en/messages.js b/api-js/src/locale/en/messages.js index 8f36b1c38..1d472e6f5 100644 --- a/api-js/src/locale/en/messages.js +++ b/api-js/src/locale/en/messages.js @@ -30,24 +30,26 @@ 'Organization has already been verified.', 'Organization name already in use, please choose another and try again.': 'Organization name already in use, please choose another and try again.', + 'Passing both `first` and `last` to paginate the `DKIMResults` connection is not supported.': + 'Passing both `first` and `last` to paginate the `DKIMResults` connection is not supported.', + 'Passing both `first` and `last` to paginate the `DKIM` connection is not supported.': + 'Passing both `first` and `last` to paginate the `DKIM` connection is not supported.', + 'Passing both `first` and `last` to paginate the `DMARC` connection is not supported.': + 'Passing both `first` and `last` to paginate the `DMARC` connection is not supported.', 'Passing both `first` and `last` to paginate the `DkimFailureTable` connection is not supported.': 'Passing both `first` and `last` to paginate the `DkimFailureTable` connection is not supported.', 'Passing both `first` and `last` to paginate the `DmarcFailureTable` connection is not supported.': 'Passing both `first` and `last` to paginate the `DmarcFailureTable` connection is not supported.', 'Passing both `first` and `last` to paginate the `FullPassTable` connection is not supported.': 'Passing both `first` and `last` to paginate the `FullPassTable` connection is not supported.', + 'Passing both `first` and `last` to paginate the `SPF` connection is not supported.': + 'Passing both `first` and `last` to paginate the `SPF` connection is not supported.', 'Passing both `first` and `last` to paginate the `SpfFailureTable` connection is not supported.': 'Passing both `first` and `last` to paginate the `SpfFailureTable` connection is not supported.', 'Passing both `first` and `last` to paginate the `affiliation` is not supported.': 'Passing both `first` and `last` to paginate the `affiliation` is not supported.', - 'Passing both `first` and `last` to paginate the `dkimResults` connection is not supported.': - 'Passing both `first` and `last` to paginate the `dkimResults` connection is not supported.', - 'Passing both `first` and `last` to paginate the `dkim` connection is not supported.': - 'Passing both `first` and `last` to paginate the `dkim` connection is not supported.', 'Passing both `first` and `last` to paginate the `dmarcSummaries` connection is not supported.': 'Passing both `first` and `last` to paginate the `dmarcSummaries` connection is not supported.', - 'Passing both `first` and `last` to paginate the `dmarc` connection is not supported.': - 'Passing both `first` and `last` to paginate the `dmarc` connection is not supported.', 'Passing both `first` and `last` to paginate the `domain` connection is not supported.': 'Passing both `first` and `last` to paginate the `domain` connection is not supported.', 'Passing both `first` and `last` to paginate the `guidanceTag` connection is not supported.': @@ -56,8 +58,6 @@ 'Passing both `first` and `last` to paginate the `https` connection is not supported.', 'Passing both `first` and `last` to paginate the `organization` connection is not supported.': 'Passing both `first` and `last` to paginate the `organization` connection is not supported.', - 'Passing both `first` and `last` to paginate the `spf` connection is not supported.': - 'Passing both `first` and `last` to paginate the `spf` connection is not supported.', 'Passing both `first` and `last` to paginate the `ssl` connection is not supported.': 'Passing both `first` and `last` to paginate the `ssl` connection is not supported.', 'Passing both `first` and `last` to paginate the `verifiedDomain` connection is not supported.': @@ -174,38 +174,38 @@ ['argSet'], '` limit of 100 records.', ], - 'Requesting {amount} records on the `dkimResults` connection exceeds the `{argSet}` limit of 100 records.': [ + 'Requesting {amount} records on the `DKIMResults` connection exceeds the `{argSet}` limit of 100 records.': [ 'Requesting ', ['amount'], - ' records on the `dkimResults` connection exceeds the `', + ' records on the `DKIMResults` connection exceeds the `', ['argSet'], '` limit of 100 records.', ], - 'Requesting {amount} records on the `dkim` connection exceeds the `{argSet}` limit of 100 records.': [ + 'Requesting {amount} records on the `DKIM` connection exceeds the `{argSet}` limit of 100 records.': [ 'Requesting ', ['amount'], - ' records on the `dkim` connection exceeds the `', + ' records on the `DKIM` connection exceeds the `', ['argSet'], '` limit of 100 records.', ], - 'Requesting {amount} records on the `dmarc` connection exceeds the `{argSet}` limit of 100 records.': [ + 'Requesting {amount} records on the `DMARC` connection exceeds the `{argSet}` limit of 100 records.': [ 'Requesting ', ['amount'], - ' records on the `dmarc` connection exceeds the `', + ' records on the `DMARC` connection exceeds the `', ['argSet'], '` limit of 100 records.', ], - 'Requesting {amount} records on the `https` connection exceeds the `{argSet}` limit of 100 records.': [ + 'Requesting {amount} records on the `SPF` connection exceeds the `{argSet}` limit of 100 records.': [ 'Requesting ', ['amount'], - ' records on the `https` connection exceeds the `', + ' records on the `SPF` connection exceeds the `', ['argSet'], '` limit of 100 records.', ], - 'Requesting {amount} records on the `spf` connection exceeds the `{argSet}` limit of 100 records.': [ + 'Requesting {amount} records on the `https` connection exceeds the `{argSet}` limit of 100 records.': [ 'Requesting ', ['amount'], - ' records on the `spf` connection exceeds the `', + ' records on the `https` connection exceeds the `', ['argSet'], '` limit of 100 records.', ], @@ -263,18 +263,20 @@ 'Unable to create organization. Please try again.', 'Unable to dispatch one time scan. Please try again.': 'Unable to dispatch one time scan. Please try again.', + 'Unable to find DKIM result(s). Please try again.': + 'Unable to find DKIM result(s). Please try again.', + 'Unable to find DKIM scan(s). Please try again.': + 'Unable to find DKIM scan(s). Please try again.', + 'Unable to find DMARC scan(s). Please try again.': + 'Unable to find DMARC scan(s). Please try again.', 'Unable to find DMARC summary data. Please try again.': 'Unable to find DMARC summary data. Please try again.', + 'Unable to find SPF scan(s). Please try again.': + 'Unable to find SPF scan(s). Please try again.', 'Unable to find dkim guidance tags. Please try again.': 'Unable to find dkim guidance tags. Please try again.', - 'Unable to find dkim result. Please try again.': - 'Unable to find dkim result. Please try again.', - 'Unable to find dkim scan. Please try again.': - 'Unable to find dkim scan. Please try again.', 'Unable to find dmarc guidance tags. Please try again.': 'Unable to find dmarc guidance tags. Please try again.', - 'Unable to find dmarc scan. Please try again.': - 'Unable to find dmarc scan. Please try again.', 'Unable to find https guidance tags. Please try again.': 'Unable to find https guidance tags. Please try again.', 'Unable to find https scan. Please try again.': @@ -283,8 +285,6 @@ 'Unable to find organization. Please try again.', 'Unable to find spf guidance tags. Please try again.': 'Unable to find spf guidance tags. Please try again.', - 'Unable to find spf scan. Please try again.': - 'Unable to find spf scan. Please try again.', 'Unable to find ssl guidance tags. Please try again.': 'Unable to find ssl guidance tags. Please try again.', 'Unable to find ssl scan. Please try again.': @@ -309,24 +309,26 @@ 'Unable to invite yourself to an org.', 'Unable to load DKIM failure data. Please try again.': 'Unable to load DKIM failure data. Please try again.', + 'Unable to load DKIM result(s). Please try again.': + 'Unable to load DKIM result(s). Please try again.', + 'Unable to load DKIM scan(s). Please try again.': + 'Unable to load DKIM scan(s). Please try again.', 'Unable to load DMARC failure data. Please try again.': 'Unable to load DMARC failure data. Please try again.', + 'Unable to load DMARC scan(s). Please try again.': + 'Unable to load DMARC scan(s). Please try again.', 'Unable to load DMARC summary data. Please try again.': 'Unable to load DMARC summary data. Please try again.', 'Unable to load SPF failure data. Please try again.': 'Unable to load SPF failure data. Please try again.', + 'Unable to load SPF scan(s). Please try again.': + 'Unable to load SPF scan(s). Please try again.', 'Unable to load affiliation(s). Please try again.': 'Unable to load affiliation(s). Please try again.', 'Unable to load dkim guidance tags. Please try again.': 'Unable to load dkim guidance tags. Please try again.', - 'Unable to load dkim results. Please try again.': - 'Unable to load dkim results. Please try again.', - 'Unable to load dkim scans. Please try again.': - 'Unable to load dkim scans. Please try again.', 'Unable to load dmarc guidance tags. Please try again.': 'Unable to load dmarc guidance tags. Please try again.', - 'Unable to load dmarc scans. Please try again.': - 'Unable to load dmarc scans. Please try again.', 'Unable to load domain(s). Please try again.': 'Unable to load domain(s). Please try again.', 'Unable to load domain. Please try again.': @@ -345,8 +347,6 @@ 'Unable to load organizations. Please try again.', 'Unable to load spf guidance tags. Please try again.': 'Unable to load spf guidance tags. Please try again.', - 'Unable to load spf scans. Please try again.': - 'Unable to load spf scans. Please try again.', 'Unable to load ssl guidance tags. Please try again.': 'Unable to load ssl guidance tags. Please try again.', 'Unable to load ssl scans. Please try again.': @@ -452,24 +452,26 @@ 'Username already in use.': 'Username already in use.', 'Username not available, please try another.': 'Username not available, please try another.', + 'You must provide a `first` or `last` value to properly paginate the `DKIMResults` connection.': + 'You must provide a `first` or `last` value to properly paginate the `DKIMResults` connection.', + 'You must provide a `first` or `last` value to properly paginate the `DKIM` connection.': + 'You must provide a `first` or `last` value to properly paginate the `DKIM` connection.', + 'You must provide a `first` or `last` value to properly paginate the `DMARC` connection.': + 'You must provide a `first` or `last` value to properly paginate the `DMARC` connection.', 'You must provide a `first` or `last` value to properly paginate the `DkimFailureTable` connection.': 'You must provide a `first` or `last` value to properly paginate the `DkimFailureTable` connection.', 'You must provide a `first` or `last` value to properly paginate the `DmarcFailureTable` connection.': 'You must provide a `first` or `last` value to properly paginate the `DmarcFailureTable` connection.', 'You must provide a `first` or `last` value to properly paginate the `FullPassTable` connection.': 'You must provide a `first` or `last` value to properly paginate the `FullPassTable` connection.', + 'You must provide a `first` or `last` value to properly paginate the `SPF` connection.': + 'You must provide a `first` or `last` value to properly paginate the `SPF` connection.', 'You must provide a `first` or `last` value to properly paginate the `SpfFailureTable` connection.': 'You must provide a `first` or `last` value to properly paginate the `SpfFailureTable` connection.', 'You must provide a `first` or `last` value to properly paginate the `affiliation`.': 'You must provide a `first` or `last` value to properly paginate the `affiliation`.', - 'You must provide a `first` or `last` value to properly paginate the `dkimResults` connection.': - 'You must provide a `first` or `last` value to properly paginate the `dkimResults` connection.', - 'You must provide a `first` or `last` value to properly paginate the `dkim` connection.': - 'You must provide a `first` or `last` value to properly paginate the `dkim` connection.', 'You must provide a `first` or `last` value to properly paginate the `dmarcSummaries` connection.': 'You must provide a `first` or `last` value to properly paginate the `dmarcSummaries` connection.', - 'You must provide a `first` or `last` value to properly paginate the `dmarc` connection.': - 'You must provide a `first` or `last` value to properly paginate the `dmarc` connection.', 'You must provide a `first` or `last` value to properly paginate the `domain` connection.': 'You must provide a `first` or `last` value to properly paginate the `domain` connection.', 'You must provide a `first` or `last` value to properly paginate the `guidanceTag` connection.': @@ -478,8 +480,6 @@ 'You must provide a `first` or `last` value to properly paginate the `https` connection.', 'You must provide a `first` or `last` value to properly paginate the `organization` connection.': 'You must provide a `first` or `last` value to properly paginate the `organization` connection.', - 'You must provide a `first` or `last` value to properly paginate the `spf` connection.': - 'You must provide a `first` or `last` value to properly paginate the `spf` connection.', 'You must provide a `first` or `last` value to properly paginate the `ssl` connection.': 'You must provide a `first` or `last` value to properly paginate the `ssl` connection.', 'You must provide a `first` or `last` value to properly paginate the `verifiedDomain` connection.': @@ -497,6 +497,21 @@ ['typeSet'], '`.', ], + '`{argSet}` on the `DKIMResults` connection cannot be less than zero.': [ + '`', + ['argSet'], + '` on the `DKIMResults` connection cannot be less than zero.', + ], + '`{argSet}` on the `DKIM` connection cannot be less than zero.': [ + '`', + ['argSet'], + '` on the `DKIM` connection cannot be less than zero.', + ], + '`{argSet}` on the `DMARC` connection cannot be less than zero.': [ + '`', + ['argSet'], + '` on the `DMARC` connection cannot be less than zero.', + ], '`{argSet}` on the `DkimFailureTable` connection cannot be less than zero.': [ '`', ['argSet'], @@ -512,6 +527,11 @@ ['argSet'], '` on the `FullPassTable` connection cannot be less than zero.', ], + '`{argSet}` on the `SPF` connection cannot be less than zero.': [ + '`', + ['argSet'], + '` on the `SPF` connection cannot be less than zero.', + ], '`{argSet}` on the `SpfFailureTable` connection cannot be less than zero.': [ '`', ['argSet'], @@ -522,26 +542,11 @@ ['argSet'], '` on the `affiliations` cannot be less than zero.', ], - '`{argSet}` on the `dkimResults` connection cannot be less than zero.': [ - '`', - ['argSet'], - '` on the `dkimResults` connection cannot be less than zero.', - ], - '`{argSet}` on the `dkim` connection cannot be less than zero.': [ - '`', - ['argSet'], - '` on the `dkim` connection cannot be less than zero.', - ], '`{argSet}` on the `dmarcSummaries` connection cannot be less than zero.': [ '`', ['argSet'], '` on the `dmarcSummaries` connection cannot be less than zero.', ], - '`{argSet}` on the `dmarc` connection cannot be less than zero.': [ - '`', - ['argSet'], - '` on the `dmarc` connection cannot be less than zero.', - ], '`{argSet}` on the `domain` connection cannot be less than zero.': [ '`', ['argSet'], @@ -562,11 +567,6 @@ ['argSet'], '` on the `organization` connection cannot be less than zero.', ], - '`{argSet}` on the `spf` connection cannot be less than zero.': [ - '`', - ['argSet'], - '` on the `spf` connection cannot be less than zero.', - ], '`{argSet}` on the `ssl` connection cannot be less than zero.': [ '`', ['argSet'], diff --git a/api-js/src/locale/en/messages.po b/api-js/src/locale/en/messages.po index c79ea65ad..4a9c70209 100644 --- a/api-js/src/locale/en/messages.po +++ b/api-js/src/locale/en/messages.po @@ -82,6 +82,19 @@ msgid "Organization name already in use, please choose another and try again." msgstr "Organization name already in use, please choose another and try again." #: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:46 +#: src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js:95 +msgid "Passing both `first` and `last` to paginate the `DKIMResults` connection is not supported." +msgstr "Passing both `first` and `last` to paginate the `DKIMResults` connection is not supported." + +#: src/email-scan/loaders/load-dkim-connections-by-domain-id.js:120 +#: src/email-scan/loaders/load-dkim-connections-by-domain-id.js:156 +msgid "Passing both `first` and `last` to paginate the `DKIM` connection is not supported." +msgstr "Passing both `first` and `last` to paginate the `DKIM` connection is not supported." + +#: src/email-scan/loaders/load-dmarc-connections-by-domain-id.js:144 +msgid "Passing both `first` and `last` to paginate the `DMARC` connection is not supported." +msgstr "Passing both `first` and `last` to paginate the `DMARC` connection is not supported." + #: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:48 msgid "Passing both `first` and `last` to paginate the `DkimFailureTable` connection is not supported." msgstr "Passing both `first` and `last` to paginate the `DkimFailureTable` connection is not supported." @@ -94,6 +107,10 @@ msgstr "Passing both `first` and `last` to paginate the `DmarcFailureTable` conn msgid "Passing both `first` and `last` to paginate the `FullPassTable` connection is not supported." msgstr "Passing both `first` and `last` to paginate the `FullPassTable` connection is not supported." +#: src/email-scan/loaders/load-spf-connections-by-domain-id.js:138 +msgid "Passing both `first` and `last` to paginate the `SPF` connection is not supported." +msgstr "Passing both `first` and `last` to paginate the `SPF` connection is not supported." + #: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:48 msgid "Passing both `first` and `last` to paginate the `SpfFailureTable` connection is not supported." msgstr "Passing both `first` and `last` to paginate the `SpfFailureTable` connection is not supported." @@ -103,23 +120,10 @@ msgstr "Passing both `first` and `last` to paginate the `SpfFailureTable` connec msgid "Passing both `first` and `last` to paginate the `affiliation` is not supported." msgstr "Passing both `first` and `last` to paginate the `affiliation` is not supported." -#: src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js:95 -msgid "Passing both `first` and `last` to paginate the `dkimResults` connection is not supported." -msgstr "Passing both `first` and `last` to paginate the `dkimResults` connection is not supported." - -#: src/email-scan/loaders/load-dkim-connections-by-domain-id.js:120 -#: src/email-scan/loaders/load-dkim-connections-by-domain-id.js:156 -msgid "Passing both `first` and `last` to paginate the `dkim` connection is not supported." -msgstr "Passing both `first` and `last` to paginate the `dkim` connection is not supported." - #: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:174 msgid "Passing both `first` and `last` to paginate the `dmarcSummaries` connection is not supported." msgstr "Passing both `first` and `last` to paginate the `dmarcSummaries` connection is not supported." -#: src/email-scan/loaders/load-dmarc-connections-by-domain-id.js:144 -msgid "Passing both `first` and `last` to paginate the `dmarc` connection is not supported." -msgstr "Passing both `first` and `last` to paginate the `dmarc` connection is not supported." - #: src/domain/loaders/load-domain-connections-by-organizations-id.js:131 #: src/domain/loaders/load-domain-connections-by-user-id.js:139 msgid "Passing both `first` and `last` to paginate the `domain` connection is not supported." @@ -142,10 +146,6 @@ msgstr "Passing both `first` and `last` to paginate the `https` connection is no msgid "Passing both `first` and `last` to paginate the `organization` connection is not supported." msgstr "Passing both `first` and `last` to paginate the `organization` connection is not supported." -#: src/email-scan/loaders/load-spf-connections-by-domain-id.js:138 -msgid "Passing both `first` and `last` to paginate the `spf` connection is not supported." -msgstr "Passing both `first` and `last` to paginate the `spf` connection is not supported." - #: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:176 msgid "Passing both `first` and `last` to paginate the `ssl` connection is not supported." msgstr "Passing both `first` and `last` to paginate the `ssl` connection is not supported." @@ -297,25 +297,25 @@ msgid "Requesting `{amount}` records on the `verifiedOrganization` connection ex msgstr "Requesting `{amount}` records on the `verifiedOrganization` connection exceeds the `{argSet}` limit of 100 records." #: src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js:118 -msgid "Requesting {amount} records on the `dkimResults` connection exceeds the `{argSet}` limit of 100 records." -msgstr "Requesting {amount} records on the `dkimResults` connection exceeds the `{argSet}` limit of 100 records." +msgid "Requesting {amount} records on the `DKIMResults` connection exceeds the `{argSet}` limit of 100 records." +msgstr "Requesting {amount} records on the `DKIMResults` connection exceeds the `{argSet}` limit of 100 records." #: src/email-scan/loaders/load-dkim-connections-by-domain-id.js:143 -msgid "Requesting {amount} records on the `dkim` connection exceeds the `{argSet}` limit of 100 records." -msgstr "Requesting {amount} records on the `dkim` connection exceeds the `{argSet}` limit of 100 records." +msgid "Requesting {amount} records on the `DKIM` connection exceeds the `{argSet}` limit of 100 records." +msgstr "Requesting {amount} records on the `DKIM` connection exceeds the `{argSet}` limit of 100 records." #: src/email-scan/loaders/load-dmarc-connections-by-domain-id.js:168 -msgid "Requesting {amount} records on the `dmarc` connection exceeds the `{argSet}` limit of 100 records." -msgstr "Requesting {amount} records on the `dmarc` connection exceeds the `{argSet}` limit of 100 records." +msgid "Requesting {amount} records on the `DMARC` connection exceeds the `{argSet}` limit of 100 records." +msgstr "Requesting {amount} records on the `DMARC` connection exceeds the `{argSet}` limit of 100 records." + +#: src/email-scan/loaders/load-spf-connections-by-domain-id.js:161 +msgid "Requesting {amount} records on the `SPF` connection exceeds the `{argSet}` limit of 100 records." +msgstr "Requesting {amount} records on the `SPF` connection exceeds the `{argSet}` limit of 100 records." #: src/web-scan/loaders/load-https-connections-by-domain-id.js:175 msgid "Requesting {amount} records on the `https` connection exceeds the `{argSet}` limit of 100 records." msgstr "Requesting {amount} records on the `https` connection exceeds the `{argSet}` limit of 100 records." -#: src/email-scan/loaders/load-spf-connections-by-domain-id.js:161 -msgid "Requesting {amount} records on the `spf` connection exceeds the `{argSet}` limit of 100 records." -msgstr "Requesting {amount} records on the `spf` connection exceeds the `{argSet}` limit of 100 records." - #: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:199 msgid "Requesting {amount} records on the `ssl` connection exceeds the `{argSet}` limit of 100 records." msgstr "Requesting {amount} records on the `ssl` connection exceeds the `{argSet}` limit of 100 records." @@ -407,36 +407,41 @@ msgstr "Unable to create organization. Please try again." msgid "Unable to dispatch one time scan. Please try again." msgstr "Unable to dispatch one time scan. Please try again." +#: src/email-scan/loaders/load-dkim-result-by-key.js:19 +#: src/email-scan/loaders/load-dkim-result-by-key.js:33 +msgid "Unable to find DKIM result(s). Please try again." +msgstr "Unable to find DKIM result(s). Please try again." + +#: src/email-scan/loaders/load-dkim-by-key.js:18 +#: src/email-scan/loaders/load-dkim-by-key.js:30 +msgid "Unable to find DKIM scan(s). Please try again." +msgstr "Unable to find DKIM scan(s). Please try again." + +#: src/email-scan/loaders/load-dmarc-by-key.js:18 +#: src/email-scan/loaders/load-dmarc-by-key.js:30 +msgid "Unable to find DMARC scan(s). Please try again." +msgstr "Unable to find DMARC scan(s). Please try again." + #: src/dmarc-summaries/loaders/load-dmarc-summary-by-key.js:36 #: src/dmarc-summaries/loaders/load-dmarc-summary-by-key.js:50 msgid "Unable to find DMARC summary data. Please try again." msgstr "Unable to find DMARC summary data. Please try again." +#: src/email-scan/loaders/load-spf-by-key.js:18 +#: src/email-scan/loaders/load-spf-by-key.js:30 +msgid "Unable to find SPF scan(s). Please try again." +msgstr "Unable to find SPF scan(s). Please try again." + #: src/guidance-tag/loaders/load-dkim-guidance-tags.js:18 #: src/guidance-tag/loaders/load-dkim-guidance-tags.js:32 msgid "Unable to find dkim guidance tags. Please try again." msgstr "Unable to find dkim guidance tags. Please try again." -#: src/email-scan/loaders/load-dkim-result-by-key.js:18 -#: src/email-scan/loaders/load-dkim-result-by-key.js:30 -msgid "Unable to find dkim result. Please try again." -msgstr "Unable to find dkim result. Please try again." - -#: src/email-scan/loaders/load-dkim-by-key.js:18 -#: src/email-scan/loaders/load-dkim-by-key.js:30 -msgid "Unable to find dkim scan. Please try again." -msgstr "Unable to find dkim scan. Please try again." - #: src/guidance-tag/loaders/load-dmarc-guidance-tags.js:18 #: src/guidance-tag/loaders/load-dmarc-guidance-tags.js:32 msgid "Unable to find dmarc guidance tags. Please try again." msgstr "Unable to find dmarc guidance tags. Please try again." -#: src/email-scan/loaders/load-dmarc-by-key.js:18 -#: src/email-scan/loaders/load-dmarc-by-key.js:30 -msgid "Unable to find dmarc scan. Please try again." -msgstr "Unable to find dmarc scan. Please try again." - #: src/guidance-tag/loaders/load-https-guidance-tags.js:18 #: src/guidance-tag/loaders/load-https-guidance-tags.js:32 msgid "Unable to find https guidance tags. Please try again." @@ -459,11 +464,6 @@ msgstr "Unable to find organization. Please try again." msgid "Unable to find spf guidance tags. Please try again." msgstr "Unable to find spf guidance tags. Please try again." -#: src/email-scan/loaders/load-spf-by-key.js:18 -#: src/email-scan/loaders/load-spf-by-key.js:30 -msgid "Unable to find spf scan. Please try again." -msgstr "Unable to find spf scan. Please try again." - #: src/guidance-tag/loaders/load-ssl-guidance-tags.js:18 #: src/guidance-tag/loaders/load-ssl-guidance-tags.js:32 msgid "Unable to find ssl guidance tags. Please try again." @@ -527,12 +527,27 @@ msgstr "Unable to invite yourself to an org." msgid "Unable to load DKIM failure data. Please try again." msgstr "Unable to load DKIM failure data. Please try again." +#: src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js:244 +#: src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js:254 +msgid "Unable to load DKIM result(s). Please try again." +msgstr "Unable to load DKIM result(s). Please try again." + +#: src/email-scan/loaders/load-dkim-connections-by-domain-id.js:268 +#: src/email-scan/loaders/load-dkim-connections-by-domain-id.js:278 +msgid "Unable to load DKIM scan(s). Please try again." +msgstr "Unable to load DKIM scan(s). Please try again." + #: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:16 #: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:142 #: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:154 msgid "Unable to load DMARC failure data. Please try again." msgstr "Unable to load DMARC failure data. Please try again." +#: src/email-scan/loaders/load-dmarc-connections-by-domain-id.js:308 +#: src/email-scan/loaders/load-dmarc-connections-by-domain-id.js:318 +msgid "Unable to load DMARC scan(s). Please try again." +msgstr "Unable to load DMARC scan(s). Please try again." + #: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:417 #: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:429 #: src/dmarc-summaries/loaders/load-dmarc-sum-edge-by-domain-id-period.js:21 @@ -548,6 +563,11 @@ msgstr "Unable to load DMARC summary data. Please try again." msgid "Unable to load SPF failure data. Please try again." msgstr "Unable to load SPF failure data. Please try again." +#: src/email-scan/loaders/load-spf-connections-by-domain-id.js:294 +#: src/email-scan/loaders/load-spf-connections-by-domain-id.js:304 +msgid "Unable to load SPF scan(s). Please try again." +msgstr "Unable to load SPF scan(s). Please try again." + #: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:233 #: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:414 msgid "Unable to load affiliation(s). Please try again." @@ -558,26 +578,11 @@ msgstr "Unable to load affiliation(s). Please try again." msgid "Unable to load dkim guidance tags. Please try again." msgstr "Unable to load dkim guidance tags. Please try again." -#: src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js:244 -#: src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js:254 -msgid "Unable to load dkim results. Please try again." -msgstr "Unable to load dkim results. Please try again." - -#: src/email-scan/loaders/load-dkim-connections-by-domain-id.js:268 -#: src/email-scan/loaders/load-dkim-connections-by-domain-id.js:278 -msgid "Unable to load dkim scans. Please try again." -msgstr "Unable to load dkim scans. Please try again." - #: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:242 #: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:254 msgid "Unable to load dmarc guidance tags. Please try again." msgstr "Unable to load dmarc guidance tags. Please try again." -#: src/email-scan/loaders/load-dmarc-connections-by-domain-id.js:308 -#: src/email-scan/loaders/load-dmarc-connections-by-domain-id.js:318 -msgid "Unable to load dmarc scans. Please try again." -msgstr "Unable to load dmarc scans. Please try again." - #: src/domain/loaders/load-domain-connections-by-organizations-id.js:313 #: src/domain/loaders/load-domain-connections-by-organizations-id.js:323 #: src/domain/loaders/load-domain-connections-by-user-id.js:346 @@ -629,11 +634,6 @@ msgstr "Unable to load organizations. Please try again." msgid "Unable to load spf guidance tags. Please try again." msgstr "Unable to load spf guidance tags. Please try again." -#: src/email-scan/loaders/load-spf-connections-by-domain-id.js:294 -#: src/email-scan/loaders/load-spf-connections-by-domain-id.js:304 -msgid "Unable to load spf scans. Please try again." -msgstr "Unable to load spf scans. Please try again." - #: src/guidance-tag/loaders/load-ssl-guidance-tags-connections.js:242 #: src/guidance-tag/loaders/load-ssl-guidance-tags-connections.js:254 msgid "Unable to load ssl guidance tags. Please try again." @@ -890,6 +890,18 @@ msgstr "Username already in use." msgid "Username not available, please try another." msgstr "Username not available, please try another." +#: src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js:86 +msgid "You must provide a `first` or `last` value to properly paginate the `DKIMResults` connection." +msgstr "You must provide a `first` or `last` value to properly paginate the `DKIMResults` connection." + +#: src/email-scan/loaders/load-dkim-connections-by-domain-id.js:111 +msgid "You must provide a `first` or `last` value to properly paginate the `DKIM` connection." +msgstr "You must provide a `first` or `last` value to properly paginate the `DKIM` connection." + +#: src/email-scan/loaders/load-dmarc-connections-by-domain-id.js:135 +msgid "You must provide a `first` or `last` value to properly paginate the `DMARC` connection." +msgstr "You must provide a `first` or `last` value to properly paginate the `DMARC` connection." + #: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:39 msgid "You must provide a `first` or `last` value to properly paginate the `DkimFailureTable` connection." msgstr "You must provide a `first` or `last` value to properly paginate the `DkimFailureTable` connection." @@ -902,6 +914,10 @@ msgstr "You must provide a `first` or `last` value to properly paginate the `Dma msgid "You must provide a `first` or `last` value to properly paginate the `FullPassTable` connection." msgstr "You must provide a `first` or `last` value to properly paginate the `FullPassTable` connection." +#: src/email-scan/loaders/load-spf-connections-by-domain-id.js:129 +msgid "You must provide a `first` or `last` value to properly paginate the `SPF` connection." +msgstr "You must provide a `first` or `last` value to properly paginate the `SPF` connection." + #: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:39 msgid "You must provide a `first` or `last` value to properly paginate the `SpfFailureTable` connection." msgstr "You must provide a `first` or `last` value to properly paginate the `SpfFailureTable` connection." @@ -911,22 +927,10 @@ msgstr "You must provide a `first` or `last` value to properly paginate the `Spf msgid "You must provide a `first` or `last` value to properly paginate the `affiliation`." msgstr "You must provide a `first` or `last` value to properly paginate the `affiliation`." -#: src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js:86 -msgid "You must provide a `first` or `last` value to properly paginate the `dkimResults` connection." -msgstr "You must provide a `first` or `last` value to properly paginate the `dkimResults` connection." - -#: src/email-scan/loaders/load-dkim-connections-by-domain-id.js:111 -msgid "You must provide a `first` or `last` value to properly paginate the `dkim` connection." -msgstr "You must provide a `first` or `last` value to properly paginate the `dkim` connection." - #: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:165 msgid "You must provide a `first` or `last` value to properly paginate the `dmarcSummaries` connection." msgstr "You must provide a `first` or `last` value to properly paginate the `dmarcSummaries` connection." -#: src/email-scan/loaders/load-dmarc-connections-by-domain-id.js:135 -msgid "You must provide a `first` or `last` value to properly paginate the `dmarc` connection." -msgstr "You must provide a `first` or `last` value to properly paginate the `dmarc` connection." - #: src/domain/loaders/load-domain-connections-by-organizations-id.js:122 #: src/domain/loaders/load-domain-connections-by-user-id.js:130 msgid "You must provide a `first` or `last` value to properly paginate the `domain` connection." @@ -949,10 +953,6 @@ msgstr "You must provide a `first` or `last` value to properly paginate the `htt msgid "You must provide a `first` or `last` value to properly paginate the `organization` connection." msgstr "You must provide a `first` or `last` value to properly paginate the `organization` connection." -#: src/email-scan/loaders/load-spf-connections-by-domain-id.js:129 -msgid "You must provide a `first` or `last` value to properly paginate the `spf` connection." -msgstr "You must provide a `first` or `last` value to properly paginate the `spf` connection." - #: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:167 msgid "You must provide a `first` or `last` value to properly paginate the `ssl` connection." msgstr "You must provide a `first` or `last` value to properly paginate the `ssl` connection." @@ -1004,6 +1004,18 @@ msgstr "You must provide a `year` value to access the `dmarcSummaries` connectio msgid "`{argSet}` must be of type `number` not `{typeSet}`." msgstr "`{argSet}` must be of type `number` not `{typeSet}`." +#: src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js:107 +msgid "`{argSet}` on the `DKIMResults` connection cannot be less than zero." +msgstr "`{argSet}` on the `DKIMResults` connection cannot be less than zero." + +#: src/email-scan/loaders/load-dkim-connections-by-domain-id.js:132 +msgid "`{argSet}` on the `DKIM` connection cannot be less than zero." +msgstr "`{argSet}` on the `DKIM` connection cannot be less than zero." + +#: src/email-scan/loaders/load-dmarc-connections-by-domain-id.js:157 +msgid "`{argSet}` on the `DMARC` connection cannot be less than zero." +msgstr "`{argSet}` on the `DMARC` connection cannot be less than zero." + #: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:60 msgid "`{argSet}` on the `DkimFailureTable` connection cannot be less than zero." msgstr "`{argSet}` on the `DkimFailureTable` connection cannot be less than zero." @@ -1016,6 +1028,10 @@ msgstr "`{argSet}` on the `DmarcFailureTable` connection cannot be less than zer msgid "`{argSet}` on the `FullPassTable` connection cannot be less than zero." msgstr "`{argSet}` on the `FullPassTable` connection cannot be less than zero." +#: src/email-scan/loaders/load-spf-connections-by-domain-id.js:150 +msgid "`{argSet}` on the `SPF` connection cannot be less than zero." +msgstr "`{argSet}` on the `SPF` connection cannot be less than zero." + #: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:60 msgid "`{argSet}` on the `SpfFailureTable` connection cannot be less than zero." msgstr "`{argSet}` on the `SpfFailureTable` connection cannot be less than zero." @@ -1025,22 +1041,10 @@ msgstr "`{argSet}` on the `SpfFailureTable` connection cannot be less than zero. msgid "`{argSet}` on the `affiliations` cannot be less than zero." msgstr "`{argSet}` on the `affiliations` cannot be less than zero." -#: src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js:107 -msgid "`{argSet}` on the `dkimResults` connection cannot be less than zero." -msgstr "`{argSet}` on the `dkimResults` connection cannot be less than zero." - -#: src/email-scan/loaders/load-dkim-connections-by-domain-id.js:132 -msgid "`{argSet}` on the `dkim` connection cannot be less than zero." -msgstr "`{argSet}` on the `dkim` connection cannot be less than zero." - #: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:186 msgid "`{argSet}` on the `dmarcSummaries` connection cannot be less than zero." msgstr "`{argSet}` on the `dmarcSummaries` connection cannot be less than zero." -#: src/email-scan/loaders/load-dmarc-connections-by-domain-id.js:157 -msgid "`{argSet}` on the `dmarc` connection cannot be less than zero." -msgstr "`{argSet}` on the `dmarc` connection cannot be less than zero." - #: src/domain/loaders/load-domain-connections-by-organizations-id.js:143 #: src/domain/loaders/load-domain-connections-by-user-id.js:151 msgid "`{argSet}` on the `domain` connection cannot be less than zero." @@ -1063,10 +1067,6 @@ msgstr "`{argSet}` on the `https` connection cannot be less than zero." msgid "`{argSet}` on the `organization` connection cannot be less than zero." msgstr "`{argSet}` on the `organization` connection cannot be less than zero." -#: src/email-scan/loaders/load-spf-connections-by-domain-id.js:150 -msgid "`{argSet}` on the `spf` connection cannot be less than zero." -msgstr "`{argSet}` on the `spf` connection cannot be less than zero." - #: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:188 msgid "`{argSet}` on the `ssl` connection cannot be less than zero." msgstr "`{argSet}` on the `ssl` connection cannot be less than zero." diff --git a/api-js/src/locale/fr/messages.js b/api-js/src/locale/fr/messages.js index aa3c04d18..5561f218d 100644 --- a/api-js/src/locale/fr/messages.js +++ b/api-js/src/locale/fr/messages.js @@ -18,6 +18,11 @@ 'No verified domain with the provided domain could be found.': 'todo', 'Organization has already been verified.': 'todo', 'Organization name already in use, please choose another and try again.': + 'Passing both `first` and `last` to paginate the `DKIMResults` connection is not supported.': + 'todo', + 'Passing both `first` and `last` to paginate the `DKIM` connection is not supported.': + 'todo', + 'Passing both `first` and `last` to paginate the `DMARC` connection is not supported.': 'todo', 'Passing both `first` and `last` to paginate the `DkimFailureTable` connection is not supported.': 'todo', @@ -25,18 +30,14 @@ 'todo', 'Passing both `first` and `last` to paginate the `FullPassTable` connection is not supported.': 'todo', + 'Passing both `first` and `last` to paginate the `SPF` connection is not supported.': + 'todo', 'Passing both `first` and `last` to paginate the `SpfFailureTable` connection is not supported.': 'todo', 'Passing both `first` and `last` to paginate the `affiliation` is not supported.': 'todo', - 'Passing both `first` and `last` to paginate the `dkimResults` connection is not supported.': - 'todo', - 'Passing both `first` and `last` to paginate the `dkim` connection is not supported.': - 'todo', 'Passing both `first` and `last` to paginate the `dmarcSummaries` connection is not supported.': 'todo', - 'Passing both `first` and `last` to paginate the `dmarc` connection is not supported.': - 'todo', 'Passing both `first` and `last` to paginate the `domain` connection is not supported.': 'todo', 'Passing both `first` and `last` to paginate the `guidanceTag` connection is not supported.': @@ -45,8 +46,6 @@ 'todo', 'Passing both `first` and `last` to paginate the `organization` connection is not supported.': 'todo', - 'Passing both `first` and `last` to paginate the `spf` connection is not supported.': - 'todo', 'Passing both `first` and `last` to paginate the `ssl` connection is not supported.': 'todo', 'Passing both `first` and `last` to paginate the `verifiedDomain` connection is not supported.': @@ -105,15 +104,15 @@ 'todo', 'Requesting `{amount}` records on the `verifiedOrganization` connection exceeds the `{argSet}` limit of 100 records.': 'todo', - 'Requesting {amount} records on the `dkimResults` connection exceeds the `{argSet}` limit of 100 records.': + 'Requesting {amount} records on the `DKIMResults` connection exceeds the `{argSet}` limit of 100 records.': 'todo', - 'Requesting {amount} records on the `dkim` connection exceeds the `{argSet}` limit of 100 records.': + 'Requesting {amount} records on the `DKIM` connection exceeds the `{argSet}` limit of 100 records.': 'todo', - 'Requesting {amount} records on the `dmarc` connection exceeds the `{argSet}` limit of 100 records.': + 'Requesting {amount} records on the `DMARC` connection exceeds the `{argSet}` limit of 100 records.': 'todo', - 'Requesting {amount} records on the `https` connection exceeds the `{argSet}` limit of 100 records.': + 'Requesting {amount} records on the `SPF` connection exceeds the `{argSet}` limit of 100 records.': 'todo', - 'Requesting {amount} records on the `spf` connection exceeds the `{argSet}` limit of 100 records.': + 'Requesting {amount} records on the `https` connection exceeds the `{argSet}` limit of 100 records.': 'todo', 'Requesting {amount} records on the `ssl` connection exceeds the `{argSet}` limit of 100 records.': 'todo', @@ -139,17 +138,17 @@ 'Unable to create domain. Please try again.': 'todo', 'Unable to create organization. Please try again.': 'todo', 'Unable to dispatch one time scan. Please try again.': 'todo', + 'Unable to find DKIM result(s). Please try again.': 'todo', + 'Unable to find DKIM scan(s). Please try again.': 'todo', + 'Unable to find DMARC scan(s). Please try again.': 'todo', 'Unable to find DMARC summary data. Please try again.': 'todo', + 'Unable to find SPF scan(s). Please try again.': 'todo', 'Unable to find dkim guidance tags. Please try again.': 'todo', - 'Unable to find dkim result. Please try again.': 'todo', - 'Unable to find dkim scan. Please try again.': 'todo', 'Unable to find dmarc guidance tags. Please try again.': 'todo', - 'Unable to find dmarc scan. Please try again.': 'todo', 'Unable to find https guidance tags. Please try again.': 'todo', 'Unable to find https scan. Please try again.': 'todo', 'Unable to find organization. Please try again.': 'todo', 'Unable to find spf guidance tags. Please try again.': 'todo', - 'Unable to find spf scan. Please try again.': 'todo', 'Unable to find ssl guidance tags. Please try again.': 'todo', 'Unable to find ssl scan. Please try again.': 'todo', 'Unable to find summary. Please try again.': 'todo', @@ -162,15 +161,16 @@ 'Unable to invite user. Please try again.': 'todo', 'Unable to invite yourself to an org.': 'todo', 'Unable to load DKIM failure data. Please try again.': 'todo', + 'Unable to load DKIM result(s). Please try again.': 'todo', + 'Unable to load DKIM scan(s). Please try again.': 'todo', 'Unable to load DMARC failure data. Please try again.': 'todo', + 'Unable to load DMARC scan(s). Please try again.': 'todo', 'Unable to load DMARC summary data. Please try again.': 'todo', 'Unable to load SPF failure data. Please try again.': 'todo', + 'Unable to load SPF scan(s). Please try again.': 'todo', 'Unable to load affiliation(s). Please try again.': 'todo', 'Unable to load dkim guidance tags. Please try again.': 'todo', - 'Unable to load dkim results. Please try again.': 'todo', - 'Unable to load dkim scans. Please try again.': 'todo', 'Unable to load dmarc guidance tags. Please try again.': 'todo', - 'Unable to load dmarc scans. Please try again.': 'todo', 'Unable to load domain(s). Please try again.': 'todo', 'Unable to load domain. Please try again.': 'todo', 'Unable to load domains. Please try again.': 'todo', @@ -180,7 +180,6 @@ 'Unable to load mail summary. Please try again.': 'todo', 'Unable to load organizations. Please try again.': 'todo', 'Unable to load spf guidance tags. Please try again.': 'todo', - 'Unable to load spf scans. Please try again.': 'todo', 'Unable to load ssl guidance tags. Please try again.': 'todo', 'Unable to load ssl scans. Please try again.': 'todo', 'Unable to load verified domains. Please try again.': 'todo', @@ -244,24 +243,26 @@ 'User role was updated successfully.': 'todo', 'Username already in use.': 'todo', 'Username not available, please try another.': 'todo', + 'You must provide a `first` or `last` value to properly paginate the `DKIMResults` connection.': + 'todo', + 'You must provide a `first` or `last` value to properly paginate the `DKIM` connection.': + 'todo', + 'You must provide a `first` or `last` value to properly paginate the `DMARC` connection.': + 'todo', 'You must provide a `first` or `last` value to properly paginate the `DkimFailureTable` connection.': 'todo', 'You must provide a `first` or `last` value to properly paginate the `DmarcFailureTable` connection.': 'todo', 'You must provide a `first` or `last` value to properly paginate the `FullPassTable` connection.': 'todo', + 'You must provide a `first` or `last` value to properly paginate the `SPF` connection.': + 'todo', 'You must provide a `first` or `last` value to properly paginate the `SpfFailureTable` connection.': 'todo', 'You must provide a `first` or `last` value to properly paginate the `affiliation`.': 'todo', - 'You must provide a `first` or `last` value to properly paginate the `dkimResults` connection.': - 'todo', - 'You must provide a `first` or `last` value to properly paginate the `dkim` connection.': - 'todo', 'You must provide a `first` or `last` value to properly paginate the `dmarcSummaries` connection.': 'todo', - 'You must provide a `first` or `last` value to properly paginate the `dmarc` connection.': - 'todo', 'You must provide a `first` or `last` value to properly paginate the `domain` connection.': 'todo', 'You must provide a `first` or `last` value to properly paginate the `guidanceTag` connection.': @@ -270,8 +271,6 @@ 'todo', 'You must provide a `first` or `last` value to properly paginate the `organization` connection.': 'todo', - 'You must provide a `first` or `last` value to properly paginate the `spf` connection.': - 'todo', 'You must provide a `first` or `last` value to properly paginate the `ssl` connection.': 'todo', 'You must provide a `first` or `last` value to properly paginate the `verifiedDomain` connection.': @@ -283,28 +282,28 @@ 'You must provide a `year` value to access the `dmarcSummaries` connection.': 'todo', '`{argSet}` must be of type `number` not `{typeSet}`.': 'todo', + '`{argSet}` on the `DKIMResults` connection cannot be less than zero.': + 'todo', + '`{argSet}` on the `DKIM` connection cannot be less than zero.': 'todo', + '`{argSet}` on the `DMARC` connection cannot be less than zero.': 'todo', '`{argSet}` on the `DkimFailureTable` connection cannot be less than zero.': 'todo', '`{argSet}` on the `DmarcFailureTable` connection cannot be less than zero.': 'todo', '`{argSet}` on the `FullPassTable` connection cannot be less than zero.': 'todo', + '`{argSet}` on the `SPF` connection cannot be less than zero.': 'todo', '`{argSet}` on the `SpfFailureTable` connection cannot be less than zero.': 'todo', '`{argSet}` on the `affiliations` cannot be less than zero.': 'todo', - '`{argSet}` on the `dkimResults` connection cannot be less than zero.': - 'todo', - '`{argSet}` on the `dkim` connection cannot be less than zero.': 'todo', '`{argSet}` on the `dmarcSummaries` connection cannot be less than zero.': 'todo', - '`{argSet}` on the `dmarc` connection cannot be less than zero.': 'todo', '`{argSet}` on the `domain` connection cannot be less than zero.': 'todo', '`{argSet}` on the `guidanceTag` connection cannot be less than zero.': 'todo', '`{argSet}` on the `https` connection cannot be less than zero.': 'todo', '`{argSet}` on the `organization` connection cannot be less than zero.': 'todo', - '`{argSet}` on the `spf` connection cannot be less than zero.': 'todo', '`{argSet}` on the `ssl` connection cannot be less than zero.': 'todo', '`{argSet}` on the `verifiedDomain` connection cannot be less than zero.': 'todo', diff --git a/api-js/src/locale/fr/messages.po b/api-js/src/locale/fr/messages.po index 2fb17ce3a..aa0716c1e 100644 --- a/api-js/src/locale/fr/messages.po +++ b/api-js/src/locale/fr/messages.po @@ -82,6 +82,19 @@ msgid "Organization name already in use, please choose another and try again." msgstr "todo" #: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:46 +#: src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js:95 +msgid "Passing both `first` and `last` to paginate the `DKIMResults` connection is not supported." +msgstr "todo" + +#: src/email-scan/loaders/load-dkim-connections-by-domain-id.js:120 +#: src/email-scan/loaders/load-dkim-connections-by-domain-id.js:156 +msgid "Passing both `first` and `last` to paginate the `DKIM` connection is not supported." +msgstr "todo" + +#: src/email-scan/loaders/load-dmarc-connections-by-domain-id.js:144 +msgid "Passing both `first` and `last` to paginate the `DMARC` connection is not supported." +msgstr "todo" + #: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:48 msgid "Passing both `first` and `last` to paginate the `DkimFailureTable` connection is not supported." msgstr "todo" @@ -94,6 +107,10 @@ msgstr "todo" msgid "Passing both `first` and `last` to paginate the `FullPassTable` connection is not supported." msgstr "todo" +#: src/email-scan/loaders/load-spf-connections-by-domain-id.js:138 +msgid "Passing both `first` and `last` to paginate the `SPF` connection is not supported." +msgstr "todo" + #: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:48 msgid "Passing both `first` and `last` to paginate the `SpfFailureTable` connection is not supported." msgstr "todo" @@ -103,23 +120,10 @@ msgstr "todo" msgid "Passing both `first` and `last` to paginate the `affiliation` is not supported." msgstr "todo" -#: src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js:95 -msgid "Passing both `first` and `last` to paginate the `dkimResults` connection is not supported." -msgstr "todo" - -#: src/email-scan/loaders/load-dkim-connections-by-domain-id.js:120 -#: src/email-scan/loaders/load-dkim-connections-by-domain-id.js:156 -msgid "Passing both `first` and `last` to paginate the `dkim` connection is not supported." -msgstr "todo" - #: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:174 msgid "Passing both `first` and `last` to paginate the `dmarcSummaries` connection is not supported." msgstr "todo" -#: src/email-scan/loaders/load-dmarc-connections-by-domain-id.js:144 -msgid "Passing both `first` and `last` to paginate the `dmarc` connection is not supported." -msgstr "todo" - #: src/domain/loaders/load-domain-connections-by-organizations-id.js:131 #: src/domain/loaders/load-domain-connections-by-user-id.js:139 msgid "Passing both `first` and `last` to paginate the `domain` connection is not supported." @@ -142,10 +146,6 @@ msgstr "todo" msgid "Passing both `first` and `last` to paginate the `organization` connection is not supported." msgstr "todo" -#: src/email-scan/loaders/load-spf-connections-by-domain-id.js:138 -msgid "Passing both `first` and `last` to paginate the `spf` connection is not supported." -msgstr "todo" - #: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:176 msgid "Passing both `first` and `last` to paginate the `ssl` connection is not supported." msgstr "todo" @@ -297,23 +297,23 @@ msgid "Requesting `{amount}` records on the `verifiedOrganization` connection ex msgstr "todo" #: src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js:118 -msgid "Requesting {amount} records on the `dkimResults` connection exceeds the `{argSet}` limit of 100 records." +msgid "Requesting {amount} records on the `DKIMResults` connection exceeds the `{argSet}` limit of 100 records." msgstr "todo" #: src/email-scan/loaders/load-dkim-connections-by-domain-id.js:143 -msgid "Requesting {amount} records on the `dkim` connection exceeds the `{argSet}` limit of 100 records." +msgid "Requesting {amount} records on the `DKIM` connection exceeds the `{argSet}` limit of 100 records." msgstr "todo" #: src/email-scan/loaders/load-dmarc-connections-by-domain-id.js:168 -msgid "Requesting {amount} records on the `dmarc` connection exceeds the `{argSet}` limit of 100 records." +msgid "Requesting {amount} records on the `DMARC` connection exceeds the `{argSet}` limit of 100 records." msgstr "todo" -#: src/web-scan/loaders/load-https-connections-by-domain-id.js:175 -msgid "Requesting {amount} records on the `https` connection exceeds the `{argSet}` limit of 100 records." +#: src/email-scan/loaders/load-spf-connections-by-domain-id.js:161 +msgid "Requesting {amount} records on the `SPF` connection exceeds the `{argSet}` limit of 100 records." msgstr "todo" -#: src/email-scan/loaders/load-spf-connections-by-domain-id.js:161 -msgid "Requesting {amount} records on the `spf` connection exceeds the `{argSet}` limit of 100 records." +#: src/web-scan/loaders/load-https-connections-by-domain-id.js:175 +msgid "Requesting {amount} records on the `https` connection exceeds the `{argSet}` limit of 100 records." msgstr "todo" #: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:199 @@ -407,36 +407,41 @@ msgstr "todo" msgid "Unable to dispatch one time scan. Please try again." msgstr "todo" +#: src/email-scan/loaders/load-dkim-result-by-key.js:19 +#: src/email-scan/loaders/load-dkim-result-by-key.js:33 +msgid "Unable to find DKIM result(s). Please try again." +msgstr "todo" + +#: src/email-scan/loaders/load-dkim-by-key.js:18 +#: src/email-scan/loaders/load-dkim-by-key.js:30 +msgid "Unable to find DKIM scan(s). Please try again." +msgstr "todo" + +#: src/email-scan/loaders/load-dmarc-by-key.js:18 +#: src/email-scan/loaders/load-dmarc-by-key.js:30 +msgid "Unable to find DMARC scan(s). Please try again." +msgstr "todo" + #: src/dmarc-summaries/loaders/load-dmarc-summary-by-key.js:36 #: src/dmarc-summaries/loaders/load-dmarc-summary-by-key.js:50 msgid "Unable to find DMARC summary data. Please try again." msgstr "todo" +#: src/email-scan/loaders/load-spf-by-key.js:18 +#: src/email-scan/loaders/load-spf-by-key.js:30 +msgid "Unable to find SPF scan(s). Please try again." +msgstr "todo" + #: src/guidance-tag/loaders/load-dkim-guidance-tags.js:18 #: src/guidance-tag/loaders/load-dkim-guidance-tags.js:32 msgid "Unable to find dkim guidance tags. Please try again." msgstr "todo" -#: src/email-scan/loaders/load-dkim-result-by-key.js:18 -#: src/email-scan/loaders/load-dkim-result-by-key.js:30 -msgid "Unable to find dkim result. Please try again." -msgstr "todo" - -#: src/email-scan/loaders/load-dkim-by-key.js:18 -#: src/email-scan/loaders/load-dkim-by-key.js:30 -msgid "Unable to find dkim scan. Please try again." -msgstr "todo" - #: src/guidance-tag/loaders/load-dmarc-guidance-tags.js:18 #: src/guidance-tag/loaders/load-dmarc-guidance-tags.js:32 msgid "Unable to find dmarc guidance tags. Please try again." msgstr "todo" -#: src/email-scan/loaders/load-dmarc-by-key.js:18 -#: src/email-scan/loaders/load-dmarc-by-key.js:30 -msgid "Unable to find dmarc scan. Please try again." -msgstr "todo" - #: src/guidance-tag/loaders/load-https-guidance-tags.js:18 #: src/guidance-tag/loaders/load-https-guidance-tags.js:32 msgid "Unable to find https guidance tags. Please try again." @@ -459,11 +464,6 @@ msgstr "todo" msgid "Unable to find spf guidance tags. Please try again." msgstr "todo" -#: src/email-scan/loaders/load-spf-by-key.js:18 -#: src/email-scan/loaders/load-spf-by-key.js:30 -msgid "Unable to find spf scan. Please try again." -msgstr "todo" - #: src/guidance-tag/loaders/load-ssl-guidance-tags.js:18 #: src/guidance-tag/loaders/load-ssl-guidance-tags.js:32 msgid "Unable to find ssl guidance tags. Please try again." @@ -527,12 +527,27 @@ msgstr "todo" msgid "Unable to load DKIM failure data. Please try again." msgstr "todo" +#: src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js:244 +#: src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js:254 +msgid "Unable to load DKIM result(s). Please try again." +msgstr "todo" + +#: src/email-scan/loaders/load-dkim-connections-by-domain-id.js:268 +#: src/email-scan/loaders/load-dkim-connections-by-domain-id.js:278 +msgid "Unable to load DKIM scan(s). Please try again." +msgstr "todo" + #: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:16 #: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:142 #: src/dmarc-summaries/loaders/load-dmarc-failure-connections-by-sum-id.js:154 msgid "Unable to load DMARC failure data. Please try again." msgstr "todo" +#: src/email-scan/loaders/load-dmarc-connections-by-domain-id.js:308 +#: src/email-scan/loaders/load-dmarc-connections-by-domain-id.js:318 +msgid "Unable to load DMARC scan(s). Please try again." +msgstr "todo" + #: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:417 #: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:429 #: src/dmarc-summaries/loaders/load-dmarc-sum-edge-by-domain-id-period.js:21 @@ -548,6 +563,11 @@ msgstr "todo" msgid "Unable to load SPF failure data. Please try again." msgstr "todo" +#: src/email-scan/loaders/load-spf-connections-by-domain-id.js:294 +#: src/email-scan/loaders/load-spf-connections-by-domain-id.js:304 +msgid "Unable to load SPF scan(s). Please try again." +msgstr "todo" + #: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:233 #: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:414 msgid "Unable to load affiliation(s). Please try again." @@ -558,26 +578,11 @@ msgstr "todo" msgid "Unable to load dkim guidance tags. Please try again." msgstr "todo" -#: src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js:244 -#: src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js:254 -msgid "Unable to load dkim results. Please try again." -msgstr "todo" - -#: src/email-scan/loaders/load-dkim-connections-by-domain-id.js:268 -#: src/email-scan/loaders/load-dkim-connections-by-domain-id.js:278 -msgid "Unable to load dkim scans. Please try again." -msgstr "todo" - #: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:242 #: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:254 msgid "Unable to load dmarc guidance tags. Please try again." msgstr "todo" -#: src/email-scan/loaders/load-dmarc-connections-by-domain-id.js:308 -#: src/email-scan/loaders/load-dmarc-connections-by-domain-id.js:318 -msgid "Unable to load dmarc scans. Please try again." -msgstr "todo" - #: src/domain/loaders/load-domain-connections-by-organizations-id.js:313 #: src/domain/loaders/load-domain-connections-by-organizations-id.js:323 #: src/domain/loaders/load-domain-connections-by-user-id.js:346 @@ -629,11 +634,6 @@ msgstr "todo" msgid "Unable to load spf guidance tags. Please try again." msgstr "todo" -#: src/email-scan/loaders/load-spf-connections-by-domain-id.js:294 -#: src/email-scan/loaders/load-spf-connections-by-domain-id.js:304 -msgid "Unable to load spf scans. Please try again." -msgstr "todo" - #: src/guidance-tag/loaders/load-ssl-guidance-tags-connections.js:242 #: src/guidance-tag/loaders/load-ssl-guidance-tags-connections.js:254 msgid "Unable to load ssl guidance tags. Please try again." @@ -890,6 +890,18 @@ msgstr "todo" msgid "Username not available, please try another." msgstr "todo" +#: src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js:86 +msgid "You must provide a `first` or `last` value to properly paginate the `DKIMResults` connection." +msgstr "todo" + +#: src/email-scan/loaders/load-dkim-connections-by-domain-id.js:111 +msgid "You must provide a `first` or `last` value to properly paginate the `DKIM` connection." +msgstr "todo" + +#: src/email-scan/loaders/load-dmarc-connections-by-domain-id.js:135 +msgid "You must provide a `first` or `last` value to properly paginate the `DMARC` connection." +msgstr "todo" + #: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:39 msgid "You must provide a `first` or `last` value to properly paginate the `DkimFailureTable` connection." msgstr "todo" @@ -902,6 +914,10 @@ msgstr "todo" msgid "You must provide a `first` or `last` value to properly paginate the `FullPassTable` connection." msgstr "todo" +#: src/email-scan/loaders/load-spf-connections-by-domain-id.js:129 +msgid "You must provide a `first` or `last` value to properly paginate the `SPF` connection." +msgstr "todo" + #: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:39 msgid "You must provide a `first` or `last` value to properly paginate the `SpfFailureTable` connection." msgstr "todo" @@ -911,22 +927,10 @@ msgstr "todo" msgid "You must provide a `first` or `last` value to properly paginate the `affiliation`." msgstr "todo" -#: src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js:86 -msgid "You must provide a `first` or `last` value to properly paginate the `dkimResults` connection." -msgstr "todo" - -#: src/email-scan/loaders/load-dkim-connections-by-domain-id.js:111 -msgid "You must provide a `first` or `last` value to properly paginate the `dkim` connection." -msgstr "todo" - #: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:165 msgid "You must provide a `first` or `last` value to properly paginate the `dmarcSummaries` connection." msgstr "todo" -#: src/email-scan/loaders/load-dmarc-connections-by-domain-id.js:135 -msgid "You must provide a `first` or `last` value to properly paginate the `dmarc` connection." -msgstr "todo" - #: src/domain/loaders/load-domain-connections-by-organizations-id.js:122 #: src/domain/loaders/load-domain-connections-by-user-id.js:130 msgid "You must provide a `first` or `last` value to properly paginate the `domain` connection." @@ -949,10 +953,6 @@ msgstr "todo" msgid "You must provide a `first` or `last` value to properly paginate the `organization` connection." msgstr "todo" -#: src/email-scan/loaders/load-spf-connections-by-domain-id.js:129 -msgid "You must provide a `first` or `last` value to properly paginate the `spf` connection." -msgstr "todo" - #: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:167 msgid "You must provide a `first` or `last` value to properly paginate the `ssl` connection." msgstr "todo" @@ -1004,6 +1004,18 @@ msgstr "todo" msgid "`{argSet}` must be of type `number` not `{typeSet}`." msgstr "todo" +#: src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js:107 +msgid "`{argSet}` on the `DKIMResults` connection cannot be less than zero." +msgstr "todo" + +#: src/email-scan/loaders/load-dkim-connections-by-domain-id.js:132 +msgid "`{argSet}` on the `DKIM` connection cannot be less than zero." +msgstr "todo" + +#: src/email-scan/loaders/load-dmarc-connections-by-domain-id.js:157 +msgid "`{argSet}` on the `DMARC` connection cannot be less than zero." +msgstr "todo" + #: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:60 msgid "`{argSet}` on the `DkimFailureTable` connection cannot be less than zero." msgstr "todo" @@ -1016,6 +1028,10 @@ msgstr "todo" msgid "`{argSet}` on the `FullPassTable` connection cannot be less than zero." msgstr "todo" +#: src/email-scan/loaders/load-spf-connections-by-domain-id.js:150 +msgid "`{argSet}` on the `SPF` connection cannot be less than zero." +msgstr "todo" + #: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:60 msgid "`{argSet}` on the `SpfFailureTable` connection cannot be less than zero." msgstr "todo" @@ -1025,22 +1041,10 @@ msgstr "todo" msgid "`{argSet}` on the `affiliations` cannot be less than zero." msgstr "todo" -#: src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js:107 -msgid "`{argSet}` on the `dkimResults` connection cannot be less than zero." -msgstr "todo" - -#: src/email-scan/loaders/load-dkim-connections-by-domain-id.js:132 -msgid "`{argSet}` on the `dkim` connection cannot be less than zero." -msgstr "todo" - #: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:186 msgid "`{argSet}` on the `dmarcSummaries` connection cannot be less than zero." msgstr "todo" -#: src/email-scan/loaders/load-dmarc-connections-by-domain-id.js:157 -msgid "`{argSet}` on the `dmarc` connection cannot be less than zero." -msgstr "todo" - #: src/domain/loaders/load-domain-connections-by-organizations-id.js:143 #: src/domain/loaders/load-domain-connections-by-user-id.js:151 msgid "`{argSet}` on the `domain` connection cannot be less than zero." @@ -1063,10 +1067,6 @@ msgstr "todo" msgid "`{argSet}` on the `organization` connection cannot be less than zero." msgstr "todo" -#: src/email-scan/loaders/load-spf-connections-by-domain-id.js:150 -msgid "`{argSet}` on the `spf` connection cannot be less than zero." -msgstr "todo" - #: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:188 msgid "`{argSet}` on the `ssl` connection cannot be less than zero." msgstr "todo" From d8b190445db8ce878301e453062f1980c8322f94 Mon Sep 17 00:00:00 2001 From: nsdeschenes Date: Fri, 12 Mar 2021 10:11:28 -0400 Subject: [PATCH 05/21] guidance tag error messages updated --- ...oad-dkim-guidance-tags-connections.test.js | 16 +- .../__tests__/load-dkim-guidance-tags.test.js | 4 +- ...ad-dmarc-guidance-tags-connections.test.js | 16 +- .../load-dmarc-guidance-tags.test.js | 4 +- ...ad-https-guidance-tags-connections.test.js | 16 +- .../load-https-guidance-tags.test.js | 4 +- ...load-spf-guidance-tags-connections.test.js | 16 +- .../__tests__/load-spf-guidance-tags.test.js | 4 +- ...load-ssl-guidance-tags-connections.test.js | 16 +- .../__tests__/load-ssl-guidance-tags.test.js | 4 +- .../load-dkim-guidance-tags-connections.js | 12 +- .../loaders/load-dkim-guidance-tags.js | 4 +- .../load-dmarc-guidance-tags-connections.js | 12 +- .../loaders/load-dmarc-guidance-tags.js | 4 +- .../load-https-guidance-tags-connections.js | 12 +- .../loaders/load-https-guidance-tags.js | 4 +- .../load-spf-guidance-tags-connections.js | 12 +- .../loaders/load-spf-guidance-tags.js | 4 +- .../load-ssl-guidance-tags-connections.js | 12 +- .../loaders/load-ssl-guidance-tags.js | 4 +- api-js/src/locale/en/messages.js | 72 ++++---- api-js/src/locale/en/messages.po | 162 +++++++++--------- api-js/src/locale/fr/messages.js | 36 ++-- api-js/src/locale/fr/messages.po | 158 ++++++++--------- 24 files changed, 304 insertions(+), 304 deletions(-) diff --git a/api-js/src/guidance-tag/loaders/__tests__/load-dkim-guidance-tags-connections.test.js b/api-js/src/guidance-tag/loaders/__tests__/load-dkim-guidance-tags-connections.test.js index cfe3e234c..ad1f3f0ed 100644 --- a/api-js/src/guidance-tag/loaders/__tests__/load-dkim-guidance-tags-connections.test.js +++ b/api-js/src/guidance-tag/loaders/__tests__/load-dkim-guidance-tags-connections.test.js @@ -670,7 +670,7 @@ describe('when given the load dkim guidance tag connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'You must provide a `first` or `last` value to properly paginate the `guidanceTag` connection.', + 'You must provide a `first` or `last` value to properly paginate the `GuidanceTag` connection.', ), ) } @@ -702,7 +702,7 @@ describe('when given the load dkim guidance tag connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Passing both `first` and `last` to paginate the `guidanceTag` connection is not supported.', + 'Passing both `first` and `last` to paginate the `GuidanceTag` connection is not supported.', ), ) } @@ -734,7 +734,7 @@ describe('when given the load dkim guidance tag connection function', () => { } catch (err) { expect(err).toEqual( new Error( - '`first` on the `guidanceTag` connection cannot be less than zero.', + '`first` on the `GuidanceTag` connection cannot be less than zero.', ), ) } @@ -765,7 +765,7 @@ describe('when given the load dkim guidance tag connection function', () => { } catch (err) { expect(err).toEqual( new Error( - '`last` on the `guidanceTag` connection cannot be less than zero.', + '`last` on the `GuidanceTag` connection cannot be less than zero.', ), ) } @@ -798,7 +798,7 @@ describe('when given the load dkim guidance tag connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Requesting `1000` records on the `guidanceTag` connection exceeds the `first` limit of 100 records.', + 'Requesting `1000` records on the `GuidanceTag` connection exceeds the `first` limit of 100 records.', ), ) } @@ -829,7 +829,7 @@ describe('when given the load dkim guidance tag connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Requesting `500` records on the `guidanceTag` connection exceeds the `last` limit of 100 records.', + 'Requesting `500` records on the `GuidanceTag` connection exceeds the `last` limit of 100 records.', ), ) } @@ -940,7 +940,7 @@ describe('when given the load dkim guidance tag connection function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load dkim guidance tags. Please try again.'), + new Error('Unable to load DKIM guidance tag(s). Please try again.'), ) } @@ -976,7 +976,7 @@ describe('when given the load dkim guidance tag connection function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load dkim guidance tags. Please try again.'), + new Error('Unable to load DKIM guidance tag(s). Please try again.'), ) } diff --git a/api-js/src/guidance-tag/loaders/__tests__/load-dkim-guidance-tags.test.js b/api-js/src/guidance-tag/loaders/__tests__/load-dkim-guidance-tags.test.js index 46de58cbf..4dbef4d0e 100644 --- a/api-js/src/guidance-tag/loaders/__tests__/load-dkim-guidance-tags.test.js +++ b/api-js/src/guidance-tag/loaders/__tests__/load-dkim-guidance-tags.test.js @@ -111,7 +111,7 @@ describe('given the dkimGuidanceTagLoader function', () => { await loader.load('1') } catch (err) { expect(err).toEqual( - new Error('Unable to find dkim guidance tags. Please try again.'), + new Error('Unable to find DKIM guidance tag(s). Please try again.'), ) } @@ -134,7 +134,7 @@ describe('given the dkimGuidanceTagLoader function', () => { await loader.load('1') } catch (err) { expect(err).toEqual( - new Error('Unable to find dkim guidance tags. Please try again.'), + new Error('Unable to find DKIM guidance tag(s). Please try again.'), ) } diff --git a/api-js/src/guidance-tag/loaders/__tests__/load-dmarc-guidance-tags-connections.test.js b/api-js/src/guidance-tag/loaders/__tests__/load-dmarc-guidance-tags-connections.test.js index f612c3a62..5a0b47e84 100644 --- a/api-js/src/guidance-tag/loaders/__tests__/load-dmarc-guidance-tags-connections.test.js +++ b/api-js/src/guidance-tag/loaders/__tests__/load-dmarc-guidance-tags-connections.test.js @@ -680,7 +680,7 @@ describe('when given the load dmarc guidance tag connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'You must provide a `first` or `last` value to properly paginate the `guidanceTag` connection.', + 'You must provide a `first` or `last` value to properly paginate the `GuidanceTag` connection.', ), ) } @@ -712,7 +712,7 @@ describe('when given the load dmarc guidance tag connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Passing both `first` and `last` to paginate the `guidanceTag` connection is not supported.', + 'Passing both `first` and `last` to paginate the `GuidanceTag` connection is not supported.', ), ) } @@ -744,7 +744,7 @@ describe('when given the load dmarc guidance tag connection function', () => { } catch (err) { expect(err).toEqual( new Error( - '`first` on the `guidanceTag` connection cannot be less than zero.', + '`first` on the `GuidanceTag` connection cannot be less than zero.', ), ) } @@ -775,7 +775,7 @@ describe('when given the load dmarc guidance tag connection function', () => { } catch (err) { expect(err).toEqual( new Error( - '`last` on the `guidanceTag` connection cannot be less than zero.', + '`last` on the `GuidanceTag` connection cannot be less than zero.', ), ) } @@ -808,7 +808,7 @@ describe('when given the load dmarc guidance tag connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Requesting `1000` records on the `guidanceTag` connection exceeds the `first` limit of 100 records.', + 'Requesting `1000` records on the `GuidanceTag` connection exceeds the `first` limit of 100 records.', ), ) } @@ -839,7 +839,7 @@ describe('when given the load dmarc guidance tag connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Requesting `500` records on the `guidanceTag` connection exceeds the `last` limit of 100 records.', + 'Requesting `500` records on the `GuidanceTag` connection exceeds the `last` limit of 100 records.', ), ) } @@ -950,7 +950,7 @@ describe('when given the load dmarc guidance tag connection function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load dmarc guidance tags. Please try again.'), + new Error('Unable to load DMARC guidance tag(s). Please try again.'), ) } @@ -986,7 +986,7 @@ describe('when given the load dmarc guidance tag connection function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load dmarc guidance tags. Please try again.'), + new Error('Unable to load DMARC guidance tag(s). Please try again.'), ) } diff --git a/api-js/src/guidance-tag/loaders/__tests__/load-dmarc-guidance-tags.test.js b/api-js/src/guidance-tag/loaders/__tests__/load-dmarc-guidance-tags.test.js index 970aad4cd..896dab703 100644 --- a/api-js/src/guidance-tag/loaders/__tests__/load-dmarc-guidance-tags.test.js +++ b/api-js/src/guidance-tag/loaders/__tests__/load-dmarc-guidance-tags.test.js @@ -111,7 +111,7 @@ describe('given the dmarcGuidanceTagLoader function', () => { await loader.load('1') } catch (err) { expect(err).toEqual( - new Error('Unable to find dmarc guidance tags. Please try again.'), + new Error('Unable to find DMARC guidance tag(s). Please try again.'), ) } @@ -134,7 +134,7 @@ describe('given the dmarcGuidanceTagLoader function', () => { await loader.load('1') } catch (err) { expect(err).toEqual( - new Error('Unable to find dmarc guidance tags. Please try again.'), + new Error('Unable to find DMARC guidance tag(s). Please try again.'), ) } diff --git a/api-js/src/guidance-tag/loaders/__tests__/load-https-guidance-tags-connections.test.js b/api-js/src/guidance-tag/loaders/__tests__/load-https-guidance-tags-connections.test.js index 1409be105..720b59b1f 100644 --- a/api-js/src/guidance-tag/loaders/__tests__/load-https-guidance-tags-connections.test.js +++ b/api-js/src/guidance-tag/loaders/__tests__/load-https-guidance-tags-connections.test.js @@ -680,7 +680,7 @@ describe('when given the load https guidance tag connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'You must provide a `first` or `last` value to properly paginate the `guidanceTag` connection.', + 'You must provide a `first` or `last` value to properly paginate the `GuidanceTag` connection.', ), ) } @@ -712,7 +712,7 @@ describe('when given the load https guidance tag connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Passing both `first` and `last` to paginate the `guidanceTag` connection is not supported.', + 'Passing both `first` and `last` to paginate the `GuidanceTag` connection is not supported.', ), ) } @@ -744,7 +744,7 @@ describe('when given the load https guidance tag connection function', () => { } catch (err) { expect(err).toEqual( new Error( - '`first` on the `guidanceTag` connection cannot be less than zero.', + '`first` on the `GuidanceTag` connection cannot be less than zero.', ), ) } @@ -775,7 +775,7 @@ describe('when given the load https guidance tag connection function', () => { } catch (err) { expect(err).toEqual( new Error( - '`last` on the `guidanceTag` connection cannot be less than zero.', + '`last` on the `GuidanceTag` connection cannot be less than zero.', ), ) } @@ -808,7 +808,7 @@ describe('when given the load https guidance tag connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Requesting `1000` records on the `guidanceTag` connection exceeds the `first` limit of 100 records.', + 'Requesting `1000` records on the `GuidanceTag` connection exceeds the `first` limit of 100 records.', ), ) } @@ -839,7 +839,7 @@ describe('when given the load https guidance tag connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Requesting `500` records on the `guidanceTag` connection exceeds the `last` limit of 100 records.', + 'Requesting `500` records on the `GuidanceTag` connection exceeds the `last` limit of 100 records.', ), ) } @@ -950,7 +950,7 @@ describe('when given the load https guidance tag connection function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load https guidance tags. Please try again.'), + new Error('Unable to load HTTPS guidance tag(s). Please try again.'), ) } @@ -986,7 +986,7 @@ describe('when given the load https guidance tag connection function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load https guidance tags. Please try again.'), + new Error('Unable to load HTTPS guidance tag(s). Please try again.'), ) } diff --git a/api-js/src/guidance-tag/loaders/__tests__/load-https-guidance-tags.test.js b/api-js/src/guidance-tag/loaders/__tests__/load-https-guidance-tags.test.js index dbeddbc43..dbee3105e 100644 --- a/api-js/src/guidance-tag/loaders/__tests__/load-https-guidance-tags.test.js +++ b/api-js/src/guidance-tag/loaders/__tests__/load-https-guidance-tags.test.js @@ -111,7 +111,7 @@ describe('given the httpsGuidanceTagLoader function', () => { await loader.load('1') } catch (err) { expect(err).toEqual( - new Error('Unable to find https guidance tags. Please try again.'), + new Error('Unable to find HTTPS guidance tag(s). Please try again.'), ) } @@ -134,7 +134,7 @@ describe('given the httpsGuidanceTagLoader function', () => { await loader.load('1') } catch (err) { expect(err).toEqual( - new Error('Unable to find https guidance tags. Please try again.'), + new Error('Unable to find HTTPS guidance tag(s). Please try again.'), ) } diff --git a/api-js/src/guidance-tag/loaders/__tests__/load-spf-guidance-tags-connections.test.js b/api-js/src/guidance-tag/loaders/__tests__/load-spf-guidance-tags-connections.test.js index 86a62361e..f840bb43b 100644 --- a/api-js/src/guidance-tag/loaders/__tests__/load-spf-guidance-tags-connections.test.js +++ b/api-js/src/guidance-tag/loaders/__tests__/load-spf-guidance-tags-connections.test.js @@ -667,7 +667,7 @@ describe('when given the load spf guidance tag connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'You must provide a `first` or `last` value to properly paginate the `guidanceTag` connection.', + 'You must provide a `first` or `last` value to properly paginate the `GuidanceTag` connection.', ), ) } @@ -699,7 +699,7 @@ describe('when given the load spf guidance tag connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Passing both `first` and `last` to paginate the `guidanceTag` connection is not supported.', + 'Passing both `first` and `last` to paginate the `GuidanceTag` connection is not supported.', ), ) } @@ -731,7 +731,7 @@ describe('when given the load spf guidance tag connection function', () => { } catch (err) { expect(err).toEqual( new Error( - '`first` on the `guidanceTag` connection cannot be less than zero.', + '`first` on the `GuidanceTag` connection cannot be less than zero.', ), ) } @@ -762,7 +762,7 @@ describe('when given the load spf guidance tag connection function', () => { } catch (err) { expect(err).toEqual( new Error( - '`last` on the `guidanceTag` connection cannot be less than zero.', + '`last` on the `GuidanceTag` connection cannot be less than zero.', ), ) } @@ -795,7 +795,7 @@ describe('when given the load spf guidance tag connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Requesting `1000` records on the `guidanceTag` connection exceeds the `first` limit of 100 records.', + 'Requesting `1000` records on the `GuidanceTag` connection exceeds the `first` limit of 100 records.', ), ) } @@ -826,7 +826,7 @@ describe('when given the load spf guidance tag connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Requesting `500` records on the `guidanceTag` connection exceeds the `last` limit of 100 records.', + 'Requesting `500` records on the `GuidanceTag` connection exceeds the `last` limit of 100 records.', ), ) } @@ -937,7 +937,7 @@ describe('when given the load spf guidance tag connection function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load spf guidance tags. Please try again.'), + new Error('Unable to load SPF guidance tag(s). Please try again.'), ) } @@ -973,7 +973,7 @@ describe('when given the load spf guidance tag connection function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load spf guidance tags. Please try again.'), + new Error('Unable to load SPF guidance tag(s). Please try again.'), ) } diff --git a/api-js/src/guidance-tag/loaders/__tests__/load-spf-guidance-tags.test.js b/api-js/src/guidance-tag/loaders/__tests__/load-spf-guidance-tags.test.js index 7b143056e..4a5503c80 100644 --- a/api-js/src/guidance-tag/loaders/__tests__/load-spf-guidance-tags.test.js +++ b/api-js/src/guidance-tag/loaders/__tests__/load-spf-guidance-tags.test.js @@ -111,7 +111,7 @@ describe('given the spfGuidanceTagLoader function', () => { await loader.load('1') } catch (err) { expect(err).toEqual( - new Error('Unable to find spf guidance tags. Please try again.'), + new Error('Unable to find SPF guidance tag(s). Please try again.'), ) } @@ -134,7 +134,7 @@ describe('given the spfGuidanceTagLoader function', () => { await loader.load('1') } catch (err) { expect(err).toEqual( - new Error('Unable to find spf guidance tags. Please try again.'), + new Error('Unable to find SPF guidance tag(s). Please try again.'), ) } diff --git a/api-js/src/guidance-tag/loaders/__tests__/load-ssl-guidance-tags-connections.test.js b/api-js/src/guidance-tag/loaders/__tests__/load-ssl-guidance-tags-connections.test.js index ea1e4492b..0d839b0f3 100644 --- a/api-js/src/guidance-tag/loaders/__tests__/load-ssl-guidance-tags-connections.test.js +++ b/api-js/src/guidance-tag/loaders/__tests__/load-ssl-guidance-tags-connections.test.js @@ -667,7 +667,7 @@ describe('when given the load ssl guidance tag connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'You must provide a `first` or `last` value to properly paginate the `guidanceTag` connection.', + 'You must provide a `first` or `last` value to properly paginate the `GuidanceTag` connection.', ), ) } @@ -699,7 +699,7 @@ describe('when given the load ssl guidance tag connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Passing both `first` and `last` to paginate the `guidanceTag` connection is not supported.', + 'Passing both `first` and `last` to paginate the `GuidanceTag` connection is not supported.', ), ) } @@ -731,7 +731,7 @@ describe('when given the load ssl guidance tag connection function', () => { } catch (err) { expect(err).toEqual( new Error( - '`first` on the `guidanceTag` connection cannot be less than zero.', + '`first` on the `GuidanceTag` connection cannot be less than zero.', ), ) } @@ -762,7 +762,7 @@ describe('when given the load ssl guidance tag connection function', () => { } catch (err) { expect(err).toEqual( new Error( - '`last` on the `guidanceTag` connection cannot be less than zero.', + '`last` on the `GuidanceTag` connection cannot be less than zero.', ), ) } @@ -795,7 +795,7 @@ describe('when given the load ssl guidance tag connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Requesting `1000` records on the `guidanceTag` connection exceeds the `first` limit of 100 records.', + 'Requesting `1000` records on the `GuidanceTag` connection exceeds the `first` limit of 100 records.', ), ) } @@ -826,7 +826,7 @@ describe('when given the load ssl guidance tag connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Requesting `500` records on the `guidanceTag` connection exceeds the `last` limit of 100 records.', + 'Requesting `500` records on the `GuidanceTag` connection exceeds the `last` limit of 100 records.', ), ) } @@ -937,7 +937,7 @@ describe('when given the load ssl guidance tag connection function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load ssl guidance tags. Please try again.'), + new Error('Unable to load SSL guidance tag(s). Please try again.'), ) } @@ -973,7 +973,7 @@ describe('when given the load ssl guidance tag connection function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load ssl guidance tags. Please try again.'), + new Error('Unable to load SSL guidance tag(s). Please try again.'), ) } diff --git a/api-js/src/guidance-tag/loaders/__tests__/load-ssl-guidance-tags.test.js b/api-js/src/guidance-tag/loaders/__tests__/load-ssl-guidance-tags.test.js index 84211f698..0b0332d0a 100644 --- a/api-js/src/guidance-tag/loaders/__tests__/load-ssl-guidance-tags.test.js +++ b/api-js/src/guidance-tag/loaders/__tests__/load-ssl-guidance-tags.test.js @@ -111,7 +111,7 @@ describe('given the sslGuidanceTagLoader function', () => { await loader.load('1') } catch (err) { expect(err).toEqual( - new Error('Unable to find ssl guidance tags. Please try again.'), + new Error('Unable to find SSL guidance tag(s). Please try again.'), ) } @@ -134,7 +134,7 @@ describe('given the sslGuidanceTagLoader function', () => { await loader.load('1') } catch (err) { expect(err).toEqual( - new Error('Unable to find ssl guidance tags. Please try again.'), + new Error('Unable to find SSL guidance tag(s). Please try again.'), ) } diff --git a/api-js/src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js b/api-js/src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js index 55d9aa68d..360a26614 100644 --- a/api-js/src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js +++ b/api-js/src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js @@ -83,7 +83,7 @@ export const dkimGuidanceTagConnectionsLoader = ( ) throw new Error( i18n._( - t`You must provide a \`first\` or \`last\` value to properly paginate the \`guidanceTag\` connection.`, + t`You must provide a \`first\` or \`last\` value to properly paginate the \`GuidanceTag\` connection.`, ), ) } else if (typeof first !== 'undefined' && typeof last !== 'undefined') { @@ -92,7 +92,7 @@ export const dkimGuidanceTagConnectionsLoader = ( ) throw new Error( i18n._( - t`Passing both \`first\` and \`last\` to paginate the \`guidanceTag\` connection is not supported.`, + t`Passing both \`first\` and \`last\` to paginate the \`GuidanceTag\` connection is not supported.`, ), ) } else if (typeof first === 'number' || typeof last === 'number') { @@ -104,7 +104,7 @@ export const dkimGuidanceTagConnectionsLoader = ( ) throw new Error( i18n._( - t`\`${argSet}\` on the \`guidanceTag\` connection cannot be less than zero.`, + t`\`${argSet}\` on the \`GuidanceTag\` connection cannot be less than zero.`, ), ) } else if (first > 100 || last > 100) { @@ -115,7 +115,7 @@ export const dkimGuidanceTagConnectionsLoader = ( ) throw new Error( i18n._( - t`Requesting \`${amount}\` records on the \`guidanceTag\` connection exceeds the \`${argSet}\` limit of 100 records.`, + t`Requesting \`${amount}\` records on the \`GuidanceTag\` connection exceeds the \`${argSet}\` limit of 100 records.`, ), ) } else if (typeof first !== 'undefined' && typeof last === 'undefined') { @@ -239,7 +239,7 @@ export const dkimGuidanceTagConnectionsLoader = ( `Database error occurred while user: ${userKey} was trying to gather orgs in dkimGuidanceTagConnectionsLoader, error: ${err}`, ) throw new Error( - i18n._(t`Unable to load dkim guidance tags. Please try again.`), + i18n._(t`Unable to load DKIM guidance tag(s). Please try again.`), ) } @@ -251,7 +251,7 @@ export const dkimGuidanceTagConnectionsLoader = ( `Cursor error occurred while user: ${userKey} was trying to gather orgs in dkimGuidanceTagConnectionsLoader, error: ${err}`, ) throw new Error( - i18n._(t`Unable to load dkim guidance tags. Please try again.`), + i18n._(t`Unable to load DKIM guidance tag(s). Please try again.`), ) } diff --git a/api-js/src/guidance-tag/loaders/load-dkim-guidance-tags.js b/api-js/src/guidance-tag/loaders/load-dkim-guidance-tags.js index e57ef6658..38fa1f431 100644 --- a/api-js/src/guidance-tag/loaders/load-dkim-guidance-tags.js +++ b/api-js/src/guidance-tag/loaders/load-dkim-guidance-tags.js @@ -15,7 +15,7 @@ export const dkimGuidanceTagLoader = (query, userKey, i18n) => `Database error occurred when user: ${userKey} running dkimGuidanceTagLoader: ${err}`, ) throw new Error( - i18n._(t`Unable to find dkim guidance tags. Please try again.`), + i18n._(t`Unable to find DKIM guidance tag(s). Please try again.`), ) } @@ -29,7 +29,7 @@ export const dkimGuidanceTagLoader = (query, userKey, i18n) => `Cursor error occurred when user: ${userKey} running dkimGuidanceTagLoader: ${err}`, ) throw new Error( - i18n._(t`Unable to find dkim guidance tags. Please try again.`), + i18n._(t`Unable to find DKIM guidance tag(s). Please try again.`), ) } diff --git a/api-js/src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js b/api-js/src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js index 4dd75862e..5f2144840 100644 --- a/api-js/src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js +++ b/api-js/src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js @@ -83,7 +83,7 @@ export const dmarcGuidanceTagConnectionsLoader = ( ) throw new Error( i18n._( - t`You must provide a \`first\` or \`last\` value to properly paginate the \`guidanceTag\` connection.`, + t`You must provide a \`first\` or \`last\` value to properly paginate the \`GuidanceTag\` connection.`, ), ) } else if (typeof first !== 'undefined' && typeof last !== 'undefined') { @@ -92,7 +92,7 @@ export const dmarcGuidanceTagConnectionsLoader = ( ) throw new Error( i18n._( - t`Passing both \`first\` and \`last\` to paginate the \`guidanceTag\` connection is not supported.`, + t`Passing both \`first\` and \`last\` to paginate the \`GuidanceTag\` connection is not supported.`, ), ) } else if (typeof first === 'number' || typeof last === 'number') { @@ -104,7 +104,7 @@ export const dmarcGuidanceTagConnectionsLoader = ( ) throw new Error( i18n._( - t`\`${argSet}\` on the \`guidanceTag\` connection cannot be less than zero.`, + t`\`${argSet}\` on the \`GuidanceTag\` connection cannot be less than zero.`, ), ) } else if (first > 100 || last > 100) { @@ -115,7 +115,7 @@ export const dmarcGuidanceTagConnectionsLoader = ( ) throw new Error( i18n._( - t`Requesting \`${amount}\` records on the \`guidanceTag\` connection exceeds the \`${argSet}\` limit of 100 records.`, + t`Requesting \`${amount}\` records on the \`GuidanceTag\` connection exceeds the \`${argSet}\` limit of 100 records.`, ), ) } else if (typeof first !== 'undefined' && typeof last === 'undefined') { @@ -239,7 +239,7 @@ export const dmarcGuidanceTagConnectionsLoader = ( `Database error occurred while user: ${userKey} was trying to gather orgs in dmarcGuidanceTagConnectionsLoader, error: ${err}`, ) throw new Error( - i18n._(t`Unable to load dmarc guidance tags. Please try again.`), + i18n._(t`Unable to load DMARC guidance tag(s). Please try again.`), ) } @@ -251,7 +251,7 @@ export const dmarcGuidanceTagConnectionsLoader = ( `Cursor error occurred while user: ${userKey} was trying to gather orgs in dmarcGuidanceTagConnectionsLoader, error: ${err}`, ) throw new Error( - i18n._(t`Unable to load dmarc guidance tags. Please try again.`), + i18n._(t`Unable to load DMARC guidance tag(s). Please try again.`), ) } diff --git a/api-js/src/guidance-tag/loaders/load-dmarc-guidance-tags.js b/api-js/src/guidance-tag/loaders/load-dmarc-guidance-tags.js index 570b7bbc0..75adb6d5b 100644 --- a/api-js/src/guidance-tag/loaders/load-dmarc-guidance-tags.js +++ b/api-js/src/guidance-tag/loaders/load-dmarc-guidance-tags.js @@ -15,7 +15,7 @@ export const dmarcGuidanceTagLoader = (query, userKey, i18n) => `Database error occurred when user: ${userKey} running dmarcGuidanceTagLoader: ${err}`, ) throw new Error( - i18n._(t`Unable to find dmarc guidance tags. Please try again.`), + i18n._(t`Unable to find DMARC guidance tag(s). Please try again.`), ) } @@ -29,7 +29,7 @@ export const dmarcGuidanceTagLoader = (query, userKey, i18n) => `Cursor error occurred when user: ${userKey} running dmarcGuidanceTagLoader: ${err}`, ) throw new Error( - i18n._(t`Unable to find dmarc guidance tags. Please try again.`), + i18n._(t`Unable to find DMARC guidance tag(s). Please try again.`), ) } diff --git a/api-js/src/guidance-tag/loaders/load-https-guidance-tags-connections.js b/api-js/src/guidance-tag/loaders/load-https-guidance-tags-connections.js index 12f1cc8c9..6752a74e0 100644 --- a/api-js/src/guidance-tag/loaders/load-https-guidance-tags-connections.js +++ b/api-js/src/guidance-tag/loaders/load-https-guidance-tags-connections.js @@ -83,7 +83,7 @@ export const httpsGuidanceTagConnectionsLoader = ( ) throw new Error( i18n._( - t`You must provide a \`first\` or \`last\` value to properly paginate the \`guidanceTag\` connection.`, + t`You must provide a \`first\` or \`last\` value to properly paginate the \`GuidanceTag\` connection.`, ), ) } else if (typeof first !== 'undefined' && typeof last !== 'undefined') { @@ -92,7 +92,7 @@ export const httpsGuidanceTagConnectionsLoader = ( ) throw new Error( i18n._( - t`Passing both \`first\` and \`last\` to paginate the \`guidanceTag\` connection is not supported.`, + t`Passing both \`first\` and \`last\` to paginate the \`GuidanceTag\` connection is not supported.`, ), ) } else if (typeof first === 'number' || typeof last === 'number') { @@ -104,7 +104,7 @@ export const httpsGuidanceTagConnectionsLoader = ( ) throw new Error( i18n._( - t`\`${argSet}\` on the \`guidanceTag\` connection cannot be less than zero.`, + t`\`${argSet}\` on the \`GuidanceTag\` connection cannot be less than zero.`, ), ) } else if (first > 100 || last > 100) { @@ -115,7 +115,7 @@ export const httpsGuidanceTagConnectionsLoader = ( ) throw new Error( i18n._( - t`Requesting \`${amount}\` records on the \`guidanceTag\` connection exceeds the \`${argSet}\` limit of 100 records.`, + t`Requesting \`${amount}\` records on the \`GuidanceTag\` connection exceeds the \`${argSet}\` limit of 100 records.`, ), ) } else if (typeof first !== 'undefined' && typeof last === 'undefined') { @@ -239,7 +239,7 @@ export const httpsGuidanceTagConnectionsLoader = ( `Database error occurred while user: ${userKey} was trying to gather orgs in httpsGuidanceTagConnectionsLoader, error: ${err}`, ) throw new Error( - i18n._(t`Unable to load https guidance tags. Please try again.`), + i18n._(t`Unable to load HTTPS guidance tag(s). Please try again.`), ) } @@ -251,7 +251,7 @@ export const httpsGuidanceTagConnectionsLoader = ( `Cursor error occurred while user: ${userKey} was trying to gather orgs in httpsGuidanceTagConnectionsLoader, error: ${err}`, ) throw new Error( - i18n._(t`Unable to load https guidance tags. Please try again.`), + i18n._(t`Unable to load HTTPS guidance tag(s). Please try again.`), ) } diff --git a/api-js/src/guidance-tag/loaders/load-https-guidance-tags.js b/api-js/src/guidance-tag/loaders/load-https-guidance-tags.js index c61f20ee9..26e31fba3 100644 --- a/api-js/src/guidance-tag/loaders/load-https-guidance-tags.js +++ b/api-js/src/guidance-tag/loaders/load-https-guidance-tags.js @@ -15,7 +15,7 @@ export const httpsGuidanceTagLoader = (query, userKey, i18n) => `Database error occurred when user: ${userKey} running httpsGuidanceTagLoader: ${err}`, ) throw new Error( - i18n._(t`Unable to find https guidance tags. Please try again.`), + i18n._(t`Unable to find HTTPS guidance tag(s). Please try again.`), ) } @@ -29,7 +29,7 @@ export const httpsGuidanceTagLoader = (query, userKey, i18n) => `Cursor error occurred when user: ${userKey} running httpsGuidanceTagLoader: ${err}`, ) throw new Error( - i18n._(t`Unable to find https guidance tags. Please try again.`), + i18n._(t`Unable to find HTTPS guidance tag(s). Please try again.`), ) } diff --git a/api-js/src/guidance-tag/loaders/load-spf-guidance-tags-connections.js b/api-js/src/guidance-tag/loaders/load-spf-guidance-tags-connections.js index 65415b9b9..656fa431c 100644 --- a/api-js/src/guidance-tag/loaders/load-spf-guidance-tags-connections.js +++ b/api-js/src/guidance-tag/loaders/load-spf-guidance-tags-connections.js @@ -83,7 +83,7 @@ export const spfGuidanceTagConnectionsLoader = ( ) throw new Error( i18n._( - t`You must provide a \`first\` or \`last\` value to properly paginate the \`guidanceTag\` connection.`, + t`You must provide a \`first\` or \`last\` value to properly paginate the \`GuidanceTag\` connection.`, ), ) } else if (typeof first !== 'undefined' && typeof last !== 'undefined') { @@ -92,7 +92,7 @@ export const spfGuidanceTagConnectionsLoader = ( ) throw new Error( i18n._( - t`Passing both \`first\` and \`last\` to paginate the \`guidanceTag\` connection is not supported.`, + t`Passing both \`first\` and \`last\` to paginate the \`GuidanceTag\` connection is not supported.`, ), ) } else if (typeof first === 'number' || typeof last === 'number') { @@ -104,7 +104,7 @@ export const spfGuidanceTagConnectionsLoader = ( ) throw new Error( i18n._( - t`\`${argSet}\` on the \`guidanceTag\` connection cannot be less than zero.`, + t`\`${argSet}\` on the \`GuidanceTag\` connection cannot be less than zero.`, ), ) } else if (first > 100 || last > 100) { @@ -115,7 +115,7 @@ export const spfGuidanceTagConnectionsLoader = ( ) throw new Error( i18n._( - t`Requesting \`${amount}\` records on the \`guidanceTag\` connection exceeds the \`${argSet}\` limit of 100 records.`, + t`Requesting \`${amount}\` records on the \`GuidanceTag\` connection exceeds the \`${argSet}\` limit of 100 records.`, ), ) } else if (typeof first !== 'undefined' && typeof last === 'undefined') { @@ -239,7 +239,7 @@ export const spfGuidanceTagConnectionsLoader = ( `Database error occurred while user: ${userKey} was trying to gather orgs in spfGuidanceTagConnectionsLoader, error: ${err}`, ) throw new Error( - i18n._(t`Unable to load spf guidance tags. Please try again.`), + i18n._(t`Unable to load SPF guidance tag(s). Please try again.`), ) } @@ -251,7 +251,7 @@ export const spfGuidanceTagConnectionsLoader = ( `Cursor error occurred while user: ${userKey} was trying to gather orgs in spfGuidanceTagConnectionsLoader, error: ${err}`, ) throw new Error( - i18n._(t`Unable to load spf guidance tags. Please try again.`), + i18n._(t`Unable to load SPF guidance tag(s). Please try again.`), ) } diff --git a/api-js/src/guidance-tag/loaders/load-spf-guidance-tags.js b/api-js/src/guidance-tag/loaders/load-spf-guidance-tags.js index 5555f18b2..5550ba0e3 100644 --- a/api-js/src/guidance-tag/loaders/load-spf-guidance-tags.js +++ b/api-js/src/guidance-tag/loaders/load-spf-guidance-tags.js @@ -15,7 +15,7 @@ export const spfGuidanceTagLoader = (query, userKey, i18n) => `Database error occurred when user: ${userKey} running spfGuidanceTagLoader: ${err}`, ) throw new Error( - i18n._(t`Unable to find spf guidance tags. Please try again.`), + i18n._(t`Unable to find SPF guidance tag(s). Please try again.`), ) } @@ -29,7 +29,7 @@ export const spfGuidanceTagLoader = (query, userKey, i18n) => `Cursor error occurred when user: ${userKey} running spfGuidanceTagLoader: ${err}`, ) throw new Error( - i18n._(t`Unable to find spf guidance tags. Please try again.`), + i18n._(t`Unable to find SPF guidance tag(s). Please try again.`), ) } diff --git a/api-js/src/guidance-tag/loaders/load-ssl-guidance-tags-connections.js b/api-js/src/guidance-tag/loaders/load-ssl-guidance-tags-connections.js index 8c1591749..8d6efef55 100644 --- a/api-js/src/guidance-tag/loaders/load-ssl-guidance-tags-connections.js +++ b/api-js/src/guidance-tag/loaders/load-ssl-guidance-tags-connections.js @@ -83,7 +83,7 @@ export const sslGuidanceTagConnectionsLoader = ( ) throw new Error( i18n._( - t`You must provide a \`first\` or \`last\` value to properly paginate the \`guidanceTag\` connection.`, + t`You must provide a \`first\` or \`last\` value to properly paginate the \`GuidanceTag\` connection.`, ), ) } else if (typeof first !== 'undefined' && typeof last !== 'undefined') { @@ -92,7 +92,7 @@ export const sslGuidanceTagConnectionsLoader = ( ) throw new Error( i18n._( - t`Passing both \`first\` and \`last\` to paginate the \`guidanceTag\` connection is not supported.`, + t`Passing both \`first\` and \`last\` to paginate the \`GuidanceTag\` connection is not supported.`, ), ) } else if (typeof first === 'number' || typeof last === 'number') { @@ -104,7 +104,7 @@ export const sslGuidanceTagConnectionsLoader = ( ) throw new Error( i18n._( - t`\`${argSet}\` on the \`guidanceTag\` connection cannot be less than zero.`, + t`\`${argSet}\` on the \`GuidanceTag\` connection cannot be less than zero.`, ), ) } else if (first > 100 || last > 100) { @@ -115,7 +115,7 @@ export const sslGuidanceTagConnectionsLoader = ( ) throw new Error( i18n._( - t`Requesting \`${amount}\` records on the \`guidanceTag\` connection exceeds the \`${argSet}\` limit of 100 records.`, + t`Requesting \`${amount}\` records on the \`GuidanceTag\` connection exceeds the \`${argSet}\` limit of 100 records.`, ), ) } else if (typeof first !== 'undefined' && typeof last === 'undefined') { @@ -239,7 +239,7 @@ export const sslGuidanceTagConnectionsLoader = ( `Database error occurred while user: ${userKey} was trying to gather orgs in sslGuidanceTagConnectionsLoader, error: ${err}`, ) throw new Error( - i18n._(t`Unable to load ssl guidance tags. Please try again.`), + i18n._(t`Unable to load SSL guidance tag(s). Please try again.`), ) } @@ -251,7 +251,7 @@ export const sslGuidanceTagConnectionsLoader = ( `Cursor error occurred while user: ${userKey} was trying to gather orgs in sslGuidanceTagConnectionsLoader, error: ${err}`, ) throw new Error( - i18n._(t`Unable to load ssl guidance tags. Please try again.`), + i18n._(t`Unable to load SSL guidance tag(s). Please try again.`), ) } diff --git a/api-js/src/guidance-tag/loaders/load-ssl-guidance-tags.js b/api-js/src/guidance-tag/loaders/load-ssl-guidance-tags.js index 496dc02ff..3ba96d9e4 100644 --- a/api-js/src/guidance-tag/loaders/load-ssl-guidance-tags.js +++ b/api-js/src/guidance-tag/loaders/load-ssl-guidance-tags.js @@ -15,7 +15,7 @@ export const sslGuidanceTagLoader = (query, userKey, i18n) => `Database error occurred when user: ${userKey} running sslGuidanceTagLoader: ${err}`, ) throw new Error( - i18n._(t`Unable to find ssl guidance tags. Please try again.`), + i18n._(t`Unable to find SSL guidance tag(s). Please try again.`), ) } @@ -29,7 +29,7 @@ export const sslGuidanceTagLoader = (query, userKey, i18n) => `Cursor error occurred when user: ${userKey} running sslGuidanceTagLoader: ${err}`, ) throw new Error( - i18n._(t`Unable to find ssl guidance tags. Please try again.`), + i18n._(t`Unable to find SSL guidance tag(s). Please try again.`), ) } diff --git a/api-js/src/locale/en/messages.js b/api-js/src/locale/en/messages.js index 1d472e6f5..abc8d7ff3 100644 --- a/api-js/src/locale/en/messages.js +++ b/api-js/src/locale/en/messages.js @@ -42,6 +42,8 @@ 'Passing both `first` and `last` to paginate the `DmarcFailureTable` connection is not supported.', 'Passing both `first` and `last` to paginate the `FullPassTable` connection is not supported.': 'Passing both `first` and `last` to paginate the `FullPassTable` connection is not supported.', + 'Passing both `first` and `last` to paginate the `GuidanceTag` connection is not supported.': + 'Passing both `first` and `last` to paginate the `GuidanceTag` connection is not supported.', 'Passing both `first` and `last` to paginate the `SPF` connection is not supported.': 'Passing both `first` and `last` to paginate the `SPF` connection is not supported.', 'Passing both `first` and `last` to paginate the `SpfFailureTable` connection is not supported.': @@ -52,8 +54,6 @@ 'Passing both `first` and `last` to paginate the `dmarcSummaries` connection is not supported.', 'Passing both `first` and `last` to paginate the `domain` connection is not supported.': 'Passing both `first` and `last` to paginate the `domain` connection is not supported.', - 'Passing both `first` and `last` to paginate the `guidanceTag` connection is not supported.': - 'Passing both `first` and `last` to paginate the `guidanceTag` connection is not supported.', 'Passing both `first` and `last` to paginate the `https` connection is not supported.': 'Passing both `first` and `last` to paginate the `https` connection is not supported.', 'Passing both `first` and `last` to paginate the `organization` connection is not supported.': @@ -118,6 +118,13 @@ ['argSet'], '` limit of 100 records.', ], + 'Requesting `{amount}` records on the `GuidanceTag` connection exceeds the `{argSet}` limit of 100 records.': [ + 'Requesting `', + ['amount'], + '` records on the `GuidanceTag` connection exceeds the `', + ['argSet'], + '` limit of 100 records.', + ], 'Requesting `{amount}` records on the `SpfFailureTable` connection exceeds the `{argSet}` limit of 100 records.': [ 'Requesting `', ['amount'], @@ -146,13 +153,6 @@ ['argSet'], '` limit of 100 records.', ], - 'Requesting `{amount}` records on the `guidanceTag` connection exceeds the `{argSet}` limit of 100 records.': [ - 'Requesting `', - ['amount'], - '` records on the `guidanceTag` connection exceeds the `', - ['argSet'], - '` limit of 100 records.', - ], 'Requesting `{amount}` records on the `organization` connection exceeds the `{argSet}` limit of 100 records.': [ 'Requesting `', ['amount'], @@ -263,30 +263,30 @@ 'Unable to create organization. Please try again.', 'Unable to dispatch one time scan. Please try again.': 'Unable to dispatch one time scan. Please try again.', + 'Unable to find DKIM guidance tag(s). Please try again.': + 'Unable to find DKIM guidance tag(s). Please try again.', 'Unable to find DKIM result(s). Please try again.': 'Unable to find DKIM result(s). Please try again.', 'Unable to find DKIM scan(s). Please try again.': 'Unable to find DKIM scan(s). Please try again.', + 'Unable to find DMARC guidance tag(s). Please try again.': + 'Unable to find DMARC guidance tag(s). Please try again.', 'Unable to find DMARC scan(s). Please try again.': 'Unable to find DMARC scan(s). Please try again.', 'Unable to find DMARC summary data. Please try again.': 'Unable to find DMARC summary data. Please try again.', + 'Unable to find HTTPS guidance tag(s). Please try again.': + 'Unable to find HTTPS guidance tag(s). Please try again.', + 'Unable to find SPF guidance tag(s). Please try again.': + 'Unable to find SPF guidance tag(s). Please try again.', 'Unable to find SPF scan(s). Please try again.': 'Unable to find SPF scan(s). Please try again.', - 'Unable to find dkim guidance tags. Please try again.': - 'Unable to find dkim guidance tags. Please try again.', - 'Unable to find dmarc guidance tags. Please try again.': - 'Unable to find dmarc guidance tags. Please try again.', - 'Unable to find https guidance tags. Please try again.': - 'Unable to find https guidance tags. Please try again.', + 'Unable to find SSL guidance tag(s). Please try again.': + 'Unable to find SSL guidance tag(s). Please try again.', 'Unable to find https scan. Please try again.': 'Unable to find https scan. Please try again.', 'Unable to find organization. Please try again.': 'Unable to find organization. Please try again.', - 'Unable to find spf guidance tags. Please try again.': - 'Unable to find spf guidance tags. Please try again.', - 'Unable to find ssl guidance tags. Please try again.': - 'Unable to find ssl guidance tags. Please try again.', 'Unable to find ssl scan. Please try again.': 'Unable to find ssl scan. Please try again.', 'Unable to find summary. Please try again.': @@ -309,26 +309,32 @@ 'Unable to invite yourself to an org.', 'Unable to load DKIM failure data. Please try again.': 'Unable to load DKIM failure data. Please try again.', + 'Unable to load DKIM guidance tag(s). Please try again.': + 'Unable to load DKIM guidance tag(s). Please try again.', 'Unable to load DKIM result(s). Please try again.': 'Unable to load DKIM result(s). Please try again.', 'Unable to load DKIM scan(s). Please try again.': 'Unable to load DKIM scan(s). Please try again.', 'Unable to load DMARC failure data. Please try again.': 'Unable to load DMARC failure data. Please try again.', + 'Unable to load DMARC guidance tag(s). Please try again.': + 'Unable to load DMARC guidance tag(s). Please try again.', 'Unable to load DMARC scan(s). Please try again.': 'Unable to load DMARC scan(s). Please try again.', 'Unable to load DMARC summary data. Please try again.': 'Unable to load DMARC summary data. Please try again.', + 'Unable to load HTTPS guidance tag(s). Please try again.': + 'Unable to load HTTPS guidance tag(s). Please try again.', 'Unable to load SPF failure data. Please try again.': 'Unable to load SPF failure data. Please try again.', + 'Unable to load SPF guidance tag(s). Please try again.': + 'Unable to load SPF guidance tag(s). Please try again.', 'Unable to load SPF scan(s). Please try again.': 'Unable to load SPF scan(s). Please try again.', + 'Unable to load SSL guidance tag(s). Please try again.': + 'Unable to load SSL guidance tag(s). Please try again.', 'Unable to load affiliation(s). Please try again.': 'Unable to load affiliation(s). Please try again.', - 'Unable to load dkim guidance tags. Please try again.': - 'Unable to load dkim guidance tags. Please try again.', - 'Unable to load dmarc guidance tags. Please try again.': - 'Unable to load dmarc guidance tags. Please try again.', 'Unable to load domain(s). Please try again.': 'Unable to load domain(s). Please try again.', 'Unable to load domain. Please try again.': @@ -337,18 +343,12 @@ 'Unable to load domains. Please try again.', 'Unable to load full pass data. Please try again.': 'Unable to load full pass data. Please try again.', - 'Unable to load https guidance tags. Please try again.': - 'Unable to load https guidance tags. Please try again.', 'Unable to load https scans. Please try again.': 'Unable to load https scans. Please try again.', 'Unable to load mail summary. Please try again.': 'Unable to load mail summary. Please try again.', 'Unable to load organizations. Please try again.': 'Unable to load organizations. Please try again.', - 'Unable to load spf guidance tags. Please try again.': - 'Unable to load spf guidance tags. Please try again.', - 'Unable to load ssl guidance tags. Please try again.': - 'Unable to load ssl guidance tags. Please try again.', 'Unable to load ssl scans. Please try again.': 'Unable to load ssl scans. Please try again.', 'Unable to load verified domains. Please try again.': @@ -464,6 +464,8 @@ 'You must provide a `first` or `last` value to properly paginate the `DmarcFailureTable` connection.', 'You must provide a `first` or `last` value to properly paginate the `FullPassTable` connection.': 'You must provide a `first` or `last` value to properly paginate the `FullPassTable` connection.', + 'You must provide a `first` or `last` value to properly paginate the `GuidanceTag` connection.': + 'You must provide a `first` or `last` value to properly paginate the `GuidanceTag` connection.', 'You must provide a `first` or `last` value to properly paginate the `SPF` connection.': 'You must provide a `first` or `last` value to properly paginate the `SPF` connection.', 'You must provide a `first` or `last` value to properly paginate the `SpfFailureTable` connection.': @@ -474,8 +476,6 @@ 'You must provide a `first` or `last` value to properly paginate the `dmarcSummaries` connection.', 'You must provide a `first` or `last` value to properly paginate the `domain` connection.': 'You must provide a `first` or `last` value to properly paginate the `domain` connection.', - 'You must provide a `first` or `last` value to properly paginate the `guidanceTag` connection.': - 'You must provide a `first` or `last` value to properly paginate the `guidanceTag` connection.', 'You must provide a `first` or `last` value to properly paginate the `https` connection.': 'You must provide a `first` or `last` value to properly paginate the `https` connection.', 'You must provide a `first` or `last` value to properly paginate the `organization` connection.': @@ -527,6 +527,11 @@ ['argSet'], '` on the `FullPassTable` connection cannot be less than zero.', ], + '`{argSet}` on the `GuidanceTag` connection cannot be less than zero.': [ + '`', + ['argSet'], + '` on the `GuidanceTag` connection cannot be less than zero.', + ], '`{argSet}` on the `SPF` connection cannot be less than zero.': [ '`', ['argSet'], @@ -552,11 +557,6 @@ ['argSet'], '` on the `domain` connection cannot be less than zero.', ], - '`{argSet}` on the `guidanceTag` connection cannot be less than zero.': [ - '`', - ['argSet'], - '` on the `guidanceTag` connection cannot be less than zero.', - ], '`{argSet}` on the `https` connection cannot be less than zero.': [ '`', ['argSet'], diff --git a/api-js/src/locale/en/messages.po b/api-js/src/locale/en/messages.po index 4a9c70209..b90985574 100644 --- a/api-js/src/locale/en/messages.po +++ b/api-js/src/locale/en/messages.po @@ -107,6 +107,14 @@ msgstr "Passing both `first` and `last` to paginate the `DmarcFailureTable` conn msgid "Passing both `first` and `last` to paginate the `FullPassTable` connection is not supported." msgstr "Passing both `first` and `last` to paginate the `FullPassTable` connection is not supported." +#: src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js:95 +#: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:95 +#: src/guidance-tag/loaders/load-https-guidance-tags-connections.js:95 +#: src/guidance-tag/loaders/load-spf-guidance-tags-connections.js:95 +#: src/guidance-tag/loaders/load-ssl-guidance-tags-connections.js:95 +msgid "Passing both `first` and `last` to paginate the `GuidanceTag` connection is not supported." +msgstr "Passing both `first` and `last` to paginate the `GuidanceTag` connection is not supported." + #: src/email-scan/loaders/load-spf-connections-by-domain-id.js:138 msgid "Passing both `first` and `last` to paginate the `SPF` connection is not supported." msgstr "Passing both `first` and `last` to paginate the `SPF` connection is not supported." @@ -129,14 +137,6 @@ msgstr "Passing both `first` and `last` to paginate the `dmarcSummaries` connect msgid "Passing both `first` and `last` to paginate the `domain` connection is not supported." msgstr "Passing both `first` and `last` to paginate the `domain` connection is not supported." -#: src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js:95 -#: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:95 -#: src/guidance-tag/loaders/load-https-guidance-tags-connections.js:95 -#: src/guidance-tag/loaders/load-spf-guidance-tags-connections.js:95 -#: src/guidance-tag/loaders/load-ssl-guidance-tags-connections.js:95 -msgid "Passing both `first` and `last` to paginate the `guidanceTag` connection is not supported." -msgstr "Passing both `first` and `last` to paginate the `guidanceTag` connection is not supported." - #: src/web-scan/loaders/load-https-connections-by-domain-id.js:152 msgid "Passing both `first` and `last` to paginate the `https` connection is not supported." msgstr "Passing both `first` and `last` to paginate the `https` connection is not supported." @@ -255,6 +255,14 @@ msgstr "Requesting `{amount}` records on the `DmarcFailureTable` connection exce msgid "Requesting `{amount}` records on the `FullPassTable` connection exceeds the `{argSet}` limit of 100 records." msgstr "Requesting `{amount}` records on the `FullPassTable` connection exceeds the `{argSet}` limit of 100 records." +#: src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js:118 +#: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:118 +#: src/guidance-tag/loaders/load-https-guidance-tags-connections.js:118 +#: src/guidance-tag/loaders/load-spf-guidance-tags-connections.js:118 +#: src/guidance-tag/loaders/load-ssl-guidance-tags-connections.js:118 +msgid "Requesting `{amount}` records on the `GuidanceTag` connection exceeds the `{argSet}` limit of 100 records." +msgstr "Requesting `{amount}` records on the `GuidanceTag` connection exceeds the `{argSet}` limit of 100 records." + #: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:71 msgid "Requesting `{amount}` records on the `SpfFailureTable` connection exceeds the `{argSet}` limit of 100 records." msgstr "Requesting `{amount}` records on the `SpfFailureTable` connection exceeds the `{argSet}` limit of 100 records." @@ -273,14 +281,6 @@ msgstr "Requesting `{amount}` records on the `dmarcSummaries` connection exceeds msgid "Requesting `{amount}` records on the `domain` connection exceeds the `{argSet}` limit of 100 records." msgstr "Requesting `{amount}` records on the `domain` connection exceeds the `{argSet}` limit of 100 records." -#: src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js:118 -#: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:118 -#: src/guidance-tag/loaders/load-https-guidance-tags-connections.js:118 -#: src/guidance-tag/loaders/load-spf-guidance-tags-connections.js:118 -#: src/guidance-tag/loaders/load-ssl-guidance-tags-connections.js:118 -msgid "Requesting `{amount}` records on the `guidanceTag` connection exceeds the `{argSet}` limit of 100 records." -msgstr "Requesting `{amount}` records on the `guidanceTag` connection exceeds the `{argSet}` limit of 100 records." - #: src/organization/loaders/load-organization-connections-by-domain-id.js:202 #: src/organization/loaders/load-organization-connections-by-user-id.js:202 msgid "Requesting `{amount}` records on the `organization` connection exceeds the `{argSet}` limit of 100 records." @@ -407,6 +407,11 @@ msgstr "Unable to create organization. Please try again." msgid "Unable to dispatch one time scan. Please try again." msgstr "Unable to dispatch one time scan. Please try again." +#: src/guidance-tag/loaders/load-dkim-guidance-tags.js:18 +#: src/guidance-tag/loaders/load-dkim-guidance-tags.js:32 +msgid "Unable to find DKIM guidance tag(s). Please try again." +msgstr "Unable to find DKIM guidance tag(s). Please try again." + #: src/email-scan/loaders/load-dkim-result-by-key.js:19 #: src/email-scan/loaders/load-dkim-result-by-key.js:33 msgid "Unable to find DKIM result(s). Please try again." @@ -417,6 +422,11 @@ msgstr "Unable to find DKIM result(s). Please try again." msgid "Unable to find DKIM scan(s). Please try again." msgstr "Unable to find DKIM scan(s). Please try again." +#: src/guidance-tag/loaders/load-dmarc-guidance-tags.js:18 +#: src/guidance-tag/loaders/load-dmarc-guidance-tags.js:32 +msgid "Unable to find DMARC guidance tag(s). Please try again." +msgstr "Unable to find DMARC guidance tag(s). Please try again." + #: src/email-scan/loaders/load-dmarc-by-key.js:18 #: src/email-scan/loaders/load-dmarc-by-key.js:30 msgid "Unable to find DMARC scan(s). Please try again." @@ -427,25 +437,25 @@ msgstr "Unable to find DMARC scan(s). Please try again." msgid "Unable to find DMARC summary data. Please try again." msgstr "Unable to find DMARC summary data. Please try again." +#: src/guidance-tag/loaders/load-https-guidance-tags.js:18 +#: src/guidance-tag/loaders/load-https-guidance-tags.js:32 +msgid "Unable to find HTTPS guidance tag(s). Please try again." +msgstr "Unable to find HTTPS guidance tag(s). Please try again." + +#: src/guidance-tag/loaders/load-spf-guidance-tags.js:18 +#: src/guidance-tag/loaders/load-spf-guidance-tags.js:32 +msgid "Unable to find SPF guidance tag(s). Please try again." +msgstr "Unable to find SPF guidance tag(s). Please try again." + #: src/email-scan/loaders/load-spf-by-key.js:18 #: src/email-scan/loaders/load-spf-by-key.js:30 msgid "Unable to find SPF scan(s). Please try again." msgstr "Unable to find SPF scan(s). Please try again." -#: src/guidance-tag/loaders/load-dkim-guidance-tags.js:18 -#: src/guidance-tag/loaders/load-dkim-guidance-tags.js:32 -msgid "Unable to find dkim guidance tags. Please try again." -msgstr "Unable to find dkim guidance tags. Please try again." - -#: src/guidance-tag/loaders/load-dmarc-guidance-tags.js:18 -#: src/guidance-tag/loaders/load-dmarc-guidance-tags.js:32 -msgid "Unable to find dmarc guidance tags. Please try again." -msgstr "Unable to find dmarc guidance tags. Please try again." - -#: src/guidance-tag/loaders/load-https-guidance-tags.js:18 -#: src/guidance-tag/loaders/load-https-guidance-tags.js:32 -msgid "Unable to find https guidance tags. Please try again." -msgstr "Unable to find https guidance tags. Please try again." +#: src/guidance-tag/loaders/load-ssl-guidance-tags.js:18 +#: src/guidance-tag/loaders/load-ssl-guidance-tags.js:32 +msgid "Unable to find SSL guidance tag(s). Please try again." +msgstr "Unable to find SSL guidance tag(s). Please try again." #: src/web-scan/loaders/load-https-by-key.js:17 #: src/web-scan/loaders/load-https-by-key.js:29 @@ -459,16 +469,6 @@ msgstr "Unable to find https scan. Please try again." msgid "Unable to find organization. Please try again." msgstr "Unable to find organization. Please try again." -#: src/guidance-tag/loaders/load-spf-guidance-tags.js:18 -#: src/guidance-tag/loaders/load-spf-guidance-tags.js:32 -msgid "Unable to find spf guidance tags. Please try again." -msgstr "Unable to find spf guidance tags. Please try again." - -#: src/guidance-tag/loaders/load-ssl-guidance-tags.js:18 -#: src/guidance-tag/loaders/load-ssl-guidance-tags.js:32 -msgid "Unable to find ssl guidance tags. Please try again." -msgstr "Unable to find ssl guidance tags. Please try again." - #: src/web-scan/loaders/load-ssl-by-key.js:17 #: src/web-scan/loaders/load-ssl-by-key.js:29 msgid "Unable to find ssl scan. Please try again." @@ -527,6 +527,11 @@ msgstr "Unable to invite yourself to an org." msgid "Unable to load DKIM failure data. Please try again." msgstr "Unable to load DKIM failure data. Please try again." +#: src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js:242 +#: src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js:254 +msgid "Unable to load DKIM guidance tag(s). Please try again." +msgstr "Unable to load DKIM guidance tag(s). Please try again." + #: src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js:244 #: src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js:254 msgid "Unable to load DKIM result(s). Please try again." @@ -543,6 +548,11 @@ msgstr "Unable to load DKIM scan(s). Please try again." msgid "Unable to load DMARC failure data. Please try again." msgstr "Unable to load DMARC failure data. Please try again." +#: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:242 +#: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:254 +msgid "Unable to load DMARC guidance tag(s). Please try again." +msgstr "Unable to load DMARC guidance tag(s). Please try again." + #: src/email-scan/loaders/load-dmarc-connections-by-domain-id.js:308 #: src/email-scan/loaders/load-dmarc-connections-by-domain-id.js:318 msgid "Unable to load DMARC scan(s). Please try again." @@ -557,32 +567,37 @@ msgstr "Unable to load DMARC scan(s). Please try again." msgid "Unable to load DMARC summary data. Please try again." msgstr "Unable to load DMARC summary data. Please try again." +#: src/guidance-tag/loaders/load-https-guidance-tags-connections.js:242 +#: src/guidance-tag/loaders/load-https-guidance-tags-connections.js:254 +msgid "Unable to load HTTPS guidance tag(s). Please try again." +msgstr "Unable to load HTTPS guidance tag(s). Please try again." + #: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:16 #: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:142 #: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:154 msgid "Unable to load SPF failure data. Please try again." msgstr "Unable to load SPF failure data. Please try again." +#: src/guidance-tag/loaders/load-spf-guidance-tags-connections.js:242 +#: src/guidance-tag/loaders/load-spf-guidance-tags-connections.js:254 +msgid "Unable to load SPF guidance tag(s). Please try again." +msgstr "Unable to load SPF guidance tag(s). Please try again." + #: src/email-scan/loaders/load-spf-connections-by-domain-id.js:294 #: src/email-scan/loaders/load-spf-connections-by-domain-id.js:304 msgid "Unable to load SPF scan(s). Please try again." msgstr "Unable to load SPF scan(s). Please try again." +#: src/guidance-tag/loaders/load-ssl-guidance-tags-connections.js:242 +#: src/guidance-tag/loaders/load-ssl-guidance-tags-connections.js:254 +msgid "Unable to load SSL guidance tag(s). Please try again." +msgstr "Unable to load SSL guidance tag(s). Please try again." + #: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:233 #: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:414 msgid "Unable to load affiliation(s). Please try again." msgstr "Unable to load affiliation(s). Please try again." -#: src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js:242 -#: src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js:254 -msgid "Unable to load dkim guidance tags. Please try again." -msgstr "Unable to load dkim guidance tags. Please try again." - -#: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:242 -#: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:254 -msgid "Unable to load dmarc guidance tags. Please try again." -msgstr "Unable to load dmarc guidance tags. Please try again." - #: src/domain/loaders/load-domain-connections-by-organizations-id.js:313 #: src/domain/loaders/load-domain-connections-by-organizations-id.js:323 #: src/domain/loaders/load-domain-connections-by-user-id.js:346 @@ -608,11 +623,6 @@ msgstr "Unable to load domains. Please try again." msgid "Unable to load full pass data. Please try again." msgstr "Unable to load full pass data. Please try again." -#: src/guidance-tag/loaders/load-https-guidance-tags-connections.js:242 -#: src/guidance-tag/loaders/load-https-guidance-tags-connections.js:254 -msgid "Unable to load https guidance tags. Please try again." -msgstr "Unable to load https guidance tags. Please try again." - #: src/web-scan/loaders/load-https-connections-by-domain-id.js:320 #: src/web-scan/loaders/load-https-connections-by-domain-id.js:330 msgid "Unable to load https scans. Please try again." @@ -629,16 +639,6 @@ msgstr "Unable to load mail summary. Please try again." msgid "Unable to load organizations. Please try again." msgstr "Unable to load organizations. Please try again." -#: src/guidance-tag/loaders/load-spf-guidance-tags-connections.js:242 -#: src/guidance-tag/loaders/load-spf-guidance-tags-connections.js:254 -msgid "Unable to load spf guidance tags. Please try again." -msgstr "Unable to load spf guidance tags. Please try again." - -#: src/guidance-tag/loaders/load-ssl-guidance-tags-connections.js:242 -#: src/guidance-tag/loaders/load-ssl-guidance-tags-connections.js:254 -msgid "Unable to load ssl guidance tags. Please try again." -msgstr "Unable to load ssl guidance tags. Please try again." - #: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:368 #: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:378 msgid "Unable to load ssl scans. Please try again." @@ -914,6 +914,14 @@ msgstr "You must provide a `first` or `last` value to properly paginate the `Dma msgid "You must provide a `first` or `last` value to properly paginate the `FullPassTable` connection." msgstr "You must provide a `first` or `last` value to properly paginate the `FullPassTable` connection." +#: src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js:86 +#: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:86 +#: src/guidance-tag/loaders/load-https-guidance-tags-connections.js:86 +#: src/guidance-tag/loaders/load-spf-guidance-tags-connections.js:86 +#: src/guidance-tag/loaders/load-ssl-guidance-tags-connections.js:86 +msgid "You must provide a `first` or `last` value to properly paginate the `GuidanceTag` connection." +msgstr "You must provide a `first` or `last` value to properly paginate the `GuidanceTag` connection." + #: src/email-scan/loaders/load-spf-connections-by-domain-id.js:129 msgid "You must provide a `first` or `last` value to properly paginate the `SPF` connection." msgstr "You must provide a `first` or `last` value to properly paginate the `SPF` connection." @@ -936,14 +944,6 @@ msgstr "You must provide a `first` or `last` value to properly paginate the `dma msgid "You must provide a `first` or `last` value to properly paginate the `domain` connection." msgstr "You must provide a `first` or `last` value to properly paginate the `domain` connection." -#: src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js:86 -#: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:86 -#: src/guidance-tag/loaders/load-https-guidance-tags-connections.js:86 -#: src/guidance-tag/loaders/load-spf-guidance-tags-connections.js:86 -#: src/guidance-tag/loaders/load-ssl-guidance-tags-connections.js:86 -msgid "You must provide a `first` or `last` value to properly paginate the `guidanceTag` connection." -msgstr "You must provide a `first` or `last` value to properly paginate the `guidanceTag` connection." - #: src/web-scan/loaders/load-https-connections-by-domain-id.js:143 msgid "You must provide a `first` or `last` value to properly paginate the `https` connection." msgstr "You must provide a `first` or `last` value to properly paginate the `https` connection." @@ -1028,6 +1028,14 @@ msgstr "`{argSet}` on the `DmarcFailureTable` connection cannot be less than zer msgid "`{argSet}` on the `FullPassTable` connection cannot be less than zero." msgstr "`{argSet}` on the `FullPassTable` connection cannot be less than zero." +#: src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js:107 +#: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:107 +#: src/guidance-tag/loaders/load-https-guidance-tags-connections.js:107 +#: src/guidance-tag/loaders/load-spf-guidance-tags-connections.js:107 +#: src/guidance-tag/loaders/load-ssl-guidance-tags-connections.js:107 +msgid "`{argSet}` on the `GuidanceTag` connection cannot be less than zero." +msgstr "`{argSet}` on the `GuidanceTag` connection cannot be less than zero." + #: src/email-scan/loaders/load-spf-connections-by-domain-id.js:150 msgid "`{argSet}` on the `SPF` connection cannot be less than zero." msgstr "`{argSet}` on the `SPF` connection cannot be less than zero." @@ -1050,14 +1058,6 @@ msgstr "`{argSet}` on the `dmarcSummaries` connection cannot be less than zero." msgid "`{argSet}` on the `domain` connection cannot be less than zero." msgstr "`{argSet}` on the `domain` connection cannot be less than zero." -#: src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js:107 -#: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:107 -#: src/guidance-tag/loaders/load-https-guidance-tags-connections.js:107 -#: src/guidance-tag/loaders/load-spf-guidance-tags-connections.js:107 -#: src/guidance-tag/loaders/load-ssl-guidance-tags-connections.js:107 -msgid "`{argSet}` on the `guidanceTag` connection cannot be less than zero." -msgstr "`{argSet}` on the `guidanceTag` connection cannot be less than zero." - #: src/web-scan/loaders/load-https-connections-by-domain-id.js:164 msgid "`{argSet}` on the `https` connection cannot be less than zero." msgstr "`{argSet}` on the `https` connection cannot be less than zero." diff --git a/api-js/src/locale/fr/messages.js b/api-js/src/locale/fr/messages.js index 5561f218d..1a9f35f32 100644 --- a/api-js/src/locale/fr/messages.js +++ b/api-js/src/locale/fr/messages.js @@ -30,6 +30,8 @@ 'todo', 'Passing both `first` and `last` to paginate the `FullPassTable` connection is not supported.': 'todo', + 'Passing both `first` and `last` to paginate the `GuidanceTag` connection is not supported.': + 'todo', 'Passing both `first` and `last` to paginate the `SPF` connection is not supported.': 'todo', 'Passing both `first` and `last` to paginate the `SpfFailureTable` connection is not supported.': @@ -40,8 +42,6 @@ 'todo', 'Passing both `first` and `last` to paginate the `domain` connection is not supported.': 'todo', - 'Passing both `first` and `last` to paginate the `guidanceTag` connection is not supported.': - 'todo', 'Passing both `first` and `last` to paginate the `https` connection is not supported.': 'todo', 'Passing both `first` and `last` to paginate the `organization` connection is not supported.': @@ -88,6 +88,8 @@ 'todo', 'Requesting `{amount}` records on the `FullPassTable` connection exceeds the `{argSet}` limit of 100 records.': 'todo', + 'Requesting `{amount}` records on the `GuidanceTag` connection exceeds the `{argSet}` limit of 100 records.': + 'todo', 'Requesting `{amount}` records on the `SpfFailureTable` connection exceeds the `{argSet}` limit of 100 records.': 'todo', 'Requesting `{amount}` records on the `affiliations` exceeds the `{argSet}` limit of 100 records.': @@ -96,8 +98,6 @@ 'todo', 'Requesting `{amount}` records on the `domain` connection exceeds the `{argSet}` limit of 100 records.': 'todo', - 'Requesting `{amount}` records on the `guidanceTag` connection exceeds the `{argSet}` limit of 100 records.': - 'todo', 'Requesting `{amount}` records on the `organization` connection exceeds the `{argSet}` limit of 100 records.': 'todo', 'Requesting `{amount}` records on the `verifiedDomain` connection exceeds the `{argSet}` limit of 100 records.': @@ -138,18 +138,18 @@ 'Unable to create domain. Please try again.': 'todo', 'Unable to create organization. Please try again.': 'todo', 'Unable to dispatch one time scan. Please try again.': 'todo', + 'Unable to find DKIM guidance tag(s). Please try again.': 'todo', 'Unable to find DKIM result(s). Please try again.': 'todo', 'Unable to find DKIM scan(s). Please try again.': 'todo', + 'Unable to find DMARC guidance tag(s). Please try again.': 'todo', 'Unable to find DMARC scan(s). Please try again.': 'todo', 'Unable to find DMARC summary data. Please try again.': 'todo', + 'Unable to find HTTPS guidance tag(s). Please try again.': 'todo', + 'Unable to find SPF guidance tag(s). Please try again.': 'todo', 'Unable to find SPF scan(s). Please try again.': 'todo', - 'Unable to find dkim guidance tags. Please try again.': 'todo', - 'Unable to find dmarc guidance tags. Please try again.': 'todo', - 'Unable to find https guidance tags. Please try again.': 'todo', + 'Unable to find SSL guidance tag(s). Please try again.': 'todo', 'Unable to find https scan. Please try again.': 'todo', 'Unable to find organization. Please try again.': 'todo', - 'Unable to find spf guidance tags. Please try again.': 'todo', - 'Unable to find ssl guidance tags. Please try again.': 'todo', 'Unable to find ssl scan. Please try again.': 'todo', 'Unable to find summary. Please try again.': 'todo', 'Unable to find the requested domain.': 'todo', @@ -161,26 +161,26 @@ 'Unable to invite user. Please try again.': 'todo', 'Unable to invite yourself to an org.': 'todo', 'Unable to load DKIM failure data. Please try again.': 'todo', + 'Unable to load DKIM guidance tag(s). Please try again.': 'todo', 'Unable to load DKIM result(s). Please try again.': 'todo', 'Unable to load DKIM scan(s). Please try again.': 'todo', 'Unable to load DMARC failure data. Please try again.': 'todo', + 'Unable to load DMARC guidance tag(s). Please try again.': 'todo', 'Unable to load DMARC scan(s). Please try again.': 'todo', 'Unable to load DMARC summary data. Please try again.': 'todo', + 'Unable to load HTTPS guidance tag(s). Please try again.': 'todo', 'Unable to load SPF failure data. Please try again.': 'todo', + 'Unable to load SPF guidance tag(s). Please try again.': 'todo', 'Unable to load SPF scan(s). Please try again.': 'todo', + 'Unable to load SSL guidance tag(s). Please try again.': 'todo', 'Unable to load affiliation(s). Please try again.': 'todo', - 'Unable to load dkim guidance tags. Please try again.': 'todo', - 'Unable to load dmarc guidance tags. Please try again.': 'todo', 'Unable to load domain(s). Please try again.': 'todo', 'Unable to load domain. Please try again.': 'todo', 'Unable to load domains. Please try again.': 'todo', 'Unable to load full pass data. Please try again.': 'todo', - 'Unable to load https guidance tags. Please try again.': 'todo', 'Unable to load https scans. Please try again.': 'todo', 'Unable to load mail summary. Please try again.': 'todo', 'Unable to load organizations. Please try again.': 'todo', - 'Unable to load spf guidance tags. Please try again.': 'todo', - 'Unable to load ssl guidance tags. Please try again.': 'todo', 'Unable to load ssl scans. Please try again.': 'todo', 'Unable to load verified domains. Please try again.': 'todo', 'Unable to load verified organizations. Please try again.': 'todo', @@ -255,6 +255,8 @@ 'todo', 'You must provide a `first` or `last` value to properly paginate the `FullPassTable` connection.': 'todo', + 'You must provide a `first` or `last` value to properly paginate the `GuidanceTag` connection.': + 'todo', 'You must provide a `first` or `last` value to properly paginate the `SPF` connection.': 'todo', 'You must provide a `first` or `last` value to properly paginate the `SpfFailureTable` connection.': @@ -265,8 +267,6 @@ 'todo', 'You must provide a `first` or `last` value to properly paginate the `domain` connection.': 'todo', - 'You must provide a `first` or `last` value to properly paginate the `guidanceTag` connection.': - 'todo', 'You must provide a `first` or `last` value to properly paginate the `https` connection.': 'todo', 'You must provide a `first` or `last` value to properly paginate the `organization` connection.': @@ -292,6 +292,8 @@ 'todo', '`{argSet}` on the `FullPassTable` connection cannot be less than zero.': 'todo', + '`{argSet}` on the `GuidanceTag` connection cannot be less than zero.': + 'todo', '`{argSet}` on the `SPF` connection cannot be less than zero.': 'todo', '`{argSet}` on the `SpfFailureTable` connection cannot be less than zero.': 'todo', @@ -299,8 +301,6 @@ '`{argSet}` on the `dmarcSummaries` connection cannot be less than zero.': 'todo', '`{argSet}` on the `domain` connection cannot be less than zero.': 'todo', - '`{argSet}` on the `guidanceTag` connection cannot be less than zero.': - 'todo', '`{argSet}` on the `https` connection cannot be less than zero.': 'todo', '`{argSet}` on the `organization` connection cannot be less than zero.': 'todo', diff --git a/api-js/src/locale/fr/messages.po b/api-js/src/locale/fr/messages.po index aa0716c1e..a5f3ce0c8 100644 --- a/api-js/src/locale/fr/messages.po +++ b/api-js/src/locale/fr/messages.po @@ -107,6 +107,14 @@ msgstr "todo" msgid "Passing both `first` and `last` to paginate the `FullPassTable` connection is not supported." msgstr "todo" +#: src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js:95 +#: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:95 +#: src/guidance-tag/loaders/load-https-guidance-tags-connections.js:95 +#: src/guidance-tag/loaders/load-spf-guidance-tags-connections.js:95 +#: src/guidance-tag/loaders/load-ssl-guidance-tags-connections.js:95 +msgid "Passing both `first` and `last` to paginate the `GuidanceTag` connection is not supported." +msgstr "todo" + #: src/email-scan/loaders/load-spf-connections-by-domain-id.js:138 msgid "Passing both `first` and `last` to paginate the `SPF` connection is not supported." msgstr "todo" @@ -129,14 +137,6 @@ msgstr "todo" msgid "Passing both `first` and `last` to paginate the `domain` connection is not supported." msgstr "todo" -#: src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js:95 -#: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:95 -#: src/guidance-tag/loaders/load-https-guidance-tags-connections.js:95 -#: src/guidance-tag/loaders/load-spf-guidance-tags-connections.js:95 -#: src/guidance-tag/loaders/load-ssl-guidance-tags-connections.js:95 -msgid "Passing both `first` and `last` to paginate the `guidanceTag` connection is not supported." -msgstr "todo" - #: src/web-scan/loaders/load-https-connections-by-domain-id.js:152 msgid "Passing both `first` and `last` to paginate the `https` connection is not supported." msgstr "todo" @@ -255,6 +255,14 @@ msgstr "todo" msgid "Requesting `{amount}` records on the `FullPassTable` connection exceeds the `{argSet}` limit of 100 records." msgstr "todo" +#: src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js:118 +#: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:118 +#: src/guidance-tag/loaders/load-https-guidance-tags-connections.js:118 +#: src/guidance-tag/loaders/load-spf-guidance-tags-connections.js:118 +#: src/guidance-tag/loaders/load-ssl-guidance-tags-connections.js:118 +msgid "Requesting `{amount}` records on the `GuidanceTag` connection exceeds the `{argSet}` limit of 100 records." +msgstr "todo" + #: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:71 msgid "Requesting `{amount}` records on the `SpfFailureTable` connection exceeds the `{argSet}` limit of 100 records." msgstr "todo" @@ -273,14 +281,6 @@ msgstr "todo" msgid "Requesting `{amount}` records on the `domain` connection exceeds the `{argSet}` limit of 100 records." msgstr "todo" -#: src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js:118 -#: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:118 -#: src/guidance-tag/loaders/load-https-guidance-tags-connections.js:118 -#: src/guidance-tag/loaders/load-spf-guidance-tags-connections.js:118 -#: src/guidance-tag/loaders/load-ssl-guidance-tags-connections.js:118 -msgid "Requesting `{amount}` records on the `guidanceTag` connection exceeds the `{argSet}` limit of 100 records." -msgstr "todo" - #: src/organization/loaders/load-organization-connections-by-domain-id.js:202 #: src/organization/loaders/load-organization-connections-by-user-id.js:202 msgid "Requesting `{amount}` records on the `organization` connection exceeds the `{argSet}` limit of 100 records." @@ -407,6 +407,11 @@ msgstr "todo" msgid "Unable to dispatch one time scan. Please try again." msgstr "todo" +#: src/guidance-tag/loaders/load-dkim-guidance-tags.js:18 +#: src/guidance-tag/loaders/load-dkim-guidance-tags.js:32 +msgid "Unable to find DKIM guidance tag(s). Please try again." +msgstr "todo" + #: src/email-scan/loaders/load-dkim-result-by-key.js:19 #: src/email-scan/loaders/load-dkim-result-by-key.js:33 msgid "Unable to find DKIM result(s). Please try again." @@ -417,6 +422,11 @@ msgstr "todo" msgid "Unable to find DKIM scan(s). Please try again." msgstr "todo" +#: src/guidance-tag/loaders/load-dmarc-guidance-tags.js:18 +#: src/guidance-tag/loaders/load-dmarc-guidance-tags.js:32 +msgid "Unable to find DMARC guidance tag(s). Please try again." +msgstr "todo" + #: src/email-scan/loaders/load-dmarc-by-key.js:18 #: src/email-scan/loaders/load-dmarc-by-key.js:30 msgid "Unable to find DMARC scan(s). Please try again." @@ -427,24 +437,24 @@ msgstr "todo" msgid "Unable to find DMARC summary data. Please try again." msgstr "todo" -#: src/email-scan/loaders/load-spf-by-key.js:18 -#: src/email-scan/loaders/load-spf-by-key.js:30 -msgid "Unable to find SPF scan(s). Please try again." +#: src/guidance-tag/loaders/load-https-guidance-tags.js:18 +#: src/guidance-tag/loaders/load-https-guidance-tags.js:32 +msgid "Unable to find HTTPS guidance tag(s). Please try again." msgstr "todo" -#: src/guidance-tag/loaders/load-dkim-guidance-tags.js:18 -#: src/guidance-tag/loaders/load-dkim-guidance-tags.js:32 -msgid "Unable to find dkim guidance tags. Please try again." +#: src/guidance-tag/loaders/load-spf-guidance-tags.js:18 +#: src/guidance-tag/loaders/load-spf-guidance-tags.js:32 +msgid "Unable to find SPF guidance tag(s). Please try again." msgstr "todo" -#: src/guidance-tag/loaders/load-dmarc-guidance-tags.js:18 -#: src/guidance-tag/loaders/load-dmarc-guidance-tags.js:32 -msgid "Unable to find dmarc guidance tags. Please try again." +#: src/email-scan/loaders/load-spf-by-key.js:18 +#: src/email-scan/loaders/load-spf-by-key.js:30 +msgid "Unable to find SPF scan(s). Please try again." msgstr "todo" -#: src/guidance-tag/loaders/load-https-guidance-tags.js:18 -#: src/guidance-tag/loaders/load-https-guidance-tags.js:32 -msgid "Unable to find https guidance tags. Please try again." +#: src/guidance-tag/loaders/load-ssl-guidance-tags.js:18 +#: src/guidance-tag/loaders/load-ssl-guidance-tags.js:32 +msgid "Unable to find SSL guidance tag(s). Please try again." msgstr "todo" #: src/web-scan/loaders/load-https-by-key.js:17 @@ -459,16 +469,6 @@ msgstr "todo" msgid "Unable to find organization. Please try again." msgstr "todo" -#: src/guidance-tag/loaders/load-spf-guidance-tags.js:18 -#: src/guidance-tag/loaders/load-spf-guidance-tags.js:32 -msgid "Unable to find spf guidance tags. Please try again." -msgstr "todo" - -#: src/guidance-tag/loaders/load-ssl-guidance-tags.js:18 -#: src/guidance-tag/loaders/load-ssl-guidance-tags.js:32 -msgid "Unable to find ssl guidance tags. Please try again." -msgstr "todo" - #: src/web-scan/loaders/load-ssl-by-key.js:17 #: src/web-scan/loaders/load-ssl-by-key.js:29 msgid "Unable to find ssl scan. Please try again." @@ -527,6 +527,11 @@ msgstr "todo" msgid "Unable to load DKIM failure data. Please try again." msgstr "todo" +#: src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js:242 +#: src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js:254 +msgid "Unable to load DKIM guidance tag(s). Please try again." +msgstr "todo" + #: src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js:244 #: src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js:254 msgid "Unable to load DKIM result(s). Please try again." @@ -543,6 +548,11 @@ msgstr "todo" msgid "Unable to load DMARC failure data. Please try again." msgstr "todo" +#: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:242 +#: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:254 +msgid "Unable to load DMARC guidance tag(s). Please try again." +msgstr "todo" + #: src/email-scan/loaders/load-dmarc-connections-by-domain-id.js:308 #: src/email-scan/loaders/load-dmarc-connections-by-domain-id.js:318 msgid "Unable to load DMARC scan(s). Please try again." @@ -557,32 +567,37 @@ msgstr "todo" msgid "Unable to load DMARC summary data. Please try again." msgstr "todo" +#: src/guidance-tag/loaders/load-https-guidance-tags-connections.js:242 +#: src/guidance-tag/loaders/load-https-guidance-tags-connections.js:254 +msgid "Unable to load HTTPS guidance tag(s). Please try again." +msgstr "todo" + #: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:16 #: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:142 #: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:154 msgid "Unable to load SPF failure data. Please try again." msgstr "todo" +#: src/guidance-tag/loaders/load-spf-guidance-tags-connections.js:242 +#: src/guidance-tag/loaders/load-spf-guidance-tags-connections.js:254 +msgid "Unable to load SPF guidance tag(s). Please try again." +msgstr "todo" + #: src/email-scan/loaders/load-spf-connections-by-domain-id.js:294 #: src/email-scan/loaders/load-spf-connections-by-domain-id.js:304 msgid "Unable to load SPF scan(s). Please try again." msgstr "todo" +#: src/guidance-tag/loaders/load-ssl-guidance-tags-connections.js:242 +#: src/guidance-tag/loaders/load-ssl-guidance-tags-connections.js:254 +msgid "Unable to load SSL guidance tag(s). Please try again." +msgstr "todo" + #: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:233 #: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:414 msgid "Unable to load affiliation(s). Please try again." msgstr "todo" -#: src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js:242 -#: src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js:254 -msgid "Unable to load dkim guidance tags. Please try again." -msgstr "todo" - -#: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:242 -#: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:254 -msgid "Unable to load dmarc guidance tags. Please try again." -msgstr "todo" - #: src/domain/loaders/load-domain-connections-by-organizations-id.js:313 #: src/domain/loaders/load-domain-connections-by-organizations-id.js:323 #: src/domain/loaders/load-domain-connections-by-user-id.js:346 @@ -608,11 +623,6 @@ msgstr "todo" msgid "Unable to load full pass data. Please try again." msgstr "todo" -#: src/guidance-tag/loaders/load-https-guidance-tags-connections.js:242 -#: src/guidance-tag/loaders/load-https-guidance-tags-connections.js:254 -msgid "Unable to load https guidance tags. Please try again." -msgstr "todo" - #: src/web-scan/loaders/load-https-connections-by-domain-id.js:320 #: src/web-scan/loaders/load-https-connections-by-domain-id.js:330 msgid "Unable to load https scans. Please try again." @@ -629,16 +639,6 @@ msgstr "todo" msgid "Unable to load organizations. Please try again." msgstr "todo" -#: src/guidance-tag/loaders/load-spf-guidance-tags-connections.js:242 -#: src/guidance-tag/loaders/load-spf-guidance-tags-connections.js:254 -msgid "Unable to load spf guidance tags. Please try again." -msgstr "todo" - -#: src/guidance-tag/loaders/load-ssl-guidance-tags-connections.js:242 -#: src/guidance-tag/loaders/load-ssl-guidance-tags-connections.js:254 -msgid "Unable to load ssl guidance tags. Please try again." -msgstr "todo" - #: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:368 #: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:378 msgid "Unable to load ssl scans. Please try again." @@ -914,6 +914,14 @@ msgstr "todo" msgid "You must provide a `first` or `last` value to properly paginate the `FullPassTable` connection." msgstr "todo" +#: src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js:86 +#: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:86 +#: src/guidance-tag/loaders/load-https-guidance-tags-connections.js:86 +#: src/guidance-tag/loaders/load-spf-guidance-tags-connections.js:86 +#: src/guidance-tag/loaders/load-ssl-guidance-tags-connections.js:86 +msgid "You must provide a `first` or `last` value to properly paginate the `GuidanceTag` connection." +msgstr "todo" + #: src/email-scan/loaders/load-spf-connections-by-domain-id.js:129 msgid "You must provide a `first` or `last` value to properly paginate the `SPF` connection." msgstr "todo" @@ -936,14 +944,6 @@ msgstr "todo" msgid "You must provide a `first` or `last` value to properly paginate the `domain` connection." msgstr "todo" -#: src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js:86 -#: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:86 -#: src/guidance-tag/loaders/load-https-guidance-tags-connections.js:86 -#: src/guidance-tag/loaders/load-spf-guidance-tags-connections.js:86 -#: src/guidance-tag/loaders/load-ssl-guidance-tags-connections.js:86 -msgid "You must provide a `first` or `last` value to properly paginate the `guidanceTag` connection." -msgstr "todo" - #: src/web-scan/loaders/load-https-connections-by-domain-id.js:143 msgid "You must provide a `first` or `last` value to properly paginate the `https` connection." msgstr "todo" @@ -1028,6 +1028,14 @@ msgstr "todo" msgid "`{argSet}` on the `FullPassTable` connection cannot be less than zero." msgstr "todo" +#: src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js:107 +#: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:107 +#: src/guidance-tag/loaders/load-https-guidance-tags-connections.js:107 +#: src/guidance-tag/loaders/load-spf-guidance-tags-connections.js:107 +#: src/guidance-tag/loaders/load-ssl-guidance-tags-connections.js:107 +msgid "`{argSet}` on the `GuidanceTag` connection cannot be less than zero." +msgstr "todo" + #: src/email-scan/loaders/load-spf-connections-by-domain-id.js:150 msgid "`{argSet}` on the `SPF` connection cannot be less than zero." msgstr "todo" @@ -1050,14 +1058,6 @@ msgstr "todo" msgid "`{argSet}` on the `domain` connection cannot be less than zero." msgstr "todo" -#: src/guidance-tag/loaders/load-dkim-guidance-tags-connections.js:107 -#: src/guidance-tag/loaders/load-dmarc-guidance-tags-connections.js:107 -#: src/guidance-tag/loaders/load-https-guidance-tags-connections.js:107 -#: src/guidance-tag/loaders/load-spf-guidance-tags-connections.js:107 -#: src/guidance-tag/loaders/load-ssl-guidance-tags-connections.js:107 -msgid "`{argSet}` on the `guidanceTag` connection cannot be less than zero." -msgstr "todo" - #: src/web-scan/loaders/load-https-connections-by-domain-id.js:164 msgid "`{argSet}` on the `https` connection cannot be less than zero." msgstr "todo" From f1b037fcb8c42cccb99017baa29c849175d66e62 Mon Sep 17 00:00:00 2001 From: nsdeschenes Date: Fri, 12 Mar 2021 10:13:44 -0400 Subject: [PATCH 06/21] notify error messages updated --- api-js/src/locale/en/messages.js | 4 ++++ api-js/src/locale/en/messages.po | 16 ++++++++++++++-- api-js/src/locale/fr/messages.js | 2 ++ api-js/src/locale/fr/messages.po | 16 ++++++++++++++-- .../notify-send-authenticate-email.test.js | 2 +- .../notify-send-authenticate-text-msg.test.js | 2 +- .../src/notify/notify-send-authenticate-email.js | 2 +- .../notify/notify-send-authenticate-text-msg.js | 2 +- 8 files changed, 38 insertions(+), 8 deletions(-) diff --git a/api-js/src/locale/en/messages.js b/api-js/src/locale/en/messages.js index abc8d7ff3..d653c7913 100644 --- a/api-js/src/locale/en/messages.js +++ b/api-js/src/locale/en/messages.js @@ -392,6 +392,10 @@ 'Unable to select DMARC report(s) for this period and year.', 'Unable to send TFA code, please try again.': 'Unable to send TFA code, please try again.', + 'Unable to send authentication email. Please try again.': + 'Unable to send authentication email. Please try again.', + 'Unable to send authentication text message. Please try again.': + 'Unable to send authentication text message. Please try again.', 'Unable to send org invite email. Please try again.': 'Unable to send org invite email. Please try again.', 'Unable to send password reset email. Please try again.': diff --git a/api-js/src/locale/en/messages.po b/api-js/src/locale/en/messages.po index b90985574..170895c75 100644 --- a/api-js/src/locale/en/messages.po +++ b/api-js/src/locale/en/messages.po @@ -368,8 +368,6 @@ msgstr "Two factor code is incorrect. Please try again." msgid "Two factor code length is incorrect. Please try again." msgstr "Two factor code length is incorrect. Please try again." -#: src/notify/notify-send-authenticate-email.js:18 -#: src/notify/notify-send-authenticate-text-msg.js:31 #: src/user/mutations/authenticate.js:58 #: src/user/mutations/authenticate.js:72 #: src/user/mutations/authenticate.js:90 @@ -739,6 +737,20 @@ msgstr "Unable to reset password. Please try again." msgid "Unable to select DMARC report(s) for this period and year." msgstr "Unable to select DMARC report(s) for this period and year." +#: src/user/mutations/send-phone-code.js:65 +#: src/user/mutations/send-phone-code.js:84 +#: src/user/mutations/send-phone-code.js:114 +msgid "Unable to send TFA code, please try again." +msgstr "Unable to send TFA code, please try again." + +#: src/notify/notify-send-authenticate-email.js:18 +msgid "Unable to send authentication email. Please try again." +msgstr "Unable to send authentication email. Please try again." + +#: src/notify/notify-send-authenticate-text-msg.js:31 +msgid "Unable to send authentication text message. Please try again." +msgstr "Unable to send authentication text message. Please try again." + #: src/notify/notify-send-org-invite-create-account.js:31 #: src/notify/notify-send-org-invite-email.js:26 msgid "Unable to send org invite email. Please try again." diff --git a/api-js/src/locale/fr/messages.js b/api-js/src/locale/fr/messages.js index 1a9f35f32..1416bb941 100644 --- a/api-js/src/locale/fr/messages.js +++ b/api-js/src/locale/fr/messages.js @@ -204,6 +204,8 @@ 'Unable to select dmarc reports for this period and year.': 'todo', 'Unable to select DMARC report(s) for this period and year.': 'todo', 'Unable to send TFA code, please try again.': 'todo', + 'Unable to send authentication email. Please try again.': 'todo', + 'Unable to send authentication text message. Please try again.': 'todo', 'Unable to send org invite email. Please try again.': 'todo', 'Unable to send password reset email. Please try again.': 'todo', 'Unable to send two factor authentication message. Please try again.': diff --git a/api-js/src/locale/fr/messages.po b/api-js/src/locale/fr/messages.po index a5f3ce0c8..84f274bd0 100644 --- a/api-js/src/locale/fr/messages.po +++ b/api-js/src/locale/fr/messages.po @@ -368,8 +368,6 @@ msgstr "todo" msgid "Two factor code length is incorrect. Please try again." msgstr "todo" -#: src/notify/notify-send-authenticate-email.js:18 -#: src/notify/notify-send-authenticate-text-msg.js:31 #: src/user/mutations/authenticate.js:58 #: src/user/mutations/authenticate.js:72 #: src/user/mutations/authenticate.js:90 @@ -739,6 +737,20 @@ msgstr "todo" msgid "Unable to select DMARC report(s) for this period and year." msgstr "todo" +#: src/user/mutations/send-phone-code.js:65 +#: src/user/mutations/send-phone-code.js:84 +#: src/user/mutations/send-phone-code.js:114 +msgid "Unable to send TFA code, please try again." +msgstr "todo" + +#: src/notify/notify-send-authenticate-email.js:18 +msgid "Unable to send authentication email. Please try again." +msgstr "todo" + +#: src/notify/notify-send-authenticate-text-msg.js:31 +msgid "Unable to send authentication text message. Please try again." +msgstr "todo" + #: src/notify/notify-send-org-invite-create-account.js:31 #: src/notify/notify-send-org-invite-email.js:26 msgid "Unable to send org invite email. Please try again." diff --git a/api-js/src/notify/__tests__/notify-send-authenticate-email.test.js b/api-js/src/notify/__tests__/notify-send-authenticate-email.test.js index c68e15e49..4dd1adc2e 100644 --- a/api-js/src/notify/__tests__/notify-send-authenticate-email.test.js +++ b/api-js/src/notify/__tests__/notify-send-authenticate-email.test.js @@ -92,7 +92,7 @@ describe('given the sendAuthEmail function', () => { await mockedSendAuthEmail({ user }) } catch (err) { expect(err).toEqual( - new Error('Unable to authenticate. Please try again.'), + new Error('Unable to send authentication email. Please try again.'), ) } diff --git a/api-js/src/notify/__tests__/notify-send-authenticate-text-msg.test.js b/api-js/src/notify/__tests__/notify-send-authenticate-text-msg.test.js index 7819ae5dd..1ac9ae99d 100644 --- a/api-js/src/notify/__tests__/notify-send-authenticate-text-msg.test.js +++ b/api-js/src/notify/__tests__/notify-send-authenticate-text-msg.test.js @@ -122,7 +122,7 @@ describe('given the sendAuthTextMsg function', () => { await mockedSendAuthTextMsg({ user }) } catch (err) { expect(err).toEqual( - new Error('Unable to authenticate. Please try again.'), + new Error('Unable to send authentication text message. Please try again.'), ) } diff --git a/api-js/src/notify/notify-send-authenticate-email.js b/api-js/src/notify/notify-send-authenticate-email.js index 0aaf6ddb1..da0caf1b5 100644 --- a/api-js/src/notify/notify-send-authenticate-email.js +++ b/api-js/src/notify/notify-send-authenticate-email.js @@ -15,6 +15,6 @@ export const sendAuthEmail = ({ notifyClient, i18n }) => async ({ user }) => { console.error( `Error ocurred when sending authentication code via email for ${user._key}: ${err}`, ) - throw new Error(i18n._(t`Unable to authenticate. Please try again.`)) + throw new Error(i18n._(t`Unable to send authentication email. Please try again.`)) } } diff --git a/api-js/src/notify/notify-send-authenticate-text-msg.js b/api-js/src/notify/notify-send-authenticate-text-msg.js index e5ba7fafc..443d5a817 100644 --- a/api-js/src/notify/notify-send-authenticate-text-msg.js +++ b/api-js/src/notify/notify-send-authenticate-text-msg.js @@ -28,6 +28,6 @@ export const sendAuthTextMsg = ({ notifyClient, i18n }) => async ({ user }) => { console.error( `Error ocurred when sending authentication code via text for ${user._key}: ${err}`, ) - throw new Error(i18n._(t`Unable to authenticate. Please try again.`)) + throw new Error(i18n._(t`Unable to send authentication text message. Please try again.`)) } } From 97fe66f6bce16b77f4277ce0cd539a54ee39094a Mon Sep 17 00:00:00 2001 From: nsdeschenes Date: Fri, 12 Mar 2021 10:37:32 -0400 Subject: [PATCH 07/21] organization error messages updated --- api-js/src/locale/en/messages.js | 62 ++++++---- api-js/src/locale/en/messages.po | 117 +++++++++++------- api-js/src/locale/fr/messages.js | 38 ++++-- api-js/src/locale/fr/messages.po | 117 +++++++++++------- .../load-organization-by-key.test.js | 4 +- .../load-organization-by-slug.test.js | 4 +- ...anization-connections-by-domain-id.test.js | 16 +-- ...rganization-connections-by-user-id.test.js | 16 +-- .../loaders/load-organization-by-key.js | 8 +- .../loaders/load-organization-by-slug.js | 8 +- ...d-organization-connections-by-domain-id.js | 16 ++- ...oad-organization-connections-by-user-id.js | 16 ++- .../__tests__/create-organization.test.js | 2 +- .../__tests__/remove-organization.test.js | 8 +- .../__tests__/update-organization.test.js | 8 +- .../__tests__/verify-organization.test.js | 8 +- .../mutations/create-organization.js | 8 +- .../mutations/remove-organization.js | 16 +-- .../mutations/update-organization.js | 8 +- .../mutations/verify-organization.js | 8 +- .../find-organization-by-slug.test.js | 4 +- .../queries/find-organization-by-slug.js | 6 +- 22 files changed, 298 insertions(+), 200 deletions(-) diff --git a/api-js/src/locale/en/messages.js b/api-js/src/locale/en/messages.js index d653c7913..954caf85e 100644 --- a/api-js/src/locale/en/messages.js +++ b/api-js/src/locale/en/messages.js @@ -8,8 +8,6 @@ 'Authentication error. Please sign in.', 'Cannot query affiliations on organization without admin permission or higher.': 'Cannot query affiliations on organization without admin permission or higher.', - 'Could not retrieve specified organization.': - 'Could not retrieve specified organization.', 'Error when retrieving dmarc report information. Please try again.': 'Error when retrieving dmarc report information. Please try again.', 'If an account with this username is found, a password reset link will be found in your inbox.': @@ -30,6 +28,8 @@ 'Organization has already been verified.', 'Organization name already in use, please choose another and try again.': 'Organization name already in use, please choose another and try again.', + 'Organization name already in use. Please try again with a different name.': + 'Organization name already in use. Please try again with a different name.', 'Passing both `first` and `last` to paginate the `DKIMResults` connection is not supported.': 'Passing both `first` and `last` to paginate the `DKIMResults` connection is not supported.', 'Passing both `first` and `last` to paginate the `DKIM` connection is not supported.': @@ -44,6 +44,8 @@ 'Passing both `first` and `last` to paginate the `FullPassTable` connection is not supported.', 'Passing both `first` and `last` to paginate the `GuidanceTag` connection is not supported.': 'Passing both `first` and `last` to paginate the `GuidanceTag` connection is not supported.', + 'Passing both `first` and `last` to paginate the `Organization` connection is not supported.': + 'Passing both `first` and `last` to paginate the `Organization` connection is not supported.', 'Passing both `first` and `last` to paginate the `SPF` connection is not supported.': 'Passing both `first` and `last` to paginate the `SPF` connection is not supported.', 'Passing both `first` and `last` to paginate the `SpfFailureTable` connection is not supported.': @@ -56,8 +58,6 @@ 'Passing both `first` and `last` to paginate the `domain` connection is not supported.', 'Passing both `first` and `last` to paginate the `https` connection is not supported.': 'Passing both `first` and `last` to paginate the `https` connection is not supported.', - 'Passing both `first` and `last` to paginate the `organization` connection is not supported.': - 'Passing both `first` and `last` to paginate the `organization` connection is not supported.', 'Passing both `first` and `last` to paginate the `ssl` connection is not supported.': 'Passing both `first` and `last` to paginate the `ssl` connection is not supported.', 'Passing both `first` and `last` to paginate the `verifiedDomain` connection is not supported.': @@ -70,10 +70,16 @@ 'Password was successfully reset.': 'Password was successfully reset.', 'Password was successfully updated.': 'Password was successfully updated.', 'Passwords do not match.': 'Passwords do not match.', + 'Permission Denied: Could not retrieve specified organization.': + 'Permission Denied: Could not retrieve specified organization.', 'Permission Denied: Please contact organization admin for help with removing domain.': 'Permission Denied: Please contact organization admin for help with removing domain.', + 'Permission Denied: Please contact organization admin for help with removing organization.': + 'Permission Denied: Please contact organization admin for help with removing organization.', 'Permission Denied: Please contact organization admin for help with removing users.': 'Permission Denied: Please contact organization admin for help with removing users.', + 'Permission Denied: Please contact organization admin for help with updating organization.': + 'Permission Denied: Please contact organization admin for help with updating organization.', 'Permission Denied: Please contact organization admin for help with updating users roles.': 'Permission Denied: Please contact organization admin for help with updating users roles.', 'Permission Denied: Please contact organization admin for help with user invitations.': @@ -90,6 +96,10 @@ 'Permission Denied: Please contact organization user for help with updating this domain.', 'Permission Denied: Please contact super admin for help with removing domain.': 'Permission Denied: Please contact super admin for help with removing domain.', + 'Permission Denied: Please contact super admin for help with removing organization.': + 'Permission Denied: Please contact super admin for help with removing organization.', + 'Permission Denied: Please contact super admin for help with verifying this organization.': + 'Permission Denied: Please contact super admin for help with verifying this organization.', 'Permission check error. Unable to request domain information.': 'Permission check error. Unable to request domain information.', 'Permission error, not an admin for this user.': @@ -125,6 +135,13 @@ ['argSet'], '` limit of 100 records.', ], + 'Requesting `{amount}` records on the `Organization` connection exceeds the `{argSet}` limit of 100 records.': [ + 'Requesting `', + ['amount'], + '` records on the `Organization` connection exceeds the `', + ['argSet'], + '` limit of 100 records.', + ], 'Requesting `{amount}` records on the `SpfFailureTable` connection exceeds the `{argSet}` limit of 100 records.': [ 'Requesting `', ['amount'], @@ -153,13 +170,6 @@ ['argSet'], '` limit of 100 records.', ], - 'Requesting `{amount}` records on the `organization` connection exceeds the `{argSet}` limit of 100 records.': [ - 'Requesting `', - ['amount'], - '` records on the `organization` connection exceeds the `', - ['argSet'], - '` limit of 100 records.', - ], 'Requesting `{amount}` records on the `verifiedDomain` connection exceeds the `{argSet}` limit of 100 records.': [ 'Requesting `', ['amount'], @@ -285,8 +295,6 @@ 'Unable to find SSL guidance tag(s). Please try again.', 'Unable to find https scan. Please try again.': 'Unable to find https scan. Please try again.', - 'Unable to find organization. Please try again.': - 'Unable to find organization. Please try again.', 'Unable to find ssl scan. Please try again.': 'Unable to find ssl scan. Please try again.', 'Unable to find summary. Please try again.': @@ -347,6 +355,8 @@ 'Unable to load https scans. Please try again.', 'Unable to load mail summary. Please try again.': 'Unable to load mail summary. Please try again.', + 'Unable to load organization(s). Please try again.': + 'Unable to load organization(s). Please try again.', 'Unable to load organizations. Please try again.': 'Unable to load organizations. Please try again.', 'Unable to load ssl scans. Please try again.': @@ -361,8 +371,6 @@ 'Unable to query affiliation(s). Please try again.', 'Unable to query domain(s). Please try again.': 'Unable to query domain(s). Please try again.', - 'Unable to query organizations. Please try again.': - 'Unable to query organizations. Please try again.', 'Unable to remove a user that already does not belong to this organization.': 'Unable to remove a user that already does not belong to this organization.', 'Unable to remove domain from unknown organization.': @@ -372,6 +380,8 @@ 'Unable to remove organization. Please try again.': 'Unable to remove organization. Please try again.', 'Unable to remove unknown domain.': 'Unable to remove unknown domain.', + 'Unable to remove unknown organization.': + 'Unable to remove unknown organization.', 'Unable to remove unknown user from organization.': 'Unable to remove unknown user from organization.', 'Unable to remove user from organization.': @@ -386,8 +396,6 @@ 'Unable to request a on time scan on an unknown domain.', 'Unable to reset password. Please try again.': 'Unable to reset password. Please try again.', - 'Unable to select dmarc reports for this period and year.': - 'Unable to select dmarc reports for this period and year.', 'Unable to select DMARC report(s) for this period and year.': 'Unable to select DMARC report(s) for this period and year.', 'Unable to send TFA code, please try again.': @@ -417,7 +425,7 @@ 'Unable to update domain that does not belong to the given organization.': 'Unable to update domain that does not belong to the given organization.', 'Unable to update domain. Please try again.': - 'Unable to update domain. Please try again.', + 'Unable to update domain. Please try again.<<<<<<< HEAD', 'Unable to update organization. Please try again.': 'Unable to update organization. Please try again.', 'Unable to update password, authentication error occurred, please sign in again.': @@ -433,6 +441,8 @@ 'Unable to update profile. Please try again.': 'Unable to update profile. Please try again.', 'Unable to update unknown domain.': 'Unable to update unknown domain.', + 'Unable to update unknown organization.': + 'Unable to update unknown organization.', 'Unable to update unknown users role.': 'Unable to update unknown users role.', 'Unable to update users role that does not belong to this org. Please invite user to the organization.': @@ -450,6 +460,8 @@ 'Unable to verify if user is an admin, please try again.', 'Unable to verify organization. Please try again.': 'Unable to verify organization. Please try again.', + 'Unable to verify unknown organization.': + 'Unable to verify unknown organization.', 'User could not be queried.': 'User could not be queried.', 'User role was updated successfully.': 'User role was updated successfully.', @@ -470,6 +482,8 @@ 'You must provide a `first` or `last` value to properly paginate the `FullPassTable` connection.', 'You must provide a `first` or `last` value to properly paginate the `GuidanceTag` connection.': 'You must provide a `first` or `last` value to properly paginate the `GuidanceTag` connection.', + 'You must provide a `first` or `last` value to properly paginate the `Organization` connection.': + 'You must provide a `first` or `last` value to properly paginate the `Organization` connection.', 'You must provide a `first` or `last` value to properly paginate the `SPF` connection.': 'You must provide a `first` or `last` value to properly paginate the `SPF` connection.', 'You must provide a `first` or `last` value to properly paginate the `SpfFailureTable` connection.': @@ -482,8 +496,6 @@ 'You must provide a `first` or `last` value to properly paginate the `domain` connection.', 'You must provide a `first` or `last` value to properly paginate the `https` connection.': 'You must provide a `first` or `last` value to properly paginate the `https` connection.', - 'You must provide a `first` or `last` value to properly paginate the `organization` connection.': - 'You must provide a `first` or `last` value to properly paginate the `organization` connection.', 'You must provide a `first` or `last` value to properly paginate the `ssl` connection.': 'You must provide a `first` or `last` value to properly paginate the `ssl` connection.', 'You must provide a `first` or `last` value to properly paginate the `verifiedDomain` connection.': @@ -536,6 +548,11 @@ ['argSet'], '` on the `GuidanceTag` connection cannot be less than zero.', ], + '`{argSet}` on the `Organization` connection cannot be less than zero.': [ + '`', + ['argSet'], + '` on the `Organization` connection cannot be less than zero.', + ], '`{argSet}` on the `SPF` connection cannot be less than zero.': [ '`', ['argSet'], @@ -566,11 +583,6 @@ ['argSet'], '` on the `https` connection cannot be less than zero.', ], - '`{argSet}` on the `organization` connection cannot be less than zero.': [ - '`', - ['argSet'], - '` on the `organization` connection cannot be less than zero.', - ], '`{argSet}` on the `ssl` connection cannot be less than zero.': [ '`', ['argSet'], diff --git a/api-js/src/locale/en/messages.po b/api-js/src/locale/en/messages.po index 170895c75..5f47dcc08 100644 --- a/api-js/src/locale/en/messages.po +++ b/api-js/src/locale/en/messages.po @@ -33,10 +33,6 @@ msgstr "Authentication error. Please sign in." msgid "Cannot query affiliations on organization without admin permission or higher." msgstr "Cannot query affiliations on organization without admin permission or higher." -#: src/organization/queries/find-organization-by-slug.js:49 -msgid "Could not retrieve specified organization." -msgstr "Could not retrieve specified organization." - #: src/auth/check-domain-ownership.js:23 #: src/auth/check-domain-ownership.js:46 #: src/auth/check-domain-ownership.js:59 @@ -82,6 +78,10 @@ msgid "Organization name already in use, please choose another and try again." msgstr "Organization name already in use, please choose another and try again." #: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:46 +#: src/organization/mutations/create-organization.js:133 +msgid "Organization name already in use. Please try again with a different name." +msgstr "Organization name already in use. Please try again with a different name." + #: src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js:95 msgid "Passing both `first` and `last` to paginate the `DKIMResults` connection is not supported." msgstr "Passing both `first` and `last` to paginate the `DKIMResults` connection is not supported." @@ -115,6 +115,11 @@ msgstr "Passing both `first` and `last` to paginate the `FullPassTable` connecti msgid "Passing both `first` and `last` to paginate the `GuidanceTag` connection is not supported." msgstr "Passing both `first` and `last` to paginate the `GuidanceTag` connection is not supported." +#: src/organization/loaders/load-organization-connections-by-domain-id.js:179 +#: src/organization/loaders/load-organization-connections-by-user-id.js:179 +msgid "Passing both `first` and `last` to paginate the `Organization` connection is not supported." +msgstr "Passing both `first` and `last` to paginate the `Organization` connection is not supported." + #: src/email-scan/loaders/load-spf-connections-by-domain-id.js:138 msgid "Passing both `first` and `last` to paginate the `SPF` connection is not supported." msgstr "Passing both `first` and `last` to paginate the `SPF` connection is not supported." @@ -141,11 +146,6 @@ msgstr "Passing both `first` and `last` to paginate the `domain` connection is n msgid "Passing both `first` and `last` to paginate the `https` connection is not supported." msgstr "Passing both `first` and `last` to paginate the `https` connection is not supported." -#: src/organization/loaders/load-organization-connections-by-domain-id.js:179 -#: src/organization/loaders/load-organization-connections-by-user-id.js:179 -msgid "Passing both `first` and `last` to paginate the `organization` connection is not supported." -msgstr "Passing both `first` and `last` to paginate the `organization` connection is not supported." - #: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:176 msgid "Passing both `first` and `last` to paginate the `ssl` connection is not supported." msgstr "Passing both `first` and `last` to paginate the `ssl` connection is not supported." @@ -180,14 +180,26 @@ msgstr "Password was successfully updated." msgid "Passwords do not match." msgstr "Passwords do not match." +#: src/organization/queries/find-organization-by-slug.js:51 +msgid "Permission Denied: Could not retrieve specified organization." +msgstr "Permission Denied: Could not retrieve specified organization." + #: src/domain/mutations/remove-domain.js:95 msgid "Permission Denied: Please contact organization admin for help with removing domain." msgstr "Permission Denied: Please contact organization admin for help with removing domain." +#: src/organization/mutations/remove-organization.js:73 +msgid "Permission Denied: Please contact organization admin for help with removing organization." +msgstr "Permission Denied: Please contact organization admin for help with removing organization." + #: src/affiliation/mutations/remove-user-from-org.js:174 msgid "Permission Denied: Please contact organization admin for help with removing users." msgstr "Permission Denied: Please contact organization admin for help with removing users." +#: src/organization/mutations/update-organization.js:149 +msgid "Permission Denied: Please contact organization admin for help with updating organization." +msgstr "Permission Denied: Please contact organization admin for help with updating organization." + #: src/affiliation/mutations/update-user-role.js:158 #: src/affiliation/mutations/update-user-role.js:179 #: src/affiliation/mutations/update-user-role.js:195 @@ -222,6 +234,14 @@ msgstr "Permission Denied: Please contact organization user for help with updati msgid "Permission Denied: Please contact super admin for help with removing domain." msgstr "Permission Denied: Please contact super admin for help with removing domain." +#: src/organization/mutations/remove-organization.js:62 +msgid "Permission Denied: Please contact super admin for help with removing organization." +msgstr "Permission Denied: Please contact super admin for help with removing organization." + +#: src/organization/mutations/verify-organization.js:58 +msgid "Permission Denied: Please contact super admin for help with verifying this organization." +msgstr "Permission Denied: Please contact super admin for help with verifying this organization." + #: src/auth/check-domain-permission.js:22 #: src/auth/check-domain-permission.js:43 #: src/auth/check-domain-permission.js:54 @@ -263,6 +283,11 @@ msgstr "Requesting `{amount}` records on the `FullPassTable` connection exceeds msgid "Requesting `{amount}` records on the `GuidanceTag` connection exceeds the `{argSet}` limit of 100 records." msgstr "Requesting `{amount}` records on the `GuidanceTag` connection exceeds the `{argSet}` limit of 100 records." +#: src/organization/loaders/load-organization-connections-by-domain-id.js:202 +#: src/organization/loaders/load-organization-connections-by-user-id.js:202 +msgid "Requesting `{amount}` records on the `Organization` connection exceeds the `{argSet}` limit of 100 records." +msgstr "Requesting `{amount}` records on the `Organization` connection exceeds the `{argSet}` limit of 100 records." + #: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:71 msgid "Requesting `{amount}` records on the `SpfFailureTable` connection exceeds the `{argSet}` limit of 100 records." msgstr "Requesting `{amount}` records on the `SpfFailureTable` connection exceeds the `{argSet}` limit of 100 records." @@ -281,11 +306,6 @@ msgstr "Requesting `{amount}` records on the `dmarcSummaries` connection exceeds msgid "Requesting `{amount}` records on the `domain` connection exceeds the `{argSet}` limit of 100 records." msgstr "Requesting `{amount}` records on the `domain` connection exceeds the `{argSet}` limit of 100 records." -#: src/organization/loaders/load-organization-connections-by-domain-id.js:202 -#: src/organization/loaders/load-organization-connections-by-user-id.js:202 -msgid "Requesting `{amount}` records on the `organization` connection exceeds the `{argSet}` limit of 100 records." -msgstr "Requesting `{amount}` records on the `organization` connection exceeds the `{argSet}` limit of 100 records." - #: src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js:144 #: src/verified-domains/loaders/load-verified-domain-connections.js:144 msgid "Requesting `{amount}` records on the `verifiedDomain` connection exceeds the `{argSet}` limit of 100 records." @@ -392,7 +412,6 @@ msgstr "Unable to create domain in unknown organization." msgid "Unable to create domain. Please try again." msgstr "Unable to create domain. Please try again." -#: src/organization/mutations/create-organization.js:134 #: src/organization/mutations/create-organization.js:188 #: src/organization/mutations/create-organization.js:209 #: src/organization/mutations/create-organization.js:220 @@ -460,13 +479,6 @@ msgstr "Unable to find SSL guidance tag(s). Please try again." msgid "Unable to find https scan. Please try again." msgstr "Unable to find https scan. Please try again." -#: src/organization/loaders/load-organization-by-key.js:31 -#: src/organization/loaders/load-organization-by-key.js:43 -#: src/organization/loaders/load-organization-by-slug.js:19 -#: src/organization/loaders/load-organization-by-slug.js:31 -msgid "Unable to find organization. Please try again." -msgstr "Unable to find organization. Please try again." - #: src/web-scan/loaders/load-ssl-by-key.js:17 #: src/web-scan/loaders/load-ssl-by-key.js:29 msgid "Unable to find ssl scan. Please try again." @@ -630,9 +642,17 @@ msgstr "Unable to load https scans. Please try again." msgid "Unable to load mail summary. Please try again." msgstr "Unable to load mail summary. Please try again." -#: src/organization/loaders/load-organization-connections-by-domain-id.js:426 -#: src/organization/loaders/load-organization-connections-by-domain-id.js:436 -#: src/organization/loaders/load-organization-connections-by-user-id.js:438 +#: src/organization/loaders/load-organization-by-key.js:32 +#: src/organization/loaders/load-organization-by-key.js:46 +#: src/organization/loaders/load-organization-by-slug.js:20 +#: src/organization/loaders/load-organization-by-slug.js:34 +#: src/organization/loaders/load-organization-connections-by-domain-id.js:427 +#: src/organization/loaders/load-organization-connections-by-domain-id.js:439 +#: src/organization/loaders/load-organization-connections-by-user-id.js:429 +#: src/organization/loaders/load-organization-connections-by-user-id.js:441 +msgid "Unable to load organization(s). Please try again." +msgstr "Unable to load organization(s). Please try again." + #: src/organization/queries/find-my-organizations.js:43 msgid "Unable to load organizations. Please try again." msgstr "Unable to load organizations. Please try again." @@ -667,10 +687,6 @@ msgstr "Unable to query affiliation(s). Please try again." msgid "Unable to query domain(s). Please try again." msgstr "Unable to query domain(s). Please try again." -#: src/organization/loaders/load-organization-connections-by-user-id.js:428 -msgid "Unable to query organizations. Please try again." -msgstr "Unable to query organizations. Please try again." - #: src/affiliation/mutations/remove-user-from-org.js:102 msgid "Unable to remove a user that already does not belong to this organization." msgstr "Unable to remove a user that already does not belong to this organization." @@ -687,9 +703,6 @@ msgstr "Unable to remove domain from unknown organization." msgid "Unable to remove domain. Please try again." msgstr "Unable to remove domain. Please try again." -#: src/organization/mutations/remove-organization.js:52 -#: src/organization/mutations/remove-organization.js:65 -#: src/organization/mutations/remove-organization.js:74 #: src/organization/mutations/remove-organization.js:145 #: src/organization/mutations/remove-organization.js:177 #: src/organization/mutations/remove-organization.js:188 @@ -700,6 +713,10 @@ msgstr "Unable to remove organization. Please try again." msgid "Unable to remove unknown domain." msgstr "Unable to remove unknown domain." +#: src/organization/mutations/remove-organization.js:49 +msgid "Unable to remove unknown organization." +msgstr "Unable to remove unknown organization." + #: src/affiliation/mutations/remove-user-from-org.js:73 msgid "Unable to remove unknown user from organization." msgstr "Unable to remove unknown user from organization." @@ -802,6 +819,7 @@ msgstr "Unable to update domain that does not belong to the given organization." msgid "Unable to update domain. Please try again." msgstr "Unable to update domain. Please try again." +<<<<<<< HEAD #: src/organization/mutations/update-organization.js:138 #: src/organization/mutations/update-organization.js:150 #: src/organization/mutations/update-organization.js:168 @@ -809,6 +827,11 @@ msgstr "Unable to update domain. Please try again." #: src/organization/mutations/update-organization.js:209 #: src/organization/mutations/update-organization.js:263 #: src/organization/mutations/update-organization.js:274 +======= +#: src/organization/mutations/update-organization.js:167 +#: src/organization/mutations/update-organization.js:223 +#: src/organization/mutations/update-organization.js:234 +>>>>>>> organization error messages updated msgid "Unable to update organization. Please try again." msgstr "Unable to update organization. Please try again." @@ -842,6 +865,10 @@ msgstr "Unable to update profile. Please try again." msgid "Unable to update unknown domain." msgstr "Unable to update unknown domain." +#: src/organization/mutations/update-organization.js:137 +msgid "Unable to update unknown organization." +msgstr "Unable to update unknown organization." + #: src/affiliation/mutations/update-user-role.js:73 msgid "Unable to update unknown users role." msgstr "Unable to update unknown users role." @@ -879,13 +906,15 @@ msgstr "Unable to verify account. Please try again." msgid "Unable to verify if user is an admin, please try again." msgstr "Unable to verify if user is an admin, please try again." -#: src/organization/mutations/verify-organization.js:47 -#: src/organization/mutations/verify-organization.js:59 #: src/organization/mutations/verify-organization.js:99 #: src/organization/mutations/verify-organization.js:110 msgid "Unable to verify organization. Please try again." msgstr "Unable to verify organization. Please try again." +#: src/organization/mutations/verify-organization.js:46 +msgid "Unable to verify unknown organization." +msgstr "Unable to verify unknown organization." + #: src/user/queries/find-user-by-username.js:41 msgid "User could not be queried." msgstr "User could not be queried." @@ -934,6 +963,11 @@ msgstr "You must provide a `first` or `last` value to properly paginate the `Ful msgid "You must provide a `first` or `last` value to properly paginate the `GuidanceTag` connection." msgstr "You must provide a `first` or `last` value to properly paginate the `GuidanceTag` connection." +#: src/organization/loaders/load-organization-connections-by-domain-id.js:170 +#: src/organization/loaders/load-organization-connections-by-user-id.js:170 +msgid "You must provide a `first` or `last` value to properly paginate the `Organization` connection." +msgstr "You must provide a `first` or `last` value to properly paginate the `Organization` connection." + #: src/email-scan/loaders/load-spf-connections-by-domain-id.js:129 msgid "You must provide a `first` or `last` value to properly paginate the `SPF` connection." msgstr "You must provide a `first` or `last` value to properly paginate the `SPF` connection." @@ -960,11 +994,6 @@ msgstr "You must provide a `first` or `last` value to properly paginate the `dom msgid "You must provide a `first` or `last` value to properly paginate the `https` connection." msgstr "You must provide a `first` or `last` value to properly paginate the `https` connection." -#: src/organization/loaders/load-organization-connections-by-domain-id.js:170 -#: src/organization/loaders/load-organization-connections-by-user-id.js:170 -msgid "You must provide a `first` or `last` value to properly paginate the `organization` connection." -msgstr "You must provide a `first` or `last` value to properly paginate the `organization` connection." - #: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:167 msgid "You must provide a `first` or `last` value to properly paginate the `ssl` connection." msgstr "You must provide a `first` or `last` value to properly paginate the `ssl` connection." @@ -1048,6 +1077,11 @@ msgstr "`{argSet}` on the `FullPassTable` connection cannot be less than zero." msgid "`{argSet}` on the `GuidanceTag` connection cannot be less than zero." msgstr "`{argSet}` on the `GuidanceTag` connection cannot be less than zero." +#: src/organization/loaders/load-organization-connections-by-domain-id.js:191 +#: src/organization/loaders/load-organization-connections-by-user-id.js:191 +msgid "`{argSet}` on the `Organization` connection cannot be less than zero." +msgstr "`{argSet}` on the `Organization` connection cannot be less than zero." + #: src/email-scan/loaders/load-spf-connections-by-domain-id.js:150 msgid "`{argSet}` on the `SPF` connection cannot be less than zero." msgstr "`{argSet}` on the `SPF` connection cannot be less than zero." @@ -1074,11 +1108,6 @@ msgstr "`{argSet}` on the `domain` connection cannot be less than zero." msgid "`{argSet}` on the `https` connection cannot be less than zero." msgstr "`{argSet}` on the `https` connection cannot be less than zero." -#: src/organization/loaders/load-organization-connections-by-domain-id.js:191 -#: src/organization/loaders/load-organization-connections-by-user-id.js:191 -msgid "`{argSet}` on the `organization` connection cannot be less than zero." -msgstr "`{argSet}` on the `organization` connection cannot be less than zero." - #: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:188 msgid "`{argSet}` on the `ssl` connection cannot be less than zero." msgstr "`{argSet}` on the `ssl` connection cannot be less than zero." diff --git a/api-js/src/locale/fr/messages.js b/api-js/src/locale/fr/messages.js index 1416bb941..17e539d1c 100644 --- a/api-js/src/locale/fr/messages.js +++ b/api-js/src/locale/fr/messages.js @@ -5,7 +5,6 @@ 'Authentication error. Please sign in.': 'todo', 'Cannot query affiliations on organization without admin permission or higher.': 'todo', - 'Could not retrieve specified organization.': 'todo', 'Error when retrieving dmarc report information. Please try again.': 'todo', 'If an account with this username is found, a password reset link will be found in your inbox.': 'todo', @@ -18,6 +17,9 @@ 'No verified domain with the provided domain could be found.': 'todo', 'Organization has already been verified.': 'todo', 'Organization name already in use, please choose another and try again.': + 'todo', + 'Organization name already in use. Please try again with a different name.': + 'todo', 'Passing both `first` and `last` to paginate the `DKIMResults` connection is not supported.': 'todo', 'Passing both `first` and `last` to paginate the `DKIM` connection is not supported.': @@ -32,6 +34,8 @@ 'todo', 'Passing both `first` and `last` to paginate the `GuidanceTag` connection is not supported.': 'todo', + 'Passing both `first` and `last` to paginate the `Organization` connection is not supported.': + 'todo', 'Passing both `first` and `last` to paginate the `SPF` connection is not supported.': 'todo', 'Passing both `first` and `last` to paginate the `SpfFailureTable` connection is not supported.': @@ -44,8 +48,6 @@ 'todo', 'Passing both `first` and `last` to paginate the `https` connection is not supported.': 'todo', - 'Passing both `first` and `last` to paginate the `organization` connection is not supported.': - 'todo', 'Passing both `first` and `last` to paginate the `ssl` connection is not supported.': 'todo', 'Passing both `first` and `last` to paginate the `verifiedDomain` connection is not supported.': @@ -57,10 +59,15 @@ 'Password was successfully reset.': 'todo', 'Password was successfully updated.': 'todo', 'Passwords do not match.': 'todo', + 'Permission Denied: Could not retrieve specified organization.': 'todo', 'Permission Denied: Please contact organization admin for help with removing domain.': 'todo', + 'Permission Denied: Please contact organization admin for help with removing organization.': + 'todo', 'Permission Denied: Please contact organization admin for help with removing users.': 'todo', + 'Permission Denied: Please contact organization admin for help with updating organization.': + 'todo', 'Permission Denied: Please contact organization admin for help with updating users roles.': 'todo', 'Permission Denied: Please contact organization admin for help with user invitations.': @@ -77,6 +84,10 @@ 'todo', 'Permission Denied: Please contact super admin for help with removing domain.': 'todo', + 'Permission Denied: Please contact super admin for help with removing organization.': + 'todo', + 'Permission Denied: Please contact super admin for help with verifying this organization.': + 'todo', 'Permission check error. Unable to request domain information.': 'todo', 'Permission error, not an admin for this user.': 'todo', 'Phone number has been successfully set, you will receive a verification text message shortly.': @@ -90,6 +101,8 @@ 'todo', 'Requesting `{amount}` records on the `GuidanceTag` connection exceeds the `{argSet}` limit of 100 records.': 'todo', + 'Requesting `{amount}` records on the `Organization` connection exceeds the `{argSet}` limit of 100 records.': + 'todo', 'Requesting `{amount}` records on the `SpfFailureTable` connection exceeds the `{argSet}` limit of 100 records.': 'todo', 'Requesting `{amount}` records on the `affiliations` exceeds the `{argSet}` limit of 100 records.': @@ -98,8 +111,6 @@ 'todo', 'Requesting `{amount}` records on the `domain` connection exceeds the `{argSet}` limit of 100 records.': 'todo', - 'Requesting `{amount}` records on the `organization` connection exceeds the `{argSet}` limit of 100 records.': - 'todo', 'Requesting `{amount}` records on the `verifiedDomain` connection exceeds the `{argSet}` limit of 100 records.': 'todo', 'Requesting `{amount}` records on the `verifiedOrganization` connection exceeds the `{argSet}` limit of 100 records.': @@ -149,7 +160,6 @@ 'Unable to find SPF scan(s). Please try again.': 'todo', 'Unable to find SSL guidance tag(s). Please try again.': 'todo', 'Unable to find https scan. Please try again.': 'todo', - 'Unable to find organization. Please try again.': 'todo', 'Unable to find ssl scan. Please try again.': 'todo', 'Unable to find summary. Please try again.': 'todo', 'Unable to find the requested domain.': 'todo', @@ -180,6 +190,7 @@ 'Unable to load full pass data. Please try again.': 'todo', 'Unable to load https scans. Please try again.': 'todo', 'Unable to load mail summary. Please try again.': 'todo', + 'Unable to load organization(s). Please try again.': 'todo', 'Unable to load organizations. Please try again.': 'todo', 'Unable to load ssl scans. Please try again.': 'todo', 'Unable to load verified domains. Please try again.': 'todo', @@ -187,13 +198,13 @@ 'Unable to load web summary. Please try again.': 'todo', 'Unable to query affiliation(s). Please try again.': 'todo', 'Unable to query domain(s). Please try again.': 'todo', - 'Unable to query organizations. Please try again.': 'todo', 'Unable to remove a user that already does not belong to this organization.': 'todo', 'Unable to remove domain from unknown organization.': 'todo', 'Unable to remove domain. Please try again.': 'todo', 'Unable to remove organization. Please try again.': 'todo', 'Unable to remove unknown domain.': 'todo', + 'Unable to remove unknown organization.': 'todo', 'Unable to remove unknown user from organization.': 'todo', 'Unable to remove user from organization.': 'todo', 'Unable to remove user from organization. Please try again.': 'todo', @@ -201,7 +212,6 @@ 'Unable to remove user from unknown organization.': 'todo', 'Unable to request a on time scan on an unknown domain.': 'todo', 'Unable to reset password. Please try again.': 'todo', - 'Unable to select dmarc reports for this period and year.': 'todo', 'Unable to select DMARC report(s) for this period and year.': 'todo', 'Unable to send TFA code, please try again.': 'todo', 'Unable to send authentication email. Please try again.': 'todo', @@ -218,7 +228,7 @@ 'Unable to update domain in an unknown org.': 'todo', 'Unable to update domain that does not belong to the given organization.': 'todo', - 'Unable to update domain. Please try again.': 'todo', + 'Unable to update domain. Please try again.': 'todo<<<<<<< HEAD', 'Unable to update organization. Please try again.': 'todo', 'Unable to update password, authentication error occurred, please sign in again.': 'todo', @@ -231,6 +241,7 @@ 'Unable to update password. Please try again.': 'todo', 'Unable to update profile. Please try again.': 'todo', 'Unable to update unknown domain.': 'todo', + 'Unable to update unknown organization.': 'todo', 'Unable to update unknown users role.': 'todo', 'Unable to update users role that does not belong to this org. Please invite user to the organization.': 'todo', @@ -241,6 +252,7 @@ 'Unable to verify account. Please try again.': 'todo', 'Unable to verify if user is an admin, please try again.': 'todo', 'Unable to verify organization. Please try again.': 'todo', + 'Unable to verify unknown organization.': 'todo', 'User could not be queried.': 'todo', 'User role was updated successfully.': 'todo', 'Username already in use.': 'todo', @@ -259,6 +271,8 @@ 'todo', 'You must provide a `first` or `last` value to properly paginate the `GuidanceTag` connection.': 'todo', + 'You must provide a `first` or `last` value to properly paginate the `Organization` connection.': + 'todo', 'You must provide a `first` or `last` value to properly paginate the `SPF` connection.': 'todo', 'You must provide a `first` or `last` value to properly paginate the `SpfFailureTable` connection.': @@ -271,8 +285,6 @@ 'todo', 'You must provide a `first` or `last` value to properly paginate the `https` connection.': 'todo', - 'You must provide a `first` or `last` value to properly paginate the `organization` connection.': - 'todo', 'You must provide a `first` or `last` value to properly paginate the `ssl` connection.': 'todo', 'You must provide a `first` or `last` value to properly paginate the `verifiedDomain` connection.': @@ -296,6 +308,8 @@ 'todo', '`{argSet}` on the `GuidanceTag` connection cannot be less than zero.': 'todo', + '`{argSet}` on the `Organization` connection cannot be less than zero.': + 'todo', '`{argSet}` on the `SPF` connection cannot be less than zero.': 'todo', '`{argSet}` on the `SpfFailureTable` connection cannot be less than zero.': 'todo', @@ -304,8 +318,6 @@ 'todo', '`{argSet}` on the `domain` connection cannot be less than zero.': 'todo', '`{argSet}` on the `https` connection cannot be less than zero.': 'todo', - '`{argSet}` on the `organization` connection cannot be less than zero.': - 'todo', '`{argSet}` on the `ssl` connection cannot be less than zero.': 'todo', '`{argSet}` on the `verifiedDomain` connection cannot be less than zero.': 'todo', diff --git a/api-js/src/locale/fr/messages.po b/api-js/src/locale/fr/messages.po index 84f274bd0..affbfeca1 100644 --- a/api-js/src/locale/fr/messages.po +++ b/api-js/src/locale/fr/messages.po @@ -33,10 +33,6 @@ msgstr "todo" msgid "Cannot query affiliations on organization without admin permission or higher." msgstr "todo" -#: src/organization/queries/find-organization-by-slug.js:49 -msgid "Could not retrieve specified organization." -msgstr "todo" - #: src/auth/check-domain-ownership.js:23 #: src/auth/check-domain-ownership.js:46 #: src/auth/check-domain-ownership.js:59 @@ -82,6 +78,10 @@ msgid "Organization name already in use, please choose another and try again." msgstr "todo" #: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:46 +#: src/organization/mutations/create-organization.js:133 +msgid "Organization name already in use. Please try again with a different name." +msgstr "todo" + #: src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js:95 msgid "Passing both `first` and `last` to paginate the `DKIMResults` connection is not supported." msgstr "todo" @@ -115,6 +115,11 @@ msgstr "todo" msgid "Passing both `first` and `last` to paginate the `GuidanceTag` connection is not supported." msgstr "todo" +#: src/organization/loaders/load-organization-connections-by-domain-id.js:179 +#: src/organization/loaders/load-organization-connections-by-user-id.js:179 +msgid "Passing both `first` and `last` to paginate the `Organization` connection is not supported." +msgstr "todo" + #: src/email-scan/loaders/load-spf-connections-by-domain-id.js:138 msgid "Passing both `first` and `last` to paginate the `SPF` connection is not supported." msgstr "todo" @@ -141,11 +146,6 @@ msgstr "todo" msgid "Passing both `first` and `last` to paginate the `https` connection is not supported." msgstr "todo" -#: src/organization/loaders/load-organization-connections-by-domain-id.js:179 -#: src/organization/loaders/load-organization-connections-by-user-id.js:179 -msgid "Passing both `first` and `last` to paginate the `organization` connection is not supported." -msgstr "todo" - #: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:176 msgid "Passing both `first` and `last` to paginate the `ssl` connection is not supported." msgstr "todo" @@ -180,14 +180,26 @@ msgstr "todo" msgid "Passwords do not match." msgstr "todo" +#: src/organization/queries/find-organization-by-slug.js:51 +msgid "Permission Denied: Could not retrieve specified organization." +msgstr "todo" + #: src/domain/mutations/remove-domain.js:95 msgid "Permission Denied: Please contact organization admin for help with removing domain." msgstr "todo" +#: src/organization/mutations/remove-organization.js:73 +msgid "Permission Denied: Please contact organization admin for help with removing organization." +msgstr "todo" + #: src/affiliation/mutations/remove-user-from-org.js:174 msgid "Permission Denied: Please contact organization admin for help with removing users." msgstr "todo" +#: src/organization/mutations/update-organization.js:149 +msgid "Permission Denied: Please contact organization admin for help with updating organization." +msgstr "todo" + #: src/affiliation/mutations/update-user-role.js:158 #: src/affiliation/mutations/update-user-role.js:179 #: src/affiliation/mutations/update-user-role.js:195 @@ -222,6 +234,14 @@ msgstr "todo" msgid "Permission Denied: Please contact super admin for help with removing domain." msgstr "todo" +#: src/organization/mutations/remove-organization.js:62 +msgid "Permission Denied: Please contact super admin for help with removing organization." +msgstr "todo" + +#: src/organization/mutations/verify-organization.js:58 +msgid "Permission Denied: Please contact super admin for help with verifying this organization." +msgstr "todo" + #: src/auth/check-domain-permission.js:22 #: src/auth/check-domain-permission.js:43 #: src/auth/check-domain-permission.js:54 @@ -263,6 +283,11 @@ msgstr "todo" msgid "Requesting `{amount}` records on the `GuidanceTag` connection exceeds the `{argSet}` limit of 100 records." msgstr "todo" +#: src/organization/loaders/load-organization-connections-by-domain-id.js:202 +#: src/organization/loaders/load-organization-connections-by-user-id.js:202 +msgid "Requesting `{amount}` records on the `Organization` connection exceeds the `{argSet}` limit of 100 records." +msgstr "todo" + #: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:71 msgid "Requesting `{amount}` records on the `SpfFailureTable` connection exceeds the `{argSet}` limit of 100 records." msgstr "todo" @@ -281,11 +306,6 @@ msgstr "todo" msgid "Requesting `{amount}` records on the `domain` connection exceeds the `{argSet}` limit of 100 records." msgstr "todo" -#: src/organization/loaders/load-organization-connections-by-domain-id.js:202 -#: src/organization/loaders/load-organization-connections-by-user-id.js:202 -msgid "Requesting `{amount}` records on the `organization` connection exceeds the `{argSet}` limit of 100 records." -msgstr "todo" - #: src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js:144 #: src/verified-domains/loaders/load-verified-domain-connections.js:144 msgid "Requesting `{amount}` records on the `verifiedDomain` connection exceeds the `{argSet}` limit of 100 records." @@ -392,7 +412,6 @@ msgstr "todo" msgid "Unable to create domain. Please try again." msgstr "todo" -#: src/organization/mutations/create-organization.js:134 #: src/organization/mutations/create-organization.js:188 #: src/organization/mutations/create-organization.js:209 #: src/organization/mutations/create-organization.js:220 @@ -460,13 +479,6 @@ msgstr "todo" msgid "Unable to find https scan. Please try again." msgstr "todo" -#: src/organization/loaders/load-organization-by-key.js:31 -#: src/organization/loaders/load-organization-by-key.js:43 -#: src/organization/loaders/load-organization-by-slug.js:19 -#: src/organization/loaders/load-organization-by-slug.js:31 -msgid "Unable to find organization. Please try again." -msgstr "todo" - #: src/web-scan/loaders/load-ssl-by-key.js:17 #: src/web-scan/loaders/load-ssl-by-key.js:29 msgid "Unable to find ssl scan. Please try again." @@ -630,9 +642,17 @@ msgstr "todo" msgid "Unable to load mail summary. Please try again." msgstr "todo" -#: src/organization/loaders/load-organization-connections-by-domain-id.js:426 -#: src/organization/loaders/load-organization-connections-by-domain-id.js:436 -#: src/organization/loaders/load-organization-connections-by-user-id.js:438 +#: src/organization/loaders/load-organization-by-key.js:32 +#: src/organization/loaders/load-organization-by-key.js:46 +#: src/organization/loaders/load-organization-by-slug.js:20 +#: src/organization/loaders/load-organization-by-slug.js:34 +#: src/organization/loaders/load-organization-connections-by-domain-id.js:427 +#: src/organization/loaders/load-organization-connections-by-domain-id.js:439 +#: src/organization/loaders/load-organization-connections-by-user-id.js:429 +#: src/organization/loaders/load-organization-connections-by-user-id.js:441 +msgid "Unable to load organization(s). Please try again." +msgstr "todo" + #: src/organization/queries/find-my-organizations.js:43 msgid "Unable to load organizations. Please try again." msgstr "todo" @@ -667,10 +687,6 @@ msgstr "todo" msgid "Unable to query domain(s). Please try again." msgstr "todo" -#: src/organization/loaders/load-organization-connections-by-user-id.js:428 -msgid "Unable to query organizations. Please try again." -msgstr "todo" - #: src/affiliation/mutations/remove-user-from-org.js:102 msgid "Unable to remove a user that already does not belong to this organization." msgstr "todo" @@ -687,9 +703,6 @@ msgstr "todo" msgid "Unable to remove domain. Please try again." msgstr "todo" -#: src/organization/mutations/remove-organization.js:52 -#: src/organization/mutations/remove-organization.js:65 -#: src/organization/mutations/remove-organization.js:74 #: src/organization/mutations/remove-organization.js:145 #: src/organization/mutations/remove-organization.js:177 #: src/organization/mutations/remove-organization.js:188 @@ -700,6 +713,10 @@ msgstr "todo" msgid "Unable to remove unknown domain." msgstr "todo" +#: src/organization/mutations/remove-organization.js:49 +msgid "Unable to remove unknown organization." +msgstr "todo" + #: src/affiliation/mutations/remove-user-from-org.js:73 msgid "Unable to remove unknown user from organization." msgstr "todo" @@ -802,6 +819,7 @@ msgstr "todo" msgid "Unable to update domain. Please try again." msgstr "todo" +<<<<<<< HEAD #: src/organization/mutations/update-organization.js:138 #: src/organization/mutations/update-organization.js:150 #: src/organization/mutations/update-organization.js:168 @@ -809,6 +827,11 @@ msgstr "todo" #: src/organization/mutations/update-organization.js:209 #: src/organization/mutations/update-organization.js:263 #: src/organization/mutations/update-organization.js:274 +======= +#: src/organization/mutations/update-organization.js:167 +#: src/organization/mutations/update-organization.js:223 +#: src/organization/mutations/update-organization.js:234 +>>>>>>> organization error messages updated msgid "Unable to update organization. Please try again." msgstr "todo" @@ -842,6 +865,10 @@ msgstr "todo" msgid "Unable to update unknown domain." msgstr "todo" +#: src/organization/mutations/update-organization.js:137 +msgid "Unable to update unknown organization." +msgstr "todo" + #: src/affiliation/mutations/update-user-role.js:73 msgid "Unable to update unknown users role." msgstr "todo" @@ -879,13 +906,15 @@ msgstr "todo" msgid "Unable to verify if user is an admin, please try again." msgstr "todo" -#: src/organization/mutations/verify-organization.js:47 -#: src/organization/mutations/verify-organization.js:59 #: src/organization/mutations/verify-organization.js:99 #: src/organization/mutations/verify-organization.js:110 msgid "Unable to verify organization. Please try again." msgstr "todo" +#: src/organization/mutations/verify-organization.js:46 +msgid "Unable to verify unknown organization." +msgstr "todo" + #: src/user/queries/find-user-by-username.js:41 msgid "User could not be queried." msgstr "todo" @@ -934,6 +963,11 @@ msgstr "todo" msgid "You must provide a `first` or `last` value to properly paginate the `GuidanceTag` connection." msgstr "todo" +#: src/organization/loaders/load-organization-connections-by-domain-id.js:170 +#: src/organization/loaders/load-organization-connections-by-user-id.js:170 +msgid "You must provide a `first` or `last` value to properly paginate the `Organization` connection." +msgstr "todo" + #: src/email-scan/loaders/load-spf-connections-by-domain-id.js:129 msgid "You must provide a `first` or `last` value to properly paginate the `SPF` connection." msgstr "todo" @@ -960,11 +994,6 @@ msgstr "todo" msgid "You must provide a `first` or `last` value to properly paginate the `https` connection." msgstr "todo" -#: src/organization/loaders/load-organization-connections-by-domain-id.js:170 -#: src/organization/loaders/load-organization-connections-by-user-id.js:170 -msgid "You must provide a `first` or `last` value to properly paginate the `organization` connection." -msgstr "todo" - #: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:167 msgid "You must provide a `first` or `last` value to properly paginate the `ssl` connection." msgstr "todo" @@ -1048,6 +1077,11 @@ msgstr "todo" msgid "`{argSet}` on the `GuidanceTag` connection cannot be less than zero." msgstr "todo" +#: src/organization/loaders/load-organization-connections-by-domain-id.js:191 +#: src/organization/loaders/load-organization-connections-by-user-id.js:191 +msgid "`{argSet}` on the `Organization` connection cannot be less than zero." +msgstr "todo" + #: src/email-scan/loaders/load-spf-connections-by-domain-id.js:150 msgid "`{argSet}` on the `SPF` connection cannot be less than zero." msgstr "todo" @@ -1074,11 +1108,6 @@ msgstr "todo" msgid "`{argSet}` on the `https` connection cannot be less than zero." msgstr "todo" -#: src/organization/loaders/load-organization-connections-by-domain-id.js:191 -#: src/organization/loaders/load-organization-connections-by-user-id.js:191 -msgid "`{argSet}` on the `organization` connection cannot be less than zero." -msgstr "todo" - #: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:188 msgid "`{argSet}` on the `ssl` connection cannot be less than zero." msgstr "todo" diff --git a/api-js/src/organization/loaders/__tests__/load-organization-by-key.test.js b/api-js/src/organization/loaders/__tests__/load-organization-by-key.test.js index 6b3d708ef..3a039990f 100644 --- a/api-js/src/organization/loaders/__tests__/load-organization-by-key.test.js +++ b/api-js/src/organization/loaders/__tests__/load-organization-by-key.test.js @@ -171,7 +171,7 @@ describe('given a orgLoaderByKey dataloader', () => { await loader.load('1') } catch (err) { expect(err).toEqual( - new Error('Unable to find organization. Please try again.'), + new Error('Unable to load organization(s). Please try again.'), ) } @@ -194,7 +194,7 @@ describe('given a orgLoaderByKey dataloader', () => { await loader.load('1') } catch (err) { expect(err).toEqual( - new Error('Unable to find organization. Please try again.'), + new Error('Unable to load organization(s). Please try again.'), ) } diff --git a/api-js/src/organization/loaders/__tests__/load-organization-by-slug.test.js b/api-js/src/organization/loaders/__tests__/load-organization-by-slug.test.js index db0a17c0d..6aef31053 100644 --- a/api-js/src/organization/loaders/__tests__/load-organization-by-slug.test.js +++ b/api-js/src/organization/loaders/__tests__/load-organization-by-slug.test.js @@ -159,7 +159,7 @@ describe('given a orgLoaderByKey dataloader', () => { await loader.load('slug') } catch (err) { expect(err).toEqual( - new Error('Unable to find organization. Please try again.'), + new Error('Unable to load organization(s). Please try again.'), ) } @@ -182,7 +182,7 @@ describe('given a orgLoaderByKey dataloader', () => { await loader.load('slug') } catch (err) { expect(err).toEqual( - new Error('Unable to find organization. Please try again.'), + new Error('Unable to load organization(s). Please try again.'), ) } diff --git a/api-js/src/organization/loaders/__tests__/load-organization-connections-by-domain-id.test.js b/api-js/src/organization/loaders/__tests__/load-organization-connections-by-domain-id.test.js index 08689237a..d4fef4959 100644 --- a/api-js/src/organization/loaders/__tests__/load-organization-connections-by-domain-id.test.js +++ b/api-js/src/organization/loaders/__tests__/load-organization-connections-by-domain-id.test.js @@ -2057,7 +2057,7 @@ describe('given the load organizations connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'You must provide a `first` or `last` value to properly paginate the `organization` connection.', + 'You must provide a `first` or `last` value to properly paginate the `Organization` connection.', ), ) } @@ -2086,7 +2086,7 @@ describe('given the load organizations connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Passing both `first` and `last` to paginate the `organization` connection is not supported.', + 'Passing both `first` and `last` to paginate the `Organization` connection is not supported.', ), ) } @@ -2118,7 +2118,7 @@ describe('given the load organizations connection function', () => { } catch (err) { expect(err).toEqual( new Error( - '`first` on the `organization` connection cannot be less than zero.', + '`first` on the `Organization` connection cannot be less than zero.', ), ) } @@ -2149,7 +2149,7 @@ describe('given the load organizations connection function', () => { } catch (err) { expect(err).toEqual( new Error( - '`last` on the `organization` connection cannot be less than zero.', + '`last` on the `Organization` connection cannot be less than zero.', ), ) } @@ -2182,7 +2182,7 @@ describe('given the load organizations connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Requesting `101` records on the `organization` connection exceeds the `first` limit of 100 records.', + 'Requesting `101` records on the `Organization` connection exceeds the `first` limit of 100 records.', ), ) } @@ -2213,7 +2213,7 @@ describe('given the load organizations connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Requesting `101` records on the `organization` connection exceeds the `last` limit of 100 records.', + 'Requesting `101` records on the `Organization` connection exceeds the `last` limit of 100 records.', ), ) } @@ -2321,7 +2321,7 @@ describe('given the load organizations connection function', () => { await connectionLoader({ domainId: domain._id, ...connectionArgs }) } catch (err) { expect(err).toEqual( - new Error('Unable to load organizations. Please try again.'), + new Error('Unable to load organization(s). Please try again.'), ) } @@ -2358,7 +2358,7 @@ describe('given the load organizations connection function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load organizations. Please try again.'), + new Error('Unable to load organization(s). Please try again.'), ) } diff --git a/api-js/src/organization/loaders/__tests__/load-organization-connections-by-user-id.test.js b/api-js/src/organization/loaders/__tests__/load-organization-connections-by-user-id.test.js index 1cefc9217..3f6c6c488 100644 --- a/api-js/src/organization/loaders/__tests__/load-organization-connections-by-user-id.test.js +++ b/api-js/src/organization/loaders/__tests__/load-organization-connections-by-user-id.test.js @@ -2081,7 +2081,7 @@ describe('given the load organization connections by user id function', () => { } catch (err) { expect(err).toEqual( new Error( - 'You must provide a `first` or `last` value to properly paginate the `organization` connection.', + 'You must provide a `first` or `last` value to properly paginate the `Organization` connection.', ), ) } @@ -2112,7 +2112,7 @@ describe('given the load organization connections by user id function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Passing both `first` and `last` to paginate the `organization` connection is not supported.', + 'Passing both `first` and `last` to paginate the `Organization` connection is not supported.', ), ) } @@ -2143,7 +2143,7 @@ describe('given the load organization connections by user id function', () => { } catch (err) { expect(err).toEqual( new Error( - '`first` on the `organization` connection cannot be less than zero.', + '`first` on the `Organization` connection cannot be less than zero.', ), ) } @@ -2173,7 +2173,7 @@ describe('given the load organization connections by user id function', () => { } catch (err) { expect(err).toEqual( new Error( - '`last` on the `organization` connection cannot be less than zero.', + '`last` on the `Organization` connection cannot be less than zero.', ), ) } @@ -2205,7 +2205,7 @@ describe('given the load organization connections by user id function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Requesting `101` records on the `organization` connection exceeds the `first` limit of 100 records.', + 'Requesting `101` records on the `Organization` connection exceeds the `first` limit of 100 records.', ), ) } @@ -2235,7 +2235,7 @@ describe('given the load organization connections by user id function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Requesting `101` records on the `organization` connection exceeds the `last` limit of 100 records.', + 'Requesting `101` records on the `Organization` connection exceeds the `last` limit of 100 records.', ), ) } @@ -2347,7 +2347,7 @@ describe('given the load organization connections by user id function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to query organizations. Please try again.'), + new Error('Unable to load organization(s). Please try again.'), ) } @@ -2384,7 +2384,7 @@ describe('given the load organization connections by user id function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load organizations. Please try again.'), + new Error('Unable to load organization(s). Please try again.'), ) } diff --git a/api-js/src/organization/loaders/load-organization-by-key.js b/api-js/src/organization/loaders/load-organization-by-key.js index b9eb2986d..f3e02b06a 100644 --- a/api-js/src/organization/loaders/load-organization-by-key.js +++ b/api-js/src/organization/loaders/load-organization-by-key.js @@ -28,7 +28,9 @@ export const orgLoaderByKey = (query, language, userKey, i18n) => console.error( `Database error occurred when user: ${userKey} running orgLoaderByKey: ${err}`, ) - throw new Error(i18n._(t`Unable to find organization. Please try again.`)) + throw new Error( + i18n._(t`Unable to load organization(s). Please try again.`), + ) } const orgMap = {} @@ -40,7 +42,9 @@ export const orgLoaderByKey = (query, language, userKey, i18n) => console.error( `Cursor error occurred when user: ${userKey} during orgLoaderByKey: ${err}`, ) - throw new Error(i18n._(t`Unable to find organization. Please try again.`)) + throw new Error( + i18n._(t`Unable to load organization(s). Please try again.`), + ) } return ids.map((id) => orgMap[id]) diff --git a/api-js/src/organization/loaders/load-organization-by-slug.js b/api-js/src/organization/loaders/load-organization-by-slug.js index 2ccd5978f..c634f9bdb 100644 --- a/api-js/src/organization/loaders/load-organization-by-slug.js +++ b/api-js/src/organization/loaders/load-organization-by-slug.js @@ -16,7 +16,9 @@ export const orgLoaderBySlug = (query, language, userKey, i18n) => console.error( `Database error occurred when user: ${userKey} running orgLoaderBySlug: ${err}`, ) - throw new Error(i18n._(t`Unable to find organization. Please try again.`)) + throw new Error( + i18n._(t`Unable to load organization(s). Please try again.`), + ) } const orgMap = {} @@ -28,7 +30,9 @@ export const orgLoaderBySlug = (query, language, userKey, i18n) => console.error( `Cursor error occurred when user: ${userKey} running orgLoaderBySlug: ${err}`, ) - throw new Error(i18n._(t`Unable to find organization. Please try again.`)) + throw new Error( + i18n._(t`Unable to load organization(s). Please try again.`), + ) } return slugs.map((slug) => orgMap[slug]) diff --git a/api-js/src/organization/loaders/load-organization-connections-by-domain-id.js b/api-js/src/organization/loaders/load-organization-connections-by-domain-id.js index 2cbc43854..21a490b9b 100644 --- a/api-js/src/organization/loaders/load-organization-connections-by-domain-id.js +++ b/api-js/src/organization/loaders/load-organization-connections-by-domain-id.js @@ -167,7 +167,7 @@ export const orgLoaderConnectionArgsByDomainId = ( ) throw new Error( i18n._( - t`You must provide a \`first\` or \`last\` value to properly paginate the \`organization\` connection.`, + t`You must provide a \`first\` or \`last\` value to properly paginate the \`Organization\` connection.`, ), ) } else if (typeof first !== 'undefined' && typeof last !== 'undefined') { @@ -176,7 +176,7 @@ export const orgLoaderConnectionArgsByDomainId = ( ) throw new Error( i18n._( - t`Passing both \`first\` and \`last\` to paginate the \`organization\` connection is not supported.`, + t`Passing both \`first\` and \`last\` to paginate the \`Organization\` connection is not supported.`, ), ) } else if (typeof first === 'number' || typeof last === 'number') { @@ -188,7 +188,7 @@ export const orgLoaderConnectionArgsByDomainId = ( ) throw new Error( i18n._( - t`\`${argSet}\` on the \`organization\` connection cannot be less than zero.`, + t`\`${argSet}\` on the \`Organization\` connection cannot be less than zero.`, ), ) } else if (first > 100 || last > 100) { @@ -199,7 +199,7 @@ export const orgLoaderConnectionArgsByDomainId = ( ) throw new Error( i18n._( - t`Requesting \`${amount}\` records on the \`organization\` connection exceeds the \`${argSet}\` limit of 100 records.`, + t`Requesting \`${amount}\` records on the \`Organization\` connection exceeds the \`${argSet}\` limit of 100 records.`, ), ) } else if (typeof first !== 'undefined' && typeof last === 'undefined') { @@ -423,7 +423,9 @@ export const orgLoaderConnectionArgsByDomainId = ( console.error( `Database error occurred while user: ${userKey} was trying to gather orgs in orgLoaderConnectionArgsByDomainId, error: ${err}`, ) - throw new Error(i18n._(t`Unable to load organizations. Please try again.`)) + throw new Error( + i18n._(t`Unable to load organization(s). Please try again.`), + ) } let organizationInfo @@ -433,7 +435,9 @@ export const orgLoaderConnectionArgsByDomainId = ( console.error( `Cursor error occurred while user: ${userKey} was trying to gather orgs in orgLoaderConnectionArgsByDomainId, error: ${err}`, ) - throw new Error(i18n._(t`Unable to load organizations. Please try again.`)) + throw new Error( + i18n._(t`Unable to load organization(s). Please try again.`), + ) } if (organizationInfo.organizations.length === 0) { diff --git a/api-js/src/organization/loaders/load-organization-connections-by-user-id.js b/api-js/src/organization/loaders/load-organization-connections-by-user-id.js index a308e93ae..42d3aaee6 100644 --- a/api-js/src/organization/loaders/load-organization-connections-by-user-id.js +++ b/api-js/src/organization/loaders/load-organization-connections-by-user-id.js @@ -167,7 +167,7 @@ export const orgLoaderConnectionsByUserId = ( ) throw new Error( i18n._( - t`You must provide a \`first\` or \`last\` value to properly paginate the \`organization\` connection.`, + t`You must provide a \`first\` or \`last\` value to properly paginate the \`Organization\` connection.`, ), ) } else if (typeof first !== 'undefined' && typeof last !== 'undefined') { @@ -176,7 +176,7 @@ export const orgLoaderConnectionsByUserId = ( ) throw new Error( i18n._( - t`Passing both \`first\` and \`last\` to paginate the \`organization\` connection is not supported.`, + t`Passing both \`first\` and \`last\` to paginate the \`Organization\` connection is not supported.`, ), ) } else if (typeof first === 'number' || typeof last === 'number') { @@ -188,7 +188,7 @@ export const orgLoaderConnectionsByUserId = ( ) throw new Error( i18n._( - t`\`${argSet}\` on the \`organization\` connection cannot be less than zero.`, + t`\`${argSet}\` on the \`Organization\` connection cannot be less than zero.`, ), ) } else if (first > 100 || last > 100) { @@ -199,7 +199,7 @@ export const orgLoaderConnectionsByUserId = ( ) throw new Error( i18n._( - t`Requesting \`${amount}\` records on the \`organization\` connection exceeds the \`${argSet}\` limit of 100 records.`, + t`Requesting \`${amount}\` records on the \`Organization\` connection exceeds the \`${argSet}\` limit of 100 records.`, ), ) } else if (typeof first !== 'undefined' && typeof last === 'undefined') { @@ -425,7 +425,9 @@ export const orgLoaderConnectionsByUserId = ( console.error( `Database error occurred while user: ${userKey} was trying to query organizations in orgLoaderConnectionsByUserId, error: ${err}`, ) - throw new Error(i18n._(t`Unable to query organizations. Please try again.`)) + throw new Error( + i18n._(t`Unable to load organization(s). Please try again.`), + ) } let organizationInfo @@ -435,7 +437,9 @@ export const orgLoaderConnectionsByUserId = ( console.error( `Cursor error occurred while user: ${userKey} was trying to gather organizations in orgLoaderConnectionsByUserId, error: ${err}`, ) - throw new Error(i18n._(t`Unable to load organizations. Please try again.`)) + throw new Error( + i18n._(t`Unable to load organization(s). Please try again.`), + ) } if (organizationInfo.organizations.length === 0) { diff --git a/api-js/src/organization/mutations/__tests__/create-organization.test.js b/api-js/src/organization/mutations/__tests__/create-organization.test.js index c1da258e7..e992284c5 100644 --- a/api-js/src/organization/mutations/__tests__/create-organization.test.js +++ b/api-js/src/organization/mutations/__tests__/create-organization.test.js @@ -363,7 +363,7 @@ describe('create an organization', () => { const error = [ new GraphQLError( - 'Unable to create organization. Please try again.', + 'Organization name already in use. Please try again with a different name.', ), ] diff --git a/api-js/src/organization/mutations/__tests__/remove-organization.test.js b/api-js/src/organization/mutations/__tests__/remove-organization.test.js index 841434935..678b2f453 100644 --- a/api-js/src/organization/mutations/__tests__/remove-organization.test.js +++ b/api-js/src/organization/mutations/__tests__/remove-organization.test.js @@ -976,9 +976,7 @@ describe('removing an organization', () => { ) const error = [ - new GraphQLError( - 'Unable to remove organization. Please try again.', - ), + new GraphQLError('Unable to remove unknown organization.'), ] expect(response.errors).toEqual(error) @@ -1090,7 +1088,7 @@ describe('removing an organization', () => { const error = [ new GraphQLError( - 'Unable to remove organization. Please try again.', + 'Permission Denied: Please contact super admin for help with removing organization.', ), ] @@ -1149,7 +1147,7 @@ describe('removing an organization', () => { const error = [ new GraphQLError( - 'Unable to remove organization. Please try again.', + 'Permission Denied: Please contact organization admin for help with removing organization.', ), ] diff --git a/api-js/src/organization/mutations/__tests__/update-organization.test.js b/api-js/src/organization/mutations/__tests__/update-organization.test.js index 896e951b6..820f3fd26 100644 --- a/api-js/src/organization/mutations/__tests__/update-organization.test.js +++ b/api-js/src/organization/mutations/__tests__/update-organization.test.js @@ -2600,7 +2600,7 @@ describe('updating an organization', () => { const error = [ new GraphQLError( - 'Unable to update organization. Please try again.', + 'Permission Denied: Please contact organization admin for help with updating organization.', ), ] @@ -2658,7 +2658,7 @@ describe('updating an organization', () => { const error = [ new GraphQLError( - 'Unable to update organization. Please try again.', + 'Permission Denied: Please contact organization admin for help with updating organization.', ), ] @@ -2718,9 +2718,7 @@ describe('updating an organization', () => { ) const error = [ - new GraphQLError( - 'Unable to update organization. Please try again.', - ), + new GraphQLError('Unable to update unknown organization.'), ] expect(response.errors).toEqual(error) diff --git a/api-js/src/organization/mutations/__tests__/verify-organization.test.js b/api-js/src/organization/mutations/__tests__/verify-organization.test.js index a345c7e0f..d8eb85194 100644 --- a/api-js/src/organization/mutations/__tests__/verify-organization.test.js +++ b/api-js/src/organization/mutations/__tests__/verify-organization.test.js @@ -465,9 +465,7 @@ describe('removing an organization', () => { ) const error = [ - new GraphQLError( - 'Unable to verify organization. Please try again.', - ), + new GraphQLError('Unable to verify unknown organization.'), ] expect(response.errors).toEqual(error) @@ -558,7 +556,7 @@ describe('removing an organization', () => { const error = [ new GraphQLError( - 'Unable to verify organization. Please try again.', + 'Permission Denied: Please contact super admin for help with verifying this organization.', ), ] @@ -649,7 +647,7 @@ describe('removing an organization', () => { const error = [ new GraphQLError( - 'Unable to verify organization. Please try again.', + 'Permission Denied: Please contact super admin for help with verifying this organization.', ), ] diff --git a/api-js/src/organization/mutations/create-organization.js b/api-js/src/organization/mutations/create-organization.js index 94f9cc92b..651a6d2de 100644 --- a/api-js/src/organization/mutations/create-organization.js +++ b/api-js/src/organization/mutations/create-organization.js @@ -81,9 +81,7 @@ export const createOrganization = new mutationWithClientMutationId({ organization: { type: organizationType, description: 'The newly created organization.', - resolve: async (payload) => { - return payload.organization - }, + resolve: ({ organization }) => organization, }, }), mutateAndGetPayload: async ( @@ -131,7 +129,9 @@ export const createOrganization = new mutationWithClientMutationId({ `User: ${userKey} attempted to create an organization that already exists: ${slugEN}`, ) throw new Error( - i18n._(t`Unable to create organization. Please try again.`), + i18n._( + t`Organization name already in use. Please try again with a different name.`, + ), ) } diff --git a/api-js/src/organization/mutations/remove-organization.js b/api-js/src/organization/mutations/remove-organization.js index 33d838b26..6fbd47c30 100644 --- a/api-js/src/organization/mutations/remove-organization.js +++ b/api-js/src/organization/mutations/remove-organization.js @@ -16,9 +16,7 @@ export const removeOrganization = new mutationWithClientMutationId({ type: GraphQLString, description: 'Status string to inform the user if the organization was successfully removed.', - resolve: async (payload) => { - return payload.status - }, + resolve: ({ status }) => status, }, }), mutateAndGetPayload: async ( @@ -48,9 +46,7 @@ export const removeOrganization = new mutationWithClientMutationId({ console.warn( `User: ${userKey} attempted to remove org: ${orgId}, but there is no org associated with that id.`, ) - throw new Error( - i18n._(t`Unable to remove organization. Please try again.`), - ) + throw new Error(i18n._(t`Unable to remove unknown organization.`)) } // Get users permission @@ -62,7 +58,9 @@ export const removeOrganization = new mutationWithClientMutationId({ `User: ${userKey} attempted to remove ${organization._key}, however the user is not a super admin.`, ) throw new Error( - i18n._(t`Unable to remove organization. Please try again.`), + i18n._( + t`Permission Denied: Please contact super admin for help with removing organization.`, + ), ) } @@ -71,7 +69,9 @@ export const removeOrganization = new mutationWithClientMutationId({ `User: ${userKey} attempted to remove ${organization._key}, however the user does not have permission to this organization.`, ) throw new Error( - i18n._(t`Unable to remove organization. Please try again.`), + i18n._( + t`Permission Denied: Please contact organization admin for help with removing organization.`, + ), ) } diff --git a/api-js/src/organization/mutations/update-organization.js b/api-js/src/organization/mutations/update-organization.js index 2dc4f7856..33e4f1059 100644 --- a/api-js/src/organization/mutations/update-organization.js +++ b/api-js/src/organization/mutations/update-organization.js @@ -134,9 +134,7 @@ export const updateOrganization = new mutationWithClientMutationId({ console.warn( `User: ${userKey} attempted to update organization: ${orgKey}, however no organizations is associated with that id.`, ) - throw new Error( - i18n._(t`Unable to update organization. Please try again.`), - ) + throw new Error(i18n._(t`Unable to update unknown organization.`)) } // Check to see if user has permission @@ -147,7 +145,9 @@ export const updateOrganization = new mutationWithClientMutationId({ `User: ${userKey} attempted to update organization ${orgKey}, however they do not have the correct permission level. Permission: ${permission}`, ) throw new Error( - i18n._(t`Unable to update organization. Please try again.`), + i18n._( + t`Permission Denied: Please contact organization admin for help with updating organization.`, + ), ) } diff --git a/api-js/src/organization/mutations/verify-organization.js b/api-js/src/organization/mutations/verify-organization.js index c8fd2a823..6adbe7a3f 100644 --- a/api-js/src/organization/mutations/verify-organization.js +++ b/api-js/src/organization/mutations/verify-organization.js @@ -43,9 +43,7 @@ export const verifyOrganization = new mutationWithClientMutationId({ console.warn( `User: ${userKey} attempted to verify organization: ${orgKey}, however no organizations is associated with that id.`, ) - throw new Error( - i18n._(t`Unable to verify organization. Please try again.`), - ) + throw new Error(i18n._(t`Unable to verify unknown organization.`)) } // Check to see if use has permission @@ -56,7 +54,9 @@ export const verifyOrganization = new mutationWithClientMutationId({ `User: ${userKey} attempted to verify organization: ${orgKey}, however they do not have the correct permission level. Permission: ${permission}`, ) throw new Error( - i18n._(t`Unable to verify organization. Please try again.`), + i18n._( + t`Permission Denied: Please contact super admin for help with verifying this organization.`, + ), ) } diff --git a/api-js/src/organization/queries/__tests__/find-organization-by-slug.test.js b/api-js/src/organization/queries/__tests__/find-organization-by-slug.test.js index 28ec52ff8..1d49a0ca0 100644 --- a/api-js/src/organization/queries/__tests__/find-organization-by-slug.test.js +++ b/api-js/src/organization/queries/__tests__/find-organization-by-slug.test.js @@ -236,7 +236,9 @@ describe('given findOrganizationBySlugQuery', () => { ) const error = [ - new GraphQLError(`Could not retrieve specified organization.`), + new GraphQLError( + `Permission Denied: Could not retrieve specified organization.`, + ), ] expect(response.errors).toEqual(error) diff --git a/api-js/src/organization/queries/find-organization-by-slug.js b/api-js/src/organization/queries/find-organization-by-slug.js index 5f5db9e2f..04602559b 100644 --- a/api-js/src/organization/queries/find-organization-by-slug.js +++ b/api-js/src/organization/queries/find-organization-by-slug.js @@ -46,7 +46,11 @@ export const findOrganizationBySlug = { if (!['super_admin', 'admin', 'user'].includes(permission)) { console.warn(`User ${user._key} could not retrieve organization.`) - throw new Error(i18n._(t`Could not retrieve specified organization.`)) + throw new Error( + i18n._( + t`Permission Denied: Could not retrieve specified organization.`, + ), + ) } console.info( From 2b5e37f342185b756d3faec8fde4e7b5c75e46bd Mon Sep 17 00:00:00 2001 From: nsdeschenes Date: Fri, 12 Mar 2021 10:41:40 -0400 Subject: [PATCH 08/21] update summaries error messages --- api-js/src/locale/en/messages.js | 4 ++-- api-js/src/locale/en/messages.po | 10 +++++----- api-js/src/locale/fr/messages.js | 2 +- api-js/src/locale/fr/messages.po | 10 +++++----- .../__tests__/load-chart-summary-by-key.test.js | 4 ++-- .../src/summaries/loaders/load-chart-summary-by-key.js | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/api-js/src/locale/en/messages.js b/api-js/src/locale/en/messages.js index 954caf85e..c46a766db 100644 --- a/api-js/src/locale/en/messages.js +++ b/api-js/src/locale/en/messages.js @@ -297,8 +297,6 @@ 'Unable to find https scan. Please try again.', 'Unable to find ssl scan. Please try again.': 'Unable to find ssl scan. Please try again.', - 'Unable to find summary. Please try again.': - 'Unable to find summary. Please try again.', 'Unable to find the requested domain.': 'Unable to find the requested domain.', 'Unable to find user affiliation(s). Please try again.': @@ -361,6 +359,8 @@ 'Unable to load organizations. Please try again.', 'Unable to load ssl scans. Please try again.': 'Unable to load ssl scans. Please try again.', + 'Unable to load summary. Please try again.': + 'Unable to load summary. Please try again.', 'Unable to load verified domains. Please try again.': 'Unable to load verified domains. Please try again.', 'Unable to load verified organizations. Please try again.': diff --git a/api-js/src/locale/en/messages.po b/api-js/src/locale/en/messages.po index 5f47dcc08..29e22da64 100644 --- a/api-js/src/locale/en/messages.po +++ b/api-js/src/locale/en/messages.po @@ -484,11 +484,6 @@ msgstr "Unable to find https scan. Please try again." msgid "Unable to find ssl scan. Please try again." msgstr "Unable to find ssl scan. Please try again." -#: src/summaries/loaders/load-chart-summary-by-key.js:18 -#: src/summaries/loaders/load-chart-summary-by-key.js:30 -msgid "Unable to find summary. Please try again." -msgstr "Unable to find summary. Please try again." - #: src/domain/queries/find-domain-by-domain.js:37 msgid "Unable to find the requested domain." msgstr "Unable to find the requested domain." @@ -662,6 +657,11 @@ msgstr "Unable to load organizations. Please try again." msgid "Unable to load ssl scans. Please try again." msgstr "Unable to load ssl scans. Please try again." +#: src/summaries/loaders/load-chart-summary-by-key.js:18 +#: src/summaries/loaders/load-chart-summary-by-key.js:30 +msgid "Unable to load summary. Please try again." +msgstr "Unable to load summary. Please try again." + #: src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js:297 #: src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js:309 msgid "Unable to load verified domains. Please try again." diff --git a/api-js/src/locale/fr/messages.js b/api-js/src/locale/fr/messages.js index 17e539d1c..64ab59942 100644 --- a/api-js/src/locale/fr/messages.js +++ b/api-js/src/locale/fr/messages.js @@ -161,7 +161,6 @@ 'Unable to find SSL guidance tag(s). Please try again.': 'todo', 'Unable to find https scan. Please try again.': 'todo', 'Unable to find ssl scan. Please try again.': 'todo', - 'Unable to find summary. Please try again.': 'todo', 'Unable to find the requested domain.': 'todo', 'Unable to find user affiliation(s). Please try again.': 'todo', 'Unable to find user. Please try again.': 'todo', @@ -193,6 +192,7 @@ 'Unable to load organization(s). Please try again.': 'todo', 'Unable to load organizations. Please try again.': 'todo', 'Unable to load ssl scans. Please try again.': 'todo', + 'Unable to load summary. Please try again.': 'todo', 'Unable to load verified domains. Please try again.': 'todo', 'Unable to load verified organizations. Please try again.': 'todo', 'Unable to load web summary. Please try again.': 'todo', diff --git a/api-js/src/locale/fr/messages.po b/api-js/src/locale/fr/messages.po index affbfeca1..c712f7702 100644 --- a/api-js/src/locale/fr/messages.po +++ b/api-js/src/locale/fr/messages.po @@ -484,11 +484,6 @@ msgstr "todo" msgid "Unable to find ssl scan. Please try again." msgstr "todo" -#: src/summaries/loaders/load-chart-summary-by-key.js:18 -#: src/summaries/loaders/load-chart-summary-by-key.js:30 -msgid "Unable to find summary. Please try again." -msgstr "todo" - #: src/domain/queries/find-domain-by-domain.js:37 msgid "Unable to find the requested domain." msgstr "todo" @@ -662,6 +657,11 @@ msgstr "todo" msgid "Unable to load ssl scans. Please try again." msgstr "todo" +#: src/summaries/loaders/load-chart-summary-by-key.js:18 +#: src/summaries/loaders/load-chart-summary-by-key.js:30 +msgid "Unable to load summary. Please try again." +msgstr "todo" + #: src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js:297 #: src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js:309 msgid "Unable to load verified domains. Please try again." diff --git a/api-js/src/summaries/loaders/__tests__/load-chart-summary-by-key.test.js b/api-js/src/summaries/loaders/__tests__/load-chart-summary-by-key.test.js index c6fba8af1..69d5bb7de 100644 --- a/api-js/src/summaries/loaders/__tests__/load-chart-summary-by-key.test.js +++ b/api-js/src/summaries/loaders/__tests__/load-chart-summary-by-key.test.js @@ -120,7 +120,7 @@ describe('given the chartSummaryLoaderByKey function', () => { await loader.load('1') } catch (err) { expect(err).toEqual( - new Error('Unable to find summary. Please try again.'), + new Error('Unable to load summary. Please try again.'), ) } @@ -143,7 +143,7 @@ describe('given the chartSummaryLoaderByKey function', () => { await loader.load('1') } catch (err) { expect(err).toEqual( - new Error('Unable to find summary. Please try again.'), + new Error('Unable to load summary. Please try again.'), ) } diff --git a/api-js/src/summaries/loaders/load-chart-summary-by-key.js b/api-js/src/summaries/loaders/load-chart-summary-by-key.js index 43df38281..07362a52e 100644 --- a/api-js/src/summaries/loaders/load-chart-summary-by-key.js +++ b/api-js/src/summaries/loaders/load-chart-summary-by-key.js @@ -15,7 +15,7 @@ export const chartSummaryLoaderByKey = (query, userKey, i18n) => console.error( `Database error occurred when user: ${userKey} running chartSummaryLoaderByKey: ${err}`, ) - throw new Error(i18n._(t`Unable to find summary. Please try again.`)) + throw new Error(i18n._(t`Unable to load summary. Please try again.`)) } const summaryMap = {} @@ -27,7 +27,7 @@ export const chartSummaryLoaderByKey = (query, userKey, i18n) => console.error( `Cursor error occurred when user: ${userKey} running chartSummaryLoaderByKey: ${err}`, ) - throw new Error(i18n._(t`Unable to find summary. Please try again.`)) + throw new Error(i18n._(t`Unable to load summary. Please try again.`)) } return keys.map((key) => summaryMap[key]) From d32aee640d733fb018a4f0eb14e48b064b65e264 Mon Sep 17 00:00:00 2001 From: nsdeschenes Date: Fri, 12 Mar 2021 11:15:30 -0400 Subject: [PATCH 09/21] update user error messages --- api-js/src/locale/en/messages.js | 35 ++-- api-js/src/locale/en/messages.po | 158 ++++++++++-------- api-js/src/locale/fr/messages.js | 25 ++- api-js/src/locale/fr/messages.po | 158 ++++++++++-------- .../__tests__/load-user-by-key.test.js | 4 +- .../__tests__/load-user-by-username.test.js | 4 +- api-js/src/user/loaders/load-user-by-key.js | 4 +- .../src/user/loaders/load-user-by-username.js | 4 +- .../mutations/__tests__/authenticate.test.js | 6 +- .../__tests__/reset-password.test.js | 8 +- .../user/mutations/__tests__/sign-up.test.js | 2 +- .../__tests__/update-user-password.test.js | 2 +- api-js/src/user/mutations/authenticate.js | 5 +- api-js/src/user/mutations/reset-password.js | 11 +- api-js/src/user/mutations/sign-in.js | 1 + api-js/src/user/mutations/sign-up.js | 2 +- .../user/mutations/update-user-password.js | 3 +- .../src/user/mutations/update-user-profile.js | 1 + api-js/src/user/mutations/verify-account.js | 1 + .../src/user/mutations/verify-phone-number.js | 1 + 20 files changed, 243 insertions(+), 192 deletions(-) diff --git a/api-js/src/locale/en/messages.js b/api-js/src/locale/en/messages.js index c46a766db..3d614fcbb 100644 --- a/api-js/src/locale/en/messages.js +++ b/api-js/src/locale/en/messages.js @@ -14,6 +14,10 @@ 'If an account with this username is found, a password reset link will be found in your inbox.', 'If an account with this username is found, an email verification link will be found in your inbox.': 'If an account with this username is found, an email verification link will be found in your inbox.', + 'Incorrect TFA code. Please sign in again.': + 'Incorrect TFA code. Please sign in again.', + 'Incorrect token value. Please request a new email.': + 'Incorrect token value. Please request a new email.', 'Incorrect username or password. Please try again.': 'Incorrect username or password. Please try again.', 'Invalid token, please request a new one.': @@ -64,9 +68,10 @@ 'Passing both `first` and `last` to paginate the `verifiedDomain` connection is not supported.', 'Passing both `first` and `last` to paginate the `verifiedOrganization` connection is not supported.': 'Passing both `first` and `last` to paginate the `verifiedOrganization` connection is not supported.', - 'Password is not strong enough. Please try again.': - 'Password is not strong enough. Please try again.', - 'Password is too short.': 'Password is too short.', + 'Password does not meet requirements.': + 'Password does not meet requirements.', + 'Password does not requirements. Please try again.': + 'Password does not requirements. Please try again.', 'Password was successfully reset.': 'Password was successfully reset.', 'Password was successfully updated.': 'Password was successfully updated.', 'Passwords do not match.': 'Passwords do not match.', @@ -255,12 +260,18 @@ ], 'Successfully verified phone number, and set TFA send method to text.': 'Successfully verified phone number, and set TFA send method to text.', + 'Token value incorrect, please sign in again.': + 'Token value incorrect, please sign in again.', 'Too many failed login attempts, please reset your password, and try again.': - 'Too many failed login attempts, please reset your password, and try again.', + 'Too many failed login attempts, please reset your password, and try again.<<<<<<< HEAD=======', + 'Two factor code has been successfully sent, you will receive a text message shortly.': + 'Two factor code has been successfully sent, you will receive a text message shortly.>>>>>>> update user error messages', 'Two factor code is incorrect. Please try again.': 'Two factor code is incorrect. Please try again.', 'Two factor code length is incorrect. Please try again.': 'Two factor code length is incorrect. Please try again.', + 'Unable to add user to organization. Please try again.': + 'Unable to add user to organization. Please try again.', 'Unable to authenticate. Please try again.': 'Unable to authenticate. Please try again.', 'Unable to check permission. Please try again.': @@ -301,8 +312,6 @@ 'Unable to find the requested domain.', 'Unable to find user affiliation(s). Please try again.': 'Unable to find user affiliation(s). Please try again.', - 'Unable to find user. Please try again.': - 'Unable to find user. Please try again.', 'Unable to find verified domain. Please try again.': 'Unable to find verified domain. Please try again.', 'Unable to find verified organization. Please try again.': @@ -361,6 +370,8 @@ 'Unable to load ssl scans. Please try again.', 'Unable to load summary. Please try again.': 'Unable to load summary. Please try again.', + 'Unable to load user(s). Please try again.': + 'Unable to load user(s). Please try again.', 'Unable to load verified domains. Please try again.': 'Unable to load verified domains. Please try again.', 'Unable to load verified organizations. Please try again.': @@ -394,6 +405,8 @@ 'Unable to remove user from unknown organization.', 'Unable to request a on time scan on an unknown domain.': 'Unable to request a on time scan on an unknown domain.', + 'Unable to reset password. Please request a new email.': + 'Unable to reset password. Please request a new email.', 'Unable to reset password. Please try again.': 'Unable to reset password. Please try again.', 'Unable to select DMARC report(s) for this period and year.': @@ -425,7 +438,7 @@ 'Unable to update domain that does not belong to the given organization.': 'Unable to update domain that does not belong to the given organization.', 'Unable to update domain. Please try again.': - 'Unable to update domain. Please try again.<<<<<<< HEAD', + 'Unable to update domain. Please try again.', 'Unable to update organization. Please try again.': 'Unable to update organization. Please try again.', 'Unable to update password, authentication error occurred, please sign in again.': @@ -434,10 +447,10 @@ 'Unable to update password, current password does not match. Please try again.', 'Unable to update password, new passwords do not match. Please try again.': 'Unable to update password, new passwords do not match. Please try again.', - 'Unable to update password, passwords are required to be 12 characters or longer. Please try again.': - 'Unable to update password, passwords are required to be 12 characters or longer. Please try again.', + 'Unable to update password, passwords do not match requirements. Please try again.': + 'Unable to update password, passwords do not match requirements. Please try again.', 'Unable to update password. Please try again.': - 'Unable to update password. Please try again.', + 'Unable to update password. Please try again.<<<<<<< HEAD', 'Unable to update profile. Please try again.': 'Unable to update profile. Please try again.', 'Unable to update unknown domain.': 'Unable to update unknown domain.', @@ -465,7 +478,7 @@ 'User could not be queried.': 'User could not be queried.', 'User role was updated successfully.': 'User role was updated successfully.', - 'Username already in use.': 'Username already in use.', + 'Username already in use.': 'Username already in use.<<<<<<< HEAD', 'Username not available, please try another.': 'Username not available, please try another.', 'You must provide a `first` or `last` value to properly paginate the `DKIMResults` connection.': diff --git a/api-js/src/locale/en/messages.po b/api-js/src/locale/en/messages.po index 29e22da64..6773c12e8 100644 --- a/api-js/src/locale/en/messages.po +++ b/api-js/src/locale/en/messages.po @@ -11,10 +11,10 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" -#: src/user/mutations/set-phone-number.js:51 -#: src/user/mutations/update-user-profile.js:65 -#: src/user/mutations/verify-phone-number.js:38 -#: src/user/mutations/verify-phone-number.js:52 +#: src/user/mutations/send-phone-code.js:52 +#: src/user/mutations/update-user-profile.js:66 +#: src/user/mutations/verify-phone-number.js:39 +#: src/user/mutations/verify-phone-number.js:53 msgid "Authentication error, please sign in again." msgstr "Authentication error, please sign in again." @@ -47,8 +47,16 @@ msgstr "If an account with this username is found, a password reset link will be msgid "If an account with this username is found, an email verification link will be found in your inbox." msgstr "If an account with this username is found, an email verification link will be found in your inbox." -#: src/user/mutations/sign-in.js:58 -#: src/user/mutations/sign-in.js:175 +#: src/user/mutations/authenticate.js:108 +msgid "Incorrect TFA code. Please sign in again." +msgstr "Incorrect TFA code. Please sign in again." + +#: src/user/mutations/reset-password.js:64 +msgid "Incorrect token value. Please request a new email." +msgstr "Incorrect token value. Please request a new email." + +#: src/user/mutations/sign-in.js:59 +#: src/user/mutations/sign-in.js:176 msgid "Incorrect username or password. Please try again." msgstr "Incorrect username or password. Please try again." @@ -56,7 +64,7 @@ msgstr "Incorrect username or password. Please try again." msgid "Invalid token, please request a new one." msgstr "Invalid token, please request a new one." -#: src/user/mutations/reset-password.js:101 +#: src/user/mutations/reset-password.js:106 msgid "New passwords do not match. Please try again." msgstr "New passwords do not match. Please try again." @@ -77,7 +85,6 @@ msgstr "Organization has already been verified." msgid "Organization name already in use, please choose another and try again." msgstr "Organization name already in use, please choose another and try again." -#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:46 #: src/organization/mutations/create-organization.js:133 msgid "Organization name already in use. Please try again with a different name." msgstr "Organization name already in use. Please try again with a different name." @@ -160,19 +167,19 @@ msgstr "Passing both `first` and `last` to paginate the `verifiedDomain` connect msgid "Passing both `first` and `last` to paginate the `verifiedOrganization` connection is not supported." msgstr "Passing both `first` and `last` to paginate the `verifiedOrganization` connection is not supported." -#: src/user/mutations/reset-password.js:114 -msgid "Password is not strong enough. Please try again." -msgstr "Password is not strong enough. Please try again." - #: src/user/mutations/sign-up.js:74 -msgid "Password is too short." -msgstr "Password is too short." +msgid "Password does not meet requirements." +msgstr "Password does not meet requirements." -#: src/user/mutations/reset-password.js:138 +#: src/user/mutations/reset-password.js:119 +msgid "Password does not requirements. Please try again." +msgstr "Password does not requirements. Please try again." + +#: src/user/mutations/reset-password.js:143 msgid "Password was successfully reset." msgstr "Password was successfully reset." -#: src/user/mutations/update-user-password.js:140 +#: src/user/mutations/update-user-password.js:141 msgid "Password was successfully updated." msgstr "Password was successfully updated." @@ -255,11 +262,11 @@ msgstr "Permission check error. Unable to request domain information." msgid "Permission error, not an admin for this user." msgstr "Permission error, not an admin for this user." -#: src/user/mutations/set-phone-number.js:130 +#: src/user/mutations/set-phone-number.js:107 msgid "Phone number has been successfully set, you will receive a verification text message shortly." msgstr "Phone number has been successfully set, you will receive a verification text message shortly." -#: src/user/mutations/update-user-profile.js:140 +#: src/user/mutations/update-user-profile.js:141 msgid "Profile successfully updated." msgstr "Profile successfully updated." @@ -344,7 +351,7 @@ msgstr "Requesting {amount} records on the `ssl` connection exceeds the `{argSet msgid "Successfully dispatched one time scan." msgstr "Successfully dispatched one time scan." -#: src/user/mutations/verify-account.js:102 +#: src/user/mutations/verify-account.js:121 msgid "Successfully email verified account, and set TFA send method to email." msgstr "Successfully email verified account, and set TFA send method to email." @@ -372,26 +379,36 @@ msgstr "Successfully sent invitation to service, and organization email." msgid "Successfully verified organization: {0}." msgstr "Successfully verified organization: {0}." -#: src/user/mutations/verify-phone-number.js:105 +#: src/user/mutations/verify-phone-number.js:106 msgid "Successfully verified phone number, and set TFA send method to text." msgstr "Successfully verified phone number, and set TFA send method to text." -#: src/user/mutations/sign-in.js:72 +#: src/user/mutations/authenticate.js:58 +msgid "Token value incorrect, please sign in again." +msgstr "Token value incorrect, please sign in again." + +#: src/user/mutations/sign-in.js:73 msgid "Too many failed login attempts, please reset your password, and try again." -msgstr "Too many failed login attempts, please reset your password, and try again." +msgstr "Too many failed login attempts, please reset your password, and try again.<<<<<<< HEAD=======" + +#: src/user/mutations/send-phone-code.js:128 +msgid "Two factor code has been successfully sent, you will receive a text message shortly." +msgstr "Two factor code has been successfully sent, you will receive a text message shortly.>>>>>>> update user error messages" -#: src/user/mutations/verify-phone-number.js:77 +#: src/user/mutations/verify-phone-number.js:78 msgid "Two factor code is incorrect. Please try again." msgstr "Two factor code is incorrect. Please try again." -#: src/user/mutations/verify-phone-number.js:64 +#: src/user/mutations/verify-phone-number.js:65 msgid "Two factor code length is incorrect. Please try again." msgstr "Two factor code length is incorrect. Please try again." -#: src/user/mutations/authenticate.js:58 -#: src/user/mutations/authenticate.js:72 -#: src/user/mutations/authenticate.js:90 -#: src/user/mutations/authenticate.js:107 +#: src/affiliation/mutations/invite-user-to-org.js:149 +msgid "Unable to add user to organization. Please try again." +msgstr "Unable to add user to organization. Please try again." + +#: src/user/mutations/authenticate.js:73 +#: src/user/mutations/authenticate.js:91 msgid "Unable to authenticate. Please try again." msgstr "Unable to authenticate. Please try again." @@ -493,13 +510,6 @@ msgstr "Unable to find the requested domain." msgid "Unable to find user affiliation(s). Please try again." msgstr "Unable to find user affiliation(s). Please try again." -#: src/user/loaders/load-user-by-key.js:18 -#: src/user/loaders/load-user-by-key.js:30 -#: src/user/loaders/load-user-by-username.js:18 -#: src/user/loaders/load-user-by-username.js:30 -msgid "Unable to find user. Please try again." -msgstr "Unable to find user. Please try again." - #: src/verified-domains/loaders/load-verified-domain-by-domain.js:23 #: src/verified-domains/loaders/load-verified-domain-by-domain.js:37 #: src/verified-domains/loaders/load-verified-domain-by-key.js:23 @@ -662,6 +672,13 @@ msgstr "Unable to load ssl scans. Please try again." msgid "Unable to load summary. Please try again." msgstr "Unable to load summary. Please try again." +#: src/user/loaders/load-user-by-key.js:18 +#: src/user/loaders/load-user-by-key.js:30 +#: src/user/loaders/load-user-by-username.js:18 +#: src/user/loaders/load-user-by-username.js:30 +msgid "Unable to load user(s). Please try again." +msgstr "Unable to load user(s). Please try again." + #: src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js:297 #: src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js:309 msgid "Unable to load verified domains. Please try again." @@ -742,10 +759,12 @@ msgstr "Unable to remove user from unknown organization." msgid "Unable to request a on time scan on an unknown domain." msgstr "Unable to request a on time scan on an unknown domain." -#: src/user/mutations/reset-password.js:63 -#: src/user/mutations/reset-password.js:77 -#: src/user/mutations/reset-password.js:89 -#: src/user/mutations/reset-password.js:131 +#: src/user/mutations/reset-password.js:93 +msgid "Unable to reset password. Please request a new email." +msgstr "Unable to reset password. Please request a new email." + +#: src/user/mutations/reset-password.js:80 +#: src/user/mutations/reset-password.js:136 msgid "Unable to reset password. Please try again." msgstr "Unable to reset password. Please try again." @@ -754,9 +773,9 @@ msgstr "Unable to reset password. Please try again." msgid "Unable to select DMARC report(s) for this period and year." msgstr "Unable to select DMARC report(s) for this period and year." -#: src/user/mutations/send-phone-code.js:65 -#: src/user/mutations/send-phone-code.js:84 -#: src/user/mutations/send-phone-code.js:114 +#: src/user/mutations/send-phone-code.js:66 +#: src/user/mutations/send-phone-code.js:85 +#: src/user/mutations/send-phone-code.js:115 msgid "Unable to send TFA code, please try again." msgstr "Unable to send TFA code, please try again." @@ -785,14 +804,13 @@ msgstr "Unable to send two factor authentication message. Please try again." msgid "Unable to send verification email. Please try again." msgstr "Unable to send verification email. Please try again." -#: src/user/mutations/set-phone-number.js:65 -#: src/user/mutations/set-phone-number.js:117 +#: src/user/mutations/set-phone-number.js:94 msgid "Unable to set phone number, please try again." msgstr "Unable to set phone number, please try again." -#: src/user/mutations/sign-in.js:88 -#: src/user/mutations/sign-in.js:107 -#: src/user/mutations/sign-in.js:166 +#: src/user/mutations/sign-in.js:89 +#: src/user/mutations/sign-in.js:108 +#: src/user/mutations/sign-in.js:167 msgid "Unable to sign in, please try again." msgstr "Unable to sign in, please try again." @@ -801,7 +819,7 @@ msgstr "Unable to sign in, please try again." msgid "Unable to sign up. Please try again." msgstr "Unable to sign up. Please try again." -#: src/user/mutations/verify-phone-number.js:94 +#: src/user/mutations/verify-phone-number.js:95 msgid "Unable to two factor authenticate. Please try again." msgstr "Unable to two factor authenticate. Please try again." @@ -819,45 +837,37 @@ msgstr "Unable to update domain that does not belong to the given organization." msgid "Unable to update domain. Please try again." msgstr "Unable to update domain. Please try again." -<<<<<<< HEAD -#: src/organization/mutations/update-organization.js:138 -#: src/organization/mutations/update-organization.js:150 #: src/organization/mutations/update-organization.js:168 #: src/organization/mutations/update-organization.js:197 #: src/organization/mutations/update-organization.js:209 #: src/organization/mutations/update-organization.js:263 #: src/organization/mutations/update-organization.js:274 -======= -#: src/organization/mutations/update-organization.js:167 -#: src/organization/mutations/update-organization.js:223 -#: src/organization/mutations/update-organization.js:234 ->>>>>>> organization error messages updated msgid "Unable to update organization. Please try again." msgstr "Unable to update organization. Please try again." -#: src/user/mutations/update-user-password.js:59 -#: src/user/mutations/update-user-password.js:75 +#: src/user/mutations/update-user-password.js:60 +#: src/user/mutations/update-user-password.js:76 msgid "Unable to update password, authentication error occurred, please sign in again." msgstr "Unable to update password, authentication error occurred, please sign in again." -#: src/user/mutations/update-user-password.js:89 +#: src/user/mutations/update-user-password.js:90 msgid "Unable to update password, current password does not match. Please try again." msgstr "Unable to update password, current password does not match. Please try again." -#: src/user/mutations/update-user-password.js:103 +#: src/user/mutations/update-user-password.js:104 msgid "Unable to update password, new passwords do not match. Please try again." msgstr "Unable to update password, new passwords do not match. Please try again." -#: src/user/mutations/update-user-password.js:117 -msgid "Unable to update password, passwords are required to be 12 characters or longer. Please try again." -msgstr "Unable to update password, passwords are required to be 12 characters or longer. Please try again." +#: src/user/mutations/update-user-password.js:118 +msgid "Unable to update password, passwords do not match requirements. Please try again." +msgstr "Unable to update password, passwords do not match requirements. Please try again." -#: src/user/mutations/update-user-password.js:134 +#: src/user/mutations/update-user-password.js:135 msgid "Unable to update password. Please try again." -msgstr "Unable to update password. Please try again." +msgstr "Unable to update password. Please try again.<<<<<<< HEAD" -#: src/user/mutations/update-user-profile.js:79 -#: src/user/mutations/update-user-profile.js:131 +#: src/user/mutations/update-user-profile.js:80 +#: src/user/mutations/update-user-profile.js:132 msgid "Unable to update profile. Please try again." msgstr "Unable to update profile. Please try again." @@ -891,14 +901,14 @@ msgstr "Unable to update users role. Please try again." msgid "Unable to update your own role." msgstr "Unable to update your own role." -#: src/user/mutations/verify-account.js:67 -#: src/user/mutations/verify-account.js:77 +#: src/user/mutations/verify-account.js:80 +#: src/user/mutations/verify-account.js:94 msgid "Unable to verify account. Please request a new email." msgstr "Unable to verify account. Please request a new email." -#: src/user/mutations/verify-account.js:42 -#: src/user/mutations/verify-account.js:52 -#: src/user/mutations/verify-account.js:93 +#: src/user/mutations/verify-account.js:46 +#: src/user/mutations/verify-account.js:61 +#: src/user/mutations/verify-account.js:111 msgid "Unable to verify account. Please try again." msgstr "Unable to verify account. Please try again." @@ -925,9 +935,9 @@ msgstr "User role was updated successfully." #: src/user/mutations/sign-up.js:100 msgid "Username already in use." -msgstr "Username already in use." +msgstr "Username already in use.<<<<<<< HEAD" -#: src/user/mutations/update-user-profile.js:93 +#: src/user/mutations/update-user-profile.js:94 msgid "Username not available, please try another." msgstr "Username not available, please try another." diff --git a/api-js/src/locale/fr/messages.js b/api-js/src/locale/fr/messages.js index 64ab59942..24ffc5549 100644 --- a/api-js/src/locale/fr/messages.js +++ b/api-js/src/locale/fr/messages.js @@ -10,6 +10,8 @@ 'todo', 'If an account with this username is found, an email verification link will be found in your inbox.': 'todo', + 'Incorrect TFA code. Please sign in again.': 'todo', + 'Incorrect token value. Please request a new email.': 'todo', 'Incorrect username or password. Please try again.': 'todo', 'Invalid token, please request a new one.': 'todo', 'New passwords do not match. Please try again.': 'todo', @@ -54,8 +56,8 @@ 'todo', 'Passing both `first` and `last` to paginate the `verifiedOrganization` connection is not supported.': 'todo', - 'Password is not strong enough. Please try again.': 'todo', - 'Password is too short.': 'todo', + 'Password does not meet requirements.': 'todo', + 'Password does not requirements. Please try again.': 'todo', 'Password was successfully reset.': 'todo', 'Password was successfully updated.': 'todo', 'Passwords do not match.': 'todo', @@ -89,7 +91,7 @@ 'Permission Denied: Please contact super admin for help with verifying this organization.': 'todo', 'Permission check error. Unable to request domain information.': 'todo', - 'Permission error, not an admin for this user.': 'todo', + 'Permission error, not an admin for this user.': 'todo<<<<<<< HEAD', 'Phone number has been successfully set, you will receive a verification text message shortly.': 'todo', 'Profile successfully updated.': 'todo', @@ -139,10 +141,14 @@ 'Successfully verified organization: {0}.': 'todo', 'Successfully verified phone number, and set TFA send method to text.': 'todo', + 'Token value incorrect, please sign in again.': 'todo', 'Too many failed login attempts, please reset your password, and try again.': - 'todo', + 'todo<<<<<<< HEAD=======', + 'Two factor code has been successfully sent, you will receive a text message shortly.': + 'todo>>>>>>> update user error messages', 'Two factor code is incorrect. Please try again.': 'todo', 'Two factor code length is incorrect. Please try again.': 'todo', + 'Unable to add user to organization. Please try again.': 'todo', 'Unable to authenticate. Please try again.': 'todo', 'Unable to check permission. Please try again.': 'todo', 'Unable to create domain in unknown organization.': 'todo', @@ -163,7 +169,6 @@ 'Unable to find ssl scan. Please try again.': 'todo', 'Unable to find the requested domain.': 'todo', 'Unable to find user affiliation(s). Please try again.': 'todo', - 'Unable to find user. Please try again.': 'todo', 'Unable to find verified domain. Please try again.': 'todo', 'Unable to find verified organization. Please try again.': 'todo', 'Unable to invite user to unknown organization.': 'todo', @@ -193,6 +198,7 @@ 'Unable to load organizations. Please try again.': 'todo', 'Unable to load ssl scans. Please try again.': 'todo', 'Unable to load summary. Please try again.': 'todo', + 'Unable to load user(s). Please try again.': 'todo', 'Unable to load verified domains. Please try again.': 'todo', 'Unable to load verified organizations. Please try again.': 'todo', 'Unable to load web summary. Please try again.': 'todo', @@ -211,6 +217,7 @@ 'Unable to remove user from this organization. Please try again.': 'todo', 'Unable to remove user from unknown organization.': 'todo', 'Unable to request a on time scan on an unknown domain.': 'todo', + 'Unable to reset password. Please request a new email.': 'todo', 'Unable to reset password. Please try again.': 'todo', 'Unable to select DMARC report(s) for this period and year.': 'todo', 'Unable to send TFA code, please try again.': 'todo', @@ -220,7 +227,7 @@ 'Unable to send password reset email. Please try again.': 'todo', 'Unable to send two factor authentication message. Please try again.': 'todo', - 'Unable to send verification email. Please try again.': 'todo', + 'Unable to send verification email. Please try again.': 'todo<<<<<<< HEAD', 'Unable to set phone number, please try again.': 'todo', 'Unable to sign in, please try again.': 'todo', 'Unable to sign up. Please try again.': 'todo', @@ -236,9 +243,9 @@ 'todo', 'Unable to update password, new passwords do not match. Please try again.': 'todo', - 'Unable to update password, passwords are required to be 12 characters or longer. Please try again.': + 'Unable to update password, passwords do not match requirements. Please try again.': 'todo', - 'Unable to update password. Please try again.': 'todo', + 'Unable to update password. Please try again.': 'todo<<<<<<< HEAD', 'Unable to update profile. Please try again.': 'todo', 'Unable to update unknown domain.': 'todo', 'Unable to update unknown organization.': 'todo', @@ -255,7 +262,7 @@ 'Unable to verify unknown organization.': 'todo', 'User could not be queried.': 'todo', 'User role was updated successfully.': 'todo', - 'Username already in use.': 'todo', + 'Username already in use.': 'todo<<<<<<< HEAD', 'Username not available, please try another.': 'todo', 'You must provide a `first` or `last` value to properly paginate the `DKIMResults` connection.': 'todo', diff --git a/api-js/src/locale/fr/messages.po b/api-js/src/locale/fr/messages.po index c712f7702..2a30535af 100644 --- a/api-js/src/locale/fr/messages.po +++ b/api-js/src/locale/fr/messages.po @@ -11,10 +11,10 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" -#: src/user/mutations/set-phone-number.js:51 -#: src/user/mutations/update-user-profile.js:65 -#: src/user/mutations/verify-phone-number.js:38 -#: src/user/mutations/verify-phone-number.js:52 +#: src/user/mutations/send-phone-code.js:52 +#: src/user/mutations/update-user-profile.js:66 +#: src/user/mutations/verify-phone-number.js:39 +#: src/user/mutations/verify-phone-number.js:53 msgid "Authentication error, please sign in again." msgstr "todo" @@ -47,8 +47,16 @@ msgstr "todo" msgid "If an account with this username is found, an email verification link will be found in your inbox." msgstr "todo" -#: src/user/mutations/sign-in.js:58 -#: src/user/mutations/sign-in.js:175 +#: src/user/mutations/authenticate.js:108 +msgid "Incorrect TFA code. Please sign in again." +msgstr "todo" + +#: src/user/mutations/reset-password.js:64 +msgid "Incorrect token value. Please request a new email." +msgstr "todo" + +#: src/user/mutations/sign-in.js:59 +#: src/user/mutations/sign-in.js:176 msgid "Incorrect username or password. Please try again." msgstr "todo" @@ -56,7 +64,7 @@ msgstr "todo" msgid "Invalid token, please request a new one." msgstr "todo" -#: src/user/mutations/reset-password.js:101 +#: src/user/mutations/reset-password.js:106 msgid "New passwords do not match. Please try again." msgstr "todo" @@ -77,7 +85,6 @@ msgstr "todo" msgid "Organization name already in use, please choose another and try again." msgstr "todo" -#: src/dmarc-summaries/loaders/load-dkim-failure-connections-by-sum-id.js:46 #: src/organization/mutations/create-organization.js:133 msgid "Organization name already in use. Please try again with a different name." msgstr "todo" @@ -160,19 +167,19 @@ msgstr "todo" msgid "Passing both `first` and `last` to paginate the `verifiedOrganization` connection is not supported." msgstr "todo" -#: src/user/mutations/reset-password.js:114 -msgid "Password is not strong enough. Please try again." +#: src/user/mutations/sign-up.js:74 +msgid "Password does not meet requirements." msgstr "todo" -#: src/user/mutations/sign-up.js:74 -msgid "Password is too short." +#: src/user/mutations/reset-password.js:119 +msgid "Password does not requirements. Please try again." msgstr "todo" -#: src/user/mutations/reset-password.js:138 +#: src/user/mutations/reset-password.js:143 msgid "Password was successfully reset." msgstr "todo" -#: src/user/mutations/update-user-password.js:140 +#: src/user/mutations/update-user-password.js:141 msgid "Password was successfully updated." msgstr "todo" @@ -253,13 +260,13 @@ msgstr "todo" #: src/auth/check-user-is-admin-for-user.js:60 #: src/auth/check-user-is-admin-for-user.js:70 msgid "Permission error, not an admin for this user." -msgstr "todo" +msgstr "todo<<<<<<< HEAD" -#: src/user/mutations/set-phone-number.js:130 +#: src/user/mutations/set-phone-number.js:107 msgid "Phone number has been successfully set, you will receive a verification text message shortly." msgstr "todo" -#: src/user/mutations/update-user-profile.js:140 +#: src/user/mutations/update-user-profile.js:141 msgid "Profile successfully updated." msgstr "todo" @@ -344,7 +351,7 @@ msgstr "todo" msgid "Successfully dispatched one time scan." msgstr "todo" -#: src/user/mutations/verify-account.js:102 +#: src/user/mutations/verify-account.js:121 msgid "Successfully email verified account, and set TFA send method to email." msgstr "todo" @@ -372,26 +379,36 @@ msgstr "todo" msgid "Successfully verified organization: {0}." msgstr "todo" -#: src/user/mutations/verify-phone-number.js:105 +#: src/user/mutations/verify-phone-number.js:106 msgid "Successfully verified phone number, and set TFA send method to text." msgstr "todo" -#: src/user/mutations/sign-in.js:72 -msgid "Too many failed login attempts, please reset your password, and try again." +#: src/user/mutations/authenticate.js:58 +msgid "Token value incorrect, please sign in again." msgstr "todo" -#: src/user/mutations/verify-phone-number.js:77 +#: src/user/mutations/sign-in.js:73 +msgid "Too many failed login attempts, please reset your password, and try again." +msgstr "todo<<<<<<< HEAD=======" + +#: src/user/mutations/send-phone-code.js:128 +msgid "Two factor code has been successfully sent, you will receive a text message shortly." +msgstr "todo>>>>>>> update user error messages" + +#: src/user/mutations/verify-phone-number.js:78 msgid "Two factor code is incorrect. Please try again." msgstr "todo" -#: src/user/mutations/verify-phone-number.js:64 +#: src/user/mutations/verify-phone-number.js:65 msgid "Two factor code length is incorrect. Please try again." msgstr "todo" -#: src/user/mutations/authenticate.js:58 -#: src/user/mutations/authenticate.js:72 -#: src/user/mutations/authenticate.js:90 -#: src/user/mutations/authenticate.js:107 +#: src/affiliation/mutations/invite-user-to-org.js:149 +msgid "Unable to add user to organization. Please try again." +msgstr "todo" + +#: src/user/mutations/authenticate.js:73 +#: src/user/mutations/authenticate.js:91 msgid "Unable to authenticate. Please try again." msgstr "todo" @@ -493,13 +510,6 @@ msgstr "todo" msgid "Unable to find user affiliation(s). Please try again." msgstr "todo" -#: src/user/loaders/load-user-by-key.js:18 -#: src/user/loaders/load-user-by-key.js:30 -#: src/user/loaders/load-user-by-username.js:18 -#: src/user/loaders/load-user-by-username.js:30 -msgid "Unable to find user. Please try again." -msgstr "todo" - #: src/verified-domains/loaders/load-verified-domain-by-domain.js:23 #: src/verified-domains/loaders/load-verified-domain-by-domain.js:37 #: src/verified-domains/loaders/load-verified-domain-by-key.js:23 @@ -662,6 +672,13 @@ msgstr "todo" msgid "Unable to load summary. Please try again." msgstr "todo" +#: src/user/loaders/load-user-by-key.js:18 +#: src/user/loaders/load-user-by-key.js:30 +#: src/user/loaders/load-user-by-username.js:18 +#: src/user/loaders/load-user-by-username.js:30 +msgid "Unable to load user(s). Please try again." +msgstr "todo" + #: src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js:297 #: src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js:309 msgid "Unable to load verified domains. Please try again." @@ -742,10 +759,12 @@ msgstr "todo" msgid "Unable to request a on time scan on an unknown domain." msgstr "todo" -#: src/user/mutations/reset-password.js:63 -#: src/user/mutations/reset-password.js:77 -#: src/user/mutations/reset-password.js:89 -#: src/user/mutations/reset-password.js:131 +#: src/user/mutations/reset-password.js:93 +msgid "Unable to reset password. Please request a new email." +msgstr "todo" + +#: src/user/mutations/reset-password.js:80 +#: src/user/mutations/reset-password.js:136 msgid "Unable to reset password. Please try again." msgstr "todo" @@ -754,9 +773,9 @@ msgstr "todo" msgid "Unable to select DMARC report(s) for this period and year." msgstr "todo" -#: src/user/mutations/send-phone-code.js:65 -#: src/user/mutations/send-phone-code.js:84 -#: src/user/mutations/send-phone-code.js:114 +#: src/user/mutations/send-phone-code.js:66 +#: src/user/mutations/send-phone-code.js:85 +#: src/user/mutations/send-phone-code.js:115 msgid "Unable to send TFA code, please try again." msgstr "todo" @@ -783,16 +802,15 @@ msgstr "todo" #: src/notify/notify-send-verification-email.js:30 msgid "Unable to send verification email. Please try again." -msgstr "todo" +msgstr "todo<<<<<<< HEAD" -#: src/user/mutations/set-phone-number.js:65 -#: src/user/mutations/set-phone-number.js:117 +#: src/user/mutations/set-phone-number.js:94 msgid "Unable to set phone number, please try again." msgstr "todo" -#: src/user/mutations/sign-in.js:88 -#: src/user/mutations/sign-in.js:107 -#: src/user/mutations/sign-in.js:166 +#: src/user/mutations/sign-in.js:89 +#: src/user/mutations/sign-in.js:108 +#: src/user/mutations/sign-in.js:167 msgid "Unable to sign in, please try again." msgstr "todo" @@ -801,7 +819,7 @@ msgstr "todo" msgid "Unable to sign up. Please try again." msgstr "todo" -#: src/user/mutations/verify-phone-number.js:94 +#: src/user/mutations/verify-phone-number.js:95 msgid "Unable to two factor authenticate. Please try again." msgstr "todo" @@ -817,47 +835,39 @@ msgstr "todo" #: src/domain/mutations/update-domain.js:161 #: src/domain/mutations/update-domain.js:171 msgid "Unable to update domain. Please try again." -msgstr "todo" +msgstr "todo<<<<<<< HEAD" -<<<<<<< HEAD -#: src/organization/mutations/update-organization.js:138 -#: src/organization/mutations/update-organization.js:150 #: src/organization/mutations/update-organization.js:168 #: src/organization/mutations/update-organization.js:197 #: src/organization/mutations/update-organization.js:209 #: src/organization/mutations/update-organization.js:263 #: src/organization/mutations/update-organization.js:274 -======= -#: src/organization/mutations/update-organization.js:167 -#: src/organization/mutations/update-organization.js:223 -#: src/organization/mutations/update-organization.js:234 ->>>>>>> organization error messages updated msgid "Unable to update organization. Please try again." msgstr "todo" -#: src/user/mutations/update-user-password.js:59 -#: src/user/mutations/update-user-password.js:75 +#: src/user/mutations/update-user-password.js:60 +#: src/user/mutations/update-user-password.js:76 msgid "Unable to update password, authentication error occurred, please sign in again." msgstr "todo" -#: src/user/mutations/update-user-password.js:89 +#: src/user/mutations/update-user-password.js:90 msgid "Unable to update password, current password does not match. Please try again." msgstr "todo" -#: src/user/mutations/update-user-password.js:103 +#: src/user/mutations/update-user-password.js:104 msgid "Unable to update password, new passwords do not match. Please try again." msgstr "todo" -#: src/user/mutations/update-user-password.js:117 -msgid "Unable to update password, passwords are required to be 12 characters or longer. Please try again." +#: src/user/mutations/update-user-password.js:118 +msgid "Unable to update password, passwords do not match requirements. Please try again." msgstr "todo" -#: src/user/mutations/update-user-password.js:134 +#: src/user/mutations/update-user-password.js:135 msgid "Unable to update password. Please try again." -msgstr "todo" +msgstr "todo<<<<<<< HEAD" -#: src/user/mutations/update-user-profile.js:79 -#: src/user/mutations/update-user-profile.js:131 +#: src/user/mutations/update-user-profile.js:80 +#: src/user/mutations/update-user-profile.js:132 msgid "Unable to update profile. Please try again." msgstr "todo" @@ -891,14 +901,14 @@ msgstr "todo" msgid "Unable to update your own role." msgstr "todo" -#: src/user/mutations/verify-account.js:67 -#: src/user/mutations/verify-account.js:77 +#: src/user/mutations/verify-account.js:80 +#: src/user/mutations/verify-account.js:94 msgid "Unable to verify account. Please request a new email." msgstr "todo" -#: src/user/mutations/verify-account.js:42 -#: src/user/mutations/verify-account.js:52 -#: src/user/mutations/verify-account.js:93 +#: src/user/mutations/verify-account.js:46 +#: src/user/mutations/verify-account.js:61 +#: src/user/mutations/verify-account.js:111 msgid "Unable to verify account. Please try again." msgstr "todo" @@ -925,9 +935,9 @@ msgstr "todo" #: src/user/mutations/sign-up.js:100 msgid "Username already in use." -msgstr "todo" +msgstr "todo<<<<<<< HEAD" -#: src/user/mutations/update-user-profile.js:93 +#: src/user/mutations/update-user-profile.js:94 msgid "Username not available, please try another." msgstr "todo" diff --git a/api-js/src/user/loaders/__tests__/load-user-by-key.test.js b/api-js/src/user/loaders/__tests__/load-user-by-key.test.js index fab541e73..e12806d04 100644 --- a/api-js/src/user/loaders/__tests__/load-user-by-key.test.js +++ b/api-js/src/user/loaders/__tests__/load-user-by-key.test.js @@ -131,7 +131,7 @@ describe('given a userLoaderByKey dataloader', () => { await loader.load(expectedUser._key) } catch (err) { expect(err).toEqual( - new Error('Unable to find user. Please try again.'), + new Error('Unable to load user(s). Please try again.'), ) } @@ -161,7 +161,7 @@ describe('given a userLoaderByKey dataloader', () => { await loader.load(expectedUser._key) } catch (err) { expect(err).toEqual( - new Error('Unable to find user. Please try again.'), + new Error('Unable to load user(s). Please try again.'), ) } diff --git a/api-js/src/user/loaders/__tests__/load-user-by-username.test.js b/api-js/src/user/loaders/__tests__/load-user-by-username.test.js index debfdab31..017f35d98 100644 --- a/api-js/src/user/loaders/__tests__/load-user-by-username.test.js +++ b/api-js/src/user/loaders/__tests__/load-user-by-username.test.js @@ -130,7 +130,7 @@ describe('given a userLoaderByUserName dataloader', () => { await loader.load(userName) } catch (err) { expect(err).toEqual( - new Error('Unable to find user. Please try again.'), + new Error('Unable to load user(s). Please try again.'), ) } @@ -155,7 +155,7 @@ describe('given a userLoaderByUserName dataloader', () => { await loader.load(userName) } catch (err) { expect(err).toEqual( - new Error('Unable to find user. Please try again.'), + new Error('Unable to load user(s). Please try again.'), ) } diff --git a/api-js/src/user/loaders/load-user-by-key.js b/api-js/src/user/loaders/load-user-by-key.js index 019ae4d3b..2e7c1d261 100644 --- a/api-js/src/user/loaders/load-user-by-key.js +++ b/api-js/src/user/loaders/load-user-by-key.js @@ -15,7 +15,7 @@ export const userLoaderByKey = (query, userKey, i18n) => console.error( `Database error occurred when user: ${userKey} running userLoaderByKey: ${err}`, ) - throw new Error(i18n._(t`Unable to find user. Please try again.`)) + throw new Error(i18n._(t`Unable to load user(s). Please try again.`)) } const userMap = {} @@ -27,7 +27,7 @@ export const userLoaderByKey = (query, userKey, i18n) => console.error( `Cursor error occurred when user: ${userKey} funning userLoaderByKey: ${err}`, ) - throw new Error(i18n._(t`Unable to find user. Please try again.`)) + throw new Error(i18n._(t`Unable to load user(s). Please try again.`)) } return ids.map((id) => userMap[id]) diff --git a/api-js/src/user/loaders/load-user-by-username.js b/api-js/src/user/loaders/load-user-by-username.js index 3563def27..79b84e51e 100644 --- a/api-js/src/user/loaders/load-user-by-username.js +++ b/api-js/src/user/loaders/load-user-by-username.js @@ -15,7 +15,7 @@ export const userLoaderByUserName = (query, userKey, i18n) => console.error( `Database error occurred when user: ${userKey} running userLoaderByUserName: ${err}`, ) - throw new Error(i18n._(t`Unable to find user. Please try again.`)) + throw new Error(i18n._(t`Unable to load user(s). Please try again.`)) } const userMap = {} @@ -27,7 +27,7 @@ export const userLoaderByUserName = (query, userKey, i18n) => console.error( `Cursor error occurred when user: ${userKey} running userLoaderByUserName: ${err}`, ) - throw new Error(i18n._(t`Unable to find user. Please try again.`)) + throw new Error(i18n._(t`Unable to load user(s). Please try again.`)) } return userNames.map((userName) => userMap[userName]) diff --git a/api-js/src/user/mutations/__tests__/authenticate.test.js b/api-js/src/user/mutations/__tests__/authenticate.test.js index 0cd15ab0d..f2480bf87 100644 --- a/api-js/src/user/mutations/__tests__/authenticate.test.js +++ b/api-js/src/user/mutations/__tests__/authenticate.test.js @@ -232,7 +232,7 @@ describe('authenticate user account', () => { authenticate: { result: { code: 400, - description: 'Unable to authenticate. Please try again.', + description: 'Token value incorrect, please sign in again.', }, }, }, @@ -303,7 +303,7 @@ describe('authenticate user account', () => { authenticate: { result: { code: 400, - description: 'Unable to authenticate. Please try again.', + description: 'Token value incorrect, please sign in again.', }, }, }, @@ -458,7 +458,7 @@ describe('authenticate user account', () => { ) const error = [ - new GraphQLError('Unable to authenticate. Please try again.'), + new GraphQLError('Incorrect TFA code. Please sign in again.'), ] expect(response.errors).toEqual(error) diff --git a/api-js/src/user/mutations/__tests__/reset-password.test.js b/api-js/src/user/mutations/__tests__/reset-password.test.js index eb482510e..0aa4e6f3e 100644 --- a/api-js/src/user/mutations/__tests__/reset-password.test.js +++ b/api-js/src/user/mutations/__tests__/reset-password.test.js @@ -355,7 +355,7 @@ describe('reset users password', () => { resetPassword: { result: { code: 400, - description: 'Unable to reset password. Please try again.', + description: 'Incorrect token value. Please request a new email.', }, }, }, @@ -420,7 +420,7 @@ describe('reset users password', () => { resetPassword: { result: { code: 400, - description: 'Unable to reset password. Please try again.', + description: 'Incorrect token value. Please request a new email.', }, }, }, @@ -560,7 +560,7 @@ describe('reset users password', () => { resetPassword: { result: { code: 400, - description: 'Unable to reset password. Please try again.', + description: 'Unable to reset password. Please request a new email.', }, }, }, @@ -705,7 +705,7 @@ describe('reset users password', () => { result: { code: 400, description: - 'Password is not strong enough. Please try again.', + 'Password does not requirements. Please try again.', }, }, }, diff --git a/api-js/src/user/mutations/__tests__/sign-up.test.js b/api-js/src/user/mutations/__tests__/sign-up.test.js index be0776a93..2cf3b6518 100644 --- a/api-js/src/user/mutations/__tests__/sign-up.test.js +++ b/api-js/src/user/mutations/__tests__/sign-up.test.js @@ -292,7 +292,7 @@ describe('user sign up', () => { signUp: { result: { code: 400, - description: 'Password is too short.', + description: 'Password does not meet requirements.', }, }, }, diff --git a/api-js/src/user/mutations/__tests__/update-user-password.test.js b/api-js/src/user/mutations/__tests__/update-user-password.test.js index 858b4674c..405d2dd47 100644 --- a/api-js/src/user/mutations/__tests__/update-user-password.test.js +++ b/api-js/src/user/mutations/__tests__/update-user-password.test.js @@ -530,7 +530,7 @@ describe('authenticate user account', () => { result: { code: 400, description: - 'Unable to update password, passwords are required to be 12 characters or longer. Please try again.', + 'Unable to update password, passwords do not match requirements. Please try again.', }, }, }, diff --git a/api-js/src/user/mutations/authenticate.js b/api-js/src/user/mutations/authenticate.js index c46e55474..7b2992fcf 100644 --- a/api-js/src/user/mutations/authenticate.js +++ b/api-js/src/user/mutations/authenticate.js @@ -55,13 +55,14 @@ export const authenticate = new mutationWithClientMutationId({ return { _type: 'error', code: 400, - description: i18n._(t`Unable to authenticate. Please try again.`), + description: i18n._(t`Token value incorrect, please sign in again.`), } } // Gather sign in user const user = await userLoaderByKey.load(tokenParameters.userKey) + // Replace with userRequired() if (typeof user === 'undefined') { console.warn( `User: ${tokenParameters.userKey} attempted to authenticate, no account is associated with this id.`, @@ -104,7 +105,7 @@ export const authenticate = new mutationWithClientMutationId({ console.warn( `User: ${user._key} attempted to authenticate their account, however the tfaCodes did not match.`, ) - throw new Error(i18n._(t`Unable to authenticate. Please try again.`)) + throw new Error(i18n._(t`Incorrect TFA code. Please sign in again.`)) } }, }) diff --git a/api-js/src/user/mutations/reset-password.js b/api-js/src/user/mutations/reset-password.js index 0f4704a99..55cfffc09 100644 --- a/api-js/src/user/mutations/reset-password.js +++ b/api-js/src/user/mutations/reset-password.js @@ -60,13 +60,16 @@ export const resetPassword = new mutationWithClientMutationId({ return { _type: 'error', code: 400, - description: i18n._(t`Unable to reset password. Please try again.`), + description: i18n._( + t`Incorrect token value. Please request a new email.`, + ), } } // Check if user exists const user = await userLoaderByKey.load(tokenParameters.userKey) + // Replace with userRequired() if (typeof user === 'undefined') { console.warn( `A user attempted to reset the password for ${tokenParameters.userKey}, however there is no associated account.`, @@ -86,7 +89,9 @@ export const resetPassword = new mutationWithClientMutationId({ return { _type: 'error', code: 400, - description: i18n._(t`Unable to reset password. Please try again.`), + description: i18n._( + t`Unable to reset password. Please request a new email.`, + ), } } @@ -111,7 +116,7 @@ export const resetPassword = new mutationWithClientMutationId({ _type: 'error', code: 400, description: i18n._( - t`Password is not strong enough. Please try again.`, + t`Password does not requirements. Please try again.`, ), } } diff --git a/api-js/src/user/mutations/sign-in.js b/api-js/src/user/mutations/sign-in.js index 5d98ebf80..78dfac8b0 100644 --- a/api-js/src/user/mutations/sign-in.js +++ b/api-js/src/user/mutations/sign-in.js @@ -47,6 +47,7 @@ export const signIn = new mutationWithClientMutationId({ // Gather user who just signed in let user = await userLoaderByUserName.load(userName) + // Replace with userRequired() if (typeof user === 'undefined') { console.warn( `User: ${userName} attempted to sign in, no account is associated with this email.`, diff --git a/api-js/src/user/mutations/sign-up.js b/api-js/src/user/mutations/sign-up.js index e6928ba46..44dc32517 100644 --- a/api-js/src/user/mutations/sign-up.js +++ b/api-js/src/user/mutations/sign-up.js @@ -71,7 +71,7 @@ export const signUp = new mutationWithClientMutationId({ return { _type: 'error', code: 400, - description: i18n._(t`Password is too short.`), + description: i18n._(t`Password does not meet requirements.`), } } diff --git a/api-js/src/user/mutations/update-user-password.js b/api-js/src/user/mutations/update-user-password.js index 44f5f13d6..a23c3a730 100644 --- a/api-js/src/user/mutations/update-user-password.js +++ b/api-js/src/user/mutations/update-user-password.js @@ -47,6 +47,7 @@ export const updateUserPassword = new mutationWithClientMutationId({ const updatedPassword = cleanseInput(args.updatedPassword) const updatedPasswordConfirm = cleanseInput(args.updatedPasswordConfirm) + // Replace with userRequired() // Make sure user id is not undefined if (typeof userKey === 'undefined') { console.warn( @@ -114,7 +115,7 @@ export const updateUserPassword = new mutationWithClientMutationId({ _type: 'error', code: 400, description: i18n._( - t`Unable to update password, passwords are required to be 12 characters or longer. Please try again.`, + t`Unable to update password, passwords do not match requirements. Please try again.`, ), } } diff --git a/api-js/src/user/mutations/update-user-profile.js b/api-js/src/user/mutations/update-user-profile.js index f57cec42a..76f52d06d 100644 --- a/api-js/src/user/mutations/update-user-profile.js +++ b/api-js/src/user/mutations/update-user-profile.js @@ -54,6 +54,7 @@ export const updateUserProfile = new mutationWithClientMutationId({ const preferredLang = cleanseInput(args.preferredLang) const subTfaSendMethod = cleanseInput(args.tfaSendMethod) + // Replace with userRequired() // Make sure userKey is not undefined if (typeof userKey === 'undefined') { console.warn( diff --git a/api-js/src/user/mutations/verify-account.js b/api-js/src/user/mutations/verify-account.js index a0ccebb7c..13055a09b 100644 --- a/api-js/src/user/mutations/verify-account.js +++ b/api-js/src/user/mutations/verify-account.js @@ -47,6 +47,7 @@ export const verifyAccount = new mutationWithClientMutationId({ } } + // Auth shouldn't be needed with this // Check if user exists const user = await userLoaderByKey.load(userKey) diff --git a/api-js/src/user/mutations/verify-phone-number.js b/api-js/src/user/mutations/verify-phone-number.js index e217a9326..6d1f900f5 100644 --- a/api-js/src/user/mutations/verify-phone-number.js +++ b/api-js/src/user/mutations/verify-phone-number.js @@ -28,6 +28,7 @@ export const verifyPhoneNumber = new mutationWithClientMutationId({ // Cleanse Input const twoFactorCode = args.twoFactorCode + // Replace with userRequired() if (typeof userKey === 'undefined') { console.warn( `User attempted to two factor authenticate, however the userKey is undefined.`, From a11534f048006f5526ff321f2b30000bfc1d8e79 Mon Sep 17 00:00:00 2001 From: nsdeschenes Date: Fri, 12 Mar 2021 11:18:57 -0400 Subject: [PATCH 10/21] update verified domain error messages --- api-js/src/locale/en/messages.js | 38 ++++++------ api-js/src/locale/en/messages.po | 59 +++++++++---------- api-js/src/locale/fr/messages.js | 19 +++--- api-js/src/locale/fr/messages.po | 57 +++++++++--------- .../loaders/load-verified-domain-by-domain.js | 4 +- .../loaders/load-verified-domain-by-key.js | 4 +- ...d-domain-connections-by-organization-id.js | 12 ++-- .../load-verified-domain-connections.js | 16 +++-- 8 files changed, 102 insertions(+), 107 deletions(-) diff --git a/api-js/src/locale/en/messages.js b/api-js/src/locale/en/messages.js index 3d614fcbb..9e771810e 100644 --- a/api-js/src/locale/en/messages.js +++ b/api-js/src/locale/en/messages.js @@ -54,6 +54,8 @@ 'Passing both `first` and `last` to paginate the `SPF` connection is not supported.', 'Passing both `first` and `last` to paginate the `SpfFailureTable` connection is not supported.': 'Passing both `first` and `last` to paginate the `SpfFailureTable` connection is not supported.', + 'Passing both `first` and `last` to paginate the `VerifiedDomain` connection is not supported.': + 'Passing both `first` and `last` to paginate the `VerifiedDomain` connection is not supported.', 'Passing both `first` and `last` to paginate the `affiliation` is not supported.': 'Passing both `first` and `last` to paginate the `affiliation` is not supported.', 'Passing both `first` and `last` to paginate the `dmarcSummaries` connection is not supported.': @@ -64,8 +66,6 @@ 'Passing both `first` and `last` to paginate the `https` connection is not supported.', 'Passing both `first` and `last` to paginate the `ssl` connection is not supported.': 'Passing both `first` and `last` to paginate the `ssl` connection is not supported.', - 'Passing both `first` and `last` to paginate the `verifiedDomain` connection is not supported.': - 'Passing both `first` and `last` to paginate the `verifiedDomain` connection is not supported.', 'Passing both `first` and `last` to paginate the `verifiedOrganization` connection is not supported.': 'Passing both `first` and `last` to paginate the `verifiedOrganization` connection is not supported.', 'Password does not meet requirements.': @@ -154,6 +154,13 @@ ['argSet'], '` limit of 100 records.', ], + 'Requesting `{amount}` records on the `VerifiedDomain` connection exceeds the `{argSet}` limit of 100 records.': [ + 'Requesting `', + ['amount'], + '` records on the `VerifiedDomain` connection exceeds the `', + ['argSet'], + '` limit of 100 records.', + ], 'Requesting `{amount}` records on the `affiliations` exceeds the `{argSet}` limit of 100 records.': [ 'Requesting `', ['amount'], @@ -175,13 +182,6 @@ ['argSet'], '` limit of 100 records.', ], - 'Requesting `{amount}` records on the `verifiedDomain` connection exceeds the `{argSet}` limit of 100 records.': [ - 'Requesting `', - ['amount'], - '` records on the `verifiedDomain` connection exceeds the `', - ['argSet'], - '` limit of 100 records.', - ], 'Requesting `{amount}` records on the `verifiedOrganization` connection exceeds the `{argSet}` limit of 100 records.': [ 'Requesting `', ['amount'], @@ -312,8 +312,6 @@ 'Unable to find the requested domain.', 'Unable to find user affiliation(s). Please try again.': 'Unable to find user affiliation(s). Please try again.', - 'Unable to find verified domain. Please try again.': - 'Unable to find verified domain. Please try again.', 'Unable to find verified organization. Please try again.': 'Unable to find verified organization. Please try again.', 'Unable to invite user to unknown organization.': @@ -372,8 +370,8 @@ 'Unable to load summary. Please try again.', 'Unable to load user(s). Please try again.': 'Unable to load user(s). Please try again.', - 'Unable to load verified domains. Please try again.': - 'Unable to load verified domains. Please try again.', + 'Unable to load verified domain(s). Please try again.': + 'Unable to load verified domain(s). Please try again.', 'Unable to load verified organizations. Please try again.': 'Unable to load verified organizations. Please try again.', 'Unable to load web summary. Please try again.': @@ -501,6 +499,8 @@ 'You must provide a `first` or `last` value to properly paginate the `SPF` connection.', 'You must provide a `first` or `last` value to properly paginate the `SpfFailureTable` connection.': 'You must provide a `first` or `last` value to properly paginate the `SpfFailureTable` connection.', + 'You must provide a `first` or `last` value to properly paginate the `VerifiedDomain` connection.': + 'You must provide a `first` or `last` value to properly paginate the `VerifiedDomain` connection.', 'You must provide a `first` or `last` value to properly paginate the `affiliation`.': 'You must provide a `first` or `last` value to properly paginate the `affiliation`.', 'You must provide a `first` or `last` value to properly paginate the `dmarcSummaries` connection.': @@ -511,8 +511,6 @@ 'You must provide a `first` or `last` value to properly paginate the `https` connection.', 'You must provide a `first` or `last` value to properly paginate the `ssl` connection.': 'You must provide a `first` or `last` value to properly paginate the `ssl` connection.', - 'You must provide a `first` or `last` value to properly paginate the `verifiedDomain` connection.': - 'You must provide a `first` or `last` value to properly paginate the `verifiedDomain` connection.', 'You must provide a `first` or `last` value to properly paginate the `verifiedOrganization` connection.': 'You must provide a `first` or `last` value to properly paginate the `verifiedOrganization` connection.', 'You must provide a `period` value to access the `dmarcSummaries` connection.': @@ -576,6 +574,11 @@ ['argSet'], '` on the `SpfFailureTable` connection cannot be less than zero.', ], + '`{argSet}` on the `VerifiedDomain` connection cannot be less than zero.': [ + '`', + ['argSet'], + '` on the `VerifiedDomain` connection cannot be less than zero.', + ], '`{argSet}` on the `affiliations` cannot be less than zero.': [ '`', ['argSet'], @@ -601,11 +604,6 @@ ['argSet'], '` on the `ssl` connection cannot be less than zero.', ], - '`{argSet}` on the `verifiedDomain` connection cannot be less than zero.': [ - '`', - ['argSet'], - '` on the `verifiedDomain` connection cannot be less than zero.', - ], '`{argSet}` on the `verifiedOrganization` connection cannot be less than zero.': [ '`', ['argSet'], diff --git a/api-js/src/locale/en/messages.po b/api-js/src/locale/en/messages.po index 6773c12e8..a89bf9e40 100644 --- a/api-js/src/locale/en/messages.po +++ b/api-js/src/locale/en/messages.po @@ -135,6 +135,11 @@ msgstr "Passing both `first` and `last` to paginate the `SPF` connection is not msgid "Passing both `first` and `last` to paginate the `SpfFailureTable` connection is not supported." msgstr "Passing both `first` and `last` to paginate the `SpfFailureTable` connection is not supported." +#: src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js:121 +#: src/verified-domains/loaders/load-verified-domain-connections.js:121 +msgid "Passing both `first` and `last` to paginate the `VerifiedDomain` connection is not supported." +msgstr "Passing both `first` and `last` to paginate the `VerifiedDomain` connection is not supported." + #: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:83 #: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:174 msgid "Passing both `first` and `last` to paginate the `affiliation` is not supported." @@ -157,11 +162,6 @@ msgstr "Passing both `first` and `last` to paginate the `https` connection is no msgid "Passing both `first` and `last` to paginate the `ssl` connection is not supported." msgstr "Passing both `first` and `last` to paginate the `ssl` connection is not supported." -#: src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js:121 -#: src/verified-domains/loaders/load-verified-domain-connections.js:121 -msgid "Passing both `first` and `last` to paginate the `verifiedDomain` connection is not supported." -msgstr "Passing both `first` and `last` to paginate the `verifiedDomain` connection is not supported." - #: src/verified-organizations/loaders/load-verified-organization-connections-by-domain-id.js:175 #: src/verified-organizations/loaders/load-verified-organizations-connections.js:176 msgid "Passing both `first` and `last` to paginate the `verifiedOrganization` connection is not supported." @@ -299,6 +299,11 @@ msgstr "Requesting `{amount}` records on the `Organization` connection exceeds t msgid "Requesting `{amount}` records on the `SpfFailureTable` connection exceeds the `{argSet}` limit of 100 records." msgstr "Requesting `{amount}` records on the `SpfFailureTable` connection exceeds the `{argSet}` limit of 100 records." +#: src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js:144 +#: src/verified-domains/loaders/load-verified-domain-connections.js:144 +msgid "Requesting `{amount}` records on the `VerifiedDomain` connection exceeds the `{argSet}` limit of 100 records." +msgstr "Requesting `{amount}` records on the `VerifiedDomain` connection exceeds the `{argSet}` limit of 100 records." + #: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:106 #: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:197 msgid "Requesting `{amount}` records on the `affiliations` exceeds the `{argSet}` limit of 100 records." @@ -313,11 +318,6 @@ msgstr "Requesting `{amount}` records on the `dmarcSummaries` connection exceeds msgid "Requesting `{amount}` records on the `domain` connection exceeds the `{argSet}` limit of 100 records." msgstr "Requesting `{amount}` records on the `domain` connection exceeds the `{argSet}` limit of 100 records." -#: src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js:144 -#: src/verified-domains/loaders/load-verified-domain-connections.js:144 -msgid "Requesting `{amount}` records on the `verifiedDomain` connection exceeds the `{argSet}` limit of 100 records." -msgstr "Requesting `{amount}` records on the `verifiedDomain` connection exceeds the `{argSet}` limit of 100 records." - #: src/verified-organizations/loaders/load-verified-organization-connections-by-domain-id.js:198 #: src/verified-organizations/loaders/load-verified-organizations-connections.js:199 msgid "Requesting `{amount}` records on the `verifiedOrganization` connection exceeds the `{argSet}` limit of 100 records." @@ -510,13 +510,6 @@ msgstr "Unable to find the requested domain." msgid "Unable to find user affiliation(s). Please try again." msgstr "Unable to find user affiliation(s). Please try again." -#: src/verified-domains/loaders/load-verified-domain-by-domain.js:23 -#: src/verified-domains/loaders/load-verified-domain-by-domain.js:37 -#: src/verified-domains/loaders/load-verified-domain-by-key.js:23 -#: src/verified-domains/loaders/load-verified-domain-by-key.js:37 -msgid "Unable to find verified domain. Please try again." -msgstr "Unable to find verified domain. Please try again." - #: src/verified-organizations/loaders/load-verified-organization-by-key.js:21 #: src/verified-organizations/loaders/load-verified-organization-by-key.js:35 #: src/verified-organizations/loaders/load-verified-organization-by-slug.js:21 @@ -627,8 +620,6 @@ msgid "Unable to load domain. Please try again." msgstr "Unable to load domain. Please try again." #: src/domain/queries/find-my-domains.js:48 -#: src/verified-domains/loaders/load-verified-domain-connections.js:302 -#: src/verified-domains/loaders/load-verified-domain-connections.js:312 msgid "Unable to load domains. Please try again." msgstr "Unable to load domains. Please try again." @@ -679,10 +670,16 @@ msgstr "Unable to load summary. Please try again." msgid "Unable to load user(s). Please try again." msgstr "Unable to load user(s). Please try again." +#: src/verified-domains/loaders/load-verified-domain-by-domain.js:23 +#: src/verified-domains/loaders/load-verified-domain-by-domain.js:37 +#: src/verified-domains/loaders/load-verified-domain-by-key.js:23 +#: src/verified-domains/loaders/load-verified-domain-by-key.js:37 #: src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js:297 #: src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js:309 -msgid "Unable to load verified domains. Please try again." -msgstr "Unable to load verified domains. Please try again." +#: src/verified-domains/loaders/load-verified-domain-connections.js:303 +#: src/verified-domains/loaders/load-verified-domain-connections.js:315 +msgid "Unable to load verified domain(s). Please try again." +msgstr "Unable to load verified domain(s). Please try again." #: src/verified-organizations/loaders/load-verified-organization-connections-by-domain-id.js:421 #: src/verified-organizations/loaders/load-verified-organization-connections-by-domain-id.js:433 @@ -986,6 +983,11 @@ msgstr "You must provide a `first` or `last` value to properly paginate the `SPF msgid "You must provide a `first` or `last` value to properly paginate the `SpfFailureTable` connection." msgstr "You must provide a `first` or `last` value to properly paginate the `SpfFailureTable` connection." +#: src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js:112 +#: src/verified-domains/loaders/load-verified-domain-connections.js:112 +msgid "You must provide a `first` or `last` value to properly paginate the `VerifiedDomain` connection." +msgstr "You must provide a `first` or `last` value to properly paginate the `VerifiedDomain` connection." + #: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:74 #: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:165 msgid "You must provide a `first` or `last` value to properly paginate the `affiliation`." @@ -1008,11 +1010,6 @@ msgstr "You must provide a `first` or `last` value to properly paginate the `htt msgid "You must provide a `first` or `last` value to properly paginate the `ssl` connection." msgstr "You must provide a `first` or `last` value to properly paginate the `ssl` connection." -#: src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js:112 -#: src/verified-domains/loaders/load-verified-domain-connections.js:112 -msgid "You must provide a `first` or `last` value to properly paginate the `verifiedDomain` connection." -msgstr "You must provide a `first` or `last` value to properly paginate the `verifiedDomain` connection." - #: src/verified-organizations/loaders/load-verified-organization-connections-by-domain-id.js:166 #: src/verified-organizations/loaders/load-verified-organizations-connections.js:167 msgid "You must provide a `first` or `last` value to properly paginate the `verifiedOrganization` connection." @@ -1100,6 +1097,11 @@ msgstr "`{argSet}` on the `SPF` connection cannot be less than zero." msgid "`{argSet}` on the `SpfFailureTable` connection cannot be less than zero." msgstr "`{argSet}` on the `SpfFailureTable` connection cannot be less than zero." +#: src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js:133 +#: src/verified-domains/loaders/load-verified-domain-connections.js:133 +msgid "`{argSet}` on the `VerifiedDomain` connection cannot be less than zero." +msgstr "`{argSet}` on the `VerifiedDomain` connection cannot be less than zero." + #: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:95 #: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:186 msgid "`{argSet}` on the `affiliations` cannot be less than zero." @@ -1122,11 +1124,6 @@ msgstr "`{argSet}` on the `https` connection cannot be less than zero." msgid "`{argSet}` on the `ssl` connection cannot be less than zero." msgstr "`{argSet}` on the `ssl` connection cannot be less than zero." -#: src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js:133 -#: src/verified-domains/loaders/load-verified-domain-connections.js:133 -msgid "`{argSet}` on the `verifiedDomain` connection cannot be less than zero." -msgstr "`{argSet}` on the `verifiedDomain` connection cannot be less than zero." - #: src/verified-organizations/loaders/load-verified-organization-connections-by-domain-id.js:187 #: src/verified-organizations/loaders/load-verified-organizations-connections.js:188 msgid "`{argSet}` on the `verifiedOrganization` connection cannot be less than zero." diff --git a/api-js/src/locale/fr/messages.js b/api-js/src/locale/fr/messages.js index 24ffc5549..d773bcd9b 100644 --- a/api-js/src/locale/fr/messages.js +++ b/api-js/src/locale/fr/messages.js @@ -42,6 +42,8 @@ 'todo', 'Passing both `first` and `last` to paginate the `SpfFailureTable` connection is not supported.': 'todo', + 'Passing both `first` and `last` to paginate the `VerifiedDomain` connection is not supported.': + 'todo', 'Passing both `first` and `last` to paginate the `affiliation` is not supported.': 'todo', 'Passing both `first` and `last` to paginate the `dmarcSummaries` connection is not supported.': @@ -52,8 +54,6 @@ 'todo', 'Passing both `first` and `last` to paginate the `ssl` connection is not supported.': 'todo', - 'Passing both `first` and `last` to paginate the `verifiedDomain` connection is not supported.': - 'todo', 'Passing both `first` and `last` to paginate the `verifiedOrganization` connection is not supported.': 'todo', 'Password does not meet requirements.': 'todo', @@ -107,14 +107,14 @@ 'todo', 'Requesting `{amount}` records on the `SpfFailureTable` connection exceeds the `{argSet}` limit of 100 records.': 'todo', + 'Requesting `{amount}` records on the `VerifiedDomain` connection exceeds the `{argSet}` limit of 100 records.': + 'todo', 'Requesting `{amount}` records on the `affiliations` exceeds the `{argSet}` limit of 100 records.': 'todo', 'Requesting `{amount}` records on the `dmarcSummaries` connection exceeds the `{argSet}` limit of 100 records.': 'todo', 'Requesting `{amount}` records on the `domain` connection exceeds the `{argSet}` limit of 100 records.': 'todo', - 'Requesting `{amount}` records on the `verifiedDomain` connection exceeds the `{argSet}` limit of 100 records.': - 'todo', 'Requesting `{amount}` records on the `verifiedOrganization` connection exceeds the `{argSet}` limit of 100 records.': 'todo', 'Requesting {amount} records on the `DKIMResults` connection exceeds the `{argSet}` limit of 100 records.': @@ -169,7 +169,6 @@ 'Unable to find ssl scan. Please try again.': 'todo', 'Unable to find the requested domain.': 'todo', 'Unable to find user affiliation(s). Please try again.': 'todo', - 'Unable to find verified domain. Please try again.': 'todo', 'Unable to find verified organization. Please try again.': 'todo', 'Unable to invite user to unknown organization.': 'todo', 'Unable to invite user. Please try again.': 'todo', @@ -199,7 +198,7 @@ 'Unable to load ssl scans. Please try again.': 'todo', 'Unable to load summary. Please try again.': 'todo', 'Unable to load user(s). Please try again.': 'todo', - 'Unable to load verified domains. Please try again.': 'todo', + 'Unable to load verified domain(s). Please try again.': 'todo', 'Unable to load verified organizations. Please try again.': 'todo', 'Unable to load web summary. Please try again.': 'todo', 'Unable to query affiliation(s). Please try again.': 'todo', @@ -284,6 +283,8 @@ 'todo', 'You must provide a `first` or `last` value to properly paginate the `SpfFailureTable` connection.': 'todo', + 'You must provide a `first` or `last` value to properly paginate the `VerifiedDomain` connection.': + 'todo', 'You must provide a `first` or `last` value to properly paginate the `affiliation`.': 'todo', 'You must provide a `first` or `last` value to properly paginate the `dmarcSummaries` connection.': @@ -294,8 +295,6 @@ 'todo', 'You must provide a `first` or `last` value to properly paginate the `ssl` connection.': 'todo', - 'You must provide a `first` or `last` value to properly paginate the `verifiedDomain` connection.': - 'todo', 'You must provide a `first` or `last` value to properly paginate the `verifiedOrganization` connection.': 'todo', 'You must provide a `period` value to access the `dmarcSummaries` connection.': @@ -320,14 +319,14 @@ '`{argSet}` on the `SPF` connection cannot be less than zero.': 'todo', '`{argSet}` on the `SpfFailureTable` connection cannot be less than zero.': 'todo', + '`{argSet}` on the `VerifiedDomain` connection cannot be less than zero.': + 'todo', '`{argSet}` on the `affiliations` cannot be less than zero.': 'todo', '`{argSet}` on the `dmarcSummaries` connection cannot be less than zero.': 'todo', '`{argSet}` on the `domain` connection cannot be less than zero.': 'todo', '`{argSet}` on the `https` connection cannot be less than zero.': 'todo', '`{argSet}` on the `ssl` connection cannot be less than zero.': 'todo', - '`{argSet}` on the `verifiedDomain` connection cannot be less than zero.': - 'todo', '`{argSet}` on the `verifiedOrganization` connection cannot be less than zero.': 'todo', fail: 'todo', diff --git a/api-js/src/locale/fr/messages.po b/api-js/src/locale/fr/messages.po index 2a30535af..1b1ed4863 100644 --- a/api-js/src/locale/fr/messages.po +++ b/api-js/src/locale/fr/messages.po @@ -135,6 +135,11 @@ msgstr "todo" msgid "Passing both `first` and `last` to paginate the `SpfFailureTable` connection is not supported." msgstr "todo" +#: src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js:121 +#: src/verified-domains/loaders/load-verified-domain-connections.js:121 +msgid "Passing both `first` and `last` to paginate the `VerifiedDomain` connection is not supported." +msgstr "todo" + #: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:83 #: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:174 msgid "Passing both `first` and `last` to paginate the `affiliation` is not supported." @@ -157,11 +162,6 @@ msgstr "todo" msgid "Passing both `first` and `last` to paginate the `ssl` connection is not supported." msgstr "todo" -#: src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js:121 -#: src/verified-domains/loaders/load-verified-domain-connections.js:121 -msgid "Passing both `first` and `last` to paginate the `verifiedDomain` connection is not supported." -msgstr "todo" - #: src/verified-organizations/loaders/load-verified-organization-connections-by-domain-id.js:175 #: src/verified-organizations/loaders/load-verified-organizations-connections.js:176 msgid "Passing both `first` and `last` to paginate the `verifiedOrganization` connection is not supported." @@ -299,6 +299,11 @@ msgstr "todo" msgid "Requesting `{amount}` records on the `SpfFailureTable` connection exceeds the `{argSet}` limit of 100 records." msgstr "todo" +#: src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js:144 +#: src/verified-domains/loaders/load-verified-domain-connections.js:144 +msgid "Requesting `{amount}` records on the `VerifiedDomain` connection exceeds the `{argSet}` limit of 100 records." +msgstr "todo" + #: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:106 #: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:197 msgid "Requesting `{amount}` records on the `affiliations` exceeds the `{argSet}` limit of 100 records." @@ -313,11 +318,6 @@ msgstr "todo" msgid "Requesting `{amount}` records on the `domain` connection exceeds the `{argSet}` limit of 100 records." msgstr "todo" -#: src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js:144 -#: src/verified-domains/loaders/load-verified-domain-connections.js:144 -msgid "Requesting `{amount}` records on the `verifiedDomain` connection exceeds the `{argSet}` limit of 100 records." -msgstr "todo" - #: src/verified-organizations/loaders/load-verified-organization-connections-by-domain-id.js:198 #: src/verified-organizations/loaders/load-verified-organizations-connections.js:199 msgid "Requesting `{amount}` records on the `verifiedOrganization` connection exceeds the `{argSet}` limit of 100 records." @@ -510,13 +510,6 @@ msgstr "todo" msgid "Unable to find user affiliation(s). Please try again." msgstr "todo" -#: src/verified-domains/loaders/load-verified-domain-by-domain.js:23 -#: src/verified-domains/loaders/load-verified-domain-by-domain.js:37 -#: src/verified-domains/loaders/load-verified-domain-by-key.js:23 -#: src/verified-domains/loaders/load-verified-domain-by-key.js:37 -msgid "Unable to find verified domain. Please try again." -msgstr "todo" - #: src/verified-organizations/loaders/load-verified-organization-by-key.js:21 #: src/verified-organizations/loaders/load-verified-organization-by-key.js:35 #: src/verified-organizations/loaders/load-verified-organization-by-slug.js:21 @@ -627,8 +620,6 @@ msgid "Unable to load domain. Please try again." msgstr "todo" #: src/domain/queries/find-my-domains.js:48 -#: src/verified-domains/loaders/load-verified-domain-connections.js:302 -#: src/verified-domains/loaders/load-verified-domain-connections.js:312 msgid "Unable to load domains. Please try again." msgstr "todo" @@ -679,9 +670,15 @@ msgstr "todo" msgid "Unable to load user(s). Please try again." msgstr "todo" +#: src/verified-domains/loaders/load-verified-domain-by-domain.js:23 +#: src/verified-domains/loaders/load-verified-domain-by-domain.js:37 +#: src/verified-domains/loaders/load-verified-domain-by-key.js:23 +#: src/verified-domains/loaders/load-verified-domain-by-key.js:37 #: src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js:297 #: src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js:309 -msgid "Unable to load verified domains. Please try again." +#: src/verified-domains/loaders/load-verified-domain-connections.js:303 +#: src/verified-domains/loaders/load-verified-domain-connections.js:315 +msgid "Unable to load verified domain(s). Please try again." msgstr "todo" #: src/verified-organizations/loaders/load-verified-organization-connections-by-domain-id.js:421 @@ -986,6 +983,11 @@ msgstr "todo" msgid "You must provide a `first` or `last` value to properly paginate the `SpfFailureTable` connection." msgstr "todo" +#: src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js:112 +#: src/verified-domains/loaders/load-verified-domain-connections.js:112 +msgid "You must provide a `first` or `last` value to properly paginate the `VerifiedDomain` connection." +msgstr "todo" + #: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:74 #: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:165 msgid "You must provide a `first` or `last` value to properly paginate the `affiliation`." @@ -1008,11 +1010,6 @@ msgstr "todo" msgid "You must provide a `first` or `last` value to properly paginate the `ssl` connection." msgstr "todo" -#: src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js:112 -#: src/verified-domains/loaders/load-verified-domain-connections.js:112 -msgid "You must provide a `first` or `last` value to properly paginate the `verifiedDomain` connection." -msgstr "todo" - #: src/verified-organizations/loaders/load-verified-organization-connections-by-domain-id.js:166 #: src/verified-organizations/loaders/load-verified-organizations-connections.js:167 msgid "You must provide a `first` or `last` value to properly paginate the `verifiedOrganization` connection." @@ -1100,6 +1097,11 @@ msgstr "todo" msgid "`{argSet}` on the `SpfFailureTable` connection cannot be less than zero." msgstr "todo" +#: src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js:133 +#: src/verified-domains/loaders/load-verified-domain-connections.js:133 +msgid "`{argSet}` on the `VerifiedDomain` connection cannot be less than zero." +msgstr "todo" + #: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:95 #: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:186 msgid "`{argSet}` on the `affiliations` cannot be less than zero." @@ -1122,11 +1124,6 @@ msgstr "todo" msgid "`{argSet}` on the `ssl` connection cannot be less than zero." msgstr "todo" -#: src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js:133 -#: src/verified-domains/loaders/load-verified-domain-connections.js:133 -msgid "`{argSet}` on the `verifiedDomain` connection cannot be less than zero." -msgstr "todo" - #: src/verified-organizations/loaders/load-verified-organization-connections-by-domain-id.js:187 #: src/verified-organizations/loaders/load-verified-organizations-connections.js:188 msgid "`{argSet}` on the `verifiedOrganization` connection cannot be less than zero." diff --git a/api-js/src/verified-domains/loaders/load-verified-domain-by-domain.js b/api-js/src/verified-domains/loaders/load-verified-domain-by-domain.js index 4b309c0ce..02e692a37 100644 --- a/api-js/src/verified-domains/loaders/load-verified-domain-by-domain.js +++ b/api-js/src/verified-domains/loaders/load-verified-domain-by-domain.js @@ -20,7 +20,7 @@ export const verifiedDomainLoaderByDomain = (query, i18n) => `Database error occurred when running verifiedDomainLoaderByDomain: ${err}`, ) throw new Error( - i18n._(t`Unable to find verified domain. Please try again.`), + i18n._(t`Unable to load verified domain(s). Please try again.`), ) } @@ -34,7 +34,7 @@ export const verifiedDomainLoaderByDomain = (query, i18n) => `Cursor error occurred during verifiedDomainLoaderByDomain: ${err}`, ) throw new Error( - i18n._(t`Unable to find verified domain. Please try again.`), + i18n._(t`Unable to load verified domain(s). Please try again.`), ) } return domains.map((domain) => domainMap[domain]) diff --git a/api-js/src/verified-domains/loaders/load-verified-domain-by-key.js b/api-js/src/verified-domains/loaders/load-verified-domain-by-key.js index e2c883683..05e4ebab8 100644 --- a/api-js/src/verified-domains/loaders/load-verified-domain-by-key.js +++ b/api-js/src/verified-domains/loaders/load-verified-domain-by-key.js @@ -20,7 +20,7 @@ export const verifiedDomainLoaderByKey = (query, i18n) => `Database error occurred when running verifiedDomainLoaderByKey: ${err}`, ) throw new Error( - i18n._(t`Unable to find verified domain. Please try again.`), + i18n._(t`Unable to load verified domain(s). Please try again.`), ) } @@ -34,7 +34,7 @@ export const verifiedDomainLoaderByKey = (query, i18n) => `Cursor error occurred during verifiedDomainLoaderByKey: ${err}`, ) throw new Error( - i18n._(t`Unable to find verified domain. Please try again.`), + i18n._(t`Unable to load verified domain(s). Please try again.`), ) } diff --git a/api-js/src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js b/api-js/src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js index d4aca928d..ec09d4559 100644 --- a/api-js/src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js +++ b/api-js/src/verified-domains/loaders/load-verified-domain-connections-by-organization-id.js @@ -109,7 +109,7 @@ export const verifiedDomainLoaderConnectionsByOrgId = ( ) throw new Error( i18n._( - t`You must provide a \`first\` or \`last\` value to properly paginate the \`verifiedDomain\` connection.`, + t`You must provide a \`first\` or \`last\` value to properly paginate the \`VerifiedDomain\` connection.`, ), ) } else if (typeof first !== 'undefined' && typeof last !== 'undefined') { @@ -118,7 +118,7 @@ export const verifiedDomainLoaderConnectionsByOrgId = ( ) throw new Error( i18n._( - t`Passing both \`first\` and \`last\` to paginate the \`verifiedDomain\` connection is not supported.`, + t`Passing both \`first\` and \`last\` to paginate the \`VerifiedDomain\` connection is not supported.`, ), ) } else if (typeof first === 'number' || typeof last === 'number') { @@ -130,7 +130,7 @@ export const verifiedDomainLoaderConnectionsByOrgId = ( ) throw new Error( i18n._( - t`\`${argSet}\` on the \`verifiedDomain\` connection cannot be less than zero.`, + t`\`${argSet}\` on the \`VerifiedDomain\` connection cannot be less than zero.`, ), ) } else if (first > 100 || last > 100) { @@ -141,7 +141,7 @@ export const verifiedDomainLoaderConnectionsByOrgId = ( ) throw new Error( i18n._( - t`Requesting \`${amount}\` records on the \`verifiedDomain\` connection exceeds the \`${argSet}\` limit of 100 records.`, + t`Requesting \`${amount}\` records on the \`VerifiedDomain\` connection exceeds the \`${argSet}\` limit of 100 records.`, ), ) } else if (typeof first !== 'undefined' && typeof last === 'undefined') { @@ -294,7 +294,7 @@ export const verifiedDomainLoaderConnectionsByOrgId = ( `Database error occurred while user was trying to gather domains in verifiedDomainLoaderConnectionsByOrgId, error: ${err}`, ) throw new Error( - i18n._(t`Unable to load verified domains. Please try again.`), + i18n._(t`Unable to load verified domain(s). Please try again.`), ) } @@ -306,7 +306,7 @@ export const verifiedDomainLoaderConnectionsByOrgId = ( `Cursor error occurred while user was trying to gather domains in verifiedDomainLoaderConnectionsByOrgId, error: ${err}`, ) throw new Error( - i18n._(t`Unable to load verified domains. Please try again.`), + i18n._(t`Unable to load verified domain(s). Please try again.`), ) } diff --git a/api-js/src/verified-domains/loaders/load-verified-domain-connections.js b/api-js/src/verified-domains/loaders/load-verified-domain-connections.js index 037bb4e93..45d982644 100644 --- a/api-js/src/verified-domains/loaders/load-verified-domain-connections.js +++ b/api-js/src/verified-domains/loaders/load-verified-domain-connections.js @@ -109,7 +109,7 @@ export const verifiedDomainLoaderConnections = ( ) throw new Error( i18n._( - t`You must provide a \`first\` or \`last\` value to properly paginate the \`verifiedDomain\` connection.`, + t`You must provide a \`first\` or \`last\` value to properly paginate the \`VerifiedDomain\` connection.`, ), ) } else if (typeof first !== 'undefined' && typeof last !== 'undefined') { @@ -118,7 +118,7 @@ export const verifiedDomainLoaderConnections = ( ) throw new Error( i18n._( - t`Passing both \`first\` and \`last\` to paginate the \`verifiedDomain\` connection is not supported.`, + t`Passing both \`first\` and \`last\` to paginate the \`VerifiedDomain\` connection is not supported.`, ), ) } else if (typeof first === 'number' || typeof last === 'number') { @@ -130,7 +130,7 @@ export const verifiedDomainLoaderConnections = ( ) throw new Error( i18n._( - t`\`${argSet}\` on the \`verifiedDomain\` connection cannot be less than zero.`, + t`\`${argSet}\` on the \`VerifiedDomain\` connection cannot be less than zero.`, ), ) } else if (first > 100 || last > 100) { @@ -141,7 +141,7 @@ export const verifiedDomainLoaderConnections = ( ) throw new Error( i18n._( - t`Requesting \`${amount}\` records on the \`verifiedDomain\` connection exceeds the \`${argSet}\` limit of 100 records.`, + t`Requesting \`${amount}\` records on the \`VerifiedDomain\` connection exceeds the \`${argSet}\` limit of 100 records.`, ), ) } else if (typeof first !== 'undefined' && typeof last === 'undefined') { @@ -299,7 +299,9 @@ export const verifiedDomainLoaderConnections = ( console.error( `Database error occurred while user was trying to gather domains in verifiedDomainLoaderConnections, error: ${err}`, ) - throw new Error(i18n._(t`Unable to load domains. Please try again.`)) + throw new Error( + i18n._(t`Unable to load verified domain(s). Please try again.`), + ) } let domainsInfo @@ -309,7 +311,9 @@ export const verifiedDomainLoaderConnections = ( console.error( `Cursor error occurred while user was trying to gather domains in verifiedDomainLoaderConnections, error: ${err}`, ) - throw new Error(i18n._(t`Unable to load domains. Please try again.`)) + throw new Error( + i18n._(t`Unable to load verified domain(s). Please try again.`), + ) } if (domainsInfo.domains.length === 0) { From b008b0b439feea55bf1fb3accadf6170a6d2a380 Mon Sep 17 00:00:00 2001 From: nsdeschenes Date: Fri, 12 Mar 2021 11:30:47 -0400 Subject: [PATCH 11/21] whoops missed the test files --- .../load-verified-domain-by-domain.test.js | 4 ++-- .../load-verified-domain-by-key.test.js | 4 ++-- .../load-verified-domain-conn-by-org-id.test.js | 16 ++++++++-------- .../load-verified-domain-connections.test.js | 16 ++++++++-------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/api-js/src/verified-domains/loaders/__tests__/load-verified-domain-by-domain.test.js b/api-js/src/verified-domains/loaders/__tests__/load-verified-domain-by-domain.test.js index f633cbde5..189bfc7e8 100644 --- a/api-js/src/verified-domains/loaders/__tests__/load-verified-domain-by-domain.test.js +++ b/api-js/src/verified-domains/loaders/__tests__/load-verified-domain-by-domain.test.js @@ -144,7 +144,7 @@ describe('given a verifiedDomainLoaderByDomain dataloader', () => { await loader.load(expectedDomain.domain) } catch (err) { expect(err).toEqual( - new Error('Unable to find verified domain. Please try again.'), + new Error('Unable to load verified domain(s). Please try again.'), ) } @@ -174,7 +174,7 @@ describe('given a verifiedDomainLoaderByDomain dataloader', () => { await loader.load(expectedDomain.domain) } catch (err) { expect(err).toEqual( - new Error('Unable to find verified domain. Please try again.'), + new Error('Unable to load verified domain(s). Please try again.'), ) } diff --git a/api-js/src/verified-domains/loaders/__tests__/load-verified-domain-by-key.test.js b/api-js/src/verified-domains/loaders/__tests__/load-verified-domain-by-key.test.js index b3d71d2f8..5eff4da18 100644 --- a/api-js/src/verified-domains/loaders/__tests__/load-verified-domain-by-key.test.js +++ b/api-js/src/verified-domains/loaders/__tests__/load-verified-domain-by-key.test.js @@ -144,7 +144,7 @@ describe('given a verifiedDomainLoaderByKey dataloader', () => { await loader.load(expectedDomain._key) } catch (err) { expect(err).toEqual( - new Error('Unable to find verified domain. Please try again.'), + new Error('Unable to load verified domain(s). Please try again.'), ) } @@ -174,7 +174,7 @@ describe('given a verifiedDomainLoaderByKey dataloader', () => { await loader.load(expectedDomain._key) } catch (err) { expect(err).toEqual( - new Error('Unable to find verified domain. Please try again.'), + new Error('Unable to load verified domain(s). Please try again.'), ) } diff --git a/api-js/src/verified-domains/loaders/__tests__/load-verified-domain-conn-by-org-id.test.js b/api-js/src/verified-domains/loaders/__tests__/load-verified-domain-conn-by-org-id.test.js index 874f7c81f..24f5ba40a 100644 --- a/api-js/src/verified-domains/loaders/__tests__/load-verified-domain-conn-by-org-id.test.js +++ b/api-js/src/verified-domains/loaders/__tests__/load-verified-domain-conn-by-org-id.test.js @@ -1099,7 +1099,7 @@ describe('given the verifiedDomainLoaderConnectionsByOrgId function', () => { } catch (err) { expect(err).toEqual( new Error( - `You must provide a \`first\` or \`last\` value to properly paginate the \`verifiedDomain\` connection.`, + 'You must provide a `first` or `last` value to properly paginate the `VerifiedDomain` connection.', ), ) } @@ -1129,7 +1129,7 @@ describe('given the verifiedDomainLoaderConnectionsByOrgId function', () => { } catch (err) { expect(err).toEqual( new Error( - `Passing both \`first\` and \`last\` to paginate the \`verifiedDomain\` connection is not supported.`, + 'Passing both `first` and `last` to paginate the `VerifiedDomain` connection is not supported.', ), ) } @@ -1159,7 +1159,7 @@ describe('given the verifiedDomainLoaderConnectionsByOrgId function', () => { } catch (err) { expect(err).toEqual( new Error( - `\`first\` on the \`verifiedDomain\` connection cannot be less than zero.`, + '`first` on the `VerifiedDomain` connection cannot be less than zero.', ), ) } @@ -1188,7 +1188,7 @@ describe('given the verifiedDomainLoaderConnectionsByOrgId function', () => { } catch (err) { expect(err).toEqual( new Error( - `\`last\` on the \`verifiedDomain\` connection cannot be less than zero.`, + '`last` on the `VerifiedDomain` connection cannot be less than zero.', ), ) } @@ -1219,7 +1219,7 @@ describe('given the verifiedDomainLoaderConnectionsByOrgId function', () => { } catch (err) { expect(err).toEqual( new Error( - `Requesting \`1000\` records on the \`verifiedDomain\` connection exceeds the \`first\` limit of 100 records.`, + 'Requesting `1000` records on the `VerifiedDomain` connection exceeds the `first` limit of 100 records.', ), ) } @@ -1248,7 +1248,7 @@ describe('given the verifiedDomainLoaderConnectionsByOrgId function', () => { } catch (err) { expect(err).toEqual( new Error( - `Requesting \`1000\` records on the \`verifiedDomain\` connection exceeds the \`last\` limit of 100 records.`, + 'Requesting `1000` records on the `VerifiedDomain` connection exceeds the `last` limit of 100 records.', ), ) } @@ -1351,7 +1351,7 @@ describe('given the verifiedDomainLoaderConnectionsByOrgId function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load verified domains. Please try again.'), + new Error('Unable to load verified domain(s). Please try again.'), ) } @@ -1387,7 +1387,7 @@ describe('given the verifiedDomainLoaderConnectionsByOrgId function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load verified domains. Please try again.'), + new Error('Unable to load verified domain(s). Please try again.'), ) } diff --git a/api-js/src/verified-domains/loaders/__tests__/load-verified-domain-connections.test.js b/api-js/src/verified-domains/loaders/__tests__/load-verified-domain-connections.test.js index be5e02b96..5c605c961 100644 --- a/api-js/src/verified-domains/loaders/__tests__/load-verified-domain-connections.test.js +++ b/api-js/src/verified-domains/loaders/__tests__/load-verified-domain-connections.test.js @@ -1078,7 +1078,7 @@ describe('given the load domain connection using org id function', () => { } catch (err) { expect(err).toEqual( new Error( - `You must provide a \`first\` or \`last\` value to properly paginate the \`verifiedDomain\` connection.`, + 'You must provide a `first` or `last` value to properly paginate the `VerifiedDomain` connection.', ), ) } @@ -1107,7 +1107,7 @@ describe('given the load domain connection using org id function', () => { } catch (err) { expect(err).toEqual( new Error( - `Passing both \`first\` and \`last\` to paginate the \`verifiedDomain\` connection is not supported.`, + 'Passing both `first` and `last` to paginate the `VerifiedDomain` connection is not supported.', ), ) } @@ -1136,7 +1136,7 @@ describe('given the load domain connection using org id function', () => { } catch (err) { expect(err).toEqual( new Error( - `\`first\` on the \`verifiedDomain\` connection cannot be less than zero.`, + '`first` on the `VerifiedDomain` connection cannot be less than zero.', ), ) } @@ -1164,7 +1164,7 @@ describe('given the load domain connection using org id function', () => { } catch (err) { expect(err).toEqual( new Error( - `\`last\` on the \`verifiedDomain\` connection cannot be less than zero.`, + '`last` on the `VerifiedDomain` connection cannot be less than zero.', ), ) } @@ -1194,7 +1194,7 @@ describe('given the load domain connection using org id function', () => { } catch (err) { expect(err).toEqual( new Error( - `Requesting \`1000\` records on the \`verifiedDomain\` connection exceeds the \`first\` limit of 100 records.`, + 'Requesting `1000` records on the `VerifiedDomain` connection exceeds the `first` limit of 100 records.', ), ) } @@ -1222,7 +1222,7 @@ describe('given the load domain connection using org id function', () => { } catch (err) { expect(err).toEqual( new Error( - `Requesting \`1000\` records on the \`verifiedDomain\` connection exceeds the \`last\` limit of 100 records.`, + 'Requesting `1000` records on the `VerifiedDomain` connection exceeds the `last` limit of 100 records.', ), ) } @@ -1322,7 +1322,7 @@ describe('given the load domain connection using org id function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load domains. Please try again.'), + new Error('Unable to load verified domain(s). Please try again.'), ) } @@ -1358,7 +1358,7 @@ describe('given the load domain connection using org id function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load domains. Please try again.'), + new Error('Unable to load verified domain(s). Please try again.'), ) } From 5072ed249da8f4d3d29feed9d72825f4c984e931 Mon Sep 17 00:00:00 2001 From: nsdeschenes Date: Fri, 12 Mar 2021 11:35:30 -0400 Subject: [PATCH 12/21] update verified organizations error messages --- api-js/src/locale/en/messages.po | 53 ++++++++++--------- api-js/src/locale/fr/messages.po | 49 +++++++++-------- ...oad-verified-org-conn-by-domain-id.test.js | 16 +++--- .../__tests__/load-verified-org-conn.test.js | 16 +++--- .../load-verified-organization-by-key.test.js | 4 +- ...load-verified-organization-by-slug.test.js | 4 +- .../load-verified-organization-by-key.js | 4 +- .../load-verified-organization-by-slug.js | 4 +- ...d-organization-connections-by-domain-id.js | 12 ++--- ...load-verified-organizations-connections.js | 12 ++--- ...find-verified-organization-by-slug.test.js | 2 +- .../find-verified-organization-by-slug.js | 4 +- 12 files changed, 94 insertions(+), 86 deletions(-) diff --git a/api-js/src/locale/en/messages.po b/api-js/src/locale/en/messages.po index a89bf9e40..f6250d3a1 100644 --- a/api-js/src/locale/en/messages.po +++ b/api-js/src/locale/en/messages.po @@ -69,7 +69,6 @@ msgid "New passwords do not match. Please try again." msgstr "New passwords do not match. Please try again." #: src/organization/queries/find-organization-by-slug.js:40 -#: src/verified-organizations/queries/find-verified-organization-by-slug.js:34 msgid "No organization with the provided slug could be found." msgstr "No organization with the provided slug could be found." @@ -77,6 +76,10 @@ msgstr "No organization with the provided slug could be found." msgid "No verified domain with the provided domain could be found." msgstr "No verified domain with the provided domain could be found." +#: src/verified-organizations/queries/find-verified-organization-by-slug.js:35 +msgid "No verified organization with the provided slug could be found." +msgstr "No verified organization with the provided slug could be found." + #: src/organization/mutations/verify-organization.js:68 msgid "Organization has already been verified." msgstr "Organization has already been verified." @@ -140,6 +143,11 @@ msgstr "Passing both `first` and `last` to paginate the `SpfFailureTable` connec msgid "Passing both `first` and `last` to paginate the `VerifiedDomain` connection is not supported." msgstr "Passing both `first` and `last` to paginate the `VerifiedDomain` connection is not supported." +#: src/verified-organizations/loaders/load-verified-organization-connections-by-domain-id.js:175 +#: src/verified-organizations/loaders/load-verified-organizations-connections.js:176 +msgid "Passing both `first` and `last` to paginate the `VerifiedOrganization` connection is not supported." +msgstr "Passing both `first` and `last` to paginate the `VerifiedOrganization` connection is not supported." + #: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:83 #: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:174 msgid "Passing both `first` and `last` to paginate the `affiliation` is not supported." @@ -162,11 +170,6 @@ msgstr "Passing both `first` and `last` to paginate the `https` connection is no msgid "Passing both `first` and `last` to paginate the `ssl` connection is not supported." msgstr "Passing both `first` and `last` to paginate the `ssl` connection is not supported." -#: src/verified-organizations/loaders/load-verified-organization-connections-by-domain-id.js:175 -#: src/verified-organizations/loaders/load-verified-organizations-connections.js:176 -msgid "Passing both `first` and `last` to paginate the `verifiedOrganization` connection is not supported." -msgstr "Passing both `first` and `last` to paginate the `verifiedOrganization` connection is not supported." - #: src/user/mutations/sign-up.js:74 msgid "Password does not meet requirements." msgstr "Password does not meet requirements." @@ -304,6 +307,11 @@ msgstr "Requesting `{amount}` records on the `SpfFailureTable` connection exceed msgid "Requesting `{amount}` records on the `VerifiedDomain` connection exceeds the `{argSet}` limit of 100 records." msgstr "Requesting `{amount}` records on the `VerifiedDomain` connection exceeds the `{argSet}` limit of 100 records." +#: src/verified-organizations/loaders/load-verified-organization-connections-by-domain-id.js:198 +#: src/verified-organizations/loaders/load-verified-organizations-connections.js:199 +msgid "Requesting `{amount}` records on the `VerifiedOrganization` connection exceeds the `{argSet}` limit of 100 records." +msgstr "Requesting `{amount}` records on the `VerifiedOrganization` connection exceeds the `{argSet}` limit of 100 records." + #: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:106 #: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:197 msgid "Requesting `{amount}` records on the `affiliations` exceeds the `{argSet}` limit of 100 records." @@ -318,11 +326,6 @@ msgstr "Requesting `{amount}` records on the `dmarcSummaries` connection exceeds msgid "Requesting `{amount}` records on the `domain` connection exceeds the `{argSet}` limit of 100 records." msgstr "Requesting `{amount}` records on the `domain` connection exceeds the `{argSet}` limit of 100 records." -#: src/verified-organizations/loaders/load-verified-organization-connections-by-domain-id.js:198 -#: src/verified-organizations/loaders/load-verified-organizations-connections.js:199 -msgid "Requesting `{amount}` records on the `verifiedOrganization` connection exceeds the `{argSet}` limit of 100 records." -msgstr "Requesting `{amount}` records on the `verifiedOrganization` connection exceeds the `{argSet}` limit of 100 records." - #: src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js:118 msgid "Requesting {amount} records on the `DKIMResults` connection exceeds the `{argSet}` limit of 100 records." msgstr "Requesting {amount} records on the `DKIMResults` connection exceeds the `{argSet}` limit of 100 records." @@ -514,8 +517,8 @@ msgstr "Unable to find user affiliation(s). Please try again." #: src/verified-organizations/loaders/load-verified-organization-by-key.js:35 #: src/verified-organizations/loaders/load-verified-organization-by-slug.js:21 #: src/verified-organizations/loaders/load-verified-organization-by-slug.js:33 -msgid "Unable to find verified organization. Please try again." -msgstr "Unable to find verified organization. Please try again." +msgid "Unable to find verified organization(s). Please try again." +msgstr "Unable to find verified organization(s). Please try again." #: src/affiliation/mutations/invite-user-to-org.js:75 msgid "Unable to invite user to unknown organization." @@ -685,8 +688,8 @@ msgstr "Unable to load verified domain(s). Please try again." #: src/verified-organizations/loaders/load-verified-organization-connections-by-domain-id.js:433 #: src/verified-organizations/loaders/load-verified-organizations-connections.js:423 #: src/verified-organizations/loaders/load-verified-organizations-connections.js:435 -msgid "Unable to load verified organizations. Please try again." -msgstr "Unable to load verified organizations. Please try again." +msgid "Unable to load verified organization(s). Please try again." +msgstr "Unable to load verified organization(s). Please try again." #: src/summaries/queries/web-summary.js:13 msgid "Unable to load web summary. Please try again." @@ -988,6 +991,11 @@ msgstr "You must provide a `first` or `last` value to properly paginate the `Spf msgid "You must provide a `first` or `last` value to properly paginate the `VerifiedDomain` connection." msgstr "You must provide a `first` or `last` value to properly paginate the `VerifiedDomain` connection." +#: src/verified-organizations/loaders/load-verified-organization-connections-by-domain-id.js:166 +#: src/verified-organizations/loaders/load-verified-organizations-connections.js:167 +msgid "You must provide a `first` or `last` value to properly paginate the `VerifiedOrganization` connection." +msgstr "You must provide a `first` or `last` value to properly paginate the `VerifiedOrganization` connection." + #: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:74 #: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:165 msgid "You must provide a `first` or `last` value to properly paginate the `affiliation`." @@ -1010,11 +1018,6 @@ msgstr "You must provide a `first` or `last` value to properly paginate the `htt msgid "You must provide a `first` or `last` value to properly paginate the `ssl` connection." msgstr "You must provide a `first` or `last` value to properly paginate the `ssl` connection." -#: src/verified-organizations/loaders/load-verified-organization-connections-by-domain-id.js:166 -#: src/verified-organizations/loaders/load-verified-organizations-connections.js:167 -msgid "You must provide a `first` or `last` value to properly paginate the `verifiedOrganization` connection." -msgstr "You must provide a `first` or `last` value to properly paginate the `verifiedOrganization` connection." - #: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:29 msgid "You must provide a `period` value to access the `dmarcSummaries` connection." msgstr "You must provide a `period` value to access the `dmarcSummaries` connection." @@ -1102,6 +1105,11 @@ msgstr "`{argSet}` on the `SpfFailureTable` connection cannot be less than zero. msgid "`{argSet}` on the `VerifiedDomain` connection cannot be less than zero." msgstr "`{argSet}` on the `VerifiedDomain` connection cannot be less than zero." +#: src/verified-organizations/loaders/load-verified-organization-connections-by-domain-id.js:187 +#: src/verified-organizations/loaders/load-verified-organizations-connections.js:188 +msgid "`{argSet}` on the `VerifiedOrganization` connection cannot be less than zero." +msgstr "`{argSet}` on the `VerifiedOrganization` connection cannot be less than zero." + #: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:95 #: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:186 msgid "`{argSet}` on the `affiliations` cannot be less than zero." @@ -1124,11 +1132,6 @@ msgstr "`{argSet}` on the `https` connection cannot be less than zero." msgid "`{argSet}` on the `ssl` connection cannot be less than zero." msgstr "`{argSet}` on the `ssl` connection cannot be less than zero." -#: src/verified-organizations/loaders/load-verified-organization-connections-by-domain-id.js:187 -#: src/verified-organizations/loaders/load-verified-organizations-connections.js:188 -msgid "`{argSet}` on the `verifiedOrganization` connection cannot be less than zero." -msgstr "`{argSet}` on the `verifiedOrganization` connection cannot be less than zero." - #: src/organization/objects/organization-summary.js:7 #: src/summaries/queries/mail-summary.js:22 #: src/summaries/queries/web-summary.js:23 diff --git a/api-js/src/locale/fr/messages.po b/api-js/src/locale/fr/messages.po index 1b1ed4863..799775cb0 100644 --- a/api-js/src/locale/fr/messages.po +++ b/api-js/src/locale/fr/messages.po @@ -69,7 +69,6 @@ msgid "New passwords do not match. Please try again." msgstr "todo" #: src/organization/queries/find-organization-by-slug.js:40 -#: src/verified-organizations/queries/find-verified-organization-by-slug.js:34 msgid "No organization with the provided slug could be found." msgstr "todo" @@ -77,6 +76,10 @@ msgstr "todo" msgid "No verified domain with the provided domain could be found." msgstr "todo" +#: src/verified-organizations/queries/find-verified-organization-by-slug.js:35 +msgid "No verified organization with the provided slug could be found." +msgstr "todo" + #: src/organization/mutations/verify-organization.js:68 msgid "Organization has already been verified." msgstr "todo" @@ -140,6 +143,11 @@ msgstr "todo" msgid "Passing both `first` and `last` to paginate the `VerifiedDomain` connection is not supported." msgstr "todo" +#: src/verified-organizations/loaders/load-verified-organization-connections-by-domain-id.js:175 +#: src/verified-organizations/loaders/load-verified-organizations-connections.js:176 +msgid "Passing both `first` and `last` to paginate the `VerifiedOrganization` connection is not supported." +msgstr "todo" + #: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:83 #: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:174 msgid "Passing both `first` and `last` to paginate the `affiliation` is not supported." @@ -162,11 +170,6 @@ msgstr "todo" msgid "Passing both `first` and `last` to paginate the `ssl` connection is not supported." msgstr "todo" -#: src/verified-organizations/loaders/load-verified-organization-connections-by-domain-id.js:175 -#: src/verified-organizations/loaders/load-verified-organizations-connections.js:176 -msgid "Passing both `first` and `last` to paginate the `verifiedOrganization` connection is not supported." -msgstr "todo" - #: src/user/mutations/sign-up.js:74 msgid "Password does not meet requirements." msgstr "todo" @@ -304,6 +307,11 @@ msgstr "todo" msgid "Requesting `{amount}` records on the `VerifiedDomain` connection exceeds the `{argSet}` limit of 100 records." msgstr "todo" +#: src/verified-organizations/loaders/load-verified-organization-connections-by-domain-id.js:198 +#: src/verified-organizations/loaders/load-verified-organizations-connections.js:199 +msgid "Requesting `{amount}` records on the `VerifiedOrganization` connection exceeds the `{argSet}` limit of 100 records." +msgstr "todo" + #: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:106 #: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:197 msgid "Requesting `{amount}` records on the `affiliations` exceeds the `{argSet}` limit of 100 records." @@ -318,11 +326,6 @@ msgstr "todo" msgid "Requesting `{amount}` records on the `domain` connection exceeds the `{argSet}` limit of 100 records." msgstr "todo" -#: src/verified-organizations/loaders/load-verified-organization-connections-by-domain-id.js:198 -#: src/verified-organizations/loaders/load-verified-organizations-connections.js:199 -msgid "Requesting `{amount}` records on the `verifiedOrganization` connection exceeds the `{argSet}` limit of 100 records." -msgstr "todo" - #: src/email-scan/loaders/load-dkim-results-connections-by-dkim-id.js:118 msgid "Requesting {amount} records on the `DKIMResults` connection exceeds the `{argSet}` limit of 100 records." msgstr "todo" @@ -514,7 +517,7 @@ msgstr "todo" #: src/verified-organizations/loaders/load-verified-organization-by-key.js:35 #: src/verified-organizations/loaders/load-verified-organization-by-slug.js:21 #: src/verified-organizations/loaders/load-verified-organization-by-slug.js:33 -msgid "Unable to find verified organization. Please try again." +msgid "Unable to find verified organization(s). Please try again." msgstr "todo" #: src/affiliation/mutations/invite-user-to-org.js:75 @@ -685,7 +688,7 @@ msgstr "todo" #: src/verified-organizations/loaders/load-verified-organization-connections-by-domain-id.js:433 #: src/verified-organizations/loaders/load-verified-organizations-connections.js:423 #: src/verified-organizations/loaders/load-verified-organizations-connections.js:435 -msgid "Unable to load verified organizations. Please try again." +msgid "Unable to load verified organization(s). Please try again." msgstr "todo" #: src/summaries/queries/web-summary.js:13 @@ -988,6 +991,11 @@ msgstr "todo" msgid "You must provide a `first` or `last` value to properly paginate the `VerifiedDomain` connection." msgstr "todo" +#: src/verified-organizations/loaders/load-verified-organization-connections-by-domain-id.js:166 +#: src/verified-organizations/loaders/load-verified-organizations-connections.js:167 +msgid "You must provide a `first` or `last` value to properly paginate the `VerifiedOrganization` connection." +msgstr "todo" + #: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:74 #: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:165 msgid "You must provide a `first` or `last` value to properly paginate the `affiliation`." @@ -1010,11 +1018,6 @@ msgstr "todo" msgid "You must provide a `first` or `last` value to properly paginate the `ssl` connection." msgstr "todo" -#: src/verified-organizations/loaders/load-verified-organization-connections-by-domain-id.js:166 -#: src/verified-organizations/loaders/load-verified-organizations-connections.js:167 -msgid "You must provide a `first` or `last` value to properly paginate the `verifiedOrganization` connection." -msgstr "todo" - #: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:29 msgid "You must provide a `period` value to access the `dmarcSummaries` connection." msgstr "todo" @@ -1102,6 +1105,11 @@ msgstr "todo" msgid "`{argSet}` on the `VerifiedDomain` connection cannot be less than zero." msgstr "todo" +#: src/verified-organizations/loaders/load-verified-organization-connections-by-domain-id.js:187 +#: src/verified-organizations/loaders/load-verified-organizations-connections.js:188 +msgid "`{argSet}` on the `VerifiedOrganization` connection cannot be less than zero." +msgstr "todo" + #: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:95 #: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:186 msgid "`{argSet}` on the `affiliations` cannot be less than zero." @@ -1124,11 +1132,6 @@ msgstr "todo" msgid "`{argSet}` on the `ssl` connection cannot be less than zero." msgstr "todo" -#: src/verified-organizations/loaders/load-verified-organization-connections-by-domain-id.js:187 -#: src/verified-organizations/loaders/load-verified-organizations-connections.js:188 -msgid "`{argSet}` on the `verifiedOrganization` connection cannot be less than zero." -msgstr "todo" - #: src/organization/objects/organization-summary.js:7 #: src/summaries/queries/mail-summary.js:22 #: src/summaries/queries/web-summary.js:23 diff --git a/api-js/src/verified-organizations/loaders/__tests__/load-verified-org-conn-by-domain-id.test.js b/api-js/src/verified-organizations/loaders/__tests__/load-verified-org-conn-by-domain-id.test.js index b17cee535..245959e2d 100644 --- a/api-js/src/verified-organizations/loaders/__tests__/load-verified-org-conn-by-domain-id.test.js +++ b/api-js/src/verified-organizations/loaders/__tests__/load-verified-org-conn-by-domain-id.test.js @@ -1934,7 +1934,7 @@ describe('given the load organizations connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'You must provide a `first` or `last` value to properly paginate the `verifiedOrganization` connection.', + 'You must provide a `first` or `last` value to properly paginate the `VerifiedOrganization` connection.', ), ) } @@ -1962,7 +1962,7 @@ describe('given the load organizations connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Passing both `first` and `last` to paginate the `verifiedOrganization` connection is not supported.', + 'Passing both `first` and `last` to paginate the `VerifiedOrganization` connection is not supported.', ), ) } @@ -1993,7 +1993,7 @@ describe('given the load organizations connection function', () => { } catch (err) { expect(err).toEqual( new Error( - '`first` on the `verifiedOrganization` connection cannot be less than zero.', + '`first` on the `VerifiedOrganization` connection cannot be less than zero.', ), ) } @@ -2023,7 +2023,7 @@ describe('given the load organizations connection function', () => { } catch (err) { expect(err).toEqual( new Error( - '`last` on the `verifiedOrganization` connection cannot be less than zero.', + '`last` on the `VerifiedOrganization` connection cannot be less than zero.', ), ) } @@ -2055,7 +2055,7 @@ describe('given the load organizations connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Requesting `101` records on the `verifiedOrganization` connection exceeds the `first` limit of 100 records.', + 'Requesting `101` records on the `VerifiedOrganization` connection exceeds the `first` limit of 100 records.', ), ) } @@ -2085,7 +2085,7 @@ describe('given the load organizations connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Requesting `101` records on the `verifiedOrganization` connection exceeds the `last` limit of 100 records.', + 'Requesting `101` records on the `VerifiedOrganization` connection exceeds the `last` limit of 100 records.', ), ) } @@ -2187,7 +2187,7 @@ describe('given the load organizations connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Unable to load verified organizations. Please try again.', + 'Unable to load verified organization(s). Please try again.', ), ) } @@ -2225,7 +2225,7 @@ describe('given the load organizations connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Unable to load verified organizations. Please try again.', + 'Unable to load verified organization(s). Please try again.', ), ) } diff --git a/api-js/src/verified-organizations/loaders/__tests__/load-verified-org-conn.test.js b/api-js/src/verified-organizations/loaders/__tests__/load-verified-org-conn.test.js index 848121d62..52ad96675 100644 --- a/api-js/src/verified-organizations/loaders/__tests__/load-verified-org-conn.test.js +++ b/api-js/src/verified-organizations/loaders/__tests__/load-verified-org-conn.test.js @@ -1906,7 +1906,7 @@ describe('given the load organizations connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'You must provide a `first` or `last` value to properly paginate the `verifiedOrganization` connection.', + 'You must provide a `first` or `last` value to properly paginate the `VerifiedOrganization` connection.', ), ) } @@ -1934,7 +1934,7 @@ describe('given the load organizations connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Passing both `first` and `last` to paginate the `verifiedOrganization` connection is not supported.', + 'Passing both `first` and `last` to paginate the `VerifiedOrganization` connection is not supported.', ), ) } @@ -1964,7 +1964,7 @@ describe('given the load organizations connection function', () => { } catch (err) { expect(err).toEqual( new Error( - '`first` on the `verifiedOrganization` connection cannot be less than zero.', + '`first` on the `VerifiedOrganization` connection cannot be less than zero.', ), ) } @@ -1993,7 +1993,7 @@ describe('given the load organizations connection function', () => { } catch (err) { expect(err).toEqual( new Error( - '`last` on the `verifiedOrganization` connection cannot be less than zero.', + '`last` on the `VerifiedOrganization` connection cannot be less than zero.', ), ) } @@ -2024,7 +2024,7 @@ describe('given the load organizations connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Requesting `101` records on the `verifiedOrganization` connection exceeds the `first` limit of 100 records.', + 'Requesting `101` records on the `VerifiedOrganization` connection exceeds the `first` limit of 100 records.', ), ) } @@ -2053,7 +2053,7 @@ describe('given the load organizations connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Requesting `101` records on the `verifiedOrganization` connection exceeds the `last` limit of 100 records.', + 'Requesting `101` records on the `VerifiedOrganization` connection exceeds the `last` limit of 100 records.', ), ) } @@ -2155,7 +2155,7 @@ describe('given the load organizations connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Unable to load verified organizations. Please try again.', + 'Unable to load verified organization(s). Please try again.', ), ) } @@ -2192,7 +2192,7 @@ describe('given the load organizations connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Unable to load verified organizations. Please try again.', + 'Unable to load verified organization(s). Please try again.', ), ) } diff --git a/api-js/src/verified-organizations/loaders/__tests__/load-verified-organization-by-key.test.js b/api-js/src/verified-organizations/loaders/__tests__/load-verified-organization-by-key.test.js index 461d0b66a..719d8c2af 100644 --- a/api-js/src/verified-organizations/loaders/__tests__/load-verified-organization-by-key.test.js +++ b/api-js/src/verified-organizations/loaders/__tests__/load-verified-organization-by-key.test.js @@ -175,7 +175,7 @@ describe('given a verifiedOrgLoaderByKey dataloader', () => { } catch (err) { expect(err).toEqual( new Error( - 'Unable to find verified organization. Please try again.', + 'Unable to find verified organization(s). Please try again.', ), ) } @@ -200,7 +200,7 @@ describe('given a verifiedOrgLoaderByKey dataloader', () => { } catch (err) { expect(err).toEqual( new Error( - 'Unable to find verified organization. Please try again.', + 'Unable to find verified organization(s). Please try again.', ), ) } diff --git a/api-js/src/verified-organizations/loaders/__tests__/load-verified-organization-by-slug.test.js b/api-js/src/verified-organizations/loaders/__tests__/load-verified-organization-by-slug.test.js index 955736b5e..8ce4875e7 100644 --- a/api-js/src/verified-organizations/loaders/__tests__/load-verified-organization-by-slug.test.js +++ b/api-js/src/verified-organizations/loaders/__tests__/load-verified-organization-by-slug.test.js @@ -175,7 +175,7 @@ describe('given a verifiedOrgLoaderBySlug dataloader', () => { } catch (err) { expect(err).toEqual( new Error( - 'Unable to find verified organization. Please try again.', + 'Unable to find verified organization(s). Please try again.', ), ) } @@ -200,7 +200,7 @@ describe('given a verifiedOrgLoaderBySlug dataloader', () => { } catch (err) { expect(err).toEqual( new Error( - 'Unable to find verified organization. Please try again.', + 'Unable to find verified organization(s). Please try again.', ), ) } diff --git a/api-js/src/verified-organizations/loaders/load-verified-organization-by-key.js b/api-js/src/verified-organizations/loaders/load-verified-organization-by-key.js index 72f8fcd3b..ea1e60cb3 100644 --- a/api-js/src/verified-organizations/loaders/load-verified-organization-by-key.js +++ b/api-js/src/verified-organizations/loaders/load-verified-organization-by-key.js @@ -18,7 +18,7 @@ export const verifiedOrgLoaderByKey = (query, language, i18n) => `Database error when running verifiedOrgLoaderByKey: ${err}`, ) throw new Error( - i18n._(t`Unable to find verified organization. Please try again.`), + i18n._(t`Unable to find verified organization(s). Please try again.`), ) } @@ -32,7 +32,7 @@ export const verifiedOrgLoaderByKey = (query, language, i18n) => `Cursor error occurred during verifiedOrgLoaderByKey: ${err}`, ) throw new Error( - i18n._(t`Unable to find verified organization. Please try again.`), + i18n._(t`Unable to find verified organization(s). Please try again.`), ) } diff --git a/api-js/src/verified-organizations/loaders/load-verified-organization-by-slug.js b/api-js/src/verified-organizations/loaders/load-verified-organization-by-slug.js index 3970819fd..1d03d3dee 100644 --- a/api-js/src/verified-organizations/loaders/load-verified-organization-by-slug.js +++ b/api-js/src/verified-organizations/loaders/load-verified-organization-by-slug.js @@ -18,7 +18,7 @@ export const verifiedOrgLoaderBySlug = (query, language, i18n) => `Database error when running verifiedOrgLoaderBySlug: ${err}`, ) throw new Error( - i18n._(t`Unable to find verified organization. Please try again.`), + i18n._(t`Unable to find verified organization(s). Please try again.`), ) } @@ -30,7 +30,7 @@ export const verifiedOrgLoaderBySlug = (query, language, i18n) => } catch (err) { console.error(`Cursor error during verifiedOrgLoaderBySlug: ${err}`) throw new Error( - i18n._(t`Unable to find verified organization. Please try again.`), + i18n._(t`Unable to find verified organization(s). Please try again.`), ) } diff --git a/api-js/src/verified-organizations/loaders/load-verified-organization-connections-by-domain-id.js b/api-js/src/verified-organizations/loaders/load-verified-organization-connections-by-domain-id.js index 98e4dc451..1b0f28e4c 100644 --- a/api-js/src/verified-organizations/loaders/load-verified-organization-connections-by-domain-id.js +++ b/api-js/src/verified-organizations/loaders/load-verified-organization-connections-by-domain-id.js @@ -163,7 +163,7 @@ export const verifiedOrgLoaderConnectionsByDomainId = ( ) throw new Error( i18n._( - t`You must provide a \`first\` or \`last\` value to properly paginate the \`verifiedOrganization\` connection.`, + t`You must provide a \`first\` or \`last\` value to properly paginate the \`VerifiedOrganization\` connection.`, ), ) } else if (typeof first !== 'undefined' && typeof last !== 'undefined') { @@ -172,7 +172,7 @@ export const verifiedOrgLoaderConnectionsByDomainId = ( ) throw new Error( i18n._( - t`Passing both \`first\` and \`last\` to paginate the \`verifiedOrganization\` connection is not supported.`, + t`Passing both \`first\` and \`last\` to paginate the \`VerifiedOrganization\` connection is not supported.`, ), ) } else if (typeof first === 'number' || typeof last === 'number') { @@ -184,7 +184,7 @@ export const verifiedOrgLoaderConnectionsByDomainId = ( ) throw new Error( i18n._( - t`\`${argSet}\` on the \`verifiedOrganization\` connection cannot be less than zero.`, + t`\`${argSet}\` on the \`VerifiedOrganization\` connection cannot be less than zero.`, ), ) } else if (first > 100 || last > 100) { @@ -195,7 +195,7 @@ export const verifiedOrgLoaderConnectionsByDomainId = ( ) throw new Error( i18n._( - t`Requesting \`${amount}\` records on the \`verifiedOrganization\` connection exceeds the \`${argSet}\` limit of 100 records.`, + t`Requesting \`${amount}\` records on the \`VerifiedOrganization\` connection exceeds the \`${argSet}\` limit of 100 records.`, ), ) } else if (typeof first !== 'undefined' && typeof last === 'undefined') { @@ -418,7 +418,7 @@ export const verifiedOrgLoaderConnectionsByDomainId = ( `Database error occurred while user was trying to gather orgs in verifiedOrgLoaderConnectionsByDomainId, error: ${err}`, ) throw new Error( - i18n._(t`Unable to load verified organizations. Please try again.`), + i18n._(t`Unable to load verified organization(s). Please try again.`), ) } @@ -430,7 +430,7 @@ export const verifiedOrgLoaderConnectionsByDomainId = ( `Cursor error occurred while user was trying to gather orgs in verifiedOrgLoaderConnectionsByDomainId, error: ${err}`, ) throw new Error( - i18n._(t`Unable to load verified organizations. Please try again.`), + i18n._(t`Unable to load verified organization(s). Please try again.`), ) } diff --git a/api-js/src/verified-organizations/loaders/load-verified-organizations-connections.js b/api-js/src/verified-organizations/loaders/load-verified-organizations-connections.js index 2149aa684..52d90e6f0 100644 --- a/api-js/src/verified-organizations/loaders/load-verified-organizations-connections.js +++ b/api-js/src/verified-organizations/loaders/load-verified-organizations-connections.js @@ -164,7 +164,7 @@ export const verifiedOrgLoaderConnections = ( ) throw new Error( i18n._( - t`You must provide a \`first\` or \`last\` value to properly paginate the \`verifiedOrganization\` connection.`, + t`You must provide a \`first\` or \`last\` value to properly paginate the \`VerifiedOrganization\` connection.`, ), ) } else if (typeof first !== 'undefined' && typeof last !== 'undefined') { @@ -173,7 +173,7 @@ export const verifiedOrgLoaderConnections = ( ) throw new Error( i18n._( - t`Passing both \`first\` and \`last\` to paginate the \`verifiedOrganization\` connection is not supported.`, + t`Passing both \`first\` and \`last\` to paginate the \`VerifiedOrganization\` connection is not supported.`, ), ) } else if (typeof first === 'number' || typeof last === 'number') { @@ -185,7 +185,7 @@ export const verifiedOrgLoaderConnections = ( ) throw new Error( i18n._( - t`\`${argSet}\` on the \`verifiedOrganization\` connection cannot be less than zero.`, + t`\`${argSet}\` on the \`VerifiedOrganization\` connection cannot be less than zero.`, ), ) } else if (first > 100 || last > 100) { @@ -196,7 +196,7 @@ export const verifiedOrgLoaderConnections = ( ) throw new Error( i18n._( - t`Requesting \`${amount}\` records on the \`verifiedOrganization\` connection exceeds the \`${argSet}\` limit of 100 records.`, + t`Requesting \`${amount}\` records on the \`VerifiedOrganization\` connection exceeds the \`${argSet}\` limit of 100 records.`, ), ) } else if (typeof first !== 'undefined' && typeof last === 'undefined') { @@ -420,7 +420,7 @@ export const verifiedOrgLoaderConnections = ( `Database error occurred while user was trying to gather orgs in verifiedOrgLoaderConnections, error: ${err}`, ) throw new Error( - i18n._(t`Unable to load verified organizations. Please try again.`), + i18n._(t`Unable to load verified organization(s). Please try again.`), ) } @@ -432,7 +432,7 @@ export const verifiedOrgLoaderConnections = ( `Cursor error occurred while user was trying to gather orgs in verifiedOrgLoaderConnections, error: ${err}`, ) throw new Error( - i18n._(t`Unable to load verified organizations. Please try again.`), + i18n._(t`Unable to load verified organization(s). Please try again.`), ) } diff --git a/api-js/src/verified-organizations/queries/__tests__/find-verified-organization-by-slug.test.js b/api-js/src/verified-organizations/queries/__tests__/find-verified-organization-by-slug.test.js index 20f543bd7..31c241983 100644 --- a/api-js/src/verified-organizations/queries/__tests__/find-verified-organization-by-slug.test.js +++ b/api-js/src/verified-organizations/queries/__tests__/find-verified-organization-by-slug.test.js @@ -184,7 +184,7 @@ describe('given findOrganizationBySlugQuery', () => { const error = [ new GraphQLError( - `No organization with the provided slug could be found.`, + `No verified organization with the provided slug could be found.`, ), ] diff --git a/api-js/src/verified-organizations/queries/find-verified-organization-by-slug.js b/api-js/src/verified-organizations/queries/find-verified-organization-by-slug.js index a6604ac88..484231035 100644 --- a/api-js/src/verified-organizations/queries/find-verified-organization-by-slug.js +++ b/api-js/src/verified-organizations/queries/find-verified-organization-by-slug.js @@ -31,7 +31,9 @@ export const findVerifiedOrganizationBySlug = { if (typeof org === 'undefined') { console.warn(`User could not retrieve verified organization.`) throw new Error( - i18n._(t`No organization with the provided slug could be found.`), + i18n._( + t`No verified organization with the provided slug could be found.`, + ), ) } From d216d65917181a8f5a385860fb4a955a8123cb00 Mon Sep 17 00:00:00 2001 From: nsdeschenes Date: Fri, 12 Mar 2021 11:41:57 -0400 Subject: [PATCH 13/21] update web-scan error messages --- api-js/src/locale/en/messages.po | 94 +++++++++---------- api-js/src/locale/fr/messages.po | 90 +++++++++--------- .../__tests__/load-https-by-key.test.js | 4 +- ...oad-https-connections-by-domain-id.test.js | 16 ++-- .../loaders/__tests__/load-ssl-by-key.test.js | 4 +- .../load-ssl-connections-by-domain-id.test.js | 16 ++-- .../src/web-scan/loaders/load-https-by-key.js | 8 +- .../load-https-connections-by-domain-id.js | 12 +-- .../src/web-scan/loaders/load-ssl-by-key.js | 4 +- .../load-ssl-connections-by-domain-id.js | 12 +-- 10 files changed, 132 insertions(+), 128 deletions(-) diff --git a/api-js/src/locale/en/messages.po b/api-js/src/locale/en/messages.po index f6250d3a1..b3609a5c3 100644 --- a/api-js/src/locale/en/messages.po +++ b/api-js/src/locale/en/messages.po @@ -125,6 +125,10 @@ msgstr "Passing both `first` and `last` to paginate the `FullPassTable` connecti msgid "Passing both `first` and `last` to paginate the `GuidanceTag` connection is not supported." msgstr "Passing both `first` and `last` to paginate the `GuidanceTag` connection is not supported." +#: src/web-scan/loaders/load-https-connections-by-domain-id.js:152 +msgid "Passing both `first` and `last` to paginate the `HTTPS` connection is not supported." +msgstr "Passing both `first` and `last` to paginate the `HTTPS` connection is not supported." + #: src/organization/loaders/load-organization-connections-by-domain-id.js:179 #: src/organization/loaders/load-organization-connections-by-user-id.js:179 msgid "Passing both `first` and `last` to paginate the `Organization` connection is not supported." @@ -134,6 +138,10 @@ msgstr "Passing both `first` and `last` to paginate the `Organization` connectio msgid "Passing both `first` and `last` to paginate the `SPF` connection is not supported." msgstr "Passing both `first` and `last` to paginate the `SPF` connection is not supported." +#: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:176 +msgid "Passing both `first` and `last` to paginate the `SSL` connection is not supported." +msgstr "Passing both `first` and `last` to paginate the `SSL` connection is not supported." + #: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:48 msgid "Passing both `first` and `last` to paginate the `SpfFailureTable` connection is not supported." msgstr "Passing both `first` and `last` to paginate the `SpfFailureTable` connection is not supported." @@ -162,14 +170,6 @@ msgstr "Passing both `first` and `last` to paginate the `dmarcSummaries` connect msgid "Passing both `first` and `last` to paginate the `domain` connection is not supported." msgstr "Passing both `first` and `last` to paginate the `domain` connection is not supported." -#: src/web-scan/loaders/load-https-connections-by-domain-id.js:152 -msgid "Passing both `first` and `last` to paginate the `https` connection is not supported." -msgstr "Passing both `first` and `last` to paginate the `https` connection is not supported." - -#: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:176 -msgid "Passing both `first` and `last` to paginate the `ssl` connection is not supported." -msgstr "Passing both `first` and `last` to paginate the `ssl` connection is not supported." - #: src/user/mutations/sign-up.js:74 msgid "Password does not meet requirements." msgstr "Password does not meet requirements." @@ -338,17 +338,17 @@ msgstr "Requesting {amount} records on the `DKIM` connection exceeds the `{argSe msgid "Requesting {amount} records on the `DMARC` connection exceeds the `{argSet}` limit of 100 records." msgstr "Requesting {amount} records on the `DMARC` connection exceeds the `{argSet}` limit of 100 records." +#: src/web-scan/loaders/load-https-connections-by-domain-id.js:175 +msgid "Requesting {amount} records on the `HTTPS` connection exceeds the `{argSet}` limit of 100 records." +msgstr "Requesting {amount} records on the `HTTPS` connection exceeds the `{argSet}` limit of 100 records." + #: src/email-scan/loaders/load-spf-connections-by-domain-id.js:161 msgid "Requesting {amount} records on the `SPF` connection exceeds the `{argSet}` limit of 100 records." msgstr "Requesting {amount} records on the `SPF` connection exceeds the `{argSet}` limit of 100 records." -#: src/web-scan/loaders/load-https-connections-by-domain-id.js:175 -msgid "Requesting {amount} records on the `https` connection exceeds the `{argSet}` limit of 100 records." -msgstr "Requesting {amount} records on the `https` connection exceeds the `{argSet}` limit of 100 records." - #: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:199 -msgid "Requesting {amount} records on the `ssl` connection exceeds the `{argSet}` limit of 100 records." -msgstr "Requesting {amount} records on the `ssl` connection exceeds the `{argSet}` limit of 100 records." +msgid "Requesting {amount} records on the `SSL` connection exceeds the `{argSet}` limit of 100 records." +msgstr "Requesting {amount} records on the `SSL` connection exceeds the `{argSet}` limit of 100 records." #: src/domain/mutations/request-scan.js:134 msgid "Successfully dispatched one time scan." @@ -479,6 +479,10 @@ msgstr "Unable to find DMARC summary data. Please try again." msgid "Unable to find HTTPS guidance tag(s). Please try again." msgstr "Unable to find HTTPS guidance tag(s). Please try again." +#: src/web-scan/loaders/load-https-by-key.js:18 +msgid "Unable to find HTTPS scan(s). Please try again." +msgstr "Unable to find HTTPS scan(s). Please try again." + #: src/guidance-tag/loaders/load-spf-guidance-tags.js:18 #: src/guidance-tag/loaders/load-spf-guidance-tags.js:32 msgid "Unable to find SPF guidance tag(s). Please try again." @@ -494,15 +498,10 @@ msgstr "Unable to find SPF scan(s). Please try again." msgid "Unable to find SSL guidance tag(s). Please try again." msgstr "Unable to find SSL guidance tag(s). Please try again." -#: src/web-scan/loaders/load-https-by-key.js:17 -#: src/web-scan/loaders/load-https-by-key.js:29 -msgid "Unable to find https scan. Please try again." -msgstr "Unable to find https scan. Please try again." - #: src/web-scan/loaders/load-ssl-by-key.js:17 #: src/web-scan/loaders/load-ssl-by-key.js:29 -msgid "Unable to find ssl scan. Please try again." -msgstr "Unable to find ssl scan. Please try again." +msgid "Unable to find SSL scan(s). Please try again." +msgstr "Unable to find SSL scan(s). Please try again." #: src/domain/queries/find-domain-by-domain.js:37 msgid "Unable to find the requested domain." @@ -583,6 +582,12 @@ msgstr "Unable to load DMARC summary data. Please try again." msgid "Unable to load HTTPS guidance tag(s). Please try again." msgstr "Unable to load HTTPS guidance tag(s). Please try again." +#: src/web-scan/loaders/load-https-by-key.js:32 +#: src/web-scan/loaders/load-https-connections-by-domain-id.js:320 +#: src/web-scan/loaders/load-https-connections-by-domain-id.js:330 +msgid "Unable to load HTTPS scan(s). Please try again." +msgstr "Unable to load HTTPS scan(s). Please try again." + #: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:16 #: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:142 #: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:154 @@ -604,6 +609,11 @@ msgstr "Unable to load SPF scan(s). Please try again." msgid "Unable to load SSL guidance tag(s). Please try again." msgstr "Unable to load SSL guidance tag(s). Please try again." +#: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:368 +#: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:378 +msgid "Unable to load SSL scan(s). Please try again." +msgstr "Unable to load SSL scan(s). Please try again." + #: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:233 #: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:414 msgid "Unable to load affiliation(s). Please try again." @@ -632,11 +642,6 @@ msgstr "Unable to load domains. Please try again." msgid "Unable to load full pass data. Please try again." msgstr "Unable to load full pass data. Please try again." -#: src/web-scan/loaders/load-https-connections-by-domain-id.js:320 -#: src/web-scan/loaders/load-https-connections-by-domain-id.js:330 -msgid "Unable to load https scans. Please try again." -msgstr "Unable to load https scans. Please try again." - #: src/summaries/queries/mail-summary.js:12 msgid "Unable to load mail summary. Please try again." msgstr "Unable to load mail summary. Please try again." @@ -656,11 +661,6 @@ msgstr "Unable to load organization(s). Please try again." msgid "Unable to load organizations. Please try again." msgstr "Unable to load organizations. Please try again." -#: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:368 -#: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:378 -msgid "Unable to load ssl scans. Please try again." -msgstr "Unable to load ssl scans. Please try again." - #: src/summaries/loaders/load-chart-summary-by-key.js:18 #: src/summaries/loaders/load-chart-summary-by-key.js:30 msgid "Unable to load summary. Please try again." @@ -973,6 +973,10 @@ msgstr "You must provide a `first` or `last` value to properly paginate the `Ful msgid "You must provide a `first` or `last` value to properly paginate the `GuidanceTag` connection." msgstr "You must provide a `first` or `last` value to properly paginate the `GuidanceTag` connection." +#: src/web-scan/loaders/load-https-connections-by-domain-id.js:143 +msgid "You must provide a `first` or `last` value to properly paginate the `HTTPS` connection." +msgstr "You must provide a `first` or `last` value to properly paginate the `HTTPS` connection." + #: src/organization/loaders/load-organization-connections-by-domain-id.js:170 #: src/organization/loaders/load-organization-connections-by-user-id.js:170 msgid "You must provide a `first` or `last` value to properly paginate the `Organization` connection." @@ -982,6 +986,10 @@ msgstr "You must provide a `first` or `last` value to properly paginate the `Org msgid "You must provide a `first` or `last` value to properly paginate the `SPF` connection." msgstr "You must provide a `first` or `last` value to properly paginate the `SPF` connection." +#: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:167 +msgid "You must provide a `first` or `last` value to properly paginate the `SSL` connection." +msgstr "You must provide a `first` or `last` value to properly paginate the `SSL` connection." + #: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:39 msgid "You must provide a `first` or `last` value to properly paginate the `SpfFailureTable` connection." msgstr "You must provide a `first` or `last` value to properly paginate the `SpfFailureTable` connection." @@ -1010,14 +1018,6 @@ msgstr "You must provide a `first` or `last` value to properly paginate the `dma msgid "You must provide a `first` or `last` value to properly paginate the `domain` connection." msgstr "You must provide a `first` or `last` value to properly paginate the `domain` connection." -#: src/web-scan/loaders/load-https-connections-by-domain-id.js:143 -msgid "You must provide a `first` or `last` value to properly paginate the `https` connection." -msgstr "You must provide a `first` or `last` value to properly paginate the `https` connection." - -#: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:167 -msgid "You must provide a `first` or `last` value to properly paginate the `ssl` connection." -msgstr "You must provide a `first` or `last` value to properly paginate the `ssl` connection." - #: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:29 msgid "You must provide a `period` value to access the `dmarcSummaries` connection." msgstr "You must provide a `period` value to access the `dmarcSummaries` connection." @@ -1087,6 +1087,10 @@ msgstr "`{argSet}` on the `FullPassTable` connection cannot be less than zero." msgid "`{argSet}` on the `GuidanceTag` connection cannot be less than zero." msgstr "`{argSet}` on the `GuidanceTag` connection cannot be less than zero." +#: src/web-scan/loaders/load-https-connections-by-domain-id.js:164 +msgid "`{argSet}` on the `HTTPS` connection cannot be less than zero." +msgstr "`{argSet}` on the `HTTPS` connection cannot be less than zero." + #: src/organization/loaders/load-organization-connections-by-domain-id.js:191 #: src/organization/loaders/load-organization-connections-by-user-id.js:191 msgid "`{argSet}` on the `Organization` connection cannot be less than zero." @@ -1096,6 +1100,10 @@ msgstr "`{argSet}` on the `Organization` connection cannot be less than zero." msgid "`{argSet}` on the `SPF` connection cannot be less than zero." msgstr "`{argSet}` on the `SPF` connection cannot be less than zero." +#: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:188 +msgid "`{argSet}` on the `SSL` connection cannot be less than zero." +msgstr "`{argSet}` on the `SSL` connection cannot be less than zero." + #: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:60 msgid "`{argSet}` on the `SpfFailureTable` connection cannot be less than zero." msgstr "`{argSet}` on the `SpfFailureTable` connection cannot be less than zero." @@ -1124,14 +1132,6 @@ msgstr "`{argSet}` on the `dmarcSummaries` connection cannot be less than zero." msgid "`{argSet}` on the `domain` connection cannot be less than zero." msgstr "`{argSet}` on the `domain` connection cannot be less than zero." -#: src/web-scan/loaders/load-https-connections-by-domain-id.js:164 -msgid "`{argSet}` on the `https` connection cannot be less than zero." -msgstr "`{argSet}` on the `https` connection cannot be less than zero." - -#: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:188 -msgid "`{argSet}` on the `ssl` connection cannot be less than zero." -msgstr "`{argSet}` on the `ssl` connection cannot be less than zero." - #: src/organization/objects/organization-summary.js:7 #: src/summaries/queries/mail-summary.js:22 #: src/summaries/queries/web-summary.js:23 diff --git a/api-js/src/locale/fr/messages.po b/api-js/src/locale/fr/messages.po index 799775cb0..785a2c155 100644 --- a/api-js/src/locale/fr/messages.po +++ b/api-js/src/locale/fr/messages.po @@ -125,6 +125,10 @@ msgstr "todo" msgid "Passing both `first` and `last` to paginate the `GuidanceTag` connection is not supported." msgstr "todo" +#: src/web-scan/loaders/load-https-connections-by-domain-id.js:152 +msgid "Passing both `first` and `last` to paginate the `HTTPS` connection is not supported." +msgstr "todo" + #: src/organization/loaders/load-organization-connections-by-domain-id.js:179 #: src/organization/loaders/load-organization-connections-by-user-id.js:179 msgid "Passing both `first` and `last` to paginate the `Organization` connection is not supported." @@ -134,6 +138,10 @@ msgstr "todo" msgid "Passing both `first` and `last` to paginate the `SPF` connection is not supported." msgstr "todo" +#: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:176 +msgid "Passing both `first` and `last` to paginate the `SSL` connection is not supported." +msgstr "todo" + #: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:48 msgid "Passing both `first` and `last` to paginate the `SpfFailureTable` connection is not supported." msgstr "todo" @@ -162,14 +170,6 @@ msgstr "todo" msgid "Passing both `first` and `last` to paginate the `domain` connection is not supported." msgstr "todo" -#: src/web-scan/loaders/load-https-connections-by-domain-id.js:152 -msgid "Passing both `first` and `last` to paginate the `https` connection is not supported." -msgstr "todo" - -#: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:176 -msgid "Passing both `first` and `last` to paginate the `ssl` connection is not supported." -msgstr "todo" - #: src/user/mutations/sign-up.js:74 msgid "Password does not meet requirements." msgstr "todo" @@ -338,16 +338,16 @@ msgstr "todo" msgid "Requesting {amount} records on the `DMARC` connection exceeds the `{argSet}` limit of 100 records." msgstr "todo" -#: src/email-scan/loaders/load-spf-connections-by-domain-id.js:161 -msgid "Requesting {amount} records on the `SPF` connection exceeds the `{argSet}` limit of 100 records." +#: src/web-scan/loaders/load-https-connections-by-domain-id.js:175 +msgid "Requesting {amount} records on the `HTTPS` connection exceeds the `{argSet}` limit of 100 records." msgstr "todo" -#: src/web-scan/loaders/load-https-connections-by-domain-id.js:175 -msgid "Requesting {amount} records on the `https` connection exceeds the `{argSet}` limit of 100 records." +#: src/email-scan/loaders/load-spf-connections-by-domain-id.js:161 +msgid "Requesting {amount} records on the `SPF` connection exceeds the `{argSet}` limit of 100 records." msgstr "todo" #: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:199 -msgid "Requesting {amount} records on the `ssl` connection exceeds the `{argSet}` limit of 100 records." +msgid "Requesting {amount} records on the `SSL` connection exceeds the `{argSet}` limit of 100 records." msgstr "todo" #: src/domain/mutations/request-scan.js:134 @@ -479,6 +479,10 @@ msgstr "todo" msgid "Unable to find HTTPS guidance tag(s). Please try again." msgstr "todo" +#: src/web-scan/loaders/load-https-by-key.js:18 +msgid "Unable to find HTTPS scan(s). Please try again." +msgstr "todo" + #: src/guidance-tag/loaders/load-spf-guidance-tags.js:18 #: src/guidance-tag/loaders/load-spf-guidance-tags.js:32 msgid "Unable to find SPF guidance tag(s). Please try again." @@ -494,14 +498,9 @@ msgstr "todo" msgid "Unable to find SSL guidance tag(s). Please try again." msgstr "todo" -#: src/web-scan/loaders/load-https-by-key.js:17 -#: src/web-scan/loaders/load-https-by-key.js:29 -msgid "Unable to find https scan. Please try again." -msgstr "todo" - #: src/web-scan/loaders/load-ssl-by-key.js:17 #: src/web-scan/loaders/load-ssl-by-key.js:29 -msgid "Unable to find ssl scan. Please try again." +msgid "Unable to find SSL scan(s). Please try again." msgstr "todo" #: src/domain/queries/find-domain-by-domain.js:37 @@ -583,6 +582,12 @@ msgstr "todo" msgid "Unable to load HTTPS guidance tag(s). Please try again." msgstr "todo" +#: src/web-scan/loaders/load-https-by-key.js:32 +#: src/web-scan/loaders/load-https-connections-by-domain-id.js:320 +#: src/web-scan/loaders/load-https-connections-by-domain-id.js:330 +msgid "Unable to load HTTPS scan(s). Please try again." +msgstr "todo" + #: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:16 #: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:142 #: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:154 @@ -604,6 +609,11 @@ msgstr "todo" msgid "Unable to load SSL guidance tag(s). Please try again." msgstr "todo" +#: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:368 +#: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:378 +msgid "Unable to load SSL scan(s). Please try again." +msgstr "todo" + #: src/affiliation/loaders/load-affiliation-connections-by-org-id.js:233 #: src/affiliation/loaders/load-affiliation-connections-by-user-id.js:414 msgid "Unable to load affiliation(s). Please try again." @@ -632,11 +642,6 @@ msgstr "todo" msgid "Unable to load full pass data. Please try again." msgstr "todo" -#: src/web-scan/loaders/load-https-connections-by-domain-id.js:320 -#: src/web-scan/loaders/load-https-connections-by-domain-id.js:330 -msgid "Unable to load https scans. Please try again." -msgstr "todo" - #: src/summaries/queries/mail-summary.js:12 msgid "Unable to load mail summary. Please try again." msgstr "todo" @@ -656,11 +661,6 @@ msgstr "todo" msgid "Unable to load organizations. Please try again." msgstr "todo" -#: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:368 -#: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:378 -msgid "Unable to load ssl scans. Please try again." -msgstr "todo" - #: src/summaries/loaders/load-chart-summary-by-key.js:18 #: src/summaries/loaders/load-chart-summary-by-key.js:30 msgid "Unable to load summary. Please try again." @@ -973,6 +973,10 @@ msgstr "todo" msgid "You must provide a `first` or `last` value to properly paginate the `GuidanceTag` connection." msgstr "todo" +#: src/web-scan/loaders/load-https-connections-by-domain-id.js:143 +msgid "You must provide a `first` or `last` value to properly paginate the `HTTPS` connection." +msgstr "todo" + #: src/organization/loaders/load-organization-connections-by-domain-id.js:170 #: src/organization/loaders/load-organization-connections-by-user-id.js:170 msgid "You must provide a `first` or `last` value to properly paginate the `Organization` connection." @@ -982,6 +986,10 @@ msgstr "todo" msgid "You must provide a `first` or `last` value to properly paginate the `SPF` connection." msgstr "todo" +#: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:167 +msgid "You must provide a `first` or `last` value to properly paginate the `SSL` connection." +msgstr "todo" + #: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:39 msgid "You must provide a `first` or `last` value to properly paginate the `SpfFailureTable` connection." msgstr "todo" @@ -1010,14 +1018,6 @@ msgstr "todo" msgid "You must provide a `first` or `last` value to properly paginate the `domain` connection." msgstr "todo" -#: src/web-scan/loaders/load-https-connections-by-domain-id.js:143 -msgid "You must provide a `first` or `last` value to properly paginate the `https` connection." -msgstr "todo" - -#: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:167 -msgid "You must provide a `first` or `last` value to properly paginate the `ssl` connection." -msgstr "todo" - #: src/dmarc-summaries/loaders/load-dmarc-sum-connections-by-user-id.js:29 msgid "You must provide a `period` value to access the `dmarcSummaries` connection." msgstr "todo" @@ -1087,6 +1087,10 @@ msgstr "todo" msgid "`{argSet}` on the `GuidanceTag` connection cannot be less than zero." msgstr "todo" +#: src/web-scan/loaders/load-https-connections-by-domain-id.js:164 +msgid "`{argSet}` on the `HTTPS` connection cannot be less than zero." +msgstr "todo" + #: src/organization/loaders/load-organization-connections-by-domain-id.js:191 #: src/organization/loaders/load-organization-connections-by-user-id.js:191 msgid "`{argSet}` on the `Organization` connection cannot be less than zero." @@ -1096,6 +1100,10 @@ msgstr "todo" msgid "`{argSet}` on the `SPF` connection cannot be less than zero." msgstr "todo" +#: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:188 +msgid "`{argSet}` on the `SSL` connection cannot be less than zero." +msgstr "todo" + #: src/dmarc-summaries/loaders/load-spf-failure-connections-by-sum-id.js:60 msgid "`{argSet}` on the `SpfFailureTable` connection cannot be less than zero." msgstr "todo" @@ -1124,14 +1132,6 @@ msgstr "todo" msgid "`{argSet}` on the `domain` connection cannot be less than zero." msgstr "todo" -#: src/web-scan/loaders/load-https-connections-by-domain-id.js:164 -msgid "`{argSet}` on the `https` connection cannot be less than zero." -msgstr "todo" - -#: src/web-scan/loaders/load-ssl-connections-by-domain-id.js:188 -msgid "`{argSet}` on the `ssl` connection cannot be less than zero." -msgstr "todo" - #: src/organization/objects/organization-summary.js:7 #: src/summaries/queries/mail-summary.js:22 #: src/summaries/queries/web-summary.js:23 diff --git a/api-js/src/web-scan/loaders/__tests__/load-https-by-key.test.js b/api-js/src/web-scan/loaders/__tests__/load-https-by-key.test.js index f041d6651..badba26ee 100644 --- a/api-js/src/web-scan/loaders/__tests__/load-https-by-key.test.js +++ b/api-js/src/web-scan/loaders/__tests__/load-https-by-key.test.js @@ -114,7 +114,7 @@ describe('given the httpsLoaderByKey function', () => { await loader.load('1') } catch (err) { expect(err).toEqual( - new Error('Unable to find https scan. Please try again.'), + new Error('Unable to find HTTPS scan(s). Please try again.'), ) } expect(consoleErrorOutput).toEqual([ @@ -136,7 +136,7 @@ describe('given the httpsLoaderByKey function', () => { await loader.load('1') } catch (err) { expect(err).toEqual( - new Error('Unable to find https scan. Please try again.'), + new Error('Unable to load HTTPS scan(s). Please try again.'), ) } expect(consoleErrorOutput).toEqual([ diff --git a/api-js/src/web-scan/loaders/__tests__/load-https-connections-by-domain-id.test.js b/api-js/src/web-scan/loaders/__tests__/load-https-connections-by-domain-id.test.js index 030b78836..576b4a7cf 100644 --- a/api-js/src/web-scan/loaders/__tests__/load-https-connections-by-domain-id.test.js +++ b/api-js/src/web-scan/loaders/__tests__/load-https-connections-by-domain-id.test.js @@ -1218,7 +1218,7 @@ describe('given the load https connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'You must provide a `first` or `last` value to properly paginate the `https` connection.', + 'You must provide a `first` or `last` value to properly paginate the `HTTPS` connection.', ), ) } @@ -1249,7 +1249,7 @@ describe('given the load https connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Passing both `first` and `last` to paginate the `https` connection is not supported.', + 'Passing both `first` and `last` to paginate the `HTTPS` connection is not supported.', ), ) } @@ -1280,7 +1280,7 @@ describe('given the load https connection function', () => { } catch (err) { expect(err).toEqual( new Error( - '`first` on the `https` connection cannot be less than zero.', + '`first` on the `HTTPS` connection cannot be less than zero.', ), ) } @@ -1310,7 +1310,7 @@ describe('given the load https connection function', () => { } catch (err) { expect(err).toEqual( new Error( - '`last` on the `https` connection cannot be less than zero.', + '`last` on the `HTTPS` connection cannot be less than zero.', ), ) } @@ -1342,7 +1342,7 @@ describe('given the load https connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Requesting 101 records on the `https` connection exceeds the `first` limit of 100 records.', + 'Requesting 101 records on the `HTTPS` connection exceeds the `first` limit of 100 records.', ), ) } @@ -1372,7 +1372,7 @@ describe('given the load https connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Requesting 500 records on the `https` connection exceeds the `last` limit of 100 records.', + 'Requesting 500 records on the `HTTPS` connection exceeds the `last` limit of 100 records.', ), ) } @@ -1481,7 +1481,7 @@ describe('given the load https connection function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load https scans. Please try again.'), + new Error('Unable to load HTTPS scan(s). Please try again.'), ) } @@ -1517,7 +1517,7 @@ describe('given the load https connection function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load https scans. Please try again.'), + new Error('Unable to load HTTPS scan(s). Please try again.'), ) } diff --git a/api-js/src/web-scan/loaders/__tests__/load-ssl-by-key.test.js b/api-js/src/web-scan/loaders/__tests__/load-ssl-by-key.test.js index bbfedee0f..01be8ef19 100644 --- a/api-js/src/web-scan/loaders/__tests__/load-ssl-by-key.test.js +++ b/api-js/src/web-scan/loaders/__tests__/load-ssl-by-key.test.js @@ -114,7 +114,7 @@ describe('given the sslLoaderByKey function', () => { await loader.load('1') } catch (err) { expect(err).toEqual( - new Error('Unable to find ssl scan. Please try again.'), + new Error('Unable to find SSL scan(s). Please try again.'), ) } expect(consoleErrorOutput).toEqual([ @@ -136,7 +136,7 @@ describe('given the sslLoaderByKey function', () => { await loader.load('1') } catch (err) { expect(err).toEqual( - new Error('Unable to find ssl scan. Please try again.'), + new Error('Unable to find SSL scan(s). Please try again.'), ) } expect(consoleErrorOutput).toEqual([ diff --git a/api-js/src/web-scan/loaders/__tests__/load-ssl-connections-by-domain-id.test.js b/api-js/src/web-scan/loaders/__tests__/load-ssl-connections-by-domain-id.test.js index 61aaccd58..811e9a6f3 100644 --- a/api-js/src/web-scan/loaders/__tests__/load-ssl-connections-by-domain-id.test.js +++ b/api-js/src/web-scan/loaders/__tests__/load-ssl-connections-by-domain-id.test.js @@ -1611,7 +1611,7 @@ describe('given the load ssl connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'You must provide a `first` or `last` value to properly paginate the `ssl` connection.', + 'You must provide a `first` or `last` value to properly paginate the `SSL` connection.', ), ) } @@ -1643,7 +1643,7 @@ describe('given the load ssl connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Passing both `first` and `last` to paginate the `ssl` connection is not supported.', + 'Passing both `first` and `last` to paginate the `SSL` connection is not supported.', ), ) } @@ -1675,7 +1675,7 @@ describe('given the load ssl connection function', () => { } catch (err) { expect(err).toEqual( new Error( - '`first` on the `ssl` connection cannot be less than zero.', + '`first` on the `SSL` connection cannot be less than zero.', ), ) } @@ -1706,7 +1706,7 @@ describe('given the load ssl connection function', () => { } catch (err) { expect(err).toEqual( new Error( - '`last` on the `ssl` connection cannot be less than zero.', + '`last` on the `SSL` connection cannot be less than zero.', ), ) } @@ -1739,7 +1739,7 @@ describe('given the load ssl connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Requesting 101 records on the `ssl` connection exceeds the `first` limit of 100 records.', + 'Requesting 101 records on the `SSL` connection exceeds the `first` limit of 100 records.', ), ) } @@ -1770,7 +1770,7 @@ describe('given the load ssl connection function', () => { } catch (err) { expect(err).toEqual( new Error( - 'Requesting 500 records on the `ssl` connection exceeds the `last` limit of 100 records.', + 'Requesting 500 records on the `SSL` connection exceeds the `last` limit of 100 records.', ), ) } @@ -1880,7 +1880,7 @@ describe('given the load ssl connection function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load ssl scans. Please try again.'), + new Error('Unable to load SSL scan(s). Please try again.'), ) } @@ -1916,7 +1916,7 @@ describe('given the load ssl connection function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load ssl scans. Please try again.'), + new Error('Unable to load SSL scan(s). Please try again.'), ) } diff --git a/api-js/src/web-scan/loaders/load-https-by-key.js b/api-js/src/web-scan/loaders/load-https-by-key.js index 2cac3d287..31a713a67 100644 --- a/api-js/src/web-scan/loaders/load-https-by-key.js +++ b/api-js/src/web-scan/loaders/load-https-by-key.js @@ -14,7 +14,9 @@ export const httpsLoaderByKey = (query, userKey, i18n) => console.error( `Database error occurred when user: ${userKey} running httpsLoaderByKey: ${err}`, ) - throw new Error(i18n._(t`Unable to find https scan. Please try again.`)) + throw new Error( + i18n._(t`Unable to find HTTPS scan(s). Please try again.`), + ) } const httpsMap = {} @@ -26,7 +28,9 @@ export const httpsLoaderByKey = (query, userKey, i18n) => console.error( `Cursor error occurred when user: ${userKey} running httpsLoaderByKey: ${err}`, ) - throw new Error(i18n._(t`Unable to find https scan. Please try again.`)) + throw new Error( + i18n._(t`Unable to load HTTPS scan(s). Please try again.`), + ) } return keys.map((key) => httpsMap[key]) diff --git a/api-js/src/web-scan/loaders/load-https-connections-by-domain-id.js b/api-js/src/web-scan/loaders/load-https-connections-by-domain-id.js index ad3e9faed..67ab21e88 100644 --- a/api-js/src/web-scan/loaders/load-https-connections-by-domain-id.js +++ b/api-js/src/web-scan/loaders/load-https-connections-by-domain-id.js @@ -140,7 +140,7 @@ export const httpsLoaderConnectionsByDomainId = ( ) throw new Error( i18n._( - t`You must provide a \`first\` or \`last\` value to properly paginate the \`https\` connection.`, + t`You must provide a \`first\` or \`last\` value to properly paginate the \`HTTPS\` connection.`, ), ) } else if (typeof first !== 'undefined' && typeof last !== 'undefined') { @@ -149,7 +149,7 @@ export const httpsLoaderConnectionsByDomainId = ( ) throw new Error( i18n._( - t`Passing both \`first\` and \`last\` to paginate the \`https\` connection is not supported.`, + t`Passing both \`first\` and \`last\` to paginate the \`HTTPS\` connection is not supported.`, ), ) } else if (typeof first === 'number' || typeof last === 'number') { @@ -161,7 +161,7 @@ export const httpsLoaderConnectionsByDomainId = ( ) throw new Error( i18n._( - t`\`${argSet}\` on the \`https\` connection cannot be less than zero.`, + t`\`${argSet}\` on the \`HTTPS\` connection cannot be less than zero.`, ), ) } else if (first > 100 || last > 100) { @@ -172,7 +172,7 @@ export const httpsLoaderConnectionsByDomainId = ( ) throw new Error( i18n._( - t`Requesting ${amount} records on the \`https\` connection exceeds the \`${argSet}\` limit of 100 records.`, + t`Requesting ${amount} records on the \`HTTPS\` connection exceeds the \`${argSet}\` limit of 100 records.`, ), ) } else if (typeof first !== 'undefined' && typeof last === 'undefined') { @@ -317,7 +317,7 @@ export const httpsLoaderConnectionsByDomainId = ( console.error( `Database error occurred while user: ${userKey} was trying to get https information for ${domainId}, error: ${err}`, ) - throw new Error(i18n._(t`Unable to load https scans. Please try again.`)) + throw new Error(i18n._(t`Unable to load HTTPS scan(s). Please try again.`)) } let httpsScanInfo @@ -327,7 +327,7 @@ export const httpsLoaderConnectionsByDomainId = ( console.error( `Cursor error occurred while user: ${userKey} was trying to get https information for ${domainId}, error: ${err}`, ) - throw new Error(i18n._(t`Unable to load https scans. Please try again.`)) + throw new Error(i18n._(t`Unable to load HTTPS scan(s). Please try again.`)) } if (httpsScanInfo.httpsScans.length === 0) { diff --git a/api-js/src/web-scan/loaders/load-ssl-by-key.js b/api-js/src/web-scan/loaders/load-ssl-by-key.js index fb1edbbe8..10cc4fb03 100644 --- a/api-js/src/web-scan/loaders/load-ssl-by-key.js +++ b/api-js/src/web-scan/loaders/load-ssl-by-key.js @@ -14,7 +14,7 @@ export const sslLoaderByKey = (query, userKey, i18n) => console.error( `Database error occurred when user: ${userKey} running sslLoaderByKey: ${err}`, ) - throw new Error(i18n._(t`Unable to find ssl scan. Please try again.`)) + throw new Error(i18n._(t`Unable to find SSL scan(s). Please try again.`)) } const sslMap = {} @@ -26,7 +26,7 @@ export const sslLoaderByKey = (query, userKey, i18n) => console.error( `Cursor error occurred when user: ${userKey} running sslLoaderByKey: ${err}`, ) - throw new Error(i18n._(t`Unable to find ssl scan. Please try again.`)) + throw new Error(i18n._(t`Unable to find SSL scan(s). Please try again.`)) } return keys.map((key) => sslMap[key]) diff --git a/api-js/src/web-scan/loaders/load-ssl-connections-by-domain-id.js b/api-js/src/web-scan/loaders/load-ssl-connections-by-domain-id.js index 7f7d25da0..9cbb1b940 100644 --- a/api-js/src/web-scan/loaders/load-ssl-connections-by-domain-id.js +++ b/api-js/src/web-scan/loaders/load-ssl-connections-by-domain-id.js @@ -164,7 +164,7 @@ export const sslLoaderConnectionsByDomainId = ( ) throw new Error( i18n._( - t`You must provide a \`first\` or \`last\` value to properly paginate the \`ssl\` connection.`, + t`You must provide a \`first\` or \`last\` value to properly paginate the \`SSL\` connection.`, ), ) } else if (typeof first !== 'undefined' && typeof last !== 'undefined') { @@ -173,7 +173,7 @@ export const sslLoaderConnectionsByDomainId = ( ) throw new Error( i18n._( - t`Passing both \`first\` and \`last\` to paginate the \`ssl\` connection is not supported.`, + t`Passing both \`first\` and \`last\` to paginate the \`SSL\` connection is not supported.`, ), ) } else if (typeof first === 'number' || typeof last === 'number') { @@ -185,7 +185,7 @@ export const sslLoaderConnectionsByDomainId = ( ) throw new Error( i18n._( - t`\`${argSet}\` on the \`ssl\` connection cannot be less than zero.`, + t`\`${argSet}\` on the \`SSL\` connection cannot be less than zero.`, ), ) } else if (first > 100 || last > 100) { @@ -196,7 +196,7 @@ export const sslLoaderConnectionsByDomainId = ( ) throw new Error( i18n._( - t`Requesting ${amount} records on the \`ssl\` connection exceeds the \`${argSet}\` limit of 100 records.`, + t`Requesting ${amount} records on the \`SSL\` connection exceeds the \`${argSet}\` limit of 100 records.`, ), ) } else if (typeof first !== 'undefined' && typeof last === 'undefined') { @@ -365,7 +365,7 @@ export const sslLoaderConnectionsByDomainId = ( console.error( `Database error occurred while user: ${userKey} was trying to get ssl information for ${domainId}, error: ${err}`, ) - throw new Error(i18n._(t`Unable to load ssl scans. Please try again.`)) + throw new Error(i18n._(t`Unable to load SSL scan(s). Please try again.`)) } let sslScansInfo @@ -375,7 +375,7 @@ export const sslLoaderConnectionsByDomainId = ( console.error( `Cursor error occurred while user: ${userKey} was trying to get ssl information for ${domainId}, error: ${err}`, ) - throw new Error(i18n._(t`Unable to load ssl scans. Please try again.`)) + throw new Error(i18n._(t`Unable to load SSL scan(s). Please try again.`)) } if (sslScansInfo.sslScans.length === 0) { From d0ff3d1796b56fb5656904a151a5c3700d061b33 Mon Sep 17 00:00:00 2001 From: nsdeschenes Date: Fri, 12 Mar 2021 11:42:41 -0400 Subject: [PATCH 14/21] run prettier on code base --- .../mutations/__tests__/remove-domain.test.js | 28 +++++++++++++------ .../mutations/__tests__/update-domain.test.js | 16 +++++++---- .../email-scan/loaders/load-dmarc-by-key.js | 8 ++++-- ...ad-dmarc-guidance-tags-connections.test.js | 8 ++++-- .../load-dmarc-guidance-tags.test.js | 8 ++++-- ...ad-https-guidance-tags-connections.test.js | 8 ++++-- .../load-https-guidance-tags.test.js | 8 ++++-- .../notify-send-authenticate-text-msg.test.js | 4 ++- .../notify/notify-send-authenticate-email.js | 4 ++- .../notify-send-authenticate-text-msg.js | 4 ++- api-js/src/server.js | 18 ++++++------ .../__tests__/reset-password.test.js | 9 ++++-- .../__tests__/authenticate-error.test.js | 2 +- .../update-user-profile-result.test.js | 4 ++- .../__tests__/reset-password-union.test.js | 5 +++- .../unions/__tests__/sign-up-union.test.js | 5 +--- 16 files changed, 91 insertions(+), 48 deletions(-) diff --git a/api-js/src/domain/mutations/__tests__/remove-domain.test.js b/api-js/src/domain/mutations/__tests__/remove-domain.test.js index 3604a4cd9..67233a2ae 100644 --- a/api-js/src/domain/mutations/__tests__/remove-domain.test.js +++ b/api-js/src/domain/mutations/__tests__/remove-domain.test.js @@ -1366,9 +1366,7 @@ describe('removing a domain', () => { }, ) - const error = [ - new GraphQLError('Unable to remove unknown domain.'), - ] + const error = [new GraphQLError('Unable to remove unknown domain.')] expect(response.errors).toEqual(error) expect(consoleOutput).toEqual([ @@ -1423,7 +1421,9 @@ describe('removing a domain', () => { ) const error = [ - new GraphQLError('Unable to remove domain from unknown organization.'), + new GraphQLError( + 'Unable to remove domain from unknown organization.', + ), ] expect(response.errors).toEqual(error) @@ -1520,7 +1520,9 @@ describe('removing a domain', () => { ) const error = [ - new GraphQLError('Permission Denied: Please contact super admin for help with removing domain.'), + new GraphQLError( + 'Permission Denied: Please contact super admin for help with removing domain.', + ), ] expect(response.errors).toEqual(error) @@ -1579,7 +1581,9 @@ describe('removing a domain', () => { ) const error = [ - new GraphQLError('Permission Denied: Please contact super admin for help with removing domain.'), + new GraphQLError( + 'Permission Denied: Please contact super admin for help with removing domain.', + ), ] expect(response.errors).toEqual(error) @@ -1631,7 +1635,9 @@ describe('removing a domain', () => { ) const error = [ - new GraphQLError('Permission Denied: Please contact super admin for help with removing domain.'), + new GraphQLError( + 'Permission Denied: Please contact super admin for help with removing domain.', + ), ] expect(response.errors).toEqual(error) @@ -1729,7 +1735,9 @@ describe('removing a domain', () => { ) const error = [ - new GraphQLError('Permission Denied: Please contact organization admin for help with removing domain.'), + new GraphQLError( + 'Permission Denied: Please contact organization admin for help with removing domain.', + ), ] expect(response.errors).toEqual(error) @@ -1781,7 +1789,9 @@ describe('removing a domain', () => { ) const error = [ - new GraphQLError('Permission Denied: Please contact organization admin for help with removing domain.'), + new GraphQLError( + 'Permission Denied: Please contact organization admin for help with removing domain.', + ), ] expect(response.errors).toEqual(error) diff --git a/api-js/src/domain/mutations/__tests__/update-domain.test.js b/api-js/src/domain/mutations/__tests__/update-domain.test.js index 1cd7e26bd..65179d4ce 100644 --- a/api-js/src/domain/mutations/__tests__/update-domain.test.js +++ b/api-js/src/domain/mutations/__tests__/update-domain.test.js @@ -806,9 +806,7 @@ describe('updating a domain', () => { }, ) - const error = [ - new GraphQLError('Unable to update unknown domain.'), - ] + const error = [new GraphQLError('Unable to update unknown domain.')] expect(response.errors).toEqual(error) expect(consoleOutput).toEqual([ @@ -1011,7 +1009,9 @@ describe('updating a domain', () => { ) const error = [ - new GraphQLError('Permission Denied: Please contact organization user for help with updating this domain.'), + new GraphQLError( + 'Permission Denied: Please contact organization user for help with updating this domain.', + ), ] expect(response.errors).toEqual(error) @@ -1083,7 +1083,9 @@ describe('updating a domain', () => { ) const error = [ - new GraphQLError('Permission Denied: Please contact organization user for help with updating this domain.'), + new GraphQLError( + 'Permission Denied: Please contact organization user for help with updating this domain.', + ), ] expect(response.errors).toEqual(error) @@ -1183,7 +1185,9 @@ describe('updating a domain', () => { ) const error = [ - new GraphQLError('Unable to update domain that does not belong to the given organization.'), + new GraphQLError( + 'Unable to update domain that does not belong to the given organization.', + ), ] expect(response.errors).toEqual(error) diff --git a/api-js/src/email-scan/loaders/load-dmarc-by-key.js b/api-js/src/email-scan/loaders/load-dmarc-by-key.js index fcc8302a7..7034469e6 100644 --- a/api-js/src/email-scan/loaders/load-dmarc-by-key.js +++ b/api-js/src/email-scan/loaders/load-dmarc-by-key.js @@ -15,7 +15,9 @@ export const dmarcLoaderByKey = (query, userKey, i18n) => console.error( `Database error occurred when user: ${userKey} running dmarcLoaderByKey: ${err}`, ) - throw new Error(i18n._(t`Unable to find DMARC scan(s). Please try again.`)) + throw new Error( + i18n._(t`Unable to find DMARC scan(s). Please try again.`), + ) } const dmarcMap = {} @@ -27,7 +29,9 @@ export const dmarcLoaderByKey = (query, userKey, i18n) => console.error( `Cursor error occurred when user: ${userKey} running dmarcLoaderByKey: ${err}`, ) - throw new Error(i18n._(t`Unable to find DMARC scan(s). Please try again.`)) + throw new Error( + i18n._(t`Unable to find DMARC scan(s). Please try again.`), + ) } return keys.map((key) => dmarcMap[key]) }) diff --git a/api-js/src/guidance-tag/loaders/__tests__/load-dmarc-guidance-tags-connections.test.js b/api-js/src/guidance-tag/loaders/__tests__/load-dmarc-guidance-tags-connections.test.js index 5a0b47e84..c0d468b1c 100644 --- a/api-js/src/guidance-tag/loaders/__tests__/load-dmarc-guidance-tags-connections.test.js +++ b/api-js/src/guidance-tag/loaders/__tests__/load-dmarc-guidance-tags-connections.test.js @@ -950,7 +950,9 @@ describe('when given the load dmarc guidance tag connection function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load DMARC guidance tag(s). Please try again.'), + new Error( + 'Unable to load DMARC guidance tag(s). Please try again.', + ), ) } @@ -986,7 +988,9 @@ describe('when given the load dmarc guidance tag connection function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load DMARC guidance tag(s). Please try again.'), + new Error( + 'Unable to load DMARC guidance tag(s). Please try again.', + ), ) } diff --git a/api-js/src/guidance-tag/loaders/__tests__/load-dmarc-guidance-tags.test.js b/api-js/src/guidance-tag/loaders/__tests__/load-dmarc-guidance-tags.test.js index 896dab703..d84bee393 100644 --- a/api-js/src/guidance-tag/loaders/__tests__/load-dmarc-guidance-tags.test.js +++ b/api-js/src/guidance-tag/loaders/__tests__/load-dmarc-guidance-tags.test.js @@ -111,7 +111,9 @@ describe('given the dmarcGuidanceTagLoader function', () => { await loader.load('1') } catch (err) { expect(err).toEqual( - new Error('Unable to find DMARC guidance tag(s). Please try again.'), + new Error( + 'Unable to find DMARC guidance tag(s). Please try again.', + ), ) } @@ -134,7 +136,9 @@ describe('given the dmarcGuidanceTagLoader function', () => { await loader.load('1') } catch (err) { expect(err).toEqual( - new Error('Unable to find DMARC guidance tag(s). Please try again.'), + new Error( + 'Unable to find DMARC guidance tag(s). Please try again.', + ), ) } diff --git a/api-js/src/guidance-tag/loaders/__tests__/load-https-guidance-tags-connections.test.js b/api-js/src/guidance-tag/loaders/__tests__/load-https-guidance-tags-connections.test.js index 720b59b1f..0a2bf9016 100644 --- a/api-js/src/guidance-tag/loaders/__tests__/load-https-guidance-tags-connections.test.js +++ b/api-js/src/guidance-tag/loaders/__tests__/load-https-guidance-tags-connections.test.js @@ -950,7 +950,9 @@ describe('when given the load https guidance tag connection function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load HTTPS guidance tag(s). Please try again.'), + new Error( + 'Unable to load HTTPS guidance tag(s). Please try again.', + ), ) } @@ -986,7 +988,9 @@ describe('when given the load https guidance tag connection function', () => { }) } catch (err) { expect(err).toEqual( - new Error('Unable to load HTTPS guidance tag(s). Please try again.'), + new Error( + 'Unable to load HTTPS guidance tag(s). Please try again.', + ), ) } diff --git a/api-js/src/guidance-tag/loaders/__tests__/load-https-guidance-tags.test.js b/api-js/src/guidance-tag/loaders/__tests__/load-https-guidance-tags.test.js index dbee3105e..942bbc8bb 100644 --- a/api-js/src/guidance-tag/loaders/__tests__/load-https-guidance-tags.test.js +++ b/api-js/src/guidance-tag/loaders/__tests__/load-https-guidance-tags.test.js @@ -111,7 +111,9 @@ describe('given the httpsGuidanceTagLoader function', () => { await loader.load('1') } catch (err) { expect(err).toEqual( - new Error('Unable to find HTTPS guidance tag(s). Please try again.'), + new Error( + 'Unable to find HTTPS guidance tag(s). Please try again.', + ), ) } @@ -134,7 +136,9 @@ describe('given the httpsGuidanceTagLoader function', () => { await loader.load('1') } catch (err) { expect(err).toEqual( - new Error('Unable to find HTTPS guidance tag(s). Please try again.'), + new Error( + 'Unable to find HTTPS guidance tag(s). Please try again.', + ), ) } diff --git a/api-js/src/notify/__tests__/notify-send-authenticate-text-msg.test.js b/api-js/src/notify/__tests__/notify-send-authenticate-text-msg.test.js index 1ac9ae99d..324f0d841 100644 --- a/api-js/src/notify/__tests__/notify-send-authenticate-text-msg.test.js +++ b/api-js/src/notify/__tests__/notify-send-authenticate-text-msg.test.js @@ -122,7 +122,9 @@ describe('given the sendAuthTextMsg function', () => { await mockedSendAuthTextMsg({ user }) } catch (err) { expect(err).toEqual( - new Error('Unable to send authentication text message. Please try again.'), + new Error( + 'Unable to send authentication text message. Please try again.', + ), ) } diff --git a/api-js/src/notify/notify-send-authenticate-email.js b/api-js/src/notify/notify-send-authenticate-email.js index da0caf1b5..a609ce825 100644 --- a/api-js/src/notify/notify-send-authenticate-email.js +++ b/api-js/src/notify/notify-send-authenticate-email.js @@ -15,6 +15,8 @@ export const sendAuthEmail = ({ notifyClient, i18n }) => async ({ user }) => { console.error( `Error ocurred when sending authentication code via email for ${user._key}: ${err}`, ) - throw new Error(i18n._(t`Unable to send authentication email. Please try again.`)) + throw new Error( + i18n._(t`Unable to send authentication email. Please try again.`), + ) } } diff --git a/api-js/src/notify/notify-send-authenticate-text-msg.js b/api-js/src/notify/notify-send-authenticate-text-msg.js index 443d5a817..4f2c5a5bc 100644 --- a/api-js/src/notify/notify-send-authenticate-text-msg.js +++ b/api-js/src/notify/notify-send-authenticate-text-msg.js @@ -28,6 +28,8 @@ export const sendAuthTextMsg = ({ notifyClient, i18n }) => async ({ user }) => { console.error( `Error ocurred when sending authentication code via text for ${user._key}: ${err}`, ) - throw new Error(i18n._(t`Unable to send authentication text message. Please try again.`)) + throw new Error( + i18n._(t`Unable to send authentication text message. Please try again.`), + ) } } diff --git a/api-js/src/server.js b/api-js/src/server.js index 6826b0f07..0e718641b 100644 --- a/api-js/src/server.js +++ b/api-js/src/server.js @@ -38,16 +38,14 @@ const createValidationRules = ( ] } -export const Server = ( - { - maxDepth, - complexityCost, - scalarCost, - objectCost, - listFactor, - context = {}, - }, -) => { +export const Server = ({ + maxDepth, + complexityCost, + scalarCost, + objectCost, + listFactor, + context = {}, +}) => { const app = express() app.use('*', cors()) diff --git a/api-js/src/user/mutations/__tests__/reset-password.test.js b/api-js/src/user/mutations/__tests__/reset-password.test.js index 0aa4e6f3e..159d0afa4 100644 --- a/api-js/src/user/mutations/__tests__/reset-password.test.js +++ b/api-js/src/user/mutations/__tests__/reset-password.test.js @@ -355,7 +355,8 @@ describe('reset users password', () => { resetPassword: { result: { code: 400, - description: 'Incorrect token value. Please request a new email.', + description: + 'Incorrect token value. Please request a new email.', }, }, }, @@ -420,7 +421,8 @@ describe('reset users password', () => { resetPassword: { result: { code: 400, - description: 'Incorrect token value. Please request a new email.', + description: + 'Incorrect token value. Please request a new email.', }, }, }, @@ -560,7 +562,8 @@ describe('reset users password', () => { resetPassword: { result: { code: 400, - description: 'Unable to reset password. Please request a new email.', + description: + 'Unable to reset password. Please request a new email.', }, }, }, diff --git a/api-js/src/user/objects/__tests__/authenticate-error.test.js b/api-js/src/user/objects/__tests__/authenticate-error.test.js index 1d6adbb1f..982043fbf 100644 --- a/api-js/src/user/objects/__tests__/authenticate-error.test.js +++ b/api-js/src/user/objects/__tests__/authenticate-error.test.js @@ -36,4 +36,4 @@ describe('given the authenticateError object', () => { }) }) }) -}) \ No newline at end of file +}) diff --git a/api-js/src/user/objects/__tests__/update-user-profile-result.test.js b/api-js/src/user/objects/__tests__/update-user-profile-result.test.js index 95786bdcc..aa16bd755 100644 --- a/api-js/src/user/objects/__tests__/update-user-profile-result.test.js +++ b/api-js/src/user/objects/__tests__/update-user-profile-result.test.js @@ -30,7 +30,9 @@ describe('given the updateUserProfileResultType object', () => { it('returns the resolved value', () => { const demoType = updateUserProfileResultType.getFields() - expect(demoType.user.resolve({ user: { id: '1' } })).toEqual({ id: '1' }) + expect(demoType.user.resolve({ user: { id: '1' } })).toEqual({ + id: '1', + }) }) }) }) diff --git a/api-js/src/user/unions/__tests__/reset-password-union.test.js b/api-js/src/user/unions/__tests__/reset-password-union.test.js index 9535275e7..fc6b2ebf4 100644 --- a/api-js/src/user/unions/__tests__/reset-password-union.test.js +++ b/api-js/src/user/unions/__tests__/reset-password-union.test.js @@ -1,4 +1,7 @@ -import { resetPasswordErrorType, resetPasswordResultType } from '../../objects/index' +import { + resetPasswordErrorType, + resetPasswordResultType, +} from '../../objects/index' import { resetPasswordUnion } from '../reset-password-union' describe('given the resetPasswordUnion', () => { diff --git a/api-js/src/user/unions/__tests__/sign-up-union.test.js b/api-js/src/user/unions/__tests__/sign-up-union.test.js index 35dd00a20..20c1e887b 100644 --- a/api-js/src/user/unions/__tests__/sign-up-union.test.js +++ b/api-js/src/user/unions/__tests__/sign-up-union.test.js @@ -1,7 +1,4 @@ -import { - authResultType, - signUpError, -} from '../../objects/index' +import { authResultType, signUpError } from '../../objects/index' import { signUpUnion } from '../sign-up-union' describe('given the sign up union', () => { From c876737d0bc5f38717e42aad6768443cc276eae5 Mon Sep 17 00:00:00 2001 From: nsdeschenes Date: Fri, 12 Mar 2021 11:49:24 -0400 Subject: [PATCH 15/21] fix up translations after rebase --- api-js/src/locale/en/messages.js | 110 +++++++++++++++---------------- api-js/src/locale/en/messages.po | 19 ++---- api-js/src/locale/fr/messages.js | 58 ++++++++-------- api-js/src/locale/fr/messages.po | 19 ++---- 4 files changed, 90 insertions(+), 116 deletions(-) diff --git a/api-js/src/locale/en/messages.js b/api-js/src/locale/en/messages.js index 9e771810e..3757331b6 100644 --- a/api-js/src/locale/en/messages.js +++ b/api-js/src/locale/en/messages.js @@ -28,6 +28,8 @@ 'No organization with the provided slug could be found.', 'No verified domain with the provided domain could be found.': 'No verified domain with the provided domain could be found.', + 'No verified organization with the provided slug could be found.': + 'No verified organization with the provided slug could be found.', 'Organization has already been verified.': 'Organization has already been verified.', 'Organization name already in use, please choose another and try again.': @@ -48,26 +50,26 @@ 'Passing both `first` and `last` to paginate the `FullPassTable` connection is not supported.', 'Passing both `first` and `last` to paginate the `GuidanceTag` connection is not supported.': 'Passing both `first` and `last` to paginate the `GuidanceTag` connection is not supported.', + 'Passing both `first` and `last` to paginate the `HTTPS` connection is not supported.': + 'Passing both `first` and `last` to paginate the `HTTPS` connection is not supported.', 'Passing both `first` and `last` to paginate the `Organization` connection is not supported.': 'Passing both `first` and `last` to paginate the `Organization` connection is not supported.', 'Passing both `first` and `last` to paginate the `SPF` connection is not supported.': 'Passing both `first` and `last` to paginate the `SPF` connection is not supported.', + 'Passing both `first` and `last` to paginate the `SSL` connection is not supported.': + 'Passing both `first` and `last` to paginate the `SSL` connection is not supported.', 'Passing both `first` and `last` to paginate the `SpfFailureTable` connection is not supported.': 'Passing both `first` and `last` to paginate the `SpfFailureTable` connection is not supported.', 'Passing both `first` and `last` to paginate the `VerifiedDomain` connection is not supported.': 'Passing both `first` and `last` to paginate the `VerifiedDomain` connection is not supported.', + 'Passing both `first` and `last` to paginate the `VerifiedOrganization` connection is not supported.': + 'Passing both `first` and `last` to paginate the `VerifiedOrganization` connection is not supported.', 'Passing both `first` and `last` to paginate the `affiliation` is not supported.': 'Passing both `first` and `last` to paginate the `affiliation` is not supported.', 'Passing both `first` and `last` to paginate the `dmarcSummaries` connection is not supported.': 'Passing both `first` and `last` to paginate the `dmarcSummaries` connection is not supported.', 'Passing both `first` and `last` to paginate the `domain` connection is not supported.': 'Passing both `first` and `last` to paginate the `domain` connection is not supported.', - 'Passing both `first` and `last` to paginate the `https` connection is not supported.': - 'Passing both `first` and `last` to paginate the `https` connection is not supported.', - 'Passing both `first` and `last` to paginate the `ssl` connection is not supported.': - 'Passing both `first` and `last` to paginate the `ssl` connection is not supported.', - 'Passing both `first` and `last` to paginate the `verifiedOrganization` connection is not supported.': - 'Passing both `first` and `last` to paginate the `verifiedOrganization` connection is not supported.', 'Password does not meet requirements.': 'Password does not meet requirements.', 'Password does not requirements. Please try again.': @@ -161,6 +163,13 @@ ['argSet'], '` limit of 100 records.', ], + 'Requesting `{amount}` records on the `VerifiedOrganization` connection exceeds the `{argSet}` limit of 100 records.': [ + 'Requesting `', + ['amount'], + '` records on the `VerifiedOrganization` connection exceeds the `', + ['argSet'], + '` limit of 100 records.', + ], 'Requesting `{amount}` records on the `affiliations` exceeds the `{argSet}` limit of 100 records.': [ 'Requesting `', ['amount'], @@ -182,13 +191,6 @@ ['argSet'], '` limit of 100 records.', ], - 'Requesting `{amount}` records on the `verifiedOrganization` connection exceeds the `{argSet}` limit of 100 records.': [ - 'Requesting `', - ['amount'], - '` records on the `verifiedOrganization` connection exceeds the `', - ['argSet'], - '` limit of 100 records.', - ], 'Requesting {amount} records on the `DKIMResults` connection exceeds the `{argSet}` limit of 100 records.': [ 'Requesting ', ['amount'], @@ -210,24 +212,24 @@ ['argSet'], '` limit of 100 records.', ], - 'Requesting {amount} records on the `SPF` connection exceeds the `{argSet}` limit of 100 records.': [ + 'Requesting {amount} records on the `HTTPS` connection exceeds the `{argSet}` limit of 100 records.': [ 'Requesting ', ['amount'], - ' records on the `SPF` connection exceeds the `', + ' records on the `HTTPS` connection exceeds the `', ['argSet'], '` limit of 100 records.', ], - 'Requesting {amount} records on the `https` connection exceeds the `{argSet}` limit of 100 records.': [ + 'Requesting {amount} records on the `SPF` connection exceeds the `{argSet}` limit of 100 records.': [ 'Requesting ', ['amount'], - ' records on the `https` connection exceeds the `', + ' records on the `SPF` connection exceeds the `', ['argSet'], '` limit of 100 records.', ], - 'Requesting {amount} records on the `ssl` connection exceeds the `{argSet}` limit of 100 records.': [ + 'Requesting {amount} records on the `SSL` connection exceeds the `{argSet}` limit of 100 records.': [ 'Requesting ', ['amount'], - ' records on the `ssl` connection exceeds the `', + ' records on the `SSL` connection exceeds the `', ['argSet'], '` limit of 100 records.', ], @@ -264,8 +266,6 @@ 'Token value incorrect, please sign in again.', 'Too many failed login attempts, please reset your password, and try again.': 'Too many failed login attempts, please reset your password, and try again.<<<<<<< HEAD=======', - 'Two factor code has been successfully sent, you will receive a text message shortly.': - 'Two factor code has been successfully sent, you will receive a text message shortly.>>>>>>> update user error messages', 'Two factor code is incorrect. Please try again.': 'Two factor code is incorrect. Please try again.', 'Two factor code length is incorrect. Please try again.': @@ -298,22 +298,22 @@ 'Unable to find DMARC summary data. Please try again.', 'Unable to find HTTPS guidance tag(s). Please try again.': 'Unable to find HTTPS guidance tag(s). Please try again.', + 'Unable to find HTTPS scan(s). Please try again.': + 'Unable to find HTTPS scan(s). Please try again.', 'Unable to find SPF guidance tag(s). Please try again.': 'Unable to find SPF guidance tag(s). Please try again.', 'Unable to find SPF scan(s). Please try again.': 'Unable to find SPF scan(s). Please try again.', 'Unable to find SSL guidance tag(s). Please try again.': 'Unable to find SSL guidance tag(s). Please try again.', - 'Unable to find https scan. Please try again.': - 'Unable to find https scan. Please try again.', - 'Unable to find ssl scan. Please try again.': - 'Unable to find ssl scan. Please try again.', + 'Unable to find SSL scan(s). Please try again.': + 'Unable to find SSL scan(s). Please try again.', 'Unable to find the requested domain.': 'Unable to find the requested domain.', 'Unable to find user affiliation(s). Please try again.': 'Unable to find user affiliation(s). Please try again.', - 'Unable to find verified organization. Please try again.': - 'Unable to find verified organization. Please try again.', + 'Unable to find verified organization(s). Please try again.': + 'Unable to find verified organization(s). Please try again.', 'Unable to invite user to unknown organization.': 'Unable to invite user to unknown organization.', 'Unable to invite user. Please try again.': @@ -338,6 +338,8 @@ 'Unable to load DMARC summary data. Please try again.', 'Unable to load HTTPS guidance tag(s). Please try again.': 'Unable to load HTTPS guidance tag(s). Please try again.', + 'Unable to load HTTPS scan(s). Please try again.': + 'Unable to load HTTPS scan(s). Please try again.', 'Unable to load SPF failure data. Please try again.': 'Unable to load SPF failure data. Please try again.', 'Unable to load SPF guidance tag(s). Please try again.': @@ -346,6 +348,8 @@ 'Unable to load SPF scan(s). Please try again.', 'Unable to load SSL guidance tag(s). Please try again.': 'Unable to load SSL guidance tag(s). Please try again.', + 'Unable to load SSL scan(s). Please try again.': + 'Unable to load SSL scan(s). Please try again.', 'Unable to load affiliation(s). Please try again.': 'Unable to load affiliation(s). Please try again.', 'Unable to load domain(s). Please try again.': @@ -356,24 +360,20 @@ 'Unable to load domains. Please try again.', 'Unable to load full pass data. Please try again.': 'Unable to load full pass data. Please try again.', - 'Unable to load https scans. Please try again.': - 'Unable to load https scans. Please try again.', 'Unable to load mail summary. Please try again.': 'Unable to load mail summary. Please try again.', 'Unable to load organization(s). Please try again.': 'Unable to load organization(s). Please try again.', 'Unable to load organizations. Please try again.': 'Unable to load organizations. Please try again.', - 'Unable to load ssl scans. Please try again.': - 'Unable to load ssl scans. Please try again.', 'Unable to load summary. Please try again.': 'Unable to load summary. Please try again.', 'Unable to load user(s). Please try again.': 'Unable to load user(s). Please try again.', 'Unable to load verified domain(s). Please try again.': 'Unable to load verified domain(s). Please try again.', - 'Unable to load verified organizations. Please try again.': - 'Unable to load verified organizations. Please try again.', + 'Unable to load verified organization(s). Please try again.': + 'Unable to load verified organization(s). Please try again.', 'Unable to load web summary. Please try again.': 'Unable to load web summary. Please try again.', 'Unable to query affiliation(s). Please try again.': @@ -409,8 +409,6 @@ 'Unable to reset password. Please try again.', 'Unable to select DMARC report(s) for this period and year.': 'Unable to select DMARC report(s) for this period and year.', - 'Unable to send TFA code, please try again.': - 'Unable to send TFA code, please try again.', 'Unable to send authentication email. Please try again.': 'Unable to send authentication email. Please try again.', 'Unable to send authentication text message. Please try again.': @@ -493,26 +491,26 @@ 'You must provide a `first` or `last` value to properly paginate the `FullPassTable` connection.', 'You must provide a `first` or `last` value to properly paginate the `GuidanceTag` connection.': 'You must provide a `first` or `last` value to properly paginate the `GuidanceTag` connection.', + 'You must provide a `first` or `last` value to properly paginate the `HTTPS` connection.': + 'You must provide a `first` or `last` value to properly paginate the `HTTPS` connection.', 'You must provide a `first` or `last` value to properly paginate the `Organization` connection.': 'You must provide a `first` or `last` value to properly paginate the `Organization` connection.', 'You must provide a `first` or `last` value to properly paginate the `SPF` connection.': 'You must provide a `first` or `last` value to properly paginate the `SPF` connection.', + 'You must provide a `first` or `last` value to properly paginate the `SSL` connection.': + 'You must provide a `first` or `last` value to properly paginate the `SSL` connection.', 'You must provide a `first` or `last` value to properly paginate the `SpfFailureTable` connection.': 'You must provide a `first` or `last` value to properly paginate the `SpfFailureTable` connection.', 'You must provide a `first` or `last` value to properly paginate the `VerifiedDomain` connection.': 'You must provide a `first` or `last` value to properly paginate the `VerifiedDomain` connection.', + 'You must provide a `first` or `last` value to properly paginate the `VerifiedOrganization` connection.': + 'You must provide a `first` or `last` value to properly paginate the `VerifiedOrganization` connection.', 'You must provide a `first` or `last` value to properly paginate the `affiliation`.': 'You must provide a `first` or `last` value to properly paginate the `affiliation`.', 'You must provide a `first` or `last` value to properly paginate the `dmarcSummaries` connection.': 'You must provide a `first` or `last` value to properly paginate the `dmarcSummaries` connection.', 'You must provide a `first` or `last` value to properly paginate the `domain` connection.': 'You must provide a `first` or `last` value to properly paginate the `domain` connection.', - 'You must provide a `first` or `last` value to properly paginate the `https` connection.': - 'You must provide a `first` or `last` value to properly paginate the `https` connection.', - 'You must provide a `first` or `last` value to properly paginate the `ssl` connection.': - 'You must provide a `first` or `last` value to properly paginate the `ssl` connection.', - 'You must provide a `first` or `last` value to properly paginate the `verifiedOrganization` connection.': - 'You must provide a `first` or `last` value to properly paginate the `verifiedOrganization` connection.', 'You must provide a `period` value to access the `dmarcSummaries` connection.': 'You must provide a `period` value to access the `dmarcSummaries` connection.', 'You must provide a `year` value to access the `dmarcSummaries` connection.': @@ -559,6 +557,11 @@ ['argSet'], '` on the `GuidanceTag` connection cannot be less than zero.', ], + '`{argSet}` on the `HTTPS` connection cannot be less than zero.': [ + '`', + ['argSet'], + '` on the `HTTPS` connection cannot be less than zero.', + ], '`{argSet}` on the `Organization` connection cannot be less than zero.': [ '`', ['argSet'], @@ -569,6 +572,11 @@ ['argSet'], '` on the `SPF` connection cannot be less than zero.', ], + '`{argSet}` on the `SSL` connection cannot be less than zero.': [ + '`', + ['argSet'], + '` on the `SSL` connection cannot be less than zero.', + ], '`{argSet}` on the `SpfFailureTable` connection cannot be less than zero.': [ '`', ['argSet'], @@ -579,6 +587,11 @@ ['argSet'], '` on the `VerifiedDomain` connection cannot be less than zero.', ], + '`{argSet}` on the `VerifiedOrganization` connection cannot be less than zero.': [ + '`', + ['argSet'], + '` on the `VerifiedOrganization` connection cannot be less than zero.', + ], '`{argSet}` on the `affiliations` cannot be less than zero.': [ '`', ['argSet'], @@ -594,21 +607,6 @@ ['argSet'], '` on the `domain` connection cannot be less than zero.', ], - '`{argSet}` on the `https` connection cannot be less than zero.': [ - '`', - ['argSet'], - '` on the `https` connection cannot be less than zero.', - ], - '`{argSet}` on the `ssl` connection cannot be less than zero.': [ - '`', - ['argSet'], - '` on the `ssl` connection cannot be less than zero.', - ], - '`{argSet}` on the `verifiedOrganization` connection cannot be less than zero.': [ - '`', - ['argSet'], - '` on the `verifiedOrganization` connection cannot be less than zero.', - ], fail: 'fail', pass: 'pass', }, diff --git a/api-js/src/locale/en/messages.po b/api-js/src/locale/en/messages.po index b3609a5c3..2bff55e8e 100644 --- a/api-js/src/locale/en/messages.po +++ b/api-js/src/locale/en/messages.po @@ -11,7 +11,6 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" -#: src/user/mutations/send-phone-code.js:52 #: src/user/mutations/update-user-profile.js:66 #: src/user/mutations/verify-phone-number.js:39 #: src/user/mutations/verify-phone-number.js:53 @@ -394,10 +393,6 @@ msgstr "Token value incorrect, please sign in again." msgid "Too many failed login attempts, please reset your password, and try again." msgstr "Too many failed login attempts, please reset your password, and try again.<<<<<<< HEAD=======" -#: src/user/mutations/send-phone-code.js:128 -msgid "Two factor code has been successfully sent, you will receive a text message shortly." -msgstr "Two factor code has been successfully sent, you will receive a text message shortly.>>>>>>> update user error messages" - #: src/user/mutations/verify-phone-number.js:78 msgid "Two factor code is incorrect. Please try again." msgstr "Two factor code is incorrect. Please try again." @@ -464,8 +459,8 @@ msgstr "Unable to find DKIM scan(s). Please try again." msgid "Unable to find DMARC guidance tag(s). Please try again." msgstr "Unable to find DMARC guidance tag(s). Please try again." -#: src/email-scan/loaders/load-dmarc-by-key.js:18 -#: src/email-scan/loaders/load-dmarc-by-key.js:30 +#: src/email-scan/loaders/load-dmarc-by-key.js:19 +#: src/email-scan/loaders/load-dmarc-by-key.js:33 msgid "Unable to find DMARC scan(s). Please try again." msgstr "Unable to find DMARC scan(s). Please try again." @@ -773,17 +768,11 @@ msgstr "Unable to reset password. Please try again." msgid "Unable to select DMARC report(s) for this period and year." msgstr "Unable to select DMARC report(s) for this period and year." -#: src/user/mutations/send-phone-code.js:66 -#: src/user/mutations/send-phone-code.js:85 -#: src/user/mutations/send-phone-code.js:115 -msgid "Unable to send TFA code, please try again." -msgstr "Unable to send TFA code, please try again." - -#: src/notify/notify-send-authenticate-email.js:18 +#: src/notify/notify-send-authenticate-email.js:19 msgid "Unable to send authentication email. Please try again." msgstr "Unable to send authentication email. Please try again." -#: src/notify/notify-send-authenticate-text-msg.js:31 +#: src/notify/notify-send-authenticate-text-msg.js:32 msgid "Unable to send authentication text message. Please try again." msgstr "Unable to send authentication text message. Please try again." diff --git a/api-js/src/locale/fr/messages.js b/api-js/src/locale/fr/messages.js index d773bcd9b..e0014c97b 100644 --- a/api-js/src/locale/fr/messages.js +++ b/api-js/src/locale/fr/messages.js @@ -17,6 +17,7 @@ 'New passwords do not match. Please try again.': 'todo', 'No organization with the provided slug could be found.': 'todo', 'No verified domain with the provided domain could be found.': 'todo', + 'No verified organization with the provided slug could be found.': 'todo', 'Organization has already been verified.': 'todo', 'Organization name already in use, please choose another and try again.': 'todo', @@ -36,26 +37,26 @@ 'todo', 'Passing both `first` and `last` to paginate the `GuidanceTag` connection is not supported.': 'todo', + 'Passing both `first` and `last` to paginate the `HTTPS` connection is not supported.': + 'todo', 'Passing both `first` and `last` to paginate the `Organization` connection is not supported.': 'todo', 'Passing both `first` and `last` to paginate the `SPF` connection is not supported.': 'todo', + 'Passing both `first` and `last` to paginate the `SSL` connection is not supported.': + 'todo', 'Passing both `first` and `last` to paginate the `SpfFailureTable` connection is not supported.': 'todo', 'Passing both `first` and `last` to paginate the `VerifiedDomain` connection is not supported.': 'todo', + 'Passing both `first` and `last` to paginate the `VerifiedOrganization` connection is not supported.': + 'todo', 'Passing both `first` and `last` to paginate the `affiliation` is not supported.': 'todo', 'Passing both `first` and `last` to paginate the `dmarcSummaries` connection is not supported.': 'todo', 'Passing both `first` and `last` to paginate the `domain` connection is not supported.': 'todo', - 'Passing both `first` and `last` to paginate the `https` connection is not supported.': - 'todo', - 'Passing both `first` and `last` to paginate the `ssl` connection is not supported.': - 'todo', - 'Passing both `first` and `last` to paginate the `verifiedOrganization` connection is not supported.': - 'todo', 'Password does not meet requirements.': 'todo', 'Password does not requirements. Please try again.': 'todo', 'Password was successfully reset.': 'todo', @@ -109,25 +110,25 @@ 'todo', 'Requesting `{amount}` records on the `VerifiedDomain` connection exceeds the `{argSet}` limit of 100 records.': 'todo', + 'Requesting `{amount}` records on the `VerifiedOrganization` connection exceeds the `{argSet}` limit of 100 records.': + 'todo', 'Requesting `{amount}` records on the `affiliations` exceeds the `{argSet}` limit of 100 records.': 'todo', 'Requesting `{amount}` records on the `dmarcSummaries` connection exceeds the `{argSet}` limit of 100 records.': 'todo', 'Requesting `{amount}` records on the `domain` connection exceeds the `{argSet}` limit of 100 records.': 'todo', - 'Requesting `{amount}` records on the `verifiedOrganization` connection exceeds the `{argSet}` limit of 100 records.': - 'todo', 'Requesting {amount} records on the `DKIMResults` connection exceeds the `{argSet}` limit of 100 records.': 'todo', 'Requesting {amount} records on the `DKIM` connection exceeds the `{argSet}` limit of 100 records.': 'todo', 'Requesting {amount} records on the `DMARC` connection exceeds the `{argSet}` limit of 100 records.': 'todo', - 'Requesting {amount} records on the `SPF` connection exceeds the `{argSet}` limit of 100 records.': + 'Requesting {amount} records on the `HTTPS` connection exceeds the `{argSet}` limit of 100 records.': 'todo', - 'Requesting {amount} records on the `https` connection exceeds the `{argSet}` limit of 100 records.': + 'Requesting {amount} records on the `SPF` connection exceeds the `{argSet}` limit of 100 records.': 'todo', - 'Requesting {amount} records on the `ssl` connection exceeds the `{argSet}` limit of 100 records.': + 'Requesting {amount} records on the `SSL` connection exceeds the `{argSet}` limit of 100 records.': 'todo', 'Successfully dispatched one time scan.': 'todo', 'Successfully email verified account, and set TFA send method to email.': @@ -144,8 +145,6 @@ 'Token value incorrect, please sign in again.': 'todo', 'Too many failed login attempts, please reset your password, and try again.': 'todo<<<<<<< HEAD=======', - 'Two factor code has been successfully sent, you will receive a text message shortly.': - 'todo>>>>>>> update user error messages', 'Two factor code is incorrect. Please try again.': 'todo', 'Two factor code length is incorrect. Please try again.': 'todo', 'Unable to add user to organization. Please try again.': 'todo', @@ -162,14 +161,14 @@ 'Unable to find DMARC scan(s). Please try again.': 'todo', 'Unable to find DMARC summary data. Please try again.': 'todo', 'Unable to find HTTPS guidance tag(s). Please try again.': 'todo', + 'Unable to find HTTPS scan(s). Please try again.': 'todo', 'Unable to find SPF guidance tag(s). Please try again.': 'todo', 'Unable to find SPF scan(s). Please try again.': 'todo', 'Unable to find SSL guidance tag(s). Please try again.': 'todo', - 'Unable to find https scan. Please try again.': 'todo', - 'Unable to find ssl scan. Please try again.': 'todo', + 'Unable to find SSL scan(s). Please try again.': 'todo', 'Unable to find the requested domain.': 'todo', 'Unable to find user affiliation(s). Please try again.': 'todo', - 'Unable to find verified organization. Please try again.': 'todo', + 'Unable to find verified organization(s). Please try again.': 'todo', 'Unable to invite user to unknown organization.': 'todo', 'Unable to invite user. Please try again.': 'todo', 'Unable to invite yourself to an org.': 'todo', @@ -182,24 +181,24 @@ 'Unable to load DMARC scan(s). Please try again.': 'todo', 'Unable to load DMARC summary data. Please try again.': 'todo', 'Unable to load HTTPS guidance tag(s). Please try again.': 'todo', + 'Unable to load HTTPS scan(s). Please try again.': 'todo', 'Unable to load SPF failure data. Please try again.': 'todo', 'Unable to load SPF guidance tag(s). Please try again.': 'todo', 'Unable to load SPF scan(s). Please try again.': 'todo', 'Unable to load SSL guidance tag(s). Please try again.': 'todo', + 'Unable to load SSL scan(s). Please try again.': 'todo', 'Unable to load affiliation(s). Please try again.': 'todo', 'Unable to load domain(s). Please try again.': 'todo', 'Unable to load domain. Please try again.': 'todo', 'Unable to load domains. Please try again.': 'todo', 'Unable to load full pass data. Please try again.': 'todo', - 'Unable to load https scans. Please try again.': 'todo', 'Unable to load mail summary. Please try again.': 'todo', 'Unable to load organization(s). Please try again.': 'todo', 'Unable to load organizations. Please try again.': 'todo', - 'Unable to load ssl scans. Please try again.': 'todo', 'Unable to load summary. Please try again.': 'todo', 'Unable to load user(s). Please try again.': 'todo', 'Unable to load verified domain(s). Please try again.': 'todo', - 'Unable to load verified organizations. Please try again.': 'todo', + 'Unable to load verified organization(s). Please try again.': 'todo', 'Unable to load web summary. Please try again.': 'todo', 'Unable to query affiliation(s). Please try again.': 'todo', 'Unable to query domain(s). Please try again.': 'todo', @@ -219,7 +218,6 @@ 'Unable to reset password. Please request a new email.': 'todo', 'Unable to reset password. Please try again.': 'todo', 'Unable to select DMARC report(s) for this period and year.': 'todo', - 'Unable to send TFA code, please try again.': 'todo', 'Unable to send authentication email. Please try again.': 'todo', 'Unable to send authentication text message. Please try again.': 'todo', 'Unable to send org invite email. Please try again.': 'todo', @@ -277,26 +275,26 @@ 'todo', 'You must provide a `first` or `last` value to properly paginate the `GuidanceTag` connection.': 'todo', + 'You must provide a `first` or `last` value to properly paginate the `HTTPS` connection.': + 'todo', 'You must provide a `first` or `last` value to properly paginate the `Organization` connection.': 'todo', 'You must provide a `first` or `last` value to properly paginate the `SPF` connection.': 'todo', + 'You must provide a `first` or `last` value to properly paginate the `SSL` connection.': + 'todo', 'You must provide a `first` or `last` value to properly paginate the `SpfFailureTable` connection.': 'todo', 'You must provide a `first` or `last` value to properly paginate the `VerifiedDomain` connection.': 'todo', + 'You must provide a `first` or `last` value to properly paginate the `VerifiedOrganization` connection.': + 'todo', 'You must provide a `first` or `last` value to properly paginate the `affiliation`.': 'todo', 'You must provide a `first` or `last` value to properly paginate the `dmarcSummaries` connection.': 'todo', 'You must provide a `first` or `last` value to properly paginate the `domain` connection.': 'todo', - 'You must provide a `first` or `last` value to properly paginate the `https` connection.': - 'todo', - 'You must provide a `first` or `last` value to properly paginate the `ssl` connection.': - 'todo', - 'You must provide a `first` or `last` value to properly paginate the `verifiedOrganization` connection.': - 'todo', 'You must provide a `period` value to access the `dmarcSummaries` connection.': 'todo', 'You must provide a `year` value to access the `dmarcSummaries` connection.': @@ -314,21 +312,21 @@ 'todo', '`{argSet}` on the `GuidanceTag` connection cannot be less than zero.': 'todo', + '`{argSet}` on the `HTTPS` connection cannot be less than zero.': 'todo', '`{argSet}` on the `Organization` connection cannot be less than zero.': 'todo', '`{argSet}` on the `SPF` connection cannot be less than zero.': 'todo', + '`{argSet}` on the `SSL` connection cannot be less than zero.': 'todo', '`{argSet}` on the `SpfFailureTable` connection cannot be less than zero.': 'todo', '`{argSet}` on the `VerifiedDomain` connection cannot be less than zero.': 'todo', + '`{argSet}` on the `VerifiedOrganization` connection cannot be less than zero.': + 'todo', '`{argSet}` on the `affiliations` cannot be less than zero.': 'todo', '`{argSet}` on the `dmarcSummaries` connection cannot be less than zero.': 'todo', '`{argSet}` on the `domain` connection cannot be less than zero.': 'todo', - '`{argSet}` on the `https` connection cannot be less than zero.': 'todo', - '`{argSet}` on the `ssl` connection cannot be less than zero.': 'todo', - '`{argSet}` on the `verifiedOrganization` connection cannot be less than zero.': - 'todo', fail: 'todo', pass: 'todo', }, diff --git a/api-js/src/locale/fr/messages.po b/api-js/src/locale/fr/messages.po index 785a2c155..662f9f4cc 100644 --- a/api-js/src/locale/fr/messages.po +++ b/api-js/src/locale/fr/messages.po @@ -11,7 +11,6 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" -#: src/user/mutations/send-phone-code.js:52 #: src/user/mutations/update-user-profile.js:66 #: src/user/mutations/verify-phone-number.js:39 #: src/user/mutations/verify-phone-number.js:53 @@ -394,10 +393,6 @@ msgstr "todo" msgid "Too many failed login attempts, please reset your password, and try again." msgstr "todo<<<<<<< HEAD=======" -#: src/user/mutations/send-phone-code.js:128 -msgid "Two factor code has been successfully sent, you will receive a text message shortly." -msgstr "todo>>>>>>> update user error messages" - #: src/user/mutations/verify-phone-number.js:78 msgid "Two factor code is incorrect. Please try again." msgstr "todo" @@ -464,8 +459,8 @@ msgstr "todo" msgid "Unable to find DMARC guidance tag(s). Please try again." msgstr "todo" -#: src/email-scan/loaders/load-dmarc-by-key.js:18 -#: src/email-scan/loaders/load-dmarc-by-key.js:30 +#: src/email-scan/loaders/load-dmarc-by-key.js:19 +#: src/email-scan/loaders/load-dmarc-by-key.js:33 msgid "Unable to find DMARC scan(s). Please try again." msgstr "todo" @@ -773,17 +768,11 @@ msgstr "todo" msgid "Unable to select DMARC report(s) for this period and year." msgstr "todo" -#: src/user/mutations/send-phone-code.js:66 -#: src/user/mutations/send-phone-code.js:85 -#: src/user/mutations/send-phone-code.js:115 -msgid "Unable to send TFA code, please try again." -msgstr "todo" - -#: src/notify/notify-send-authenticate-email.js:18 +#: src/notify/notify-send-authenticate-email.js:19 msgid "Unable to send authentication email. Please try again." msgstr "todo" -#: src/notify/notify-send-authenticate-text-msg.js:31 +#: src/notify/notify-send-authenticate-text-msg.js:32 msgid "Unable to send authentication text message. Please try again." msgstr "todo" From f3ad724ba1e1c73aa1de4361fc280939b20031eb Mon Sep 17 00:00:00 2001 From: nsdeschenes Date: Mon, 15 Mar 2021 06:54:17 -0300 Subject: [PATCH 16/21] fix grammar in update user roles error messages --- .../__tests__/update-user-role.test.js | 32 +++++++++---------- .../affiliation/mutations/update-user-role.js | 32 +++++++++---------- api-js/src/locale/en/messages.po | 24 +++++++------- api-js/src/locale/fr/messages.po | 16 +++++----- 4 files changed, 52 insertions(+), 52 deletions(-) diff --git a/api-js/src/affiliation/mutations/__tests__/update-user-role.test.js b/api-js/src/affiliation/mutations/__tests__/update-user-role.test.js index c8065ad2f..d44b2156a 100644 --- a/api-js/src/affiliation/mutations/__tests__/update-user-role.test.js +++ b/api-js/src/affiliation/mutations/__tests__/update-user-role.test.js @@ -632,7 +632,7 @@ describe('update a users role', () => { ) const error = [ - new GraphQLError('Unable to update unknown users role.'), + new GraphQLError(`Unable to update unknown user's role.`), ] expect(response.errors).toEqual(error) @@ -685,7 +685,7 @@ describe('update a users role', () => { const error = [ new GraphQLError( - 'Unable to update users role, in unknown organization.', + `Unable to update user's role, in unknown organization.`, ), ] @@ -894,7 +894,7 @@ describe('update a users role', () => { const error = [ new GraphQLError( - 'Unable to update users role that does not belong to this org. Please invite user to the organization.', + 'Unable to update role of user that does not belong to this org. Please invite user to the organization.', ), ] @@ -965,7 +965,7 @@ describe('update a users role', () => { const error = [ new GraphQLError( - 'Permission Denied: Please contact organization admin for help with updating users roles.', + `Permission Denied: Please contact organization admin for help with updating user's roles.`, ), ] @@ -1036,7 +1036,7 @@ describe('update a users role', () => { const error = [ new GraphQLError( - 'Permission Denied: Please contact organization admin for help with updating users roles.', + `Permission Denied: Please contact organization admin for help with updating user's roles.`, ), ] @@ -1108,7 +1108,7 @@ describe('update a users role', () => { const error = [ new GraphQLError( - 'Permission Denied: Please contact organization admin for help with updating users roles.', + `Permission Denied: Please contact organization admin for help with updating user's roles.`, ), ] @@ -1177,7 +1177,7 @@ describe('update a users role', () => { const error = [ new GraphQLError( - 'Permission Denied: Please contact organization admin for help with updating users roles.', + `Permission Denied: Please contact organization admin for help with updating user's roles.`, ), ] @@ -1308,12 +1308,12 @@ describe('update a users role', () => { ) const error = [ - new GraphQLError('Unable to update users role. Please try again.'), + new GraphQLError(`Unable to update user's role. Please try again.`), ] expect(response.errors).toEqual(error) expect(consoleOutput).toEqual([ - `Database error occurred when user: ${user._key} attempted to update a users: ${secondaryUser._key} role, error: Error: Database error occurred.`, + `Database error occurred when user: ${user._key} attempted to update a user's: ${secondaryUser._key} role, error: Error: Database error occurred.`, ]) }) }) @@ -1429,12 +1429,12 @@ describe('update a users role', () => { ) const error = [ - new GraphQLError('Unable to update users role. Please try again.'), + new GraphQLError(`Unable to update user's role. Please try again.`), ] expect(response.errors).toEqual(error) expect(consoleOutput).toEqual([ - `Transaction step error occurred when user: ${user._key} attempted to update a users: ${secondaryUser._key} role, error: Error: Transaction error occurred.`, + `Transaction step error occurred when user: ${user._key} attempted to update a user's: ${secondaryUser._key} role, error: Error: Transaction error occurred.`, ]) }) }) @@ -1494,12 +1494,12 @@ describe('update a users role', () => { ) const error = [ - new GraphQLError('Unable to update users role. Please try again.'), + new GraphQLError(`Unable to update user's role. Please try again.`), ] expect(response.errors).toEqual(error) expect(consoleOutput).toEqual([ - `Transaction commit error occurred when user: ${user._key} attempted to update a users: ${secondaryUser._key} role, error: Error: Transaction error occurred.`, + `Transaction commit error occurred when user: ${user._key} attempted to update a user's: ${secondaryUser._key} role, error: Error: Transaction error occurred.`, ]) }) }) @@ -2693,7 +2693,7 @@ describe('update a users role', () => { expect(response.errors).toEqual(error) expect(consoleOutput).toEqual([ - `Database error occurred when user: ${user._key} attempted to update a users: ${secondaryUser._key} role, error: Error: Database error occurred.`, + `Database error occurred when user: ${user._key} attempted to update a user's: ${secondaryUser._key} role, error: Error: Database error occurred.`, ]) }) }) @@ -2812,7 +2812,7 @@ describe('update a users role', () => { expect(response.errors).toEqual(error) expect(consoleOutput).toEqual([ - `Transaction step error occurred when user: ${user._key} attempted to update a users: ${secondaryUser._key} role, error: Error: Transaction error occurred.`, + `Transaction step error occurred when user: ${user._key} attempted to update a user's: ${secondaryUser._key} role, error: Error: Transaction error occurred.`, ]) }) }) @@ -2875,7 +2875,7 @@ describe('update a users role', () => { expect(response.errors).toEqual(error) expect(consoleOutput).toEqual([ - `Transaction commit error occurred when user: ${user._key} attempted to update a users: ${secondaryUser._key} role, error: Error: Transaction error occurred.`, + `Transaction commit error occurred when user: ${user._key} attempted to update a user's: ${secondaryUser._key} role, error: Error: Transaction error occurred.`, ]) }) }) diff --git a/api-js/src/affiliation/mutations/update-user-role.js b/api-js/src/affiliation/mutations/update-user-role.js index bec38bf72..b7b000ad5 100644 --- a/api-js/src/affiliation/mutations/update-user-role.js +++ b/api-js/src/affiliation/mutations/update-user-role.js @@ -70,7 +70,7 @@ given organization.`, console.warn( `User: ${userKey} attempted to update a user: ${userName} role in org: ${orgId}, however there is no user associated with that user name.`, ) - throw new Error(i18n._(t`Unable to update unknown users role.`)) + throw new Error(i18n._(t`Unable to update unknown user's role.`)) } // Check to see if org exists @@ -81,11 +81,11 @@ given organization.`, `User: ${userKey} attempted to update a user: ${requestedUser._key} role in org: ${orgId}, however there is no org associated with that id.`, ) throw new Error( - i18n._(t`Unable to update users role, in unknown organization.`), + i18n._(t`Unable to update user's role, in unknown organization.`), ) } - // Check requesting users permission + // Check requesting user's permission const permission = await checkPermission({ orgId: org._id }) if (permission === 'user' || typeof permission === 'undefined') { @@ -99,7 +99,7 @@ given organization.`, ) } - // Get users current permission level + // Get user's current permission level let affiliationCursor try { affiliationCursor = await query` @@ -109,9 +109,9 @@ given organization.`, ` } catch (err) { console.error( - `Database error occurred when user: ${userKey} attempted to update a users: ${requestedUser._key} role, error: ${err}`, + `Database error occurred when user: ${userKey} attempted to update a user's: ${requestedUser._key} role, error: ${err}`, ) - throw new Error(i18n._(t`Unable to update users role. Please try again.`)) + throw new Error(i18n._(t`Unable to update user's role. Please try again.`)) } if (affiliationCursor.count < 1) { @@ -120,7 +120,7 @@ given organization.`, ) throw new Error( i18n._( - t`Unable to update users role that does not belong to this org. Please invite user to the organization.`, + t`Unable to update role of user that does not belong to this org. Please invite user to the organization.`, ), ) } @@ -148,14 +148,14 @@ given organization.`, role === 'admin' && (permission === 'admin' || permission === 'super_admin') ) { - // If requested users permission is super admin, make sure they don't get downgraded + // If requested user's permission is super admin, make sure they don't get downgraded if (affiliation.permission === 'super_admin') { console.warn( `User: ${userKey} attempted to lower user: ${requestedUser._key} from ${affiliation.permission} to: admin.`, ) throw new Error( i18n._( - t`Permission Denied: Please contact organization admin for help with updating users roles.`, + t`Permission Denied: Please contact organization admin for help with updating user's roles.`, ), ) } @@ -166,7 +166,7 @@ given organization.`, permission: 'admin', } } else if (role === 'user' && permission === 'super_admin') { - // If requested users permission is super admin or admin, make sure they don't get downgraded + // If requested user's permission is super admin or admin, make sure they don't get downgraded if ( affiliation.permission === 'super_admin' || (affiliation.permission === 'admin' && permission !== 'super_admin') @@ -176,7 +176,7 @@ given organization.`, ) throw new Error( i18n._( - t`Permission Denied: Please contact organization admin for help with updating users roles.`, + t`Permission Denied: Please contact organization admin for help with updating user's roles.`, ), ) } @@ -192,7 +192,7 @@ given organization.`, ) throw new Error( i18n._( - t`Permission Denied: Please contact organization admin for help with updating users roles.`, + t`Permission Denied: Please contact organization admin for help with updating user's roles.`, ), ) } @@ -208,18 +208,18 @@ given organization.`, }) } catch (err) { console.error( - `Transaction step error occurred when user: ${userKey} attempted to update a users: ${requestedUser._key} role, error: ${err}`, + `Transaction step error occurred when user: ${userKey} attempted to update a user's: ${requestedUser._key} role, error: ${err}`, ) - throw new Error(i18n._(t`Unable to update users role. Please try again.`)) + throw new Error(i18n._(t`Unable to update user's role. Please try again.`)) } try { await trx.commit() } catch (err) { console.warn( - `Transaction commit error occurred when user: ${userKey} attempted to update a users: ${requestedUser._key} role, error: ${err}`, + `Transaction commit error occurred when user: ${userKey} attempted to update a user's: ${requestedUser._key} role, error: ${err}`, ) - throw new Error(i18n._(t`Unable to update users role. Please try again.`)) + throw new Error(i18n._(t`Unable to update user's role. Please try again.`)) } console.info( diff --git a/api-js/src/locale/en/messages.po b/api-js/src/locale/en/messages.po index 2bff55e8e..d27cc69a9 100644 --- a/api-js/src/locale/en/messages.po +++ b/api-js/src/locale/en/messages.po @@ -212,8 +212,8 @@ msgstr "Permission Denied: Please contact organization admin for help with updat #: src/affiliation/mutations/update-user-role.js:158 #: src/affiliation/mutations/update-user-role.js:179 #: src/affiliation/mutations/update-user-role.js:195 -msgid "Permission Denied: Please contact organization admin for help with updating users roles." -msgstr "Permission Denied: Please contact organization admin for help with updating users roles." +msgid "Permission Denied: Please contact organization admin for help with updating user's roles." +msgstr "Permission Denied: Please contact organization admin for help with updating user's roles." #: src/affiliation/mutations/invite-user-to-org.js:91 msgid "Permission Denied: Please contact organization admin for help with user invitations." @@ -860,6 +860,10 @@ msgstr "Unable to update password. Please try again.<<<<<<< HEAD" msgid "Unable to update profile. Please try again." msgstr "Unable to update profile. Please try again." +#: src/affiliation/mutations/update-user-role.js:123 +msgid "Unable to update role of user that does not belong to this org. Please invite user to the organization." +msgstr "Unable to update role of user that does not belong to this org. Please invite user to the organization." + #: src/domain/mutations/update-domain.js:74 msgid "Unable to update unknown domain." msgstr "Unable to update unknown domain." @@ -869,22 +873,18 @@ msgid "Unable to update unknown organization." msgstr "Unable to update unknown organization." #: src/affiliation/mutations/update-user-role.js:73 -msgid "Unable to update unknown users role." -msgstr "Unable to update unknown users role." - -#: src/affiliation/mutations/update-user-role.js:123 -msgid "Unable to update users role that does not belong to this org. Please invite user to the organization." -msgstr "Unable to update users role that does not belong to this org. Please invite user to the organization." +msgid "Unable to update unknown user's role." +msgstr "Unable to update unknown user's role." #: src/affiliation/mutations/update-user-role.js:84 -msgid "Unable to update users role, in unknown organization." -msgstr "Unable to update users role, in unknown organization." +msgid "Unable to update user's role, in unknown organization." +msgstr "Unable to update user's role, in unknown organization." #: src/affiliation/mutations/update-user-role.js:114 #: src/affiliation/mutations/update-user-role.js:213 #: src/affiliation/mutations/update-user-role.js:222 -msgid "Unable to update users role. Please try again." -msgstr "Unable to update users role. Please try again." +msgid "Unable to update user's role. Please try again." +msgstr "Unable to update user's role. Please try again." #: src/affiliation/mutations/update-user-role.js:63 msgid "Unable to update your own role." diff --git a/api-js/src/locale/fr/messages.po b/api-js/src/locale/fr/messages.po index 662f9f4cc..908d5deb6 100644 --- a/api-js/src/locale/fr/messages.po +++ b/api-js/src/locale/fr/messages.po @@ -212,7 +212,7 @@ msgstr "todo" #: src/affiliation/mutations/update-user-role.js:158 #: src/affiliation/mutations/update-user-role.js:179 #: src/affiliation/mutations/update-user-role.js:195 -msgid "Permission Denied: Please contact organization admin for help with updating users roles." +msgid "Permission Denied: Please contact organization admin for help with updating user's roles." msgstr "todo" #: src/affiliation/mutations/invite-user-to-org.js:91 @@ -860,6 +860,10 @@ msgstr "todo<<<<<<< HEAD" msgid "Unable to update profile. Please try again." msgstr "todo" +#: src/affiliation/mutations/update-user-role.js:123 +msgid "Unable to update role of user that does not belong to this org. Please invite user to the organization." +msgstr "todo" + #: src/domain/mutations/update-domain.js:74 msgid "Unable to update unknown domain." msgstr "todo" @@ -869,21 +873,17 @@ msgid "Unable to update unknown organization." msgstr "todo" #: src/affiliation/mutations/update-user-role.js:73 -msgid "Unable to update unknown users role." -msgstr "todo" - -#: src/affiliation/mutations/update-user-role.js:123 -msgid "Unable to update users role that does not belong to this org. Please invite user to the organization." +msgid "Unable to update unknown user's role." msgstr "todo" #: src/affiliation/mutations/update-user-role.js:84 -msgid "Unable to update users role, in unknown organization." +msgid "Unable to update user's role, in unknown organization." msgstr "todo" #: src/affiliation/mutations/update-user-role.js:114 #: src/affiliation/mutations/update-user-role.js:213 #: src/affiliation/mutations/update-user-role.js:222 -msgid "Unable to update users role. Please try again." +msgid "Unable to update user's role. Please try again." msgstr "todo" #: src/affiliation/mutations/update-user-role.js:63 From 330e9f3fdb56774021aeb5729e5c229551dd7648 Mon Sep 17 00:00:00 2001 From: nsdeschenes Date: Mon, 15 Mar 2021 09:32:28 -0300 Subject: [PATCH 17/21] update user role error messages --- .../__tests__/update-user-role.test.js | 8 +++---- .../affiliation/mutations/update-user-role.js | 22 ++++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/api-js/src/affiliation/mutations/__tests__/update-user-role.test.js b/api-js/src/affiliation/mutations/__tests__/update-user-role.test.js index d44b2156a..85f733b33 100644 --- a/api-js/src/affiliation/mutations/__tests__/update-user-role.test.js +++ b/api-js/src/affiliation/mutations/__tests__/update-user-role.test.js @@ -632,7 +632,7 @@ describe('update a users role', () => { ) const error = [ - new GraphQLError(`Unable to update unknown user's role.`), + new GraphQLError(`Unable to update role: user unknown.`), ] expect(response.errors).toEqual(error) @@ -684,9 +684,7 @@ describe('update a users role', () => { ) const error = [ - new GraphQLError( - `Unable to update user's role, in unknown organization.`, - ), + new GraphQLError(`Unable to update role: organization unknown.`), ] expect(response.errors).toEqual(error) @@ -894,7 +892,7 @@ describe('update a users role', () => { const error = [ new GraphQLError( - 'Unable to update role of user that does not belong to this org. Please invite user to the organization.', + 'Unable to update role: user does not belong to organization.', ), ] diff --git a/api-js/src/affiliation/mutations/update-user-role.js b/api-js/src/affiliation/mutations/update-user-role.js index b7b000ad5..6797fe4a1 100644 --- a/api-js/src/affiliation/mutations/update-user-role.js +++ b/api-js/src/affiliation/mutations/update-user-role.js @@ -70,7 +70,7 @@ given organization.`, console.warn( `User: ${userKey} attempted to update a user: ${userName} role in org: ${orgId}, however there is no user associated with that user name.`, ) - throw new Error(i18n._(t`Unable to update unknown user's role.`)) + throw new Error(i18n._(t`Unable to update role: user unknown.`)) } // Check to see if org exists @@ -80,9 +80,7 @@ given organization.`, console.warn( `User: ${userKey} attempted to update a user: ${requestedUser._key} role in org: ${orgId}, however there is no org associated with that id.`, ) - throw new Error( - i18n._(t`Unable to update user's role, in unknown organization.`), - ) + throw new Error(i18n._(t`Unable to update role: organization unknown.`)) } // Check requesting user's permission @@ -111,7 +109,9 @@ given organization.`, console.error( `Database error occurred when user: ${userKey} attempted to update a user's: ${requestedUser._key} role, error: ${err}`, ) - throw new Error(i18n._(t`Unable to update user's role. Please try again.`)) + throw new Error( + i18n._(t`Unable to update user's role. Please try again.`), + ) } if (affiliationCursor.count < 1) { @@ -119,9 +119,7 @@ given organization.`, `User: ${userKey} attempted to update a user: ${requestedUser._key} role in org: ${org.slug}, however that user does not have an affiliation with that organization.`, ) throw new Error( - i18n._( - t`Unable to update role of user that does not belong to this org. Please invite user to the organization.`, - ), + i18n._(t`Unable to update role: user does not belong to organization.`), ) } @@ -210,7 +208,9 @@ given organization.`, console.error( `Transaction step error occurred when user: ${userKey} attempted to update a user's: ${requestedUser._key} role, error: ${err}`, ) - throw new Error(i18n._(t`Unable to update user's role. Please try again.`)) + throw new Error( + i18n._(t`Unable to update user's role. Please try again.`), + ) } try { @@ -219,7 +219,9 @@ given organization.`, console.warn( `Transaction commit error occurred when user: ${userKey} attempted to update a user's: ${requestedUser._key} role, error: ${err}`, ) - throw new Error(i18n._(t`Unable to update user's role. Please try again.`)) + throw new Error( + i18n._(t`Unable to update user's role. Please try again.`), + ) } console.info( From 598116a43b402414c0ed21eccd581c4b624d7698 Mon Sep 17 00:00:00 2001 From: nsdeschenes Date: Mon, 15 Mar 2021 09:33:18 -0300 Subject: [PATCH 18/21] update translations --- api-js/src/locale/en/messages.js | 20 ++++++++--------- api-js/src/locale/en/messages.po | 38 ++++++++++++++++---------------- api-js/src/locale/fr/messages.js | 11 +++++---- api-js/src/locale/fr/messages.po | 36 +++++++++++++++--------------- 4 files changed, 52 insertions(+), 53 deletions(-) diff --git a/api-js/src/locale/en/messages.js b/api-js/src/locale/en/messages.js index 3757331b6..f0d6b0760 100644 --- a/api-js/src/locale/en/messages.js +++ b/api-js/src/locale/en/messages.js @@ -87,8 +87,8 @@ 'Permission Denied: Please contact organization admin for help with removing users.', 'Permission Denied: Please contact organization admin for help with updating organization.': 'Permission Denied: Please contact organization admin for help with updating organization.', - 'Permission Denied: Please contact organization admin for help with updating users roles.': - 'Permission Denied: Please contact organization admin for help with updating users roles.', + "Permission Denied: Please contact organization admin for help with updating user's roles.": + "Permission Denied: Please contact organization admin for help with updating user's roles.", 'Permission Denied: Please contact organization admin for help with user invitations.': 'Permission Denied: Please contact organization admin for help with user invitations.', 'Permission Denied: Please contact organization admin for help with user role changes.': @@ -449,17 +449,17 @@ 'Unable to update password. Please try again.<<<<<<< HEAD', 'Unable to update profile. Please try again.': 'Unable to update profile. Please try again.', + 'Unable to update role: organization unknown.': + 'Unable to update role: organization unknown.', + 'Unable to update role: user does not belong to organization.': + 'Unable to update role: user does not belong to organization.', + 'Unable to update role: user unknown.': + 'Unable to update role: user unknown.', 'Unable to update unknown domain.': 'Unable to update unknown domain.', 'Unable to update unknown organization.': 'Unable to update unknown organization.', - 'Unable to update unknown users role.': - 'Unable to update unknown users role.', - 'Unable to update users role that does not belong to this org. Please invite user to the organization.': - 'Unable to update users role that does not belong to this org. Please invite user to the organization.', - 'Unable to update users role, in unknown organization.': - 'Unable to update users role, in unknown organization.', - 'Unable to update users role. Please try again.': - 'Unable to update users role. Please try again.', + "Unable to update user's role. Please try again.": + "Unable to update user's role. Please try again.", 'Unable to update your own role.': 'Unable to update your own role.', 'Unable to verify account. Please request a new email.': 'Unable to verify account. Please request a new email.', diff --git a/api-js/src/locale/en/messages.po b/api-js/src/locale/en/messages.po index d27cc69a9..4a559daf8 100644 --- a/api-js/src/locale/en/messages.po +++ b/api-js/src/locale/en/messages.po @@ -209,9 +209,9 @@ msgstr "Permission Denied: Please contact organization admin for help with remov msgid "Permission Denied: Please contact organization admin for help with updating organization." msgstr "Permission Denied: Please contact organization admin for help with updating organization." -#: src/affiliation/mutations/update-user-role.js:158 -#: src/affiliation/mutations/update-user-role.js:179 -#: src/affiliation/mutations/update-user-role.js:195 +#: src/affiliation/mutations/update-user-role.js:156 +#: src/affiliation/mutations/update-user-role.js:177 +#: src/affiliation/mutations/update-user-role.js:193 msgid "Permission Denied: Please contact organization admin for help with updating user's roles." msgstr "Permission Denied: Please contact organization admin for help with updating user's roles." @@ -219,7 +219,7 @@ msgstr "Permission Denied: Please contact organization admin for help with updat msgid "Permission Denied: Please contact organization admin for help with user invitations." msgstr "Permission Denied: Please contact organization admin for help with user invitations." -#: src/affiliation/mutations/update-user-role.js:97 +#: src/affiliation/mutations/update-user-role.js:95 msgid "Permission Denied: Please contact organization admin for help with user role changes." msgstr "Permission Denied: Please contact organization admin for help with user role changes." @@ -860,9 +860,17 @@ msgstr "Unable to update password. Please try again.<<<<<<< HEAD" msgid "Unable to update profile. Please try again." msgstr "Unable to update profile. Please try again." -#: src/affiliation/mutations/update-user-role.js:123 -msgid "Unable to update role of user that does not belong to this org. Please invite user to the organization." -msgstr "Unable to update role of user that does not belong to this org. Please invite user to the organization." +#: src/affiliation/mutations/update-user-role.js:83 +msgid "Unable to update role: organization unknown." +msgstr "Unable to update role: organization unknown." + +#: src/affiliation/mutations/update-user-role.js:122 +msgid "Unable to update role: user does not belong to organization." +msgstr "Unable to update role: user does not belong to organization." + +#: src/affiliation/mutations/update-user-role.js:73 +msgid "Unable to update role: user unknown." +msgstr "Unable to update role: user unknown." #: src/domain/mutations/update-domain.js:74 msgid "Unable to update unknown domain." @@ -872,17 +880,9 @@ msgstr "Unable to update unknown domain." msgid "Unable to update unknown organization." msgstr "Unable to update unknown organization." -#: src/affiliation/mutations/update-user-role.js:73 -msgid "Unable to update unknown user's role." -msgstr "Unable to update unknown user's role." - -#: src/affiliation/mutations/update-user-role.js:84 -msgid "Unable to update user's role, in unknown organization." -msgstr "Unable to update user's role, in unknown organization." - -#: src/affiliation/mutations/update-user-role.js:114 -#: src/affiliation/mutations/update-user-role.js:213 -#: src/affiliation/mutations/update-user-role.js:222 +#: src/affiliation/mutations/update-user-role.js:113 +#: src/affiliation/mutations/update-user-role.js:212 +#: src/affiliation/mutations/update-user-role.js:223 msgid "Unable to update user's role. Please try again." msgstr "Unable to update user's role. Please try again." @@ -918,7 +918,7 @@ msgstr "Unable to verify unknown organization." msgid "User could not be queried." msgstr "User could not be queried." -#: src/affiliation/mutations/update-user-role.js:230 +#: src/affiliation/mutations/update-user-role.js:232 msgid "User role was updated successfully." msgstr "User role was updated successfully." diff --git a/api-js/src/locale/fr/messages.js b/api-js/src/locale/fr/messages.js index e0014c97b..56e64c591 100644 --- a/api-js/src/locale/fr/messages.js +++ b/api-js/src/locale/fr/messages.js @@ -71,7 +71,7 @@ 'todo', 'Permission Denied: Please contact organization admin for help with updating organization.': 'todo', - 'Permission Denied: Please contact organization admin for help with updating users roles.': + "Permission Denied: Please contact organization admin for help with updating user's roles.": 'todo', 'Permission Denied: Please contact organization admin for help with user invitations.': 'todo', @@ -244,13 +244,12 @@ 'todo', 'Unable to update password. Please try again.': 'todo<<<<<<< HEAD', 'Unable to update profile. Please try again.': 'todo', + 'Unable to update role: organization unknown.': 'todo', + 'Unable to update role: user does not belong to organization.': 'todo', + 'Unable to update role: user unknown.': 'todo', 'Unable to update unknown domain.': 'todo', 'Unable to update unknown organization.': 'todo', - 'Unable to update unknown users role.': 'todo', - 'Unable to update users role that does not belong to this org. Please invite user to the organization.': - 'todo', - 'Unable to update users role, in unknown organization.': 'todo', - 'Unable to update users role. Please try again.': 'todo', + "Unable to update user's role. Please try again.": 'todo', 'Unable to update your own role.': 'todo', 'Unable to verify account. Please request a new email.': 'todo', 'Unable to verify account. Please try again.': 'todo', diff --git a/api-js/src/locale/fr/messages.po b/api-js/src/locale/fr/messages.po index 908d5deb6..2dc38f88d 100644 --- a/api-js/src/locale/fr/messages.po +++ b/api-js/src/locale/fr/messages.po @@ -209,9 +209,9 @@ msgstr "todo" msgid "Permission Denied: Please contact organization admin for help with updating organization." msgstr "todo" -#: src/affiliation/mutations/update-user-role.js:158 -#: src/affiliation/mutations/update-user-role.js:179 -#: src/affiliation/mutations/update-user-role.js:195 +#: src/affiliation/mutations/update-user-role.js:156 +#: src/affiliation/mutations/update-user-role.js:177 +#: src/affiliation/mutations/update-user-role.js:193 msgid "Permission Denied: Please contact organization admin for help with updating user's roles." msgstr "todo" @@ -219,7 +219,7 @@ msgstr "todo" msgid "Permission Denied: Please contact organization admin for help with user invitations." msgstr "todo" -#: src/affiliation/mutations/update-user-role.js:97 +#: src/affiliation/mutations/update-user-role.js:95 msgid "Permission Denied: Please contact organization admin for help with user role changes." msgstr "todo" @@ -860,29 +860,29 @@ msgstr "todo<<<<<<< HEAD" msgid "Unable to update profile. Please try again." msgstr "todo" -#: src/affiliation/mutations/update-user-role.js:123 -msgid "Unable to update role of user that does not belong to this org. Please invite user to the organization." +#: src/affiliation/mutations/update-user-role.js:83 +msgid "Unable to update role: organization unknown." msgstr "todo" -#: src/domain/mutations/update-domain.js:74 -msgid "Unable to update unknown domain." +#: src/affiliation/mutations/update-user-role.js:122 +msgid "Unable to update role: user does not belong to organization." msgstr "todo" -#: src/organization/mutations/update-organization.js:137 -msgid "Unable to update unknown organization." +#: src/affiliation/mutations/update-user-role.js:73 +msgid "Unable to update role: user unknown." msgstr "todo" -#: src/affiliation/mutations/update-user-role.js:73 -msgid "Unable to update unknown user's role." +#: src/domain/mutations/update-domain.js:74 +msgid "Unable to update unknown domain." msgstr "todo" -#: src/affiliation/mutations/update-user-role.js:84 -msgid "Unable to update user's role, in unknown organization." +#: src/organization/mutations/update-organization.js:137 +msgid "Unable to update unknown organization." msgstr "todo" -#: src/affiliation/mutations/update-user-role.js:114 -#: src/affiliation/mutations/update-user-role.js:213 -#: src/affiliation/mutations/update-user-role.js:222 +#: src/affiliation/mutations/update-user-role.js:113 +#: src/affiliation/mutations/update-user-role.js:212 +#: src/affiliation/mutations/update-user-role.js:223 msgid "Unable to update user's role. Please try again." msgstr "todo" @@ -918,7 +918,7 @@ msgstr "todo" msgid "User could not be queried." msgstr "todo" -#: src/affiliation/mutations/update-user-role.js:230 +#: src/affiliation/mutations/update-user-role.js:232 msgid "User role was updated successfully." msgstr "todo" From b3e92878acba3faaa630b4d2c5a750a1f69f84cc Mon Sep 17 00:00:00 2001 From: nsdeschenes Date: Mon, 15 Mar 2021 10:32:40 -0300 Subject: [PATCH 19/21] more changes to updateUserRole error messages --- .../mutations/__tests__/update-user-role.test.js | 8 ++++---- api-js/src/affiliation/mutations/update-user-role.js | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/api-js/src/affiliation/mutations/__tests__/update-user-role.test.js b/api-js/src/affiliation/mutations/__tests__/update-user-role.test.js index 85f733b33..80390cbea 100644 --- a/api-js/src/affiliation/mutations/__tests__/update-user-role.test.js +++ b/api-js/src/affiliation/mutations/__tests__/update-user-role.test.js @@ -963,7 +963,7 @@ describe('update a users role', () => { const error = [ new GraphQLError( - `Permission Denied: Please contact organization admin for help with updating user's roles.`, + `Permission Denied: Please contact organization admin for help with updating user roles.`, ), ] @@ -1034,7 +1034,7 @@ describe('update a users role', () => { const error = [ new GraphQLError( - `Permission Denied: Please contact organization admin for help with updating user's roles.`, + `Permission Denied: Please contact organization admin for help with updating user roles.`, ), ] @@ -1106,7 +1106,7 @@ describe('update a users role', () => { const error = [ new GraphQLError( - `Permission Denied: Please contact organization admin for help with updating user's roles.`, + `Permission Denied: Please contact organization admin for help with updating user roles.`, ), ] @@ -1175,7 +1175,7 @@ describe('update a users role', () => { const error = [ new GraphQLError( - `Permission Denied: Please contact organization admin for help with updating user's roles.`, + `Permission Denied: Please contact organization admin for help with updating user roles.`, ), ] diff --git a/api-js/src/affiliation/mutations/update-user-role.js b/api-js/src/affiliation/mutations/update-user-role.js index 6797fe4a1..8e1c3eef2 100644 --- a/api-js/src/affiliation/mutations/update-user-role.js +++ b/api-js/src/affiliation/mutations/update-user-role.js @@ -153,7 +153,7 @@ given organization.`, ) throw new Error( i18n._( - t`Permission Denied: Please contact organization admin for help with updating user's roles.`, + t`Permission Denied: Please contact organization admin for help with updating user roles.`, ), ) } @@ -174,7 +174,7 @@ given organization.`, ) throw new Error( i18n._( - t`Permission Denied: Please contact organization admin for help with updating user's roles.`, + t`Permission Denied: Please contact organization admin for help with updating user roles.`, ), ) } @@ -190,7 +190,7 @@ given organization.`, ) throw new Error( i18n._( - t`Permission Denied: Please contact organization admin for help with updating user's roles.`, + t`Permission Denied: Please contact organization admin for help with updating user roles.`, ), ) } From 4359851be67b732e8261654c52c6d4915137ccf3 Mon Sep 17 00:00:00 2001 From: nsdeschenes Date: Mon, 15 Mar 2021 10:32:46 -0300 Subject: [PATCH 20/21] update translations --- api-js/src/locale/en/messages.js | 4 ++-- api-js/src/locale/en/messages.po | 4 ++-- api-js/src/locale/fr/messages.js | 2 +- api-js/src/locale/fr/messages.po | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api-js/src/locale/en/messages.js b/api-js/src/locale/en/messages.js index f0d6b0760..1d73adda4 100644 --- a/api-js/src/locale/en/messages.js +++ b/api-js/src/locale/en/messages.js @@ -87,8 +87,8 @@ 'Permission Denied: Please contact organization admin for help with removing users.', 'Permission Denied: Please contact organization admin for help with updating organization.': 'Permission Denied: Please contact organization admin for help with updating organization.', - "Permission Denied: Please contact organization admin for help with updating user's roles.": - "Permission Denied: Please contact organization admin for help with updating user's roles.", + 'Permission Denied: Please contact organization admin for help with updating user roles.': + 'Permission Denied: Please contact organization admin for help with updating user roles.', 'Permission Denied: Please contact organization admin for help with user invitations.': 'Permission Denied: Please contact organization admin for help with user invitations.', 'Permission Denied: Please contact organization admin for help with user role changes.': diff --git a/api-js/src/locale/en/messages.po b/api-js/src/locale/en/messages.po index 4a559daf8..a3f560b5d 100644 --- a/api-js/src/locale/en/messages.po +++ b/api-js/src/locale/en/messages.po @@ -212,8 +212,8 @@ msgstr "Permission Denied: Please contact organization admin for help with updat #: src/affiliation/mutations/update-user-role.js:156 #: src/affiliation/mutations/update-user-role.js:177 #: src/affiliation/mutations/update-user-role.js:193 -msgid "Permission Denied: Please contact organization admin for help with updating user's roles." -msgstr "Permission Denied: Please contact organization admin for help with updating user's roles." +msgid "Permission Denied: Please contact organization admin for help with updating user roles." +msgstr "Permission Denied: Please contact organization admin for help with updating user roles." #: src/affiliation/mutations/invite-user-to-org.js:91 msgid "Permission Denied: Please contact organization admin for help with user invitations." diff --git a/api-js/src/locale/fr/messages.js b/api-js/src/locale/fr/messages.js index 56e64c591..e65b8c832 100644 --- a/api-js/src/locale/fr/messages.js +++ b/api-js/src/locale/fr/messages.js @@ -71,7 +71,7 @@ 'todo', 'Permission Denied: Please contact organization admin for help with updating organization.': 'todo', - "Permission Denied: Please contact organization admin for help with updating user's roles.": + 'Permission Denied: Please contact organization admin for help with updating user roles.': 'todo', 'Permission Denied: Please contact organization admin for help with user invitations.': 'todo', diff --git a/api-js/src/locale/fr/messages.po b/api-js/src/locale/fr/messages.po index 2dc38f88d..61587de32 100644 --- a/api-js/src/locale/fr/messages.po +++ b/api-js/src/locale/fr/messages.po @@ -212,7 +212,7 @@ msgstr "todo" #: src/affiliation/mutations/update-user-role.js:156 #: src/affiliation/mutations/update-user-role.js:177 #: src/affiliation/mutations/update-user-role.js:193 -msgid "Permission Denied: Please contact organization admin for help with updating user's roles." +msgid "Permission Denied: Please contact organization admin for help with updating user roles." msgstr "todo" #: src/affiliation/mutations/invite-user-to-org.js:91 From 0e993f7268e1a132bb6bb4e73a701a5571d88ddf Mon Sep 17 00:00:00 2001 From: nsdeschenes Date: Mon, 15 Mar 2021 11:00:21 -0300 Subject: [PATCH 21/21] fix translation issues from rebase --- api-js/src/locale/en/messages.js | 6 +++--- api-js/src/locale/en/messages.po | 6 +++--- api-js/src/locale/fr/messages.js | 12 ++++++------ api-js/src/locale/fr/messages.po | 12 ++++++------ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/api-js/src/locale/en/messages.js b/api-js/src/locale/en/messages.js index 1d73adda4..aca5f7b85 100644 --- a/api-js/src/locale/en/messages.js +++ b/api-js/src/locale/en/messages.js @@ -265,7 +265,7 @@ 'Token value incorrect, please sign in again.': 'Token value incorrect, please sign in again.', 'Too many failed login attempts, please reset your password, and try again.': - 'Too many failed login attempts, please reset your password, and try again.<<<<<<< HEAD=======', + 'Too many failed login attempts, please reset your password, and try again.', 'Two factor code is incorrect. Please try again.': 'Two factor code is incorrect. Please try again.', 'Two factor code length is incorrect. Please try again.': @@ -446,7 +446,7 @@ 'Unable to update password, passwords do not match requirements. Please try again.': 'Unable to update password, passwords do not match requirements. Please try again.', 'Unable to update password. Please try again.': - 'Unable to update password. Please try again.<<<<<<< HEAD', + 'Unable to update password. Please try again.', 'Unable to update profile. Please try again.': 'Unable to update profile. Please try again.', 'Unable to update role: organization unknown.': @@ -474,7 +474,7 @@ 'User could not be queried.': 'User could not be queried.', 'User role was updated successfully.': 'User role was updated successfully.', - 'Username already in use.': 'Username already in use.<<<<<<< HEAD', + 'Username already in use.': 'Username already in use.', 'Username not available, please try another.': 'Username not available, please try another.', 'You must provide a `first` or `last` value to properly paginate the `DKIMResults` connection.': diff --git a/api-js/src/locale/en/messages.po b/api-js/src/locale/en/messages.po index a3f560b5d..c01bceddb 100644 --- a/api-js/src/locale/en/messages.po +++ b/api-js/src/locale/en/messages.po @@ -391,7 +391,7 @@ msgstr "Token value incorrect, please sign in again." #: src/user/mutations/sign-in.js:73 msgid "Too many failed login attempts, please reset your password, and try again." -msgstr "Too many failed login attempts, please reset your password, and try again.<<<<<<< HEAD=======" +msgstr "Too many failed login attempts, please reset your password, and try again." #: src/user/mutations/verify-phone-number.js:78 msgid "Two factor code is incorrect. Please try again." @@ -853,7 +853,7 @@ msgstr "Unable to update password, passwords do not match requirements. Please t #: src/user/mutations/update-user-password.js:135 msgid "Unable to update password. Please try again." -msgstr "Unable to update password. Please try again.<<<<<<< HEAD" +msgstr "Unable to update password. Please try again." #: src/user/mutations/update-user-profile.js:80 #: src/user/mutations/update-user-profile.js:132 @@ -924,7 +924,7 @@ msgstr "User role was updated successfully." #: src/user/mutations/sign-up.js:100 msgid "Username already in use." -msgstr "Username already in use.<<<<<<< HEAD" +msgstr "Username already in use." #: src/user/mutations/update-user-profile.js:94 msgid "Username not available, please try another." diff --git a/api-js/src/locale/fr/messages.js b/api-js/src/locale/fr/messages.js index e65b8c832..0b30ee5c1 100644 --- a/api-js/src/locale/fr/messages.js +++ b/api-js/src/locale/fr/messages.js @@ -92,7 +92,7 @@ 'Permission Denied: Please contact super admin for help with verifying this organization.': 'todo', 'Permission check error. Unable to request domain information.': 'todo', - 'Permission error, not an admin for this user.': 'todo<<<<<<< HEAD', + 'Permission error, not an admin for this user.': 'todo', 'Phone number has been successfully set, you will receive a verification text message shortly.': 'todo', 'Profile successfully updated.': 'todo', @@ -144,7 +144,7 @@ 'todo', 'Token value incorrect, please sign in again.': 'todo', 'Too many failed login attempts, please reset your password, and try again.': - 'todo<<<<<<< HEAD=======', + 'todo', 'Two factor code is incorrect. Please try again.': 'todo', 'Two factor code length is incorrect. Please try again.': 'todo', 'Unable to add user to organization. Please try again.': 'todo', @@ -224,7 +224,7 @@ 'Unable to send password reset email. Please try again.': 'todo', 'Unable to send two factor authentication message. Please try again.': 'todo', - 'Unable to send verification email. Please try again.': 'todo<<<<<<< HEAD', + 'Unable to send verification email. Please try again.': 'todo', 'Unable to set phone number, please try again.': 'todo', 'Unable to sign in, please try again.': 'todo', 'Unable to sign up. Please try again.': 'todo', @@ -232,7 +232,7 @@ 'Unable to update domain in an unknown org.': 'todo', 'Unable to update domain that does not belong to the given organization.': 'todo', - 'Unable to update domain. Please try again.': 'todo<<<<<<< HEAD', + 'Unable to update domain. Please try again.': 'todo', 'Unable to update organization. Please try again.': 'todo', 'Unable to update password, authentication error occurred, please sign in again.': 'todo', @@ -242,7 +242,7 @@ 'todo', 'Unable to update password, passwords do not match requirements. Please try again.': 'todo', - 'Unable to update password. Please try again.': 'todo<<<<<<< HEAD', + 'Unable to update password. Please try again.': 'todo', 'Unable to update profile. Please try again.': 'todo', 'Unable to update role: organization unknown.': 'todo', 'Unable to update role: user does not belong to organization.': 'todo', @@ -258,7 +258,7 @@ 'Unable to verify unknown organization.': 'todo', 'User could not be queried.': 'todo', 'User role was updated successfully.': 'todo', - 'Username already in use.': 'todo<<<<<<< HEAD', + 'Username already in use.': 'todo', 'Username not available, please try another.': 'todo', 'You must provide a `first` or `last` value to properly paginate the `DKIMResults` connection.': 'todo', diff --git a/api-js/src/locale/fr/messages.po b/api-js/src/locale/fr/messages.po index 61587de32..280886d3b 100644 --- a/api-js/src/locale/fr/messages.po +++ b/api-js/src/locale/fr/messages.po @@ -262,7 +262,7 @@ msgstr "todo" #: src/auth/check-user-is-admin-for-user.js:60 #: src/auth/check-user-is-admin-for-user.js:70 msgid "Permission error, not an admin for this user." -msgstr "todo<<<<<<< HEAD" +msgstr "todo" #: src/user/mutations/set-phone-number.js:107 msgid "Phone number has been successfully set, you will receive a verification text message shortly." @@ -391,7 +391,7 @@ msgstr "todo" #: src/user/mutations/sign-in.js:73 msgid "Too many failed login attempts, please reset your password, and try again." -msgstr "todo<<<<<<< HEAD=======" +msgstr "todo" #: src/user/mutations/verify-phone-number.js:78 msgid "Two factor code is incorrect. Please try again." @@ -791,7 +791,7 @@ msgstr "todo" #: src/notify/notify-send-verification-email.js:30 msgid "Unable to send verification email. Please try again." -msgstr "todo<<<<<<< HEAD" +msgstr "todo" #: src/user/mutations/set-phone-number.js:94 msgid "Unable to set phone number, please try again." @@ -824,7 +824,7 @@ msgstr "todo" #: src/domain/mutations/update-domain.js:161 #: src/domain/mutations/update-domain.js:171 msgid "Unable to update domain. Please try again." -msgstr "todo<<<<<<< HEAD" +msgstr "todo" #: src/organization/mutations/update-organization.js:168 #: src/organization/mutations/update-organization.js:197 @@ -853,7 +853,7 @@ msgstr "todo" #: src/user/mutations/update-user-password.js:135 msgid "Unable to update password. Please try again." -msgstr "todo<<<<<<< HEAD" +msgstr "todo" #: src/user/mutations/update-user-profile.js:80 #: src/user/mutations/update-user-profile.js:132 @@ -924,7 +924,7 @@ msgstr "todo" #: src/user/mutations/sign-up.js:100 msgid "Username already in use." -msgstr "todo<<<<<<< HEAD" +msgstr "todo" #: src/user/mutations/update-user-profile.js:94 msgid "Username not available, please try another."