More space savings

[jepler]

Two big ones:

• eliminating a bunch of incorrect, never-used QSTRs
• Fixing a problem where the French translation was using Unicode code points above 255 again; this almost certainly pops French out of being the largest translation again

We should add a check for langauges that we expect all the chars to fit in uint8_t actually do, otherwise firmware grows by up to 500+ bytes...

[jepler]

Marking this as a draft, we can pick and choose from these improvements when we have a need for space ...

[dhalbert]

@Neradoc what do you think of the French apostrophe change? I'm not sure we could get the regular translators to do that, or if it looks wrong.

[Neradoc]

@Neradoc what do you think of the French apostrophe change? I'm not sure we could get the regular translators to do that, or if it looks wrong.

As far as I know it's only ever auto inserted by software, like Word, a CMS and such. Nobody is gonna notice the difference. It's also not even used consistently in CP.

[jepler]

I also had to respell an œ as oe, and made changes in a few other translations as well.

we could look into a different way of storing the data (such as utf-8) but last time I looked there was a real inconvenience to storing values[] in a way that can't simply be indexed

I also noticed that some other languages, like ru, use just a small number of codes well outside the 0-255 range. A much less complicated rule could remap the 160..255 values to those code points and potentially save space. In the board I've been using as my benchmark (adafruit_proxlight_trinkey_m0), with all the uint8 fixes, the fullest languages are ru and el (greek) which could benefit from this treatment.

[dhalbert]

@jepler Did you back out all the French spelling changes? That was the thing I was worried about. If so, I'll approve.

[dhalbert]

Needs a re-merge from upstream.

[jepler]

I'll rebase.

The french translation leaves œ but still changes a smart-quote to a regular quote.

[jepler]

@dhalbert ready for hopefully one last review

[dhalbert]

Looks good! More bytes to use up :)

[dhalbert]

After merging this, I got an email from weblate:

Could not merge the repository.

Weblate could not merge upstream changes while updating the repository.

Auto-merging locale/nl.po
Auto-merging locale/fr.po
Auto-merging locale/fil.po
CONFLICT (content): Merge conflict in locale/fil.po
Automatic merge failed; fix conflicts and then commit the result.
 (1)

Typical workflow for fixing merge conflicts

1. Commit all pending changes in Weblate and lock the translation component.
   wlc commit; wlc lock
2. Add Weblate exported repository as a remote.
   git remote add weblate https://hosted.weblate.org/git/circuitpython/main/ ; git remote update weblate
3. Merge Weblate changes and resolve any conflicts.
   git merge weblate/main
4. Push changes into upstream repository.
   git push origin main
5. Weblate should now be able to see updated repository and you can unlock it.
   wlc pull ; wlc unlock

Check the FAQ for info on how to resolve this.

View all alerts