chore: Add support for UA language translation. #4415

philmoz · 2023-12-13T00:06:30Z

Initial support for UA.

Not sure what else may be needed for Companion.

edit(pfeerick): To prevent any confusion (as it was not clearly pointed out), the translation included in this PR was not provided by the PR author, but an UA native speaker.

josser · 2023-12-13T09:13:43Z

radio/src/fonts/sqt5/font_ua_04x06.png

UA fonts are different than RU, they have different subsets of Cyrillic symbols.

Can you elaborate further on this? Any idea what the range is if it's different? Are wrong characters being shown?

Here is the Ukrainian alphabet

Kyiv - по цій транслітерації буде коректно?

radio/src/translations/ua.h

olegshevtsov · 2024-01-09T09:04:06Z

Hi,

Thanks for your work.
I'm from teams that made translations of ELRS, Betaflight, ESC configurators to Ukrainian. If you need some assistance with honing the Ukrainian version - we'll be happy to contribute.

Last activity in this PR was 3 weeks ago, so let me know if anything is needed for merging the initial version. Thanks.

pfeerick · 2024-01-09T09:09:09Z

If you can proof the translation that's been provided, that would be a great start. Also, your thoughts on this comment? #4415 (comment)

olegshevtsov · 2024-01-09T09:28:28Z

If you can proof the translation that's been provided, that would be a great start.

How should we do it technically? In this PR or after it's merged?

Also, your thoughts on this comment? #4415

Ukrainian alphabet differs from Russian, I can second it.
Letters that do not exist in Russian:
Ґґ
Єє
Іі
Її
Also the apostrophe is used. https://en.wikipedia.org/wiki/Ukrainian_alphabet

pfeerick · 2024-01-09T10:20:34Z

For you, it's probably easier after this PR is merged (since you'll then be able to do a PR with any changes). At this point, I think it's more just a matter of ensuring there is nothing major that needs changing before merge - like inappropriate words/phrases.

olegshevtsov · 2024-01-09T11:08:03Z

radio/src/fonts/std/font_ua_08x10.png

The PNGs seem to have only Russian alphabet letters, not the Ukrainian ones. Not sure how it impacts the UI and what's the use of the files.

olegshevtsov · 2024-01-09T11:14:30Z

radio/src/gui/common/stdlcd/utf8.cpp

+  L'г', L'д', L'е', L'ж', L'з', L'и', L'й',
+  L'к', L'л', L'м', L'н', L'о', L'п', L'р',
+  L'с', L'т', L'у', L'ф', L'х', L'ц', L'ч',
+  L'ш', L'щ', L'ъ', L'ы', L'ь', L'э', L'ю',


the charset looks like is copy-paste from Russian.

It does not have Ukrainian-specific letters Ґ, ґ, Є, є, І, і, Ї, ї and

has some of the extra Russian letters, which are not used in Ukrainian.
And there is also an apostrophe - ' , which is probably the same as in latin.

https://en.wikipedia.org/wiki/Ukrainian_alphabet

Please correct it.

radio/src/translations/ru.h

olegshevtsov · 2024-01-09T11:21:04Z

At this point, I think it's more just a matter of ensuring there is nothing major that needs changing before merge - like inappropriate words/phrases.

AFAIKs, the PNGs with font are wrong - they do not have Ukrainian letters - only Russian. And the charset is also wrong / incomplete - misses the Ukrainian letters, has extra Russian letters. Left comments on the code.

As for the radio/src/translations/tts_ua.cpp - reviewing translations will take some days. The context is not always clear, so will need to get more context.

kobakirill · 2024-01-09T12:24:44Z

As for the radio/src/translations/tts_ua.cpp - reviewing translations will take some days. The context is not always clear, so will need to get more context.

You need to draw your own Ukrainian fonts. This is necessary to display the signs on a black-and-white screen.

olegshevtsov · 2024-01-09T20:26:02Z

You need to draw your own Ukrainian fonts. This is necessary to display the signs on a black-and-white screen.

@philmoz, I'm not sure I understand the end-to-end flow involving those PNGs - are PNGs generated somehow from the fonts or prepared manually?

pfeerick · 2024-01-09T21:02:16Z

Have a look at radio/src/fonts/lvgl/make_fonts.sh and more importantly radio/src/fonts/lvgl/get_char_cyrillic.py (which are both part of this PR).

philmoz · 2024-01-09T21:32:02Z

You need to draw your own Ukrainian fonts. This is necessary to display the signs on a black-and-white screen.

