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.

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

Improve French translations #811

Merged
merged 2 commits into from
Apr 16, 2021
Merged

Improve French translations #811

merged 2 commits into from
Apr 16, 2021

Conversation

LeMinaw
Copy link
Contributor

@LeMinaw LeMinaw commented Apr 3, 2021

Description

As a native French speaker, I fixed a few spelling issues in the current translation.

Motivation and Context

The most important change is replacing Annuler with Rétablir (for Revert), because the first translates to Cancel -which is very misleading, as you moght have guessed.

How Has This Been Tested?

I'm using this fork on a project where it works like expected.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • I have run the make format command to format my code
    => make format errors on my machine
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
    => make docs errors on my machine
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
    => non applicable
  • I have added my name and/or github handle to AUTHORS.rst
  • I have added my change to CHANGES.rst
    => minor change, I guess it's not required
  • All new and existing tests passed.
    => some tests do not pass on my machine, but it's clearly unrelated

@codecov
Copy link

codecov bot commented Apr 3, 2021

Codecov Report

Merging #811 (6aa160b) into master (418716e) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #811   +/-   ##
=======================================
  Coverage   97.47%   97.47%           
=======================================
  Files          18       18           
  Lines         992      992           
  Branches      151      151           
=======================================
  Hits          967      967           
  Misses         12       12           
  Partials       13       13           

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 418716e...6aa160b. Read the comment docs.

@LeMinaw
Copy link
Contributor Author

LeMinaw commented Apr 3, 2021

(CI not passing is due to docker timeout when pulling resources, and has nothing to do with this PR -it only contains translations)

@ThePumpingLemma
Copy link
Collaborator

(CI not passing is due to docker timeout when pulling resources, and has nothing to do with this PR -it only contains translations)

I reran and it worked fine.

"X-Generator: Poedit 2.3\n"

#: simple_history/admin.py:111
#: .\simple_history\admin.py:102
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why are all of the slashes now backslashes?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Because sadly, path encoding depends on the platform gettext is running on.
I'm not sure whether this is a big deal or not, as running makemessages again on a GNU/Linux system would revert to /.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Would it be worth overriding the makemessages command to normalize the paths? Not sure why Django doesn’t do this by default (AFAIK, Unix-style paths work fine on Windows).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm not sure how 3rd-party translation tools manage with this.
Overriding makemessages might be an idea, but it doesn't sound very project-specific to me. I guess Django preserves default gettext behavior, as generally you'll run makemessages on the platform you are translating on before making any edits.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

(in the context of this somewhat trivial PR, I'll rather do a quick regex replace and not dive into a makemessages override and the tests that it would need)

@barm barm merged commit 723462c into jazzband:master Apr 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants