Add option to add built-in strings in the POT generation #86222

YeldhamDev · 2023-12-16T01:12:58Z

This PR adds the option to add the built-in strings that can appear inside user projects (such as FileDialog node and the menu from LineEdit) into the POT generation. This is made possible with the new ETR/ETRN() functions, which from now on should be used on those occasions. Here's the sister PR on the "l10n" repo: godotengine/godot-editor-l10n#13

As a bonus, this PR also makes so that the POT generator stops putting location comments into strings that don't have one.

Bugsquad edit: Closes godotengine/godot-proposals#3827 Supersedes #81180
Production edit: Closes godotengine/godot-roadmap#33

Calinou · 2023-12-16T21:24:28Z

Does this pave the way to godotengine/godot-proposals#7334? As I understand it, it should, but I'm asking to make sure nonetheless.

YeldhamDev · 2023-12-16T21:42:20Z

@Calinou It's a first step. For, it just populates the POT, but the plan is to add translations to the PO files in the future.

KoBeWi · 2023-12-16T22:51:12Z

Generate POT is disabled when you have only built-in strings included (no scenes). Not sure how useful is that, but technically it could work.

EDIT:
Also, even though I enabled built-in strings, they are not included for some reason.

YeldhamDev · 2023-12-16T22:55:45Z

@KoBeWi As stated above, this PR won't work until its sister PR is merged (godotengine/godot-editor-l10n#13).

YeldhamDev · 2024-01-14T14:17:20Z

Alright, I made an important change on how ETR/ETRN() works: now, they won't return translated strings at all, but instead the exact string it was given to them. They will now work purely to tag strings to be extract for translation.

This change was made so they could work better with auto_translate, because now the original string is preserved, and the controls themselves can handle a translation change with atr() internally. I think this technically supersedes #81180 for what it was intended to do (WDYT @KoBeWi?).

auto_translated isn't working as best as it could however, since it only affects the control itself, and not its children, which is bad for how some UI nodes in Godot work. I plan to open a proposal on how to tackle that.

KoBeWi · 2024-01-14T16:54:20Z

ETR won't work for formatted text. Auto-translation only has effect on exact strings.
My PR adds ATR, which is like RTR, but respects auto_translate. You need a similar method for dynamic strings. I see you do atr(ETR( in some places, but you missed some strings.

YeldhamDev · 2024-01-14T17:33:08Z

My PR adds ATR, which is like RTR, but respects auto_translate.

I'm aware, but that method has a flaw: it overrides the original string if the locale is not set to "en" at the start. That means if a control has a lot of other controls (e. g. FileDialog), it would need to updated all of them manually if auto_translated is changed. But if the original string is preserved, it can let the controls themselves update the string.

I see you do atr(ETR( in some places, but you missed some strings.

I see. I will update those them.

KoBeWi · 2024-01-14T17:52:26Z

I only used ATR for dynamic texts. It's basically the same as your atr(ETR(.

YeldhamDev · 2024-01-14T18:06:34Z

I only used ATR for dynamic texts. It's basically the same as your atr(ETR(.

Not really, the ColorPicker and GraphEdit constructors have them, for example. We're starting to get off-topic now.

YeldhamDev · 2024-01-14T19:40:28Z

@KoBeWi I've added more cases, give me a heads-up if I forgot anything else.

KoBeWi · 2024-01-14T20:21:56Z

This change is missing if you were to supersede my PR:
https://github.com/godotengine/godot/pull/81180/files#diff-f7fb6c2c4c5d4fce35e389297048f54be3d4b08621edfc55a5586b437031ff10R51-R59
You already added TRANSLATION_CHANGED to ColorPicker, so you could handle this as well.

btw ATR in constructor was a mistake.

core/object/object.cpp

scene/main/viewport.cpp

KoBeWi

Looks fine on GUI side.

YeldhamDev · 2024-01-16T14:08:53Z

Here's the proposal I was talking about: godotengine/godot-proposals#8897

Kiisu-Master · 2024-01-19T17:49:15Z

Would this also enable translating built in strings with CSV or is that not possible?
I'm translating my app with CSV and have been searching for ways to also translate some built-in context menus, but I haven't found any info. Even for Gettext.

YeldhamDev · 2024-01-20T14:38:24Z

@Kiisu-Master Built-in nodes should already be using translations when available.

akien-mga

Looks good overall, though I'm a bit confused about when we should use atr(ETR(...)) and when it should only be ETR(...).

core/object/object.cpp

akien-mga · 2024-02-28T13:43:09Z

editor/editor_translation.h

 void load_editor_translations(const String &p_locale);
-void load_doc_translations(const String &p_locale);
 void load_property_translations(const String &p_locale);
+void load_doc_translations(const String &p_locale);
+void load_extractable_translations(const String &p_locale);


This is starting to look like something that could be refactored in a single method, using an enum parameter to define whether it's editor, property, doc, or extractable.

But that can be for future rework.

akien-mga · 2024-02-28T13:44:47Z

scene/gui/color_picker.cpp

@@ -689,7 +705,7 @@ void ColorPicker::_text_type_toggled() {
 		text_type->set_icon(nullptr);

 		c_text->set_editable(true);
-		c_text->set_tooltip_text(RTR("Enter a hex code (\"#ff0000\") or named color (\"red\")."));
+		c_text->set_tooltip_text(ETR("Enter a hex code (\"#ff0000\") or named color (\"red\")."));


Is it intentional that some of the tooltips use atr(ETR()) and others just ETR()?

Tooltips obey auto translation, so if they are a static string, they don't need atr(). However, if the string has a dynamic component, it needs to be translated directly.

akien-mga · 2024-02-29T13:03:52Z

Thanks!

Adds 'extractable' strings after #86222.

YeldhamDev added enhancement topic:editor labels Dec 16, 2023

YeldhamDev added this to the 4.x milestone Dec 16, 2023

YeldhamDev requested review from a team as code owners December 16, 2023 01:12

YeldhamDev mentioned this pull request Dec 16, 2023

Add POT generation for ETR/ETRN() strings godotengine/godot-editor-l10n#13

Merged

YeldhamDev force-pushed the give_me_those_strings_baby branch 4 times, most recently from a57cc59 to 1d02419 Compare December 16, 2023 15:25

YeldhamDev force-pushed the give_me_those_strings_baby branch from 1d02419 to 9c2c478 Compare December 17, 2023 14:19

YeldhamDev force-pushed the give_me_those_strings_baby branch from 9c2c478 to 4240892 Compare January 14, 2024 14:05

YeldhamDev force-pushed the give_me_those_strings_baby branch from 4240892 to 52df18d Compare January 14, 2024 14:21

YeldhamDev force-pushed the give_me_those_strings_baby branch from 52df18d to 765ff9a Compare January 14, 2024 19:07

KoBeWi reviewed Jan 14, 2024

View reviewed changes

core/object/object.cpp Outdated Show resolved Hide resolved

YeldhamDev commented Jan 14, 2024

View reviewed changes

scene/main/viewport.cpp Show resolved Hide resolved

YeldhamDev force-pushed the give_me_those_strings_baby branch from 765ff9a to 6f7cb67 Compare January 14, 2024 21:23

KoBeWi approved these changes Jan 14, 2024

View reviewed changes

akien-mga self-requested a review January 15, 2024 11:39

YeldhamDev force-pushed the give_me_those_strings_baby branch from 6f7cb67 to 9e099ce Compare January 16, 2024 14:14

YuriSizov modified the milestones: 4.x, 4.3 Jan 17, 2024

YeldhamDev mentioned this pull request Feb 15, 2024

Rework the auto translation system #87530

Merged

YeldhamDev force-pushed the give_me_those_strings_baby branch from 9e099ce to 735e657 Compare February 27, 2024 19:09

Chubercik approved these changes Feb 27, 2024

View reviewed changes

akien-mga reviewed Feb 28, 2024

View reviewed changes

Add option to add built-in strings in the POT generation

d70c45b

YeldhamDev force-pushed the give_me_those_strings_baby branch from 735e657 to d70c45b Compare February 28, 2024 14:36

akien-mga approved these changes Feb 28, 2024

View reviewed changes

akien-mga merged commit 846428e into godotengine:master Feb 29, 2024
16 checks passed

akien-mga mentioned this pull request Feb 29, 2024

Better respect auto-translation of static strings #81180

Closed

YeldhamDev deleted the give_me_those_strings_baby branch February 29, 2024 13:42

akien-mga added a commit that referenced this pull request Mar 4, 2024

i18n: Sync translations with Weblate

01dc5c5

Adds 'extractable' strings after #86222.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add option to add built-in strings in the POT generation #86222

Add option to add built-in strings in the POT generation #86222

YeldhamDev commented Dec 16, 2023 •

edited by adamscott

Loading

Calinou commented Dec 16, 2023 •

edited

Loading

YeldhamDev commented Dec 16, 2023

KoBeWi commented Dec 16, 2023 •

edited

Loading

YeldhamDev commented Dec 16, 2023

YeldhamDev commented Jan 14, 2024

KoBeWi commented Jan 14, 2024 •

edited

Loading

YeldhamDev commented Jan 14, 2024

KoBeWi commented Jan 14, 2024

YeldhamDev commented Jan 14, 2024

YeldhamDev commented Jan 14, 2024

KoBeWi commented Jan 14, 2024 •

edited

Loading

KoBeWi left a comment

YeldhamDev commented Jan 16, 2024

Kiisu-Master commented Jan 19, 2024

YeldhamDev commented Jan 20, 2024

akien-mga left a comment

akien-mga Feb 28, 2024

akien-mga Feb 28, 2024

YeldhamDev Feb 28, 2024

akien-mga commented Feb 29, 2024

Add option to add built-in strings in the POT generation #86222

Add option to add built-in strings in the POT generation #86222

Conversation

YeldhamDev commented Dec 16, 2023 • edited by adamscott Loading

Calinou commented Dec 16, 2023 • edited Loading

YeldhamDev commented Dec 16, 2023

KoBeWi commented Dec 16, 2023 • edited Loading

YeldhamDev commented Dec 16, 2023

YeldhamDev commented Jan 14, 2024

KoBeWi commented Jan 14, 2024 • edited Loading

YeldhamDev commented Jan 14, 2024

KoBeWi commented Jan 14, 2024

YeldhamDev commented Jan 14, 2024

YeldhamDev commented Jan 14, 2024

KoBeWi commented Jan 14, 2024 • edited Loading

KoBeWi left a comment

Choose a reason for hiding this comment

YeldhamDev commented Jan 16, 2024

Kiisu-Master commented Jan 19, 2024

YeldhamDev commented Jan 20, 2024

akien-mga left a comment

Choose a reason for hiding this comment

akien-mga Feb 28, 2024

Choose a reason for hiding this comment

akien-mga Feb 28, 2024

Choose a reason for hiding this comment

YeldhamDev Feb 28, 2024

Choose a reason for hiding this comment

akien-mga commented Feb 29, 2024

YeldhamDev commented Dec 16, 2023 •

edited by adamscott

Loading

Calinou commented Dec 16, 2023 •

edited

Loading

KoBeWi commented Dec 16, 2023 •

edited

Loading

KoBeWi commented Jan 14, 2024 •

edited

Loading

KoBeWi commented Jan 14, 2024 •

edited

Loading