From 98bda13fd8f1b3f73b532c001a052808efb73963 Mon Sep 17 00:00:00 2001 From: Jay Mehta <91770194+jaymehta-g@users.noreply.github.com> Date: Sat, 19 Nov 2022 17:55:15 -0600 Subject: [PATCH 1/5] Changed Area2D node description Changed description to be less confusing Changed "2D area for detection and physics and audio influence." To "2D area for detection, physics, and audio influence." --- doc/classes/Area2D.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/classes/Area2D.xml b/doc/classes/Area2D.xml index 29592f133d7..113e9ab506a 100644 --- a/doc/classes/Area2D.xml +++ b/doc/classes/Area2D.xml @@ -1,7 +1,7 @@ - 2D area for detection and physics and audio influence. + 2D area for detection, physics, and audio influence. 2D area that detects [CollisionObject2D] nodes overlapping, entering, or exiting. Can also alter or override local physics parameters (gravity, damping) and route audio to custom audio buses. From e7234564946e5672379775956fd47fd758070df3 Mon Sep 17 00:00:00 2001 From: Jay Mehta <91770194+jaymehta-g@users.noreply.github.com> Date: Sat, 19 Nov 2022 17:56:17 -0600 Subject: [PATCH 2/5] Changed Area3D node description Changed description to be less confusing Changed "3D area for detection and physics and audio influence." To "3D area for detection, physics, and audio influence." --- doc/classes/Area3D.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/classes/Area3D.xml b/doc/classes/Area3D.xml index ea8cab324d7..683160d8005 100644 --- a/doc/classes/Area3D.xml +++ b/doc/classes/Area3D.xml @@ -1,7 +1,7 @@ - 3D area for detection and physics and audio influence. + 3D area for detection, physics, and audio influence. 3D area that detects [CollisionObject3D] nodes overlapping, entering, or exiting. Can also alter or override local physics parameters (gravity, damping) and route audio to custom audio buses. From 0331f4475729f249decdca9a306e79ad82c55f3f Mon Sep 17 00:00:00 2001 From: Jay Mehta <91770194+jaymehta-g@users.noreply.github.com> Date: Sun, 20 Nov 2022 19:43:21 -0600 Subject: [PATCH 3/5] Revise Area node brief descriptions Revision to make the separation between collision and physics/audio influence more clear --- doc/classes/Area2D.xml | 2 +- doc/classes/Area3D.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/classes/Area2D.xml b/doc/classes/Area2D.xml index 113e9ab506a..c6c99fa0278 100644 --- a/doc/classes/Area2D.xml +++ b/doc/classes/Area2D.xml @@ -1,7 +1,7 @@ - 2D area for detection, physics, and audio influence. + 2D area for collision detection, as well as physics and audio influence. 2D area that detects [CollisionObject2D] nodes overlapping, entering, or exiting. Can also alter or override local physics parameters (gravity, damping) and route audio to custom audio buses. diff --git a/doc/classes/Area3D.xml b/doc/classes/Area3D.xml index 683160d8005..3bcbc2e1878 100644 --- a/doc/classes/Area3D.xml +++ b/doc/classes/Area3D.xml @@ -1,7 +1,7 @@ - 3D area for detection, physics, and audio influence. + 3D area for collision detection, as well as physics and audio influence. 3D area that detects [CollisionObject3D] nodes overlapping, entering, or exiting. Can also alter or override local physics parameters (gravity, damping) and route audio to custom audio buses. From 3bafb97e894e438114aa87160fe10027bf346275 Mon Sep 17 00:00:00 2001 From: Jay Mehta <91770194+jaymehta-g@users.noreply.github.com> Date: Tue, 7 Feb 2023 16:13:28 -0600 Subject: [PATCH 4/5] Second revision of area node desc --- doc/classes/Area2D.xml | 2 +- doc/classes/Area3D.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/classes/Area2D.xml b/doc/classes/Area2D.xml index c6c99fa0278..66750acf671 100644 --- a/doc/classes/Area2D.xml +++ b/doc/classes/Area2D.xml @@ -1,7 +1,7 @@ - 2D area for collision detection, as well as physics and audio influence. + 2D area for detection, as well as physics and audio influence. 2D area that detects [CollisionObject2D] nodes overlapping, entering, or exiting. Can also alter or override local physics parameters (gravity, damping) and route audio to custom audio buses. diff --git a/doc/classes/Area3D.xml b/doc/classes/Area3D.xml index 3bcbc2e1878..42aa5aa036b 100644 --- a/doc/classes/Area3D.xml +++ b/doc/classes/Area3D.xml @@ -1,7 +1,7 @@ - 3D area for collision detection, as well as physics and audio influence. + 3D area for detection, as well as physics and audio influence. 3D area that detects [CollisionObject3D] nodes overlapping, entering, or exiting. Can also alter or override local physics parameters (gravity, damping) and route audio to custom audio buses. From 52b4014362d019e6807702ba467028610db68e92 Mon Sep 17 00:00:00 2001 From: Haoyu Qiu Date: Sat, 11 Feb 2023 13:21:57 +0800 Subject: [PATCH 5/5] Don't warn when using TTRN() in a language without plurals --- core/string/translation_po.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/core/string/translation_po.cpp b/core/string/translation_po.cpp index 2d3a9c75756..6b1595174ad 100644 --- a/core/string/translation_po.cpp +++ b/core/string/translation_po.cpp @@ -254,11 +254,6 @@ StringName TranslationPO::get_plural_message(const StringName &p_src_text, const } ERR_FAIL_COND_V_MSG(translation_map[p_context][p_src_text].is_empty(), StringName(), "Source text \"" + String(p_src_text) + "\" is registered but doesn't have a translation. Please report this bug."); - if (translation_map[p_context][p_src_text].size() == 1) { - WARN_PRINT("Source string \"" + String(p_src_text) + "\" doesn't have plural translations. Use singular translation API for such as tr(), TTR() to translate \"" + String(p_src_text) + "\""); - return translation_map[p_context][p_src_text][0]; - } - int plural_index = _get_plural_index(p_n); ERR_FAIL_COND_V_MSG(plural_index < 0 || translation_map[p_context][p_src_text].size() < plural_index + 1, StringName(), "Plural index returned or number of plural translations is not valid. Please report this bug.");