Skip to content

Spanish Translation Account form and New Password #1547

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.

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

Merged
merged 8 commits into from
Aug 13, 2020

Conversation

oruburos
Copy link
Collaborator

@oruburos oruburos commented Aug 12, 2020

I have verified that this pull request:

  • has no linting errors (npm run lint)
  • is from a uniquely-named feature branch and has been rebased on top of the latest master. (If I was asked to make more changes, I have made sure to rebase onto master then too)
  • is descriptively named

This PR introduces Spanish Translation for the Account Form/View, ApiKeyForm and List and New Password Form/View

@andrewn
Copy link
Member

andrewn commented Aug 13, 2020

This is looking very good.

@oruburos Can you fix the merge conflicts in this branch and then let me know when it's done please?

@oruburos
Copy link
Collaborator Author

@andrewn Hi, I've merged the most recent develop branch with this PR to solve the conflicts, can you have a look please?

@@ -39,7 +39,8 @@ class APIKeyForm extends React.Component {
}

removeKey(key) {
const message = `Are you sure you want to delete "${key.label}"?`;
// const message = `Are you sure you want to delete "${}"?`;
const message = i18next.t('APIKeyForm.ConfirmDelete', { key_label: key.label });
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should use withTranslation, not i18next as it's within a component.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, the change requested it is complete, can you check this please?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You also need to remove the i18next import from the top of the file as it's no longer used. The lint should be warning about this.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, the import is deleted, can you have a look please.?

Copy link
Member

@andrewn andrewn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great!

@andrewn andrewn merged commit 236cdac into processing:develop Aug 13, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants