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

chore(fr-translation): update whole French translation (based on 1.3.0 release) #16868

Merged
merged 75 commits into from
Nov 18, 2021

Conversation

audour
Copy link
Contributor

@audour audour commented Sep 28, 2021

SUMMARY

Based on 1.3.0 release, update whole French translation by following CONTRIBUTING.md#translating.

BEFORE/AFTER SCREENSHOTS

Before:
2021-09-28_before

After:
2021-09-28_after

ADDITIONAL INFORMATION

Copy link
Contributor

@mathieudruart mathieudruart left a comment

Choose a reason for hiding this comment

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

I reviewed the first 1300 lines (I will continue later)

superset/translations/fr/LC_MESSAGES/messages.po Outdated Show resolved Hide resolved
superset/translations/fr/LC_MESSAGES/messages.po Outdated Show resolved Hide resolved
superset/translations/fr/LC_MESSAGES/messages.po Outdated Show resolved Hide resolved
superset/translations/fr/LC_MESSAGES/messages.po Outdated Show resolved Hide resolved
superset/translations/fr/LC_MESSAGES/messages.po Outdated Show resolved Hide resolved
superset/translations/fr/LC_MESSAGES/messages.po Outdated Show resolved Hide resolved
superset/translations/fr/LC_MESSAGES/messages.po Outdated Show resolved Hide resolved
superset/translations/fr/LC_MESSAGES/messages.po Outdated Show resolved Hide resolved
superset/translations/fr/LC_MESSAGES/messages.po Outdated Show resolved Hide resolved
superset/translations/fr/LC_MESSAGES/messages.po Outdated Show resolved Hide resolved
@mistercrunch mistercrunch added the i18n:french Translation related to French language label Oct 28, 2021
superset/translations/fr/LC_MESSAGES/messages.po Outdated Show resolved Hide resolved
superset/translations/fr/LC_MESSAGES/messages.po Outdated Show resolved Hide resolved
superset/translations/fr/LC_MESSAGES/messages.po Outdated Show resolved Hide resolved
superset/translations/fr/LC_MESSAGES/messages.po Outdated Show resolved Hide resolved
superset/translations/fr/LC_MESSAGES/messages.po Outdated Show resolved Hide resolved
superset/translations/fr/LC_MESSAGES/messages.po Outdated Show resolved Hide resolved
superset/translations/fr/LC_MESSAGES/messages.po Outdated Show resolved Hide resolved
superset/translations/fr/LC_MESSAGES/messages.po Outdated Show resolved Hide resolved
superset/translations/fr/LC_MESSAGES/messages.po Outdated Show resolved Hide resolved
superset/translations/fr/LC_MESSAGES/messages.po Outdated Show resolved Hide resolved
@villebro
Copy link
Member

@audour this PR has a conflict - can you rebase it so we can get these comprehensive fixes merged? Thanks!

@audour
Copy link
Contributor Author

audour commented Nov 15, 2021

@audour this PR has a conflict - can you rebase it so we can get these comprehensive fixes merged? Thanks!

Hi @villebro,
As I'm not very familiar with Github suggestions (as proposed above by @mathieudruart and @martin-raymond), can you confirm that following steps would be OK:

  1. accept manually each suggestion using "Commit suggestion" button => it will create as many commits as suggestions
  2. do the rebase following this approach on the master branch latest commit : https://gist.github.com/scottyhq/299e4d36018a2f13acfb2528a1553002
    Thanks in advance for your help

@villebro
Copy link
Member

@audour I think this will work just fine. The PR will be squashed to a single commit during merging, so it doesn't really matter how many commits there are in the PR. So to reiterate what I think is most sensible here:

  1. click through all suggestions.
  2. one done, merge master on the PR, resolve the outstanding conflicts, then push and tag a committer so we can get it merged.

audour and others added 22 commits November 15, 2021 17:54
Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>
Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>
Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>
Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>
Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>
Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>
Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>
Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>
Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>
Co-authored-by: martin-raymond <martin.raymond31@gmail.com>
Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>
Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>
Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>
Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>
Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>
Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>
Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>
Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>
Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>
Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>
Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>
@audour
Copy link
Contributor Author

audour commented Nov 15, 2021

Thanks to @martin-raymond and @mathieudruart for their suggestions: I've applied almost all of them. For others I've answered with a comment.
@villebro: it seems that conflicts are resolved, I hope it's now ok to merge.

@junlincc
Copy link
Member

@audour Thank you for the contribution! We can merge, as soon as the the checks pass :)

@villebro
Copy link
Member

Thanks @audour - I kicked off the tests, will babysit this and ping you if there's anything that needs further attention.

@codecov
Copy link

codecov bot commented Nov 16, 2021

Codecov Report

Merging #16868 (b4a6813) into master (9741eaa) will increase coverage by 5.10%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #16868      +/-   ##
==========================================
+ Coverage   76.94%   82.05%   +5.10%     
==========================================
  Files        1042      362     -680     
  Lines       56248    29117   -27131     
  Branches     7784        0    -7784     
