locale: Restore translations lost in 357467022 #2967
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…uit#2931 from tannewt/esp32s2_digitalio
|
@tannewt can you take a look please? |
jepler
added a commit
to jepler/circuitpython
that referenced
this pull request
May 28, 2020
Length was stored as a 16-bit number always. Most translations have a max length far less. For example, US English translation lengths always fit in just 8 bits. probably all languages fit in 9 bits. This also has the side effect of reducing the alignment of compressed_string_t from 2 bytes to 1. testing performed: ran in german and english on pyruler, printed messages looked right. Firmware size, en_US Before: 3044 bytes free in flash After: 3408 bytes free in flash Firmware size, de_DE (with adafruit#2967 merged to restore translations) Before: 1236 bytes free in flash After: 1600 bytes free in flash
tannewt
approved these changes
May 28, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
"Merge pull request #2005 931 from tannewt/esp32s2_digitalio"
I noticed that instead of being quasi-complete as they were a few days ago, these translations were back in the range of 2/3 complete.
Inspecting the git history, I saw that they were unexpectedly changed in the merge commit 3574670. This is easiest to see if you
git diff 357467022^ 357467022 -- locale, you can see that e.g., this message translation is removed accidentally:We may also want to examine our processes to see if there's a way to avoid this. Changing what "make translate" does (so that it only updates the .pot file, not the .po files) may help. I hope to have a concrete proposal soon.