Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Regression: Update Composer Formatters Translation Keys #28228

Merged
merged 4 commits into from
Mar 1, 2023
Merged

Regression: Update Composer Formatters Translation Keys #28228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5204360
chore: update translation keys
dougfabris Mar 1, 2023
12510ae
Merge branch 'develop' into chore/composer-formatters-translation
Mar 1, 2023
3949cd3
Merge branch 'develop' into chore/composer-formatters-translation
kodiakhq[bot] Mar 1, 2023
95e5882
Merge branch 'develop' into chore/composer-formatters-translation
kodiakhq[bot] Mar 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions apps/meteor/app/ui-message/client/messageBox/messageBoxFormatting.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,29 +23,29 @@ export type FormattingButton =

export const formattingButtons: ReadonlyArray<FormattingButton> = [
{
label: 'bold',
label: 'Bold',
icon: 'bold',
pattern: '*{{text}}*',
command: 'b',
},
{
label: 'italic',
label: 'Italic',
icon: 'italic',
pattern: '_{{text}}_',
command: 'i',
},
{
label: 'strike',
label: 'Strike',
icon: 'strike',
pattern: '~{{text}}~',
},
{
label: 'inline_code',
label: 'Inline_code',
icon: 'code',
pattern: '`{{text}}`',
},
{
label: 'multi_line',
label: 'Multi_line',
icon: 'multiline',
pattern: '```\n{{text}}\n``` ',
},
Expand Down
8 changes: 4 additions & 4 deletions apps/meteor/ee/client/omnichannel/components/CannedResponse/MarkdownTextEditor/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ const MarkdownTextEditor: FC<{ onChange: any; value: string }> = ({ onChange, va
<TextEditor>
<TextEditor.Toolbox>
<Box display='flex' flexDirection='row'>
<TextEditor.Toolbox.IconButton name='bold' action={useMarkdownSyntax('*')} title={t('bold')} />
<TextEditor.Toolbox.IconButton name='italic' action={useMarkdownSyntax('_')} title={t('italic')} />
<TextEditor.Toolbox.IconButton name='strike' action={useMarkdownSyntax('~')} title={t('strike')} />
<TextEditor.Toolbox.IconButton name='link' action={useMarkdownSyntax('[]()')} title={t('link')} />
<TextEditor.Toolbox.IconButton name='bold' action={useMarkdownSyntax('*')} title={t('Bold')} />
<TextEditor.Toolbox.IconButton name='italic' action={useMarkdownSyntax('_')} title={t('Italic')} />
<TextEditor.Toolbox.IconButton name='strike' action={useMarkdownSyntax('~')} title={t('Strike')} />
<TextEditor.Toolbox.IconButton name='link' action={useMarkdownSyntax('[]()')} title={t('Link')} />
<TextEditor.Toolbox.IconButton name='emoji' action={openEmojiPicker} title={t('Emoji')} />
</Box>
<TextEditor.Toolbox.TextButton text='Insert_Placeholder' action={openPlaceholderSelect} ref={ref} />
Expand Down
14 changes: 7 additions & 7 deletions apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,7 @@
"Blockstack_ButtonLabelText": "Button label text",
"Blockstack_Generate_Username": "Generate username",
"Body": "Body",
"bold": "bold",
"Bold": "Bold",
"bot_request": "Bot request",
"BotHelpers_userFields": "User Fields",
"BotHelpers_userFields_Description": "CSV of user fields that can be accessed by bots helper methods.",
Expand Down Expand Up @@ -2512,7 +2512,7 @@
"Industry": "Industry",
"Info": "Info",
"initials_avatar": "Initials Avatar",
"inline_code": "inline code",
"Inline_code": "Inline code",
"Install": "Install",
"Install_anyway": "Install anyway",
"Install_Extension": "Install Extension",
Expand Down Expand Up @@ -2648,7 +2648,7 @@
"It_Will_Hide_All_Other_White_Blocks_In_The_Homepage": "It will hide all other white blocks in the homepage (Enterprise only)",
"It_works": "It works",
"It_Security": "It Security",
"italic": "Italic",
"Italic": "Italic",
"italics": "italics",
"Items_per_page:": "Items per page:",
"Jitsi_included_with_Community": "Jitsi, included with Community",
Expand Down Expand Up @@ -2939,8 +2939,8 @@
"leave-p_description": "Permission to leave private groups",
"Lets_get_you_new_one": "Let's get you a new one!",
"License": "License",
"line": "line",
"link": "link",
"Line": "Line",
"Link": "Link",
"Link_Preview": "Link Preview",
"List_of_Channels": "List of Channels",
"List_of_departments_for_forward": "List of departments allowed for forwarding (Optional)",
Expand Down Expand Up @@ -3436,7 +3436,7 @@
"Move_queue": "Move to the queue",
"Msgs": "Msgs",
"multi": "multi",
"multi_line": "multi line",
"Multi_line": "Multi line",
"Multiple_monolith_instances_alert": "You are operating multiple instances without an active enterprise license - some features may not behave as designed",
"Mute": "Mute",
"Mute_and_dismiss": "Mute and dismiss",
Expand Down Expand Up @@ -4639,7 +4639,7 @@
"Stream_Cast": "Stream Cast",
"Stream_Cast_Address": "Stream Cast Address",
"Stream_Cast_Address_Description": "IP or Host of your Rocket.Chat central Stream Cast. E.g. `192.168.1.1:3000` or `localhost:4000`",
"strike": "strike",
"Strike": "Strike",
"Style": "Style",
"Subject": "Subject",
"Submit": "Submit",
Expand Down