==========================================
- Hits        43280    23891   -19389     
+ Misses      12709     5226    -7483     
+ Partials      259        0     -259     
Flag Coverage Δ
hive ?
javascript ?
mysql 81.95% <ø> (-0.01%) ⬇️
postgres 81.96% <ø> (-0.01%) ⬇️
presto ?
python 82.05% <ø> (-0.42%) ⬇️
sqlite 81.64% <ø> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
superset/db_engines/hive.py 0.00% <0.00%> (-85.19%) ⬇️
superset/db_engine_specs/hive.py 69.49% <0.00%> (-16.99%) ⬇️
superset/db_engine_specs/presto.py 83.47% <0.00%> (-6.49%) ⬇️
superset/views/database/mixins.py 81.03% <0.00%> (-1.73%) ⬇️
superset/connectors/sqla/models.py 86.79% <0.00%> (-1.59%) ⬇️
superset/utils/webdriver.py 79.78% <0.00%> (-1.12%) ⬇️
superset/models/core.py 89.26% <0.00%> (-0.74%) ⬇️
superset/db_engine_specs/base.py 88.20% <0.00%> (-0.39%) ⬇️
superset/utils/core.py 89.61% <0.00%> (-0.12%) ⬇️
superset/config.py 91.50% <0.00%> (ø)
... and 681 more

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 9741eaa...b4a6813. Read the comment docs.

@villebro
Copy link
Member

@audour it appears you need to fix some lint to get CI green:
image

@audour
Copy link
Contributor Author

audour commented Nov 16, 2021

@audour it appears you need to fix some lint to get CI green

Hi @villebro, sorry for that I've just pushed an update. News since last push:

  • open fr PO file with Poedit which :
    • highlighted a typo error -> fixed
    • highlighted about a hundred suggestions about adding/removing trailing spaces, final dots or first capital letter -> fixed
  • re-extract strings with pybabel extract to get new strings since I've rebased yesterday the working branch on master and re-update fr language file
  • add missing strings and review all lines marked as "fuzzy" by POedit
  • update the .json
  • last check: re-run with success pybabel extract/pybabel update/po2json.sh/pybabel compile

Hope CI will turn green

@villebro
Copy link
Member

Thanks so much for this! I started tests, fingers crossed 🤞

@junlincc
Copy link
Member

@villebro I am curious why one of the tests is not passing as this PR seems super low risk?

@junlincc junlincc added this to review in progress in Community issues Nov 16, 2021
@villebro
Copy link
Member

villebro commented Nov 17, 2021

I am curious why one of the tests is not passing as this PR seems super low risk?

@junlincc we have a linting rule that expects the code to be formatted in a certain way. For instance, it doesn't allow for blank spaces at the end of the line or missing/excessive line changes at the end of files.

@audour do you mind taking another look? If needed I can help fix the issue.

@audour
Copy link
Contributor Author

audour commented Nov 17, 2021

@audour do you mind taking another look? If needed I can help fix the issue.

Hi @villebro, I can take another look but to be efficient I need to know the list of linting rules as the file superset/translations/fr/LC_MESSAGES/messages.po seems OK for Poedit and pybabel and to figure out how to find the issues locally without a dedicated linter.

@villebro
Copy link
Member

villebro commented Nov 17, 2021

This appears to be the violation (redundant line change at the end of the file):

diff --git a/superset/translations/fr/LC_MESSAGES/messages.po b/superset/translations/fr/LC_MESSAGES/messages.po
index c2058ee9e..8beec739c 100644
--- a/superset/translations/fr/LC_MESSAGES/messages.po
+++ b/superset/translations/fr/LC_MESSAGES/messages.po
@@ -10632,4 +10632,3 @@ msgstr "Zone de texte"
 #: superset-frontend/src/visualizations/TimeTable/TimeTableChartPlugin.js:36
 msgid "Trend"
 msgstr "Tendance"
-

These get picked up automatically by pre-commit (check CONTRIBUTING.md if you want to enable it by default)

@audour
Copy link
Contributor Author

audour commented Nov 17, 2021

This appears to be the violation (redundant line change at the end of the file):

Thanks, so is it ok with this new commit b4a6813 ?

@villebro
Copy link
Member

This appears to be the violation (redundant line change at the end of the file):

Thanks, so is it ok with this new commit b4a6813 ?

Yes, this seems to have fixed it 👍 merging as soon as the flaky test has passed (restarted now)

@villebro villebro merged commit 56d742f into apache:master Nov 18, 2021
AAfghahi pushed a commit that referenced this pull request Jan 10, 2022
…0 release) (#16868)

* Update whole French translation (from 1.3.0)

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

Co-authored-by: martin-raymond <martin.raymond31@gmail.com>

* Update superset/translations/fr/LC_MESSAGES/messages.po

* Update superset/translations/fr/LC_MESSAGES/messages.json

* Update and fix superset/translations/fr/LC_MESSAGES/messages.po after extracting new strings

* Update superset/translations/fr/LC_MESSAGES/messages.po by fixing fuzzy lines and filling missing strings

* Update superset/translations/fr/LC_MESSAGES/messages.po : just rerun `pybabel update`

* Update superset/translations/fr/LC_MESSAGES/messages.json

* Update superset/translations/fr/LC_MESSAGES/messages.po: fix redundant new line at EOF

Co-authored-by: mathieudruart <mathieudruart@users.noreply.github.com>
Co-authored-by: martin-raymond <martin.raymond31@gmail.com>
@mistercrunch mistercrunch added 🏷️ bot A label used by `supersetbot` to keep track of which PR where auto-tagged with release labels 🚢 1.5.0 labels Mar 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏷️ bot A label used by `supersetbot` to keep track of which PR where auto-tagged with release labels i18n:french Translation related to French language size/XXL 🚢 1.5.0
Projects
Community issues
review in progress
Development

Successfully merging this pull request may close these issues.

French translation not usable: contribution proposal
6 participants