@philmoz, I'm not sure I understand the end-to-end flow involving those PNGs - are PNGs generated somehow from the fonts or prepared manually?

For colour radios all the font handling is automatic as pfeerick mentioned.

For B&W I believe it has to be done manually. The _utf8_lut array in utf8.cpp needs to be populated with the unicode characters you want to be available for display and then the font_ua_XX.png images need to be edited to contain the corresponding symbols. There are two sets of font images for B&W - one in the 'sqt5' folder and one in the 'std' folder.

olegshevtsov · 2024-01-09T21:38:34Z

Thanks @pfeerick .

I did have a look on get_char_cyrillic.py. It found almost all the alphabet, except Ґ and ґ. It seems that this letter was missing in the radio/src/translations/ua.h. It happens, this is a rarely used letter.

The full alphabet is
АБВГҐДЕЄЖЗИІЇЙКЛМНОПРСТУФХЦЧШЩЬЮЯабвгґдеєжзиіїйклмнопрстуфхцчшщьюя

The output of python3 get_char_cyrillic.py ../../translations/ua.h is (Ґ and ґ are missing):
АБВГДЕЄЖЗИІЇЙКЛМНОПРСТУФХЦЧШЩЬЮЯабвгдеєжзиіїйклмнопрстуфхцчшщьюя

Also I did a sanity check for the /radio/src/translations/ua.h.
#define TR_VOICE_RUSSIAN "Pосійський"
should be replaced with
#define TR_VOICE_RUSSIAN "Pосійська"
to follow the grammar rules.

There are some typos, some items left to be clarified in the context, but it should be safe to commit and do the QA.

As for the fonts in PNG - @philmoz, sorry, I could not get through to make them appear in the repository. I have a string with all letters:
АБВГҐДЕЄЖЗИІЇЙКЛМНОПРСТУФХЦЧШЩЬЮЯабвгґдеєжзиіїйклмнопрстуфхцчшщьюя

what tools should be used to generate these PNGs?
what are the requirements - spacing, padding etc.

PS: Sorry for the noobish questions, this is my first day in EdgeTX repo. Have been a happy user of the English version on my radiomaster.

pfeerick · 2024-01-09T22:46:50Z

Most likely this file needs extending for the other B&W fonts...

https://github.com/EdgeTX/edgetx/blob/main/radio/util/font2png.py

edit: btw, path to the utf8.cpp file mentioned above is radio/src/gui/common/stdlcd/utf8.cpp

kobakirill · 2024-01-10T05:10:58Z

АБВГҐДЕЄЖЗИІЇЙКЛМНОПРСТУФХЦЧШЩЬЮЯабвгґдеєжзиіїйклмнопрстуфхцчшщьюя

your PNGs should be the same as the Ukrainian alphabet.

kobakirill · 2024-01-10T05:18:17Z

Most likely this file needs extending for the other B&W fonts...

https://github.com/EdgeTX/edgetx/blob/main/radio/util/font2png.py

edit: btw, path to the utf8.cpp file mentioned above is radio/src/gui/common/stdlcd/utf8.cpp

chars_ua = u"""АБВГҐДЕЄЖЗИІЇЙКЛМНОПРСТУФХЦЧШЩЬЮЯабвгґдеєжзиіїйклмнопрстуфхцчшщьюя"""

philmoz · 2024-01-10T08:13:09Z

The output of python3 get_char_cyrillic.py ../../translations/ua.h is (Ґ and ґ are missing): АБВГДЕЄЖЗИІЇЙКЛМНОПРСТУФХЦЧШЩЬЮЯабвгдеєжзиіїйклмнопрстуфхцчшщьюя

You don't need to worry about this. The python script is extracting just the characters that are actually used in the translation file. So the missing ones are not a problem because they are not currently needed.

kobakirill · 2024-01-10T08:37:12Z

5. As for the fonts in PNG - @philmoz, sorry, I could not get through to make them appear in the repository. I have a string with all letters:
АБВГҐДЕЄЖЗИІЇЙКЛМНОПРСТУФХЦЧШЩЬЮЯабвгґдеєжзиіїйклмнопрстуфхцчшщьюя

what tools should be used to generate these PNGs?

what are the requirements - spacing, padding etc.

Take my PNGs as a sample. Add the necessary characters, remove unnecessary ones. They look good on a black and white screen.

olegshevtsov · 2024-01-10T12:51:49Z

Most likely this file needs extending for the other B&W fonts...

https://github.com/EdgeTX/edgetx/blob/main/radio/util/font2png.py

