Skip to content

Commit

Permalink
Merge branch '1.11' into 1
Browse files Browse the repository at this point in the history
  • Loading branch information
GuySartorelli committed May 26, 2022
2 parents c7fe9a0 + d4c8835 commit eb192f4
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion client/dist/js/TinyMCE_sslink.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions client/lang/src/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
"Admin.VALIDATION_ERRORS_IN_TAB_SCREEN_READER": "(Has validation errors)",
"Admin.NONE": "None",
"Admin.EDIT": "Edit",
"Admin.EDIT_LINK": "Edit link",
"Admin.REMOVE_LINK": "Remove link",
"Admin.ANY": "Any",
"Admin.ERRORINTRANSACTION": "An error occured while fetching data from the server\n Please try again later.",
"Admin.DELETECONFIRMMESSAGE": "Are you sure you want to delete this record?",
Expand Down
4 changes: 2 additions & 2 deletions client/src/legacy/TinyMCE_sslink.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ const plugin = {

editor.on('preinit', () => {
setupTinyMceInlineToolbar(editor, [
{ type: 'button', onClick: openLinkDialog, text: 'Edit link' },
{ type: 'button', onClick: () => this.handleRemoveLinkClick(editor), text: 'Remove link' },
{ type: 'button', onClick: openLinkDialog, text: i18n._t('Admin.EDIT_LINK', 'Edit link') },
{ type: 'button', onClick: () => this.handleRemoveLinkClick(editor), text: i18n._t('Admin.REMOVE_LINK', 'Remove link') },
], ['a[href]']);
});
},
Expand Down

0 comments on commit eb192f4

Please sign in to comment.