asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename localization method to tr again

Browse source 
Partial revert of #10380 based on contributor ~~bullying~~ feedback.
This commit is contained in:
Rémi Verschelde 2017-08-18 22:29:15 +02:00
parent b20952ebff
commit 18a7315381
10 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/object.cpp
View file

@ -1560,7 +1560,7 @@ void Object::initialize_class() {
initialized = true; initialized = true;
} }
StringName Object::localize(const StringName &p_message) const { StringName Object::tr(const StringName &p_message) const {
if (!_can_translate || !TranslationServer::get_singleton()) if (!_can_translate || !TranslationServer::get_singleton())
return p_message; return p_message;
@ -1707,11 +1707,11 @@ void Object::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_block_signals", "enable"), &Object::set_block_signals); ClassDB::bind_method(D_METHOD("set_block_signals", "enable"), &Object::set_block_signals);
ClassDB::bind_method(D_METHOD("is_blocking_signals"), &Object::is_blocking_signals); ClassDB::bind_method(D_METHOD("is_blocking_signals"), &Object::is_blocking_signals);
ClassDB::bind_method(D_METHOD("set_message_localization", "enable"), &Object::set_message_localization);
ClassDB::bind_method(D_METHOD("can_translate_messages"), &Object::can_translate_messages);
ClassDB::bind_method(D_METHOD("property_list_changed_notify"), &Object::property_list_changed_notify); ClassDB::bind_method(D_METHOD("property_list_changed_notify"), &Object::property_list_changed_notify);
ClassDB::bind_method(D_METHOD("localize", "message"), &Object::localize); ClassDB::bind_method(D_METHOD("set_message_translation", "enable"), &Object::set_message_translation);
ClassDB::bind_method(D_METHOD("can_translate_messages"), &Object::can_translate_messages);
ClassDB::bind_method(D_METHOD("tr", "message"), &Object::tr);
ClassDB::bind_method(D_METHOD("is_queued_for_deletion"), &Object::is_queued_for_deletion); ClassDB::bind_method(D_METHOD("is_queued_for_deletion"), &Object::is_queued_for_deletion);

4
core/object.h
View file

@ -679,12 +679,12 @@ public:
virtual void get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const; virtual void get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const;
StringName localize(const StringName &p_message) const; //translate message (internationalization) StringName tr(const StringName &p_message) const; // translate message (internationalization)
bool _is_queued_for_deletion; // set to true by SceneTree::queue_delete() bool _is_queued_for_deletion; // set to true by SceneTree::queue_delete()
bool is_queued_for_deletion() const; bool is_queued_for_deletion() const;
_FORCE_INLINE_ void set_message_localization(bool p_enable) { _can_translate = p_enable; } _FORCE_INLINE_ void set_message_translation(bool p_enable) { _can_translate = p_enable; }
_FORCE_INLINE_ bool can_translate_messages() const { return _can_translate; } _FORCE_INLINE_ bool can_translate_messages() const { return _can_translate; }
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED

22
doc/base/classes.xml
View file

@ -28259,15 +28259,6 @@
<description> <description>
</description> </description>
</method> </method>
<method name="localize" qualifiers="const">
<return type="String">
</return>
<argument index="0" name="message" type="String">
</argument>
<description>
Localize (translate) a message. Only works if message localization is enabled (which it is by default). See [method set_message_localization].
</description>
</method>
<method name="notification"> <method name="notification">
<argument index="0" name="what" type="int"> <argument index="0" name="what" type="int">
</argument> </argument>
@ -28297,11 +28288,11 @@
If set to true, signal emission is blocked. If set to true, signal emission is blocked.
</description> </description>
</method> </method>
<method name="set_message_localization"> <method name="set_message_translation">
<argument index="0" name="enable" type="bool"> <argument index="0" name="enable" type="bool">
</argument> </argument>
<description> <description>
Define whether this object can localize strings (with calls to [code]localize[/code]). Default is true. Define whether this object can translate strings (with calls to [method tr]). Default is true.
</description> </description>
</method> </method>
<method name="set_meta"> <method name="set_meta">
@ -28320,6 +28311,15 @@
Set a script into the object, scripts extend the object functionality. Set a script into the object, scripts extend the object functionality.
</description> </description>
</method> </method>
<method name="tr" qualifiers="const">
<return type="String">
</return>
<argument index="0" name="message" type="String">
</argument>
<description>
Translate a message. Only works if message translation is enabled (which it is by default). See [method set_message_translation].
</description>
</method>
</methods> </methods>
<signals> <signals>
<signal name="script_changed"> <signal name="script_changed">

4
scene/gui/button.cpp
View file

@ -59,7 +59,7 @@ void Button::_notification(int p_what) {
if (p_what == NOTIFICATION_TRANSLATION_CHANGED) { if (p_what == NOTIFICATION_TRANSLATION_CHANGED) {
xl_text = localize(text); xl_text = tr(text);
minimum_size_changed(); minimum_size_changed();
update(); update();
} }
@ -172,7 +172,7 @@ void Button::set_text(const String &p_text) {
if (text == p_text) if (text == p_text)
return; return;
text = p_text; text = p_text;
xl_text = localize(p_text); xl_text = tr(p_text);
update(); update();
_change_notify("text"); _change_notify("text");
minimum_size_changed(); minimum_size_changed();

2
scene/gui/dialogs.cpp
View file

@ -271,7 +271,7 @@ int WindowDialog::_drag_hit_test(const Point2 &pos) const {
void WindowDialog::set_title(const String &p_title) { void WindowDialog::set_title(const String &p_title) {
title = localize(p_title); title = tr(p_title);
update(); update();
} }
String WindowDialog::get_title() const { String WindowDialog::get_title() const {

2
scene/gui/file_dialog.cpp
View file

@ -464,7 +464,7 @@ void FileDialog::update_filters() {
String flt = filters[i].get_slice(";", 0).strip_edges(); String flt = filters[i].get_slice(";", 0).strip_edges();
String desc = filters[i].get_slice(";", 1).strip_edges(); String desc = filters[i].get_slice(";", 1).strip_edges();
if (desc.length()) if (desc.length())
filter->add_item(String(localize(desc)) + " ( " + flt + " )"); filter->add_item(String(tr(desc)) + " ( " + flt + " )");
else else
filter->add_item("( " + flt + " )"); filter->add_item("( " + flt + " )");
} }

4
scene/gui/label.cpp
View file

@ -63,7 +63,7 @@ void Label::_notification(int p_what) {
if (p_what == NOTIFICATION_TRANSLATION_CHANGED) { if (p_what == NOTIFICATION_TRANSLATION_CHANGED) {
String new_text = localize(text); String new_text = tr(text);
if (new_text == xl_text) if (new_text == xl_text)
return; //nothing new return; //nothing new
xl_text = new_text; xl_text = new_text;
@ -526,7 +526,7 @@ void Label::set_text(const String &p_string) {
if (text == p_string) if (text == p_string)
return; return;
text = p_string; text = p_string;
xl_text = localize(p_string); xl_text = tr(p_string);
word_cache_dirty = true; word_cache_dirty = true;
if (percent_visible < 1) if (percent_visible < 1)
visible_chars = get_total_character_count() * percent_visible; visible_chars = get_total_character_count() * percent_visible;

2
scene/gui/line_edit.cpp
View file

@ -991,7 +991,7 @@ String LineEdit::get_text() const {
void LineEdit::set_placeholder(String p_text) { void LineEdit::set_placeholder(String p_text) {
placeholder = localize(p_text); placeholder = tr(p_text);
update(); update();
} }

18
scene/gui/popup_menu.cpp
View file

@ -96,7 +96,7 @@ Size2 PopupMenu::get_minimum_size() const {
size.width += check_w + hseparation; size.width += check_w + hseparation;
} }
String text = items[i].shortcut.is_valid() ? String(localize(items[i].shortcut->get_name())) : items[i].xl_text; String text = items[i].shortcut.is_valid() ? String(tr(items[i].shortcut->get_name())) : items[i].xl_text;
size.width += font->get_string_size(text).width; size.width += font->get_string_size(text).width;
if (i > 0) if (i > 0)
size.height += vseparation; size.height += vseparation;
@ -395,7 +395,7 @@ void PopupMenu::_notification(int p_what) {
case NOTIFICATION_TRANSLATION_CHANGED: { case NOTIFICATION_TRANSLATION_CHANGED: {
for (int i = 0; i < items.size(); i++) { for (int i = 0; i < items.size(); i++) {
items[i].xl_text = localize(items[i].text); items[i].xl_text = tr(items[i].text);
} }
minimum_size_changed(); minimum_size_changed();
@ -475,7 +475,7 @@ void PopupMenu::_notification(int p_what) {
} }
item_ofs.y += font->get_ascent(); item_ofs.y += font->get_ascent();
String text = items[i].shortcut.is_valid() ? String(localize(items[i].shortcut->get_name())) : items[i].xl_text; String text = items[i].shortcut.is_valid() ? String(tr(items[i].shortcut->get_name())) : items[i].xl_text;
if (!items[i].separator) { if (!items[i].separator) {
font->draw(ci, item_ofs + Point2(0, Math::floor((h - font_h) / 2.0)), text, items[i].disabled ? font_color_disabled : (i == mouse_over ? font_color_hover : font_color)); font->draw(ci, item_ofs + Point2(0, Math::floor((h - font_h) / 2.0)), text, items[i].disabled ? font_color_disabled : (i == mouse_over ? font_color_hover : font_color));
@ -513,7 +513,7 @@ void PopupMenu::add_icon_item(const Ref<Texture> &p_icon, const String &p_label,
Item item; Item item;
item.icon = p_icon; item.icon = p_icon;
item.text = p_label; item.text = p_label;
item.xl_text = localize(p_label); item.xl_text = tr(p_label);
item.accel = p_accel; item.accel = p_accel;
item.ID = p_ID; item.ID = p_ID;
items.push_back(item); items.push_back(item);
@ -523,7 +523,7 @@ void PopupMenu::add_item(const String &p_label, int p_ID, uint32_t p_accel) {
Item item; Item item;
item.text = p_label; item.text = p_label;
item.xl_text = localize(p_label); item.xl_text = tr(p_label);
item.accel = p_accel; item.accel = p_accel;
item.ID = p_ID; item.ID = p_ID;
items.push_back(item); items.push_back(item);
@ -534,7 +534,7 @@ void PopupMenu::add_submenu_item(const String &p_label, const String &p_submenu,
Item item; Item item;
item.text = p_label; item.text = p_label;
item.xl_text = localize(p_label); item.xl_text = tr(p_label);
item.ID = p_ID; item.ID = p_ID;
item.submenu = p_submenu; item.submenu = p_submenu;
items.push_back(item); items.push_back(item);
@ -546,7 +546,7 @@ void PopupMenu::add_icon_check_item(const Ref<Texture> &p_icon, const String &p_
Item item; Item item;
item.icon = p_icon; item.icon = p_icon;
item.text = p_label; item.text = p_label;
item.xl_text = localize(p_label); item.xl_text = tr(p_label);
item.accel = p_accel; item.accel = p_accel;
item.ID = p_ID; item.ID = p_ID;
item.checkable = true; item.checkable = true;
@ -557,7 +557,7 @@ void PopupMenu::add_check_item(const String &p_label, int p_ID, uint32_t p_accel
Item item; Item item;
item.text = p_label; item.text = p_label;
item.xl_text = localize(p_label); item.xl_text = tr(p_label);
item.accel = p_accel; item.accel = p_accel;
item.ID = p_ID; item.ID = p_ID;
item.checkable = true; item.checkable = true;
@ -628,7 +628,7 @@ void PopupMenu::set_item_text(int p_idx, const String &p_text) {
ERR_FAIL_INDEX(p_idx, items.size()); ERR_FAIL_INDEX(p_idx, items.size());
items[p_idx].text = p_text; items[p_idx].text = p_text;
items[p_idx].xl_text = localize(p_text); items[p_idx].xl_text = tr(p_text);
update(); update();
} }

4
scene/gui/tab_container.cpp
View file

@ -231,7 +231,7 @@ void TabContainer::_notification(int p_what) {
// Draw the tab contents. // Draw the tab contents.
Control *control = tabs[i + first_tab_cache]->cast_to<Control>(); Control *control = tabs[i + first_tab_cache]->cast_to<Control>();
String text = control->has_meta("_tab_name") ? String(localize(String(control->get_meta("_tab_name")))) : String(control->get_name()); String text = control->has_meta("_tab_name") ? String(tr(String(control->get_meta("_tab_name")))) : String(control->get_name());
int x_content = tab_rect.position.x + tab_style->get_margin(MARGIN_LEFT); int x_content = tab_rect.position.x + tab_style->get_margin(MARGIN_LEFT);
int top_margin = tab_style->get_margin(MARGIN_TOP); int top_margin = tab_style->get_margin(MARGIN_TOP);
@ -299,7 +299,7 @@ int TabContainer::_get_tab_width(int p_index) const {
// Get the width of the text displayed on the tab. // Get the width of the text displayed on the tab.
Ref<Font> font = get_font("font"); Ref<Font> font = get_font("font");
String text = control->has_meta("_tab_name") ? String(localize(String(control->get_meta("_tab_name")))) : String(control->get_name()); String text = control->has_meta("_tab_name") ? String(tr(String(control->get_meta("_tab_name")))) : String(control->get_name());
int width = font->get_string_size(text).width; int width = font->get_string_size(text).width;
// Add space for a tab icon. // Add space for a tab icon.