edit: btw, path to the utf8.cpp file mentioned above is radio/src/gui/common/stdlcd/utf8.cpp

I'm not a developer, sorry. I can modify something, but there is little probabilty that it will work fine. Especially with the pieces like font2png.py, where god only knows what parameters should be used: which font, size etc. I tried - and it differs greatly from what @kobakirill has done for Russian.

diff --git a/radio/util/font2png.py b/radio/util/font2png.py
index 9e9139b97..b4ea283a7 100644
--- a/radio/util/font2png.py
+++ b/radio/util/font2png.py
@@ -17,11 +17,12 @@ chars_it = u"""àù"""
chars_pl = u"""ąćęłńóśżźĄĆĘŁŃÓŚŻŹ"""
chars_pt = u"""ÁáÂâÃãÀàÇçÉéÊêÍíÓóÔôÕõÚú"""
chars_ru = u"""АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя"""
+chars_ua = u"""АБВГҐДЕЄЖЗИІЇЙКЛМНОПРСТУФХЦЧШЩЬЮЯабвгґдеєжзиіїйклмнопрстуфхцчшщьюя"""

COUNT_EXTRA_CHARS = 21

chars_extra = u"".join([chr(1+i) for i in range(COUNT_EXTRA_CHARS)])
-chars = chars_en + chars_extra + chars_fr + chars_da + chars_de + chars_cz + chars_es + chars_fi + chars_it + chars_pl + chars_pt + chars_ru
+chars = chars_en + chars_extra + chars_fr + chars_da + chars_de + chars_cz + chars_es + chars_fi + chars_it + chars_pl + chars_pt + chars_ru + chars_ua

def createFontBitmap(filename, fontname, fontsize, fontoffset, foreground, background, coordsfile=True):

So it will be definitely tough for me to create my own pull request. But I can help with the language part here, because I know Ukrainian and I'm not afraid to read the code. Hope it clarifies my skill level.

thenester

This was a long review, but hopefully it would be helpful to improve the overall quality of the translation. Looking forward to see some changes. 😄

radio/src/translations/ua.h

companion/src/firmwares/opentx/opentxinterface.h

philmoz · 2024-01-20T22:51:02Z

Do we care that Ukranian is using the country code (UA) instead of the language code (uk)?
Swedish is also the same (SE vs sv).

pfeerick · 2024-01-21T04:47:41Z

