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

Use "Command" for OSX in translation strings (#1619)

Browse source
This commit is contained in:
Cong 2017-10-13 20:12:58 +11:00
parent dd684eaaa0
commit 524ffc9712
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
editor/project_settings_editor.cpp
View file

@ -358,7 +358,7 @@ void ProjectSettingsEditor::_wait_for_key(const Ref<InputEvent> &p_event) {
last_wait_for_key = p_event; last_wait_for_key = p_event;
String str = keycode_get_string(k->get_scancode()).capitalize(); String str = keycode_get_string(k->get_scancode()).capitalize();
if (k->get_metakey()) if (k->get_metakey())
str = TTR("Meta+") + str; str = vformat("%s+", find_keycode_name(KEY_META)) + str;
if (k->get_shift()) if (k->get_shift())
str = TTR("Shift+") + str; str = TTR("Shift+") + str;
if (k->get_alt()) if (k->get_alt())
@ -640,7 +640,7 @@ void ProjectSettingsEditor::_update_actions() {
String str = keycode_get_string(k->get_scancode()).capitalize(); String str = keycode_get_string(k->get_scancode()).capitalize();
if (k->get_metakey()) if (k->get_metakey())
str = TTR("Meta+") + str; str = vformat("%s+", find_keycode_name(KEY_META)) + str;
if (k->get_shift()) if (k->get_shift())
str = TTR("Shift+") + str; str = TTR("Shift+") + str;
if (k->get_alt()) if (k->get_alt())

2
editor/settings_config_dialog.cpp
View file

@ -248,7 +248,7 @@ void EditorSettingsDialog::_wait_for_key(const Ref<InputEvent> &p_event) {
last_wait_for_key = k; last_wait_for_key = k;
String str = keycode_get_string(k->get_scancode()).capitalize(); String str = keycode_get_string(k->get_scancode()).capitalize();
if (k->get_metakey()) if (k->get_metakey())
str = TTR("Meta+") + str; str = vformat("%s+", find_keycode_name(KEY_META)) + str;
if (k->get_shift()) if (k->get_shift())
str = TTR("Shift+") + str; str = TTR("Shift+") + str;
if (k->get_alt()) if (k->get_alt())

6
modules/visual_script/visual_script_editor.cpp
View file

@ -1388,7 +1388,7 @@ bool VisualScriptEditor::can_drop_data_fw(const Point2 &p_point, const Variant &
if (String(d["type"]) == "obj_property") { if (String(d["type"]) == "obj_property") {
#ifdef OSX_ENABLED #ifdef OSX_ENABLED
const_cast<VisualScriptEditor *>(this)->_show_hint(TTR("Hold Meta to drop a Getter. Hold Shift to drop a generic signature.")); const_cast<VisualScriptEditor *>(this)->_show_hint(vformat(TTR("Hold %s to drop a Getter. Hold Shift to drop a generic signature."), find_keycode_name(KEY_META)));
#else #else
const_cast<VisualScriptEditor *>(this)->_show_hint(TTR("Hold Ctrl to drop a Getter. Hold Shift to drop a generic signature.")); const_cast<VisualScriptEditor *>(this)->_show_hint(TTR("Hold Ctrl to drop a Getter. Hold Shift to drop a generic signature."));
#endif #endif
@ -1397,7 +1397,7 @@ bool VisualScriptEditor::can_drop_data_fw(const Point2 &p_point, const Variant &
if (String(d["type"]) == "nodes") { if (String(d["type"]) == "nodes") {
#ifdef OSX_ENABLED #ifdef OSX_ENABLED
const_cast<VisualScriptEditor *>(this)->_show_hint(TTR("Hold Meta to drop a simple reference to the node.")); const_cast<VisualScriptEditor *>(this)->_show_hint(vformat(TTR("Hold %s to drop a simple reference to the node."), find_keycode_name(KEY_META)));
#else #else
const_cast<VisualScriptEditor *>(this)->_show_hint(TTR("Hold Ctrl to drop a simple reference to the node.")); const_cast<VisualScriptEditor *>(this)->_show_hint(TTR("Hold Ctrl to drop a simple reference to the node."));
#endif #endif
@ -1406,7 +1406,7 @@ bool VisualScriptEditor::can_drop_data_fw(const Point2 &p_point, const Variant &
if (String(d["type"]) == "visual_script_variable_drag") { if (String(d["type"]) == "visual_script_variable_drag") {
#ifdef OSX_ENABLED #ifdef OSX_ENABLED
const_cast<VisualScriptEditor *>(this)->_show_hint(TTR("Hold Meta to drop a Variable Setter.")); const_cast<VisualScriptEditor *>(this)->_show_hint(vformat(TTR("Hold %s to drop a Variable Setter."), find_keycode_name(KEY_META)));
#else #else
const_cast<VisualScriptEditor *>(this)->_show_hint(TTR("Hold Ctrl to drop a Variable Setter.")); const_cast<VisualScriptEditor *>(this)->_show_hint(TTR("Hold Ctrl to drop a Variable Setter."));
#endif #endif