Browse Source

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

Cong 7 years ago
parent
commit
524ffc9712

+ 2 - 2
editor/project_settings_editor.cpp

@@ -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())

+ 1 - 1
editor/settings_config_dialog.cpp

@@ -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())

+ 3 - 3
modules/visual_script/visual_script_editor.cpp

@@ -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