At the present time, the colorlcd translations should be in a somewhat usable state for colorlcd radios, but B&W will not be (until at least the font graphics and mapping is resolved. I would propose at this point to merge this as it is, so there is the start of UA support present in 2.10 and (like with everything else) it will get improved on with adoption and time.

HThuren · 2024-01-25T08:29:41Z

@pfeerick and @philmoz, are we sure that 'ua' are the right identifyer, in betaflight we use 'uk' and ISO Language Code Table from http://www.lingoes.net/en/translator/langcode.htm say "uk-UA" (compare to Danish 'da' / 'da-DK')

pfeerick · 2024-01-25T09:13:09Z

For the present time, yes. Only two letters are currently used, and "uk" probably isn't as intelligible. As is alreadly noted in code, we are NOT currently following any of the ISO conventions at present in the references in Companion or firmware. But it is documented as a TODO item ;) In other words, until we move all languages over to something like ISO 3166 (country code) and ISO639 (locale code) pair, this is correct.

philmoz and others added 3 commits December 13, 2023 11:03

Add support for UA language translation.

215bd53

Add missing tts_ua.cpp file.

76fe930

chore: Add UA as a radio language

d0878af

pfeerick mentioned this pull request Dec 13, 2023

There is not Ukrainian language in a voice language menu EdgeTX/edgetx-sdcard-sounds#81

Closed

pfeerick added the translation label Dec 13, 2023

pfeerick added this to the 2.10 milestone Dec 13, 2023

josser reviewed Dec 13, 2023

View reviewed changes

rotorman reviewed Dec 20, 2023

View reviewed changes

radio/src/translations/ua.h Outdated Show resolved Hide resolved

chore: Correct TR_VOICE_RUSSIAN

7f16c56

olegshevtsov reviewed Jan 9, 2024

View reviewed changes

radio/src/translations/ru.h Outdated Show resolved Hide resolved

thenester reviewed Jan 14, 2024

View reviewed changes

hacky-swan reviewed Jan 16, 2024

View reviewed changes

radio/src/translations/ua.h Outdated Show resolved Hide resolved

kshchepanovskyi reviewed Jan 19, 2024

View reviewed changes

companion/src/firmwares/opentx/opentxinterface.h Show resolved Hide resolved

pfeerick added 4 commits January 21, 2024 04:27

chore: Adopt suggestions and minor formatting

d1db105

chore: Missed a couple in review

b7e1e3b

chore: Spelling

5ff792a

chore: Add UA chars per @olegshevtsov

40d04be

pfeerick merged commit b40c40d into main Jan 25, 2024
47 checks passed

pfeerick deleted the philmoz/ua-language branch January 25, 2024 00:12

pfeerick mentioned this pull request Mar 11, 2024

chore: translation catchup for v2.10 #4613

Merged

13 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: Add support for UA language translation. #4415

chore: Add support for UA language translation. #4415

philmoz commented Dec 13, 2023 •

edited by pfeerick

Loading

josser Dec 13, 2023

pfeerick Dec 19, 2023

josser Dec 19, 2023

koliasa Mar 14, 2024 •

edited

Loading

olegshevtsov commented Jan 9, 2024 •

edited

Loading

pfeerick commented Jan 9, 2024 •

edited

Loading

olegshevtsov commented Jan 9, 2024 •

edited

Loading

pfeerick commented Jan 9, 2024 •

edited

Loading

olegshevtsov Jan 9, 2024

olegshevtsov Jan 9, 2024

olegshevtsov commented Jan 9, 2024

kobakirill commented Jan 9, 2024

olegshevtsov commented Jan 9, 2024

pfeerick commented Jan 9, 2024 •

edited

Loading

philmoz commented Jan 9, 2024

olegshevtsov commented Jan 9, 2024 •

edited

Loading

pfeerick commented Jan 9, 2024 •

edited

Loading

kobakirill commented Jan 10, 2024

kobakirill commented Jan 10, 2024

philmoz commented Jan 10, 2024

kobakirill commented Jan 10, 2024

olegshevtsov commented Jan 10, 2024

thenester left a comment

philmoz commented Jan 20, 2024

pfeerick commented Jan 21, 2024 •

edited

Loading

HThuren commented Jan 25, 2024

pfeerick commented Jan 25, 2024 •

edited

Loading

chore: Add support for UA language translation. #4415

chore: Add support for UA language translation. #4415

Conversation

philmoz commented Dec 13, 2023 • edited by pfeerick Loading

josser Dec 13, 2023

Choose a reason for hiding this comment

pfeerick Dec 19, 2023

Choose a reason for hiding this comment

josser Dec 19, 2023

Choose a reason for hiding this comment

koliasa Mar 14, 2024 • edited Loading

Choose a reason for hiding this comment

olegshevtsov commented Jan 9, 2024 • edited Loading

pfeerick commented Jan 9, 2024 • edited Loading

olegshevtsov commented Jan 9, 2024 • edited Loading

pfeerick commented Jan 9, 2024 • edited Loading

olegshevtsov Jan 9, 2024

Choose a reason for hiding this comment

olegshevtsov Jan 9, 2024

Choose a reason for hiding this comment

olegshevtsov commented Jan 9, 2024

kobakirill commented Jan 9, 2024

olegshevtsov commented Jan 9, 2024

pfeerick commented Jan 9, 2024 • edited Loading

philmoz commented Jan 9, 2024

olegshevtsov commented Jan 9, 2024 • edited Loading

pfeerick commented Jan 9, 2024 • edited Loading

kobakirill commented Jan 10, 2024

kobakirill commented Jan 10, 2024

philmoz commented Jan 10, 2024

kobakirill commented Jan 10, 2024

olegshevtsov commented Jan 10, 2024

thenester left a comment

Choose a reason for hiding this comment

philmoz commented Jan 20, 2024

pfeerick commented Jan 21, 2024 • edited Loading

HThuren commented Jan 25, 2024

pfeerick commented Jan 25, 2024 • edited Loading

philmoz commented Dec 13, 2023 •

edited by pfeerick

Loading

koliasa Mar 14, 2024 •

edited

Loading

olegshevtsov commented Jan 9, 2024 •

edited

Loading

pfeerick commented Jan 9, 2024 •

edited

Loading

olegshevtsov commented Jan 9, 2024 •

edited

Loading

pfeerick commented Jan 9, 2024 •

edited

Loading

pfeerick commented Jan 9, 2024 •

edited

Loading

olegshevtsov commented Jan 9, 2024 •

edited

Loading

pfeerick commented Jan 9, 2024 •

edited

Loading

pfeerick commented Jan 21, 2024 •

edited

Loading

pfeerick commented Jan 25, 2024 •

edited

Loading