Skip to content

Commit a3b3cd1

Browse files
ghalestriloghalestrilo
authored
Merge branch 'develop' into feature/mobile-save-sketch
2 parents 2349acc + 093c8ff commit a3b3cd1

File tree

6 files changed

+100
-34
lines changed

6 files changed

+100
-34
lines changed

‎client/modules/IDE/components/ErrorModal.jsx

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
import PropTypes from 'prop-types';
22
import React from 'react';
33
import { Link } from 'react-router';
4+
import { withTranslation } from 'react-i18next';
45

56
class ErrorModal extends React.Component {
67
forceAuthentication() {
78
return (
89
<p>
9-
In order to save sketches, you must be logged in. Please&nbsp;
10-
<Link to="/login" onClick={this.props.closeModal}>Login</Link>
11-
&nbsp;or&nbsp;
12-
<Link to="/signup" onClick={this.props.closeModal}>Sign Up</Link>.
10+
{this.props.t('ErrorModal.MessageLogin')}
11+
<Link to="/login" onClick={this.props.closeModal}> {this.props.t('ErrorModal.Login')}</Link>
12+
{this.props.t('ErrorModal.LoginOr')}
13+
<Link to="/signup" onClick={this.props.closeModal}>{this.props.t('ErrorModal.SignUp')}</Link>.
1314
</p>
1415
);
1516
}
1617

1718
staleSession() {
1819
return (
1920
<p>
20-
It looks like you&apos;ve been logged out. Please&nbsp;
21-
<Link to="/login" onClick={this.props.closeModal}>log in</Link>.
21+
{this.props.t('ErrorModal.MessageLoggedOut')}
22+
<Link to="/login" onClick={this.props.closeModal}>{this.props.t('ErrorModal.LogIn')}</Link>.
2223
</p>
2324
);
2425
}
2526

2627
staleProject() {
2728
return (
2829
<p>
29-
The project you have attempted to save has been saved from another window.
30-
Please refresh the page to see the latest version.
30+
{this.props.t('ErrorModal.SavedDifferentWindow')}
3131
</p>
3232
);
3333
}
@@ -51,7 +51,8 @@ class ErrorModal extends React.Component {
5151

5252
ErrorModal.propTypes = {
5353
type: PropTypes.string.isRequired,
54-
closeModal: PropTypes.func.isRequired
54+
closeModal: PropTypes.func.isRequired,
55+
t: PropTypes.func.isRequired
5556
};
5657

57-
export default ErrorModal;
58+
export default withTranslation()(ErrorModal);

‎client/modules/IDE/components/FileUploader.jsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import React from 'react';
33
import Dropzone from 'dropzone';
44
import { bindActionCreators } from 'redux';
55
import { connect } from 'react-redux';
6+
import { withTranslation } from 'react-i18next';
67
import * as UploaderActions from '../actions/uploader';
78
import getConfig from '../../../utils/getConfig';
89
import { fileExtensionsAndMimeTypes } from '../../../../server/utils/fileUtils';
@@ -30,7 +31,7 @@ class FileUploader extends React.Component {
3031
thumbnailWidth: 200,
3132
thumbnailHeight: 200,
3233
acceptedFiles: fileExtensionsAndMimeTypes,
33-
dictDefaultMessage: 'Drop files here or click to use the file browser',
34+
dictDefaultMessage: this.props.t('FileUploader.DictDefaultMessage'),
3435
accept: this.props.dropzoneAcceptCallback.bind(this, userId),
3536
sending: this.props.dropzoneSendingCallback,
3637
complete: this.props.dropzoneCompleteCallback
@@ -59,7 +60,8 @@ FileUploader.propTypes = {
5960
}),
6061
user: PropTypes.shape({
6162
id: PropTypes.string
62-
})
63+
}),
64+
t: PropTypes.func.isRequired
6365
};
6466

