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

Jump to bottom

Add Ukrainian translations for the whole project #6223

Merged
merged 2 commits into from Jul 2, 2020
Merged

Add Ukrainian translations for the whole project #6223

merged 2 commits into from Jul 2, 2020

Conversation

richardgrey
Copy link
Contributor

Description of what you did:

  • UK locale added across the project.
  • Minor misspellings in English translations.
  • Few missing translations.
  • Fix for input placeholders in email-templates forms at users-permissions plugin (proper ids and removing HTML tags from translation, as react-intl doesn't allow them).

@codecov
Copy link

codecov bot commented May 15, 2020 •
edited

Codecov Report

Merging #6223 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #6223   +/-   ##
=======================================
  Coverage   20.05%   20.05%           
=======================================
  Files         858      858           
  Lines       12049    12049           
  Branches     1950     1950           
=======================================
  Hits         2416     2416           
  Misses       8063     8063           
  Partials     1570     1570
Flag Coverage Δ
#front 14.67% <ø> (ø)
#unit 42.45% <ø> (ø)
Impacted Files Coverage Δ
...kages/strapi-admin/admin/src/translations/index.js 100.00% <ø> (ø)
...in-content-manager/admin/src/translations/index.js 0.00% <ø> (ø)
...ntent-type-builder/admin/src/translations/index.js 0.00% <ø> (ø)
...ugin-documentation/admin/src/translations/index.js 0.00% <ø> (ø)
...trapi-plugin-email/admin/src/translations/index.js 0.00% <ø> (ø)
...rapi-plugin-upload/admin/src/translations/index.js 0.00% <ø> (ø)
...-permissions/admin/src/components/ListRow/index.js 0.00% <ø> (ø)
...-users-permissions/admin/src/translations/index.js 0.00% <ø> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8edb6cd...a014368. Read the comment docs.

soupette
soupette suggested changes May 29, 2020
View reviewed changes
Copy link
Contributor

@soupette soupette left a comment

Choose a reason for hiding this comment

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

Thanks a lot for your contribution!

Can you just fix the conflict so we can merge your PR?

packages/strapi-plugin-email/admin/src/translations/uk.json Show resolved Hide resolved
packages/strapi-plugin-email/admin/src/translations/en.json Outdated Show resolved Hide resolved
packages/strapi-plugin-users-permissions/admin/src/components/ListRow/index.js Outdated
@@ -93,9 +94,13 @@ class ListRow extends React.Component {
</div>
<div className="col-md-6" style={{ fontWeight: '500' }}>
{get(this.props.values, [get(this.props.item, 'name'), 'enabled']) ? (
<span style={{ color: '#5A9E06' }}>Enabled</span>
<span style={{ color: '#5A9E06' }}>
<FormattedMessage id={getTrad('ListRow.enabled')} />
Copy link
Contributor

@soupette soupette May 29, 2020 •
edited

Choose a reason for hiding this comment

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

Thanks a lot for adding this trad!

@richardgrey richardgrey force-pushed the locale_uk branch 2 times, most recently from 10a35c1 to 71eb9f2 Compare May 29, 2020 15:57
soupette
soupette previously approved these changes Jun 1, 2020
View reviewed changes
Copy link
Contributor

@soupette soupette left a comment

Choose a reason for hiding this comment

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

LGTM!

Thanks a lot for your contribution!

@soupette soupette added this to the 3.0.2 milestone Jun 1, 2020
@soupette soupette added source: core:admin Source is core/admin package issue: enhancement Issue suggesting an enhancement to an existing feature labels Jun 1, 2020
@alexandrebodin
Copy link
Member

Hi @richardgrey can you resolve the conflicts in your PR please :)

@alexandrebodin alexandrebodin removed this from the 3.0.2 milestone Jun 11, 2020
@dannymatkovsky
Copy link

@alexandrebodin @richardgrey
I'd like to help with this one. But don't really understand how a bunch of translation files may cause a Knex: Timeout acquiring a connection error.
Can you please guide me?

@alexandrebodin
Copy link
Member

@richardgrey I'm not talking about the tests but the git conflicts :)

@richardgrey
Copy link
Contributor Author

Hey @alexandrebodin! I've just updated the branch. Thank you for patience =)

@richardgrey
Add Ukrainian translations for the whole project
4719741 
Signed-off-by: richardgrey <richie.grey@gmail.com>
soupette
soupette approved these changes Jul 1, 2020
View reviewed changes
Copy link
Contributor

@soupette soupette left a comment

Choose a reason for hiding this comment

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

LGTM

@soupette soupette added this to the 3.0.6 milestone Jul 1, 2020
@alexandrebodin alexandrebodin merged commit fd3c769 into strapi:master Jul 2, 2020
This was referenced Jun 6, 2021
Closed
Closed
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@soupette soupette soupette approved these changes

Assignees
No one assigned
Labels
issue: enhancement Issue suggesting an enhancement to an existing feature source: core:admin Source is core/admin package
Projects
None yet
Milestone
3.0.6
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@richardgrey @alexandrebodin @dannymatkovsky @soupette