From 7a41cfb2db6e04a6fcf789882adc109afb5ca349 Mon Sep 17 00:00:00 2001 From: drafish Date: Sat, 12 Aug 2023 19:31:48 +0800 Subject: [PATCH] patch en locale messages for filePanel --- .../src/app/tabs/locales/en/filePanel.json | 47 ++++++++- .../src/lib/components/file-explorer.tsx | 66 ++++++++++--- .../workspace/src/lib/remix-ui-workspace.tsx | 97 ++++++++++++------- 3 files changed, 163 insertions(+), 47 deletions(-) diff --git a/apps/remix-ide/src/app/tabs/locales/en/filePanel.json b/apps/remix-ide/src/app/tabs/locales/en/filePanel.json index 6724180c22..493239b44c 100644 --- a/apps/remix-ide/src/app/tabs/locales/en/filePanel.json +++ b/apps/remix-ide/src/app/tabs/locales/en/filePanel.json @@ -73,5 +73,50 @@ "filePanel.features": "Features", "filePanel.upgradeability": "Upgradeability", "filePanel.ok": "OK", - "filePanel.cancel": "Cancel" + "filePanel.cancel": "Cancel", + "filePanel.createNewWorkspace": "create a new workspace", + "filePanel.connectToLocalhost": "connect to localhost", + "filePanel.copiedToClipboard": "Copied to clipboard {path}", + "filePanel.downloadFailed": "Download Failed", + "filePanel.downloadFailedMsg": "Unexpected error while downloading: {error}", + "filePanel.close": "Close", + "filePanel.copyFileFailed": "Copy File Failed", + "filePanel.copyFileFailedMsg": "Unexpected error while copying file: {src}", + "filePanel.copyFolderFailed": "Copy Folder Failed", + "filePanel.copyFolderFailedMsg": "Unexpected error while copying folder: {src}", + "filePanel.runScriptFailed": "Run script failed", + "filePanel.createPublicGist": "Create a public gist", + "filePanel.createPublicGistMsg1": "Are you sure you want to push changes to remote gist file on github.com?", + "filePanel.createPublicGistMsg2": "Are you sure you want to anonymously publish all your files in the {path} folder as a public gist on github.com?", + "filePanel.createPublicGistMsg3": "Are you sure you want to anonymously publish {path} file as a public gist on github.com?", + "filePanel.createPublicGistMsg4": "Are you sure you want to anonymously publish all your files in the {name} workspace as a public gist on github.com?", + "filePanel.deleteMsg": "Are you sure you want to delete", + "filePanel.theseItems": "these items", + "filePanel.thisItem": "this item", + "filePanel.deleteItems": "Delete items", + "filePanel.deleteItem": "Delete item", + "filePanel.globalToast": "Cannot write/modify file system in read only mode.", + "filePanel.basic": "Basic", + "filePanel.blank": "Blank", + "filePanel.multiSigWallet": "MultiSig Wallet", + "filePanel.mintable": "Mintable", + "filePanel.burnable": "Burnable", + "filePanel.pausable": "Pausable", + "filePanel.transparent": "Transparent", + "filePanel.initGitRepoTitle": "Check option to initialize workspace as a new git repository", + "filePanel.switchToBranchTitle1": "Checkout new branch from remote branch", + "filePanel.switchToBranchTitle2": "Checkout to local branch", + "filePanel.readOnly": "read-only", + "filePanel.renameFileFailed": "Rename File Failed", + "filePanel.renameFileFailedMsg": "Unexpected error while renaming: {error}", + "filePanel.fileCreationFailed": "File Creation Failed", + "filePanel.folderCreationFailed": "Folder Creation Failed", + "filePanel.validationError": "Validation Error", + "filePanel.validationErrorMsg": "Special characters are not allowed", + "filePanel.reservedKeyword": "Reserved Keyword", + "filePanel.reservedKeywordMsg": "File name contains Remix reserved keywords. \"{content}\"", + "filePanel.movingFileFailed": "Moving File Failed", + "filePanel.movingFileFailedMsg": "Unexpected error while moving file: {src}", + "filePanel.movingFolderFailed": "Moving Folder Failed", + "filePanel.movingFolderFailedMsg": "Unexpected error while moving folder: {src}" } diff --git a/libs/remix-ui/workspace/src/lib/components/file-explorer.tsx b/libs/remix-ui/workspace/src/lib/components/file-explorer.tsx index 1c660aeb9b..70ebf68898 100644 --- a/libs/remix-ui/workspace/src/lib/components/file-explorer.tsx +++ b/libs/remix-ui/workspace/src/lib/components/file-explorer.tsx @@ -1,4 +1,5 @@ import React, {useEffect, useState, useRef, SyntheticEvent} from 'react' // eslint-disable-line +import {useIntl} from 'react-intl' import {TreeView, TreeViewItem} from '@remix-ui/tree-view' // eslint-disable-line import {FileExplorerMenu} from './file-explorer-menu' // eslint-disable-line import {FileExplorerContextMenu} from './file-explorer-context-menu' // eslint-disable-line @@ -12,6 +13,7 @@ import {Drag} from '@remix-ui/drag-n-drop' import {ROOT_PATH} from '../utils/constants' export const FileExplorer = (props: FileExplorerProps) => { + const intl = useIntl() const { name, contextMenuItems, @@ -100,7 +102,12 @@ export const FileExplorer = (props: FileExplorerProps) => { try { props.dispatchCreateNewFile(newFilePath, ROOT_PATH) } catch (error) { - return props.modal('File Creation Failed', typeof error === 'string' ? error : error.message, 'Close', async () => {}) + return props.modal( + intl.formatMessage({id: 'filePanel.fileCreationFailed'}), + typeof error === 'string' ? error : error.message, + intl.formatMessage({id: 'filePanel.close'}), + async () => {} + ) } } @@ -108,7 +115,12 @@ export const FileExplorer = (props: FileExplorerProps) => { try { props.dispatchCreateNewFolder(newFolderPath, ROOT_PATH) } catch (e) { - return props.modal('Folder Creation Failed', typeof e === 'string' ? e : e.message, 'Close', async () => {}) + return props.modal( + intl.formatMessage({id: 'filePanel.folderCreationFailed'}), + typeof e === 'string' ? e : e.message, + intl.formatMessage({id: 'filePanel.close'}), + async () => {} + ) } } @@ -116,17 +128,22 @@ export const FileExplorer = (props: FileExplorerProps) => { try { props.dispatchRenamePath(oldPath, newPath) } catch (error) { - props.modal('Rename File Failed', 'Unexpected error while renaming: ' + typeof error === 'string' ? error : error.message, 'Close', async () => {}) + props.modal( + intl.formatMessage({id: 'filePanel.renameFileFailed'}), + intl.formatMessage({id: 'filePanel.renameFileFailedMsg'}, {error: typeof error === 'string' ? error : error.message}), + intl.formatMessage({id: 'filePanel.close'}), + async () => {} + ) } } const publishToGist = (path?: string, type?: string) => { props.modal( - 'Create a public gist', - `Are you sure you want to anonymously publish all your files in the ${name} workspace as a public gist on github.com?`, - 'OK', + intl.formatMessage({id: 'filePanel.createPublicGist'}), + intl.formatMessage({id: 'filePanel.createPublicGistMsg4'}, {name}), + intl.formatMessage({id: 'filePanel.ok'}), () => toGist(path, type), - 'Cancel', + intl.formatMessage({id: 'filePanel.cancel'}), () => {} ) } @@ -210,19 +227,34 @@ export const FileExplorer = (props: FileExplorerProps) => { }) } if (checkSpecialChars(content)) { - props.modal('Validation Error', 'Special characters are not allowed', 'OK', () => {}) + props.modal( + intl.formatMessage({id: 'filePanel.validationError'}), + intl.formatMessage({id: 'filePanel.validationErrorMsg'}), + intl.formatMessage({id: 'filePanel.ok'}), + () => {} + ) } else { if (state.focusEdit.isNew) { if (hasReservedKeyword(content)) { props.dispatchRemoveInputField(parentFolder) - props.modal('Reserved Keyword', `File name contains Remix reserved keywords. '${content}'`, 'Close', () => {}) + props.modal( + intl.formatMessage({id: 'filePanel.reservedKeyword'}), + intl.formatMessage({id: 'filePanel.reservedKeywordMsg'}, {content}), + intl.formatMessage({id: 'filePanel.close'}), + () => {} + ) } else { state.focusEdit.type === 'file' ? createNewFile(joinPath(parentFolder, content)) : createNewFolder(joinPath(parentFolder, content)) props.dispatchRemoveInputField(parentFolder) } } else { if (hasReservedKeyword(content)) { - props.modal('Reserved Keyword', `File name contains Remix reserved keywords. '${content}'`, 'Close', () => {}) + props.modal( + intl.formatMessage({id: 'filePanel.reservedKeyword'}), + intl.formatMessage({id: 'filePanel.reservedKeywordMsg'}, {content}), + intl.formatMessage({id: 'filePanel.close'}), + () => {} + ) } else { if (state.focusEdit.element) { const oldPath: string = state.focusEdit.element @@ -261,7 +293,12 @@ export const FileExplorer = (props: FileExplorerProps) => { try { props.dispatchMoveFile(src, dest) } catch (error) { - props.modal('Moving File Failed', 'Unexpected error while moving file: ' + src, 'Close', async () => {}) + props.modal( + intl.formatMessage({id: 'filePanel.movingFileFailed'}), + intl.formatMessage({id: 'filePanel.movingFileFailedMsg'}, {src}), + intl.formatMessage({id: 'filePanel.close'}), + async () => {} + ) } } @@ -269,7 +306,12 @@ export const FileExplorer = (props: FileExplorerProps) => { try { props.dispatchMoveFolder(src, dest) } catch (error) { - props.modal('Moving Folder Failed', 'Unexpected error while moving folder: ' + src, 'Close', async () => {}) + props.modal( + intl.formatMessage({id: 'filePanel.movingFolderFailed'}), + intl.formatMessage({id: 'filePanel.movingFolderFailedMsg'}, {src}), + intl.formatMessage({id: 'filePanel.close'}), + async () => {} + ) } } diff --git a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx index f73d7df6c5..e1b8b2a446 100644 --- a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx +++ b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx @@ -414,7 +414,7 @@ export function Workspace() { return {...prevState, copyElement: [{key: path, type}]} }) setCanPaste(true) - global.toast(`Copied to clipboard ${path}`) + global.toast(intl.formatMessage({id: 'filePanel.copiedToClipboard'}, {path})) } const handlePasteClick = (dest: string, destType: string) => { @@ -428,7 +428,12 @@ export function Workspace() { try { global.dispatchDownloadPath(path) } catch (error) { - global.modal('Download Failed', 'Unexpected error while downloading: ' + typeof error === 'string' ? error : error.message, 'Close', async () => {}) + global.modal( + intl.formatMessage({id: 'filePanel.downloadFailed'}), + intl.formatMessage({id: 'filePanel.copiedToClipboard'}, {error: typeof error === 'string' ? error : error.message}), + intl.formatMessage({id: 'filePanel.close'}), + async () => {} + ) } } @@ -436,7 +441,12 @@ export function Workspace() { try { global.dispatchCopyFile(src, dest) } catch (error) { - global.modal('Copy File Failed', 'Unexpected error while copying file: ' + src, 'Close', async () => {}) + global.modal( + intl.formatMessage({id: 'filePanel.copyFileFailed'}), + intl.formatMessage({id: 'filePanel.copyFileFailedMsg'}, {src}), + intl.formatMessage({id: 'filePanel.close'}), + async () => {} + ) } } @@ -444,7 +454,12 @@ export function Workspace() { try { global.dispatchCopyFolder(src, dest) } catch (error) { - global.modal('Copy Folder Failed', 'Unexpected error while copying folder: ' + src, 'Close', async () => {}) + global.modal( + intl.formatMessage({id: 'filePanel.copyFolderFailed'}), + intl.formatMessage({id: 'filePanel.copyFolderFailedMsg'}, {src}), + intl.formatMessage({id: 'filePanel.close'}), + async () => {} + ) } } @@ -510,7 +525,7 @@ export function Workspace() { try { global.dispatchRunScript(path) } catch (error) { - global.toast('Run script failed') + global.toast(intl.formatMessage({id: 'filePanel.runScriptFailed'})) } } @@ -524,33 +539,33 @@ export function Workspace() { const pushChangesToGist = (path?: string, type?: string) => { global.modal( - 'Create a public gist', - 'Are you sure you want to push changes to remote gist file on github.com?', - 'OK', + intl.formatMessage({id: 'filePanel.createPublicGist'}), + intl.formatMessage({id: 'filePanel.createPublicGistMsg1'}), + intl.formatMessage({id: 'filePanel.ok'}), () => toGist(path, type), - 'Cancel', + intl.formatMessage({id: 'filePanel.cancel'}), () => {} ) } const publishFolderToGist = (path?: string, type?: string) => { global.modal( - 'Create a public gist', - `Are you sure you want to anonymously publish all your files in the ${path} folder as a public gist on github.com?`, - 'OK', + intl.formatMessage({id: 'filePanel.createPublicGist'}), + intl.formatMessage({id: 'filePanel.createPublicGistMsg2'}, {path}), + intl.formatMessage({id: 'filePanel.ok'}), () => toGist(path, type), - 'Cancel', + intl.formatMessage({id: 'filePanel.cancel'}), () => {} ) } const publishFileToGist = (path?: string, type?: string) => { global.modal( - 'Create a public gist', - `Are you sure you want to anonymously publish ${path} file as a public gist on github.com?`, - 'OK', + intl.formatMessage({id: 'filePanel.createPublicGist'}), + intl.formatMessage({id: 'filePanel.createPublicGistMsg3'}, {path}), + intl.formatMessage({id: 'filePanel.ok'}), () => toGist(path, type), - 'Cancel', + intl.formatMessage({id: 'filePanel.cancel'}), () => {} ) } @@ -558,7 +573,9 @@ export function Workspace() { const deleteMessage = (path: string[]) => { return (
-
Are you sure you want to delete {path.length > 1 ? 'these items' : 'this item'}?
+
+ {path.length > 1 ? : }? +
{path.map((item, i) => (
  • {item}
    • ))} @@ -571,13 +588,13 @@ export function Workspace() { if (!Array.isArray(path)) path = [path] global.modal( - `Delete ${path.length > 1 ? 'items' : 'item'}`, + path.length > 1 ? intl.formatMessage({id: 'filePanel.deleteItems'}) : intl.formatMessage({id: 'filePanel.deleteItem'}), deleteMessage(path), - 'OK', + intl.formatMessage({id: 'filePanel.ok'}), () => { global.dispatchDeletePath(path) }, - 'Cancel', + intl.formatMessage({id: 'filePanel.cancel'}), () => {} ) } @@ -587,7 +604,7 @@ export function Workspace() { } const editModeOn = (path: string, type: string, isNew = false) => { - if (global.fs.readonly) return global.toast('Cannot write/modify file system in read only mode.') + if (global.fs.readonly) return global.toast(intl.formatMessage({id: 'filePanel.globalToast'})) setState((prevState) => { return { ...prevState, @@ -685,10 +702,10 @@ export function Workspace() { > @@ -709,7 +726,7 @@ export function Workspace() { @@ -726,19 +743,19 @@ export function Workspace() {
    @@ -750,7 +767,7 @@ export function Workspace() {
    @@ -787,7 +804,7 @@ export function Workspace() { htmlFor="initGitRepository" data-id="initGitRepositoryLabel" className="m-0 form-check-label custom-control-label udapp_checkboxAlign" - title="Check option to initialize workspace as a new git repository" + title={intl.formatMessage({id: 'filePanel.initGitRepoTitle'})} > @@ -812,7 +829,7 @@ export function Workspace() { } const formatNameForReadonly = (name: string) => { - return global.fs.readonly ? name + ' (read-only)' : name + return global.fs.readonly ? name + ` (${intl.formatMessage({id: 'filePanel.readOnly'})})` : name } const cloneModalMessage = () => { @@ -903,14 +920,26 @@ export function Workspace() { createWorkspace() }} > - { - create a new workspace - } + { + + {' '} + - -{' '} + + } { switchWorkspace(LOCALHOST) }} > - {currentWorkspace === LOCALHOST ? ✓ localhost : {LOCALHOST} } + {currentWorkspace === LOCALHOST ? ( + ✓ localhost + ) : ( + + {' '} + {' '} + + )} {global.fs.browser.workspaces.map(({name, isGitRepo}, index) => ( { switchToBranch(branch) }} - title={branch.remote ? 'Checkout new branch from remote branch' : 'Checkout to local branch'} + title={intl.formatMessage({id: `filePanel.switchToBranch${branch.remote ? 'Title1' : 'Title2'}`})} >
    {currentBranch === branch.name && !branch.remote ? (