6567
FileUploader.defaultProps = {
@@ -84,4 +86,4 @@ function mapDispatchToProps(dispatch) {
8486
return bindActionCreators(UploaderActions, dispatch);
8587
}
8688

87-
export default connect(mapStateToProps, mapDispatchToProps)(FileUploader);
89+
export default withTranslation()(connect(mapStateToProps, mapDispatchToProps)(FileUploader));

‎client/modules/IDE/components/ShareModal.jsx

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import PropTypes from 'prop-types';
22
import React from 'react';
3+
import { withTranslation } from 'react-i18next';
34
import CopyableInput from './CopyableInput';
45

56
class ShareModal extends React.PureComponent {
@@ -16,21 +17,21 @@ class ShareModal extends React.PureComponent {
1617
{projectName}
1718
</h3>
1819
<CopyableInput
19-
label="Embed"
20+
label={this.props.t('ShareModal.Embed')}
2021
value={`<iframe src="${hostname}/${ownerUsername}/embed/${projectId}"></iframe>`}
2122
/>
2223
<CopyableInput
23-
label="Present"
24+
label={this.props.t('ShareModal.Present')}
2425
hasPreviewLink
2526
value={`${hostname}/${ownerUsername}/present/${projectId}`}
2627
/>
2728
<CopyableInput
28-
label="Fullscreen"
29+
label={this.props.t('ShareModal.Fullscreen')}
2930
hasPreviewLink
3031
value={`${hostname}/${ownerUsername}/full/${projectId}`}
3132
/>
3233
<CopyableInput
33-
label="Edit"
34+
label={this.props.t('ShareModal.Edit')}
3435
hasPreviewLink
3536
value={`${hostname}/${ownerUsername}/sketches/${projectId}`}
3637
/>
@@ -42,7 +43,8 @@ class ShareModal extends React.PureComponent {
4243
ShareModal.propTypes = {
4344
projectId: PropTypes.string.isRequired,
4445
ownerUsername: PropTypes.string.isRequired,
45-
projectName: PropTypes.string.isRequired
46+
projectName: PropTypes.string.isRequired,
47+
t: PropTypes.func.isRequired
4648
};
4749

48-
export default ShareModal;
50+
export default withTranslation()(ShareModal);

‎client/modules/IDE/components/UploadFileModal.jsx

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import React from 'react';
22
import PropTypes from 'prop-types';
33
import { connect } from 'react-redux';
44
import { Link } from 'react-router';
5+
import { withTranslation } from 'react-i18next';
56
import prettyBytes from 'pretty-bytes';
67
import getConfig from '../../../utils/getConfig';
78
import FileUploader from './FileUploader';
@@ -14,7 +15,8 @@ const limitText = prettyBytes(limit);
1415
class UploadFileModal extends React.Component {
1516
propTypes = {
1617
reachedTotalSizeLimit: PropTypes.bool.isRequired,
17-
closeModal: PropTypes.func.isRequired
18+
closeModal: PropTypes.func.isRequired,
19+
t: PropTypes.func.isRequired
1820
}
1921

2022
componentDidMount() {
@@ -31,22 +33,18 @@ class UploadFileModal extends React.Component {
3133
<section className="modal" ref={(element) => { this.modal = element; }}>
3234
<div className="modal-content">
3335
<div className="modal__header">
34-
<h2 className="modal__title">Upload File</h2>
36+
<h2 className="modal__title">{this.props.t('UploadFileModal.Title')}</h2>
3537
<button
3638
className="modal__exit-button"
3739
onClick={this.props.closeModal}
38-
aria-label="Close upload file modal"
40+
aria-label={this.props.t('UploadFileModal.CloseButtonARIA')}
3941
>
4042
<ExitIcon focusable="false" aria-hidden="true" />
4143
</button>
4244
</div>
4345
{ this.props.reachedTotalSizeLimit &&
4446
<p>
45-
{
46-
`Error: You cannot upload any more files. You have reached the total size limit of ${limitText}.
47-
If you would like to upload more, please remove the ones you aren't using anymore by
48-
in your `
49-
}
47+
{this.props.t('UploadFileModal.SizeLimitError', { sizeLimit: limitText })}
5048
<Link to="/assets" onClick={this.props.closeModal}>assets</Link>
5149
.
5250
</p>
@@ -68,4 +66,4 @@ function mapStateToProps(state) {
6866
};
6967
}
7068

71-
export default connect(mapStateToProps)(UploadFileModal);
69+
export default withTranslation()(connect(mapStateToProps)(UploadFileModal));

‎translations/locales/en-US/translations.json

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,13 +326,35 @@
326326
"AlreadyHave": "Already have an account?",
327327
"Login": "Log In"
328328
},
329-
330329
"EmailVerificationView": {
331330
"Title": "p5.js Web Editor | Email Verification",
332331
"Verify": "Verify your email",
333332
"InvalidTokenNull": "That link is invalid.",
334333
"Checking": "Validating token, please wait...",
335334
"Verified": "All done, your email address has been verified.",
336335
"InvalidState": "Something went wrong."
336+
},
337+
"UploadFileModal": {
338+
"Title": "Upload File",
339+
"CloseButtonARIA": "Close upload file modal",
340+
"SizeLimitError": "Error: You cannot upload any more files. You have reached the total size limit of {{sizeLimit}}.\n If you would like to upload more, please remove the ones you aren't using anymore by\n in your "
341+
},
342+
"FileUploader": {
343+
"DictDefaultMessage": "Drop files here or click to use the file browser"
344+
},
345+
"ErrorModal": {
346+
"MessageLogin": "In order to save sketches, you must be logged in. Please ",
347+
"Login": "Login",
348+
"LoginOr": " or ",
349+
"SignUp": "Sign Up",
350+
"MessageLoggedOut": "It looks like you've been logged out. Please ",
351+
"LogIn": "log in",
352+
"SavedDifferentWindow": "The project you have attempted to save has been saved from another window.\n Please refresh the page to see the latest version."
353+
},
354+
"ShareModal": {
355+
"Embed": "Embed",
356+
"Present": "Present",
357+
"Fullscreen": "Fullscreen",
358+
"Edit": "Edit"
337359
}
338360
}

‎translations/locales/es-419/translations.json

Lines changed: 46 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,15 +174,33 @@
174174
}
175175
},
176176
"Sidebar": {
177-
"Create": "Crear",
178-
"EnterName": "Introduce un nombre",
179-
"Add": "Agregar",
180-
"Folder": "Directorio"
177+
"Title": "Archivos de Bosquejo",
178+
"ToggleARIA": "Alternar abrir/cerrar opciones de archivo de bosquejo",
179+
"AddFolder": "Crear directorio",
180+
"AddFolderARIA": "Agregar directorio",
181+
"AddFile": "Crear archivo",
182+
"AddFileARIA": "agregar archivo",
183+
"UploadFile": "Subir archivo",
184+
"UploadFileARIA": "Subir archivo"
185+
},
186+
"FileNode": {
187+
"OpenFolderARIA": "Abrir contenidos del directorio",
188+
"CloseFolderARIA": "Cerrar contenidos del directorio",
189+
"ToggleFileOptionsARIA": "Alternar abrir/cerrar opciones de archivo",
190+
"AddFolder": "Crear directorio",
191+
"AddFolderARIA": "Agregar directorio",
192+
"AddFile": "Crear archivo",
193+
"AddFileARIA": "agregar archivo",
194+
"UploadFile": "Subir archivo",
195+
"UploadFileARIA": "Subir archivo",
196+
"Rename": "Renombrar",
197+
"Delete": "Borrar"
181198
},
182199
"Common": {
183200
"Error": "Error",
184201
"Save": "Guardar",
185-
"p5logoARIA": "Logo p5.js "
202+
"p5logoARIA": "Logo p5.js ",
203+
"DeleteConfirmation": "¿Estás que quieres borrar {{name}}?"
186204
},
187205
"IDEView": {
188206
"SubmitFeedback": "Enviar retroalimentación"
@@ -315,5 +333,28 @@
315333
"Checking": "Validando token, por favor espera...",
316334
"Verified": "Concluido, tu correo electrónico ha sido verificado.",
317335
"InvalidState": "Algo salió mal."
336+
},
337+
"UploadFileModal": {
338+
"Title": "Subir Archivo",
339+
"CloseButtonARIA": "Cerrar diálogo para subir archivo",
340+
"SizeLimitError": "Error: No puedes subir archivos. Has alcanzado el limite de tamaño total de {{sizeLimit}}.\n Si quieres agregar más,por favor remueve alugnos que no estes usando en tus "
341+
},
342+
"FileUploader": {
343+
"DictDefaultMessage": "Deposita los archivos aquí o haz click para usar el navegador de archivos"
344+
},
345+
"ErrorModal": {
346+
"MessageLogin": "Para poder guardar bosquejos, debes ingresar a tu cuenta. Por favor ",
347+
"Login": "Ingresa",
348+
"LoginOr": " o ",
349+
"SignUp": "Registráte",
350+
"MessageLoggedOut": "Parece que has salido de tu cuenta. Por favor ",
351+
"LogIn": "ingresa",
352+
"SavedDifferentWindow": " El proyecto que has intentado guardar ha sido guardado desde otra ventana.\n Por favor refresca la página para ver la versión más actual."
353+
},
354+
"ShareModal": {
355+
"Embed": "Incrustar",
356+
"Present": "Presentar",
357+
"Fullscreen": "Pantalla Completa",
358+
"Edit": "Editar"
318359
}
319360
}

0 commit comments

Comments
 (0)