From b911de0cc3f67719f9825e84b55c5bf5d97c1d23 Mon Sep 17 00:00:00 2001 From: Scott Bishel Date: Thu, 16 Jun 2022 05:17:44 -0600 Subject: [PATCH] CP - Update en.json: Bug fix and consistency (#3231) * Update en.json: Bug fix and consistency (#3151) * Update en.json Updated copy and fixed https://github.com/mattermost/focalboard/issues/3131 * update cypress tests * update default messages, en.json is created from default messages when running i18n-extract * update tests for string changes Co-authored-by: Mattermod Co-authored-by: Scott Bishel (cherry picked from commit 020d83fa446929ddd7738cb7a94d6854c5cdd343) * clean up cherry-pick * more cleanup * fix bad merge * fix cypress tests Co-authored-by: Justine Geffen --- webapp/cypress/integration/cardBadges.ts | 4 +- webapp/cypress/integration/createBoard.ts | 2 +- webapp/cypress/support/api_commands.ts | 4 +- webapp/i18n/en.json | 56 ++++++++++--------- .../__snapshots__/centerPanel.test.tsx.snap | 30 +++++----- .../__snapshots__/topBar.test.tsx.snap | 4 +- .../__snapshots__/workspace.test.tsx.snap | 10 ++-- .../boardTemplateSelector.test.tsx.snap | 6 +- .../boardTemplateSelectorItem.test.tsx.snap | 2 +- .../boardTemplateSelector.tsx | 4 +- .../boardSwitcherDialog.tsx | 2 +- .../src/components/calculations/options.tsx | 12 ++-- .../cardDetailProperties.test.tsx.snap | 4 +- .../cardDetail/cardDetailContents.tsx | 2 +- .../cardDetail/cardDetailProperties.test.tsx | 4 +- .../cardDetail/cardDetailProperties.tsx | 8 +-- .../__snapshots__/copyLink.test.tsx.snap | 2 +- .../onboardingTour/copyLink/copy_link.tsx | 2 +- .../__snapshots__/shareBoard.test.tsx.snap | 26 ++++----- .../src/components/shareBoard/shareBoard.tsx | 4 +- .../components/sidebar/deleteBoardDialog.tsx | 6 +- .../components/sidebar/sidebarBoardItem.tsx | 2 +- webapp/src/components/topBar.tsx | 4 +- .../viewHeaderPropertiesMenu.test.tsx.snap | 8 +-- .../viewHeaderPropertiesMenu.test.tsx | 2 +- .../viewHeader/viewHeaderPropertiesMenu.tsx | 2 +- .../__snapshots__/welcomePage.test.tsx.snap | 4 +- webapp/src/pages/welcome/welcomePage.tsx | 2 +- .../__snapshots__/propertyMenu.test.tsx.snap | 4 +- webapp/src/widgets/propertyMenu.tsx | 4 +- 30 files changed, 115 insertions(+), 111 deletions(-) diff --git a/webapp/cypress/integration/cardBadges.ts b/webapp/cypress/integration/cardBadges.ts index 892b0d69c..8874e6135 100644 --- a/webapp/cypress/integration/cardBadges.ts +++ b/webapp/cypress/integration/cardBadges.ts @@ -47,7 +47,7 @@ describe('Card badges', () => { // Show card badges cy.log('**Show card badges**') cy.findByRole('button', {name: 'Properties menu'}).click() - cy.findByRole('button', {name: 'Comments and Description'}).click() + cy.findByRole('button', {name: 'Comments and description'}).click() cy.findByTitle('This card has a description').should('exist') cy.findByTitle('Comments').contains('3').should('exist') cy.findByTitle('Checkboxes').contains('2/4').should('exist') @@ -55,7 +55,7 @@ describe('Card badges', () => { // Hide card badges cy.log('**Hide card badges**') cy.findByRole('button', {name: 'Properties menu'}).click() - cy.findByRole('button', {name: 'Comments and Description'}).click() + cy.findByRole('button', {name: 'Comments and description'}).click() cy.findByTitle('This card has a description').should('not.exist') cy.findByTitle('Comments').should('not.exist') cy.findByTitle('Checkboxes').should('not.exist') diff --git a/webapp/cypress/integration/createBoard.ts b/webapp/cypress/integration/createBoard.ts index 60a6bb0b4..895ab9fcb 100644 --- a/webapp/cypress/integration/createBoard.ts +++ b/webapp/cypress/integration/createBoard.ts @@ -30,7 +30,7 @@ describe('Create and delete board / card', () => { // Create empty board cy.contains('Create empty board').should('exist').click({force: true}) cy.get('.BoardComponent').should('exist') - cy.get('.Editable.title').invoke('attr', 'placeholder').should('contain', 'Untitled Board') + cy.get('.Editable.title').invoke('attr', 'placeholder').should('contain', 'Untitled board') // Change Title cy.get('.Editable.title'). diff --git a/webapp/cypress/support/api_commands.ts b/webapp/cypress/support/api_commands.ts index 0fa9e06f8..428926601 100644 --- a/webapp/cypress/support/api_commands.ts +++ b/webapp/cypress/support/api_commands.ts @@ -119,11 +119,11 @@ Cypress.Commands.add('uiCreateNewBoard', (title?: string) => { cy.log('**Create new empty board**') cy.uiCreateEmptyBoard() - cy.findByPlaceholderText('Untitled Board').should('exist') + cy.findByPlaceholderText('Untitled board').should('exist') cy.wait(10) if (title) { cy.log('**Rename board**') - cy.findByPlaceholderText('Untitled Board').type(`${title}{enter}`) + cy.findByPlaceholderText('Untitled board').type(`${title}{enter}`) cy.findByRole('textbox', {name: title}).should('exist') } cy.wait(500) diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index eb69ee69f..5948c5e70 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -8,9 +8,11 @@ "BoardComponent.no-property-title": "Items with an empty {property} property will go here. This column cannot be removed.", "BoardComponent.show": "Show", "BoardMember.schemeAdmin": "Admin", + "BoardMember.schemeCommenter": "Commenter", "BoardMember.schemeEditor": "Editor", "BoardMember.schemeNone": "None", "BoardMember.schemeViewer": "Viewer", + "BoardMember.schemeViwer": "Viewer", "BoardPage.newVersion": "A new version of Boards is available, click here to reload.", "BoardPage.syncFailed": "Board may be deleted or access revoked.", "BoardTemplateSelector.add-template": "New template", @@ -20,7 +22,7 @@ "BoardTemplateSelector.edit-template": "Edit", "BoardTemplateSelector.plugin.no-content-description": "Add a board to the sidebar using any of the templates defined below or start from scratch.{lineBreak} Members of \"{teamName}\" will have access to boards created here.", "BoardTemplateSelector.plugin.no-content-title": "Create a Board in {teamName}", - "BoardTemplateSelector.title": "Create a Board", + "BoardTemplateSelector.title": "Create a board", "BoardTemplateSelector.use-this-template": "Use this template", "BoardsSwitcher.Title": "Find Boards", "BoardsUnfurl.Remainder": "+{remainder} more", @@ -30,13 +32,13 @@ "Calculations.Options.count.displayName": "Count", "Calculations.Options.count.label": "Count", "Calculations.Options.countChecked.displayName": "Checked", - "Calculations.Options.countChecked.label": "Count Checked", + "Calculations.Options.countChecked.label": "Count checked", "Calculations.Options.countUnchecked.displayName": "Unchecked", - "Calculations.Options.countUnchecked.label": "Count Unchecked", + "Calculations.Options.countUnchecked.label": "Count unchecked", "Calculations.Options.countUniqueValue.displayName": "Unique", - "Calculations.Options.countUniqueValue.label": "Count Unique Values", + "Calculations.Options.countUniqueValue.label": "Count unique values", "Calculations.Options.countValue.displayName": "Values", - "Calculations.Options.countValue.label": "Count Value", + "Calculations.Options.countValue.label": "Count value", "Calculations.Options.dateRange.displayName": "Range", "Calculations.Options.dateRange.label": "Range", "Calculations.Options.earliest.displayName": "Earliest", @@ -52,9 +54,9 @@ "Calculations.Options.none.displayName": "Calculate", "Calculations.Options.none.label": "None", "Calculations.Options.percentChecked.displayName": "Checked", - "Calculations.Options.percentChecked.label": "Percent Checked", + "Calculations.Options.percentChecked.label": "Percent checked", "Calculations.Options.percentUnchecked.displayName": "Unchecked", - "Calculations.Options.percentUnchecked.label": "Percent Unchecked", + "Calculations.Options.percentUnchecked.label": "Percent unchecked", "Calculations.Options.range.displayName": "Range", "Calculations.Options.range.label": "Range", "Calculations.Options.sum.displayName": "Sum", @@ -68,16 +70,16 @@ "CardDetail.add-icon": "Add icon", "CardDetail.add-property": "+ Add a property", "CardDetail.addCardText": "add card text", - "CardDetail.moveContent": "move card content", + "CardDetail.moveContent": "Move card content", "CardDetail.new-comment-placeholder": "Add a comment...", - "CardDetailProperty.confirm-delete-heading": "Confirm Delete Property", + "CardDetailProperty.confirm-delete-heading": "Confirm delete property", "CardDetailProperty.confirm-delete-subtext": "Are you sure you want to delete the property \"{propertyName}\"? Deleting it will delete the property from all cards in this board.", "CardDetailProperty.confirm-property-name-change-subtext": "Are you sure you want to change property \"{propertyName}\" {customText}? This will affect value(s) across {numOfCards} card(s) in this board, and can result in data loss.", - "CardDetailProperty.confirm-property-type-change": "Confirm Property Type Change!", + "CardDetailProperty.confirm-property-type-change": "Confirm property type change", "CardDetailProperty.delete-action-button": "Delete", - "CardDetailProperty.property-change-action-button": "Change Property", + "CardDetailProperty.property-change-action-button": "Change property", "CardDetailProperty.property-changed": "Changed property successfully!", - "CardDetailProperty.property-deleted": "Deleted {propertyName} Successfully!", + "CardDetailProperty.property-deleted": "Deleted {propertyName} successfully!", "CardDetailProperty.property-name-change-subtext": "type from \"{oldPropType}\" to \"{newPropType}\"", "CardDetailProperty.property-type-change-subtext": "name to \"{newPropName}\"", "CardDialog.copiedLink": "Copied!", @@ -92,6 +94,7 @@ "Categories.CreateCategoryDialog.UpdateText": "Update", "CenterPanel.Login": "Login", "CenterPanel.Share": "Share", + "CloudMessage.cloud-server": "Get your own free cloud server.", "ColorOption.selectColor": "Select {color} Color", "Comment.delete": "Delete", "CommentsList.send": "Send", @@ -118,8 +121,9 @@ "DeleteBoardDialog.confirm-cancel": "Cancel", "DeleteBoardDialog.confirm-delete": "Delete", "DeleteBoardDialog.confirm-info": "Are you sure you want to delete the board “{boardTitle}”? Deleting it will delete all cards in the board.", - "DeleteBoardDialog.confirm-tite": "Confirm Delete Board", - "DeleteBoardDialog.confirm-tite-template": "Confirm Delete Board Template", + "DeleteBoardDialog.confirm-info-template": "Are you sure you want to delete the board template “{boardTitle}”?", + "DeleteBoardDialog.confirm-tite": "Confirm delete board", + "DeleteBoardDialog.confirm-tite-template": "Confirm delete board template", "Dialog.closeDialog": "Close dialog", "EditableDayPicker.today": "Today", "Error.mobileweb": "Mobile web support is currently in early beta. Not all functionality may be present.", @@ -157,7 +161,7 @@ "OnboardingTour.AddProperties.Title": "Add properties", "OnboardingTour.AddView.Body": "Go here to create a new view to organise your board using different layouts.", "OnboardingTour.AddView.Title": "Add a new view", - "OnboardingTour.CopyLink.Body": "You can share your cards with teammates by copying the link and pasting it in a channel, Direct Message, or Group Message.", + "OnboardingTour.CopyLink.Body": "You can share your cards with teammates by copying the link and pasting it in a channel, direct message, or group message.", "OnboardingTour.CopyLink.Title": "Copy link", "OnboardingTour.OpenACard.Body": "Open a card to explore the powerful ways that Boards can help you organize your work.", "OnboardingTour.OpenACard.Title": "Open a card", @@ -172,8 +176,8 @@ "PropertyType.CreatedTime": "Created time", "PropertyType.Date": "Date", "PropertyType.Email": "Email", - "PropertyType.File": "File or Media", - "PropertyType.MultiSelect": "Multi Select", + "PropertyType.File": "File or media", + "PropertyType.MultiSelect": "Multi select", "PropertyType.Number": "Number", "PropertyType.Person": "Person", "PropertyType.Phone": "Phone", @@ -189,10 +193,10 @@ "RegistrationLink.description": "Share this link for others to create accounts:", "RegistrationLink.regenerateToken": "Regenerate token", "RegistrationLink.tokenRegenerated": "Registration link regenerated", - "ShareBoard.PublishDescription": "Publish and share a “read only” link with everyone on the web", + "ShareBoard.PublishDescription": "Publish and share a read-only link with everyone on the web.", "ShareBoard.PublishTitle": "Publish to the web", "ShareBoard.ShareInternal": "Share internally", - "ShareBoard.ShareInternalDescription": "Users who have permissions will be able to use this link", + "ShareBoard.ShareInternalDescription": "Users who have permissions will be able to use this link.", "ShareBoard.Title": "Share Board", "ShareBoard.confirmRegenerateToken": "This will invalidate previously shared links. Continue?", "ShareBoard.copiedLink": "Copied!", @@ -238,9 +242,9 @@ "TableHeaderMenu.insert-right": "Insert right", "TableHeaderMenu.sort-ascending": "Sort ascending", "TableHeaderMenu.sort-descending": "Sort descending", - "TableRow.open": "Open", "TableRow.delete": "Delete", - "TopBar.give-feedback": "Give Feedback", + "TableRow.open": "Open", + "TopBar.give-feedback": "Give feedback", "URLProperty.copiedLink": "Copied!", "URLProperty.copy": "Copy", "URLProperty.edit": "Edit", @@ -271,7 +275,6 @@ "ViewHeader.new": "New", "ViewHeader.properties": "Properties", "ViewHeader.properties-menu": "Properties menu", - "ViewHeader.search": "Search", "ViewHeader.search-text": "Search cards", "ViewHeader.select-a-template": "Select a template", "ViewHeader.set-default-template": "Set as default", @@ -284,8 +287,8 @@ "ViewTitle.random-icon": "Random", "ViewTitle.remove-icon": "Remove icon", "ViewTitle.show-description": "show description", - "ViewTitle.untitled-board": "Untitled Board", - "WelcomePage.Description": "Boards is a project management tool that helps define, organize, track and manage work across teams, using a familiar kanban board view", + "ViewTitle.untitled-board": "Untitled board", + "WelcomePage.Description": "Boards is a project management tool that helps define, organize, track, and manage work across teams using a familiar Kanban board view.", "WelcomePage.Explore.Button": "Take a tour", "WelcomePage.Heading": "Welcome To Boards", "WelcomePage.NoThanks.Text": "No thanks, I'll figure it out myself", @@ -293,8 +296,9 @@ "calendar.month": "Month", "calendar.today": "TODAY", "calendar.week": "Week", + "cloudMessage.learn-more": "Learn more", "createImageBlock.failed": "Unable to upload the file. File size limit reached.", - "default-properties.badges": "Comments and Description", + "default-properties.badges": "Comments and description", "default-properties.title": "Title", "error.page.title": "Sorry, something went wrong", "generic.previous": "Previous", @@ -312,4 +316,4 @@ "tutorial_tip.ok": "Next", "tutorial_tip.out": "Opt out of these tips.", "tutorial_tip.seen": "Seen this before?" -} +} \ No newline at end of file diff --git a/webapp/src/components/__snapshots__/centerPanel.test.tsx.snap b/webapp/src/components/__snapshots__/centerPanel.test.tsx.snap index bec269297..daf2b9143 100644 --- a/webapp/src/components/__snapshots__/centerPanel.test.tsx.snap +++ b/webapp/src/components/__snapshots__/centerPanel.test.tsx.snap @@ -17,7 +17,7 @@ exports[`components/centerPanel return centerPanel and click on card to show car rel="noreferrer" target="_blank" > - Give Feedback + Give feedback - Give Feedback + Give feedback - Give Feedback + Give feedback - Give Feedback + Give feedback - Give Feedback + Give feedback - Give Feedback + Give feedback - Give Feedback + Give feedback - Give Feedback + Give feedback - Give Feedback + Give feedback - Give Feedback + Give feedback - Give Feedback + Give feedback - Give Feedback + Give feedback - Give Feedback + Give feedback - Give Feedback + Give feedback - Give Feedback + Give feedback - Give Feedback + Give feedback @@ -633,7 +633,7 @@ exports[`src/components/shareBoard/shareBoard return shareBoard and click Regene
- Publish and share a “read only” link with everyone on the web + Publish and share a read-only link with everyone on the web.
@@ -854,7 +854,7 @@ exports[`src/components/shareBoard/shareBoard return shareBoard and click Select
- Users who have permissions will be able to use this link + Users who have permissions will be able to use this link.
@@ -1176,7 +1176,7 @@ exports[`src/components/shareBoard/shareBoard return shareBoard and click Select
- Users who have permissions will be able to use this link + Users who have permissions will be able to use this link.
@@ -1374,7 +1374,7 @@ exports[`src/components/shareBoard/shareBoard return shareBoard and click Select
- Users who have permissions will be able to use this link + Users who have permissions will be able to use this link.
@@ -1696,7 +1696,7 @@ exports[`src/components/shareBoard/shareBoard return shareBoard and click Select
- Users who have permissions will be able to use this link + Users who have permissions will be able to use this link.
@@ -1920,7 +1920,7 @@ exports[`src/components/shareBoard/shareBoard return shareBoard, and click switc
- Publish and share a “read only” link with everyone on the web + Publish and share a read-only link with everyone on the web.
@@ -2167,7 +2167,7 @@ exports[`src/components/shareBoard/shareBoard return shareBoardComponent and cli
- Publish and share a “read only” link with everyone on the web + Publish and share a read-only link with everyone on the web.
@@ -2414,7 +2414,7 @@ exports[`src/components/shareBoard/shareBoard should match snapshot 1`] = `
- Users who have permissions will be able to use this link + Users who have permissions will be able to use this link.
@@ -2638,7 +2638,7 @@ exports[`src/components/shareBoard/shareBoard should match snapshot with sharing
- Users who have permissions will be able to use this link + Users who have permissions will be able to use this link.
@@ -2862,7 +2862,7 @@ exports[`src/components/shareBoard/shareBoard should match snapshot with sharing
- Users who have permissions will be able to use this link + Users who have permissions will be able to use this link.
@@ -3086,7 +3086,7 @@ exports[`src/components/shareBoard/shareBoard should match snapshot with sharing
- Users who have permissions will be able to use this link + Users who have permissions will be able to use this link.
diff --git a/webapp/src/components/shareBoard/shareBoard.tsx b/webapp/src/components/shareBoard/shareBoard.tsx index 81d98c246..f01cfbbe7 100644 --- a/webapp/src/components/shareBoard/shareBoard.tsx +++ b/webapp/src/components/shareBoard/shareBoard.tsx @@ -366,7 +366,7 @@ export default function ShareBoardDialog(props: Props): JSX.Element {
{intl.formatMessage({id: 'ShareBoard.PublishTitle', defaultMessage: 'Publish to the web'})}
-
{intl.formatMessage({id: 'ShareBoard.PublishDescription', defaultMessage: 'Publish and share a “read only” link with everyone on the web'})}
+
{intl.formatMessage({id: 'ShareBoard.PublishDescription', defaultMessage: 'Publish and share a read-only link with everyone on the web.'})}
{intl.formatMessage({id: 'ShareBoard.ShareInternal', defaultMessage: 'Share internally'})}
-
{intl.formatMessage({id: 'ShareBoard.ShareInternalDescription', defaultMessage: 'Users who have permissions will be able to use this link'})}
+
{intl.formatMessage({id: 'ShareBoard.ShareInternalDescription', defaultMessage: 'Users who have permissions will be able to use this link.'})}
diff --git a/webapp/src/components/sidebar/deleteBoardDialog.tsx b/webapp/src/components/sidebar/deleteBoardDialog.tsx index 25e932de9..f33cf9582 100644 --- a/webapp/src/components/sidebar/deleteBoardDialog.tsx +++ b/webapp/src/components/sidebar/deleteBoardDialog.tsx @@ -33,18 +33,18 @@ export default function DeleteBoardDialog(props: Props): JSX.Element { {props.isTemplate && } {!props.isTemplate && }

{props.isTemplate && { } onClick={() => { props.onDeleteRequest(board) diff --git a/webapp/src/components/topBar.tsx b/webapp/src/components/topBar.tsx index 22d4b1ce2..ad6f5358b 100644 --- a/webapp/src/components/topBar.tsx +++ b/webapp/src/components/topBar.tsx @@ -25,7 +25,7 @@ const TopBar = (): JSX.Element => { >

@@ -53,7 +53,7 @@ const TopBar = (): JSX.Element => { >