Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 07:53:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #111473 from KoBeWi/easing-i18n-redux

Browse source 
Fix some easing presets not translated
This commit is contained in:
Thaddeus Crews 2025-10-10 10:26:04 -05:00
commit 99ab454a64
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
2 changed files with 32 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
editor/animation/animation_track_editor.cpp
View file

@ -8280,10 +8280,10 @@ AnimationTrackEditor::AnimationTrackEditor() {
transition_selection->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED); // Translation context is needed.
ease_selection = memnew(OptionButton);
ease_selection->set_accessibility_name(TTRC("Ease Type:"));
ease_selection->add_item(TTR("In", "Ease Type"), Tween::EASE_IN);
ease_selection->add_item(TTR("Out", "Ease Type"), Tween::EASE_OUT);
ease_selection->add_item(TTR("InOut", "Ease Type"), Tween::EASE_IN_OUT);
ease_selection->add_item(TTR("OutIn", "Ease Type"), Tween::EASE_OUT_IN);
ease_selection->add_item(TTR("Ease In", "Ease Type"), Tween::EASE_IN);
ease_selection->add_item(TTR("Ease Out", "Ease Type"), Tween::EASE_OUT);
ease_selection->add_item(TTR("Ease In-Out", "Ease Type"), Tween::EASE_IN_OUT);
ease_selection->add_item(TTR("Ease Out-In", "Ease Type"), Tween::EASE_OUT_IN);
ease_selection->select(Tween::EASE_IN_OUT); // Default
ease_selection->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED); // Translation context is needed.
ease_fps = memnew(SpinBox);

35
editor/inspector/editor_properties.cpp
View file

@ -1796,22 +1796,42 @@ void EditorPropertyEasing::_spin_focus_exited() {
void EditorPropertyEasing::setup(bool p_positive_only, bool p_flip) {
flip = p_flip;
positive_only = p_positive_only;
// Names need translation context, so they are set in NOTIFICATION_TRANSLATION_CHANGED.
preset->add_item("", EASING_LINEAR);
preset->add_item("", EASING_IN);
preset->add_item("", EASING_OUT);
preset->add_item("", EASING_ZERO);
if (!positive_only) {
preset->add_item("", EASING_IN_OUT);
preset->add_item("", EASING_OUT_IN);
}
}
void EditorPropertyEasing::_notification(int p_what) {
switch (p_what) {
case NOTIFICATION_THEME_CHANGED: {
preset->clear();
preset->add_icon_item(get_editor_theme_icon(SNAME("CurveLinear")), "Linear", EASING_LINEAR);
preset->add_icon_item(get_editor_theme_icon(SNAME("CurveIn")), "Ease In", EASING_IN);
preset->add_icon_item(get_editor_theme_icon(SNAME("CurveOut")), "Ease Out", EASING_OUT);
preset->add_icon_item(get_editor_theme_icon(SNAME("CurveConstant")), "Zero", EASING_ZERO);
preset->set_item_icon(preset->get_item_index(EASING_LINEAR), get_editor_theme_icon(SNAME("CurveLinear")));
preset->set_item_icon(preset->get_item_index(EASING_IN), get_editor_theme_icon(SNAME("CurveIn")));
preset->set_item_icon(preset->get_item_index(EASING_OUT), get_editor_theme_icon(SNAME("CurveOut")));
preset->set_item_icon(preset->get_item_index(EASING_ZERO), get_editor_theme_icon(SNAME("CurveConstant")));
if (!positive_only) {
preset->add_icon_item(get_editor_theme_icon(SNAME("CurveInOut")), "Ease In-Out", EASING_IN_OUT);
preset->add_icon_item(get_editor_theme_icon(SNAME("CurveOutIn")), "Ease Out-In", EASING_OUT_IN);
preset->set_item_icon(preset->get_item_index(EASING_IN_OUT), get_editor_theme_icon(SNAME("CurveInOut")));
preset->set_item_icon(preset->get_item_index(EASING_OUT_IN), get_editor_theme_icon(SNAME("CurveOutIn")));
}
easing_draw->set_custom_minimum_size(Size2(0, get_theme_font(SceneStringName(font), SNAME("Label"))->get_height(get_theme_font_size(SceneStringName(font_size), SNAME("Label"))) * 2));
} break;
case NOTIFICATION_TRANSLATION_CHANGED: {
preset->set_item_text(preset->get_item_index(EASING_LINEAR), TTR("Linear", "Ease Type"));
preset->set_item_text(preset->get_item_index(EASING_IN), TTR("Ease In", "Ease Type"));
preset->set_item_text(preset->get_item_index(EASING_OUT), TTR("Ease Out", "Ease Type"));
preset->set_item_text(preset->get_item_index(EASING_ZERO), TTR("Zero", "Ease Type"));
if (!positive_only) {
preset->set_item_text(preset->get_item_index(EASING_IN_OUT), TTR("Ease In-Out", "Ease Type"));
preset->set_item_text(preset->get_item_index(EASING_OUT_IN), TTR("Ease Out-In", "Ease Type"));
}
} break;
}
}
@ -1823,6 +1843,7 @@ EditorPropertyEasing::EditorPropertyEasing() {
add_child(easing_draw);
preset = memnew(PopupMenu);
preset->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
add_child(preset);
preset->connect(SceneStringName(id_pressed), callable_mp(this, &EditorPropertyEasing::_set_preset));