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

Replace some TTRCs with RTRs #62311

Merged
merged 1 commit into from
Jun 25, 2022
Merged

Replace some TTRCs with RTRs #62311

merged 1 commit into from
Jun 25, 2022

Conversation

KoBeWi
Copy link
Member

@KoBeWi KoBeWi commented Jun 22, 2022

Addresses #50650
TTRC was not needed in the cases there, as none of this is saved in the scene, so it won't be causing problems (🤞).
Not sure if doing changes in FileDialog is necessary, as it's probably not used in the editor, idk.
Also I used TTR not RTR, as the strings are automatically runtime-translated anyway.

This doesn't fully fix the issue, because titles are still not translated. But changing them to TTR() would re-introduce translated property bug, so not sure how to solve this.

@KoBeWi KoBeWi added this to the 4.0 milestone Jun 22, 2022
@KoBeWi KoBeWi requested a review from a team as a code owner June 22, 2022 13:23
@timothyqiu
Copy link
Member

I think CI would fail because TTR is not defined in non-tools builds. FYI: It's removed in #59636.

@KoBeWi
Copy link
Member Author

KoBeWi commented Jun 22, 2022

Hmm, RTR might break auto_translate property, by forcing translation. I'll have to check.

EDIT:
Ok auto_translate is only for custom strings, so it doesn't matter here.

@akien-mga akien-mga changed the title Replace some TTRCs with TTRs Replace some TTRCs with RTRs Jun 25, 2022
@akien-mga
Copy link
Member

This pretty much reverts #46735, no? Won't it reintroduce the issues that it was trying to fix? CC @fabriceci

@KoBeWi
Copy link
Member Author

KoBeWi commented Jun 25, 2022

No, #39258 will not be re-introduced. The problem was that RTR was used on dialog title, which is saved to a property, hence the translated string was saved. This PR doesn't restore RTR in title. All other strings are not saved in scene, because they are texts of internal controls, so there won't be issue.

#46735 was mostly correct, but most of the added TTRCs weren't actually necessary.

@akien-mga akien-mga merged commit 21c79d7 into godotengine:master Jun 25, 2022
@akien-mga
Copy link
Member

Thanks!

@KoBeWi KoBeWi deleted the anuluj branch June 25, 2022 13:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants