Browse Source

Merge pull request #73075 from timothyqiu/ttrn-single

Don't warn when using `TTRN()` in a language without plurals
Rémi Verschelde 2 years ago
parent
commit
5c5f1452db
3 changed files with 2 additions and 7 deletions
  1. 0 5
      core/string/translation_po.cpp
  2. 1 1
      doc/classes/Area2D.xml
  3. 1 1
      doc/classes/Area3D.xml

+ 0 - 5
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.");
 

+ 1 - 1
doc/classes/Area2D.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class name="Area2D" inherits="CollisionObject2D" version="4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		2D area for detection and physics and audio influence.
+		2D area for detection, as well as physics and audio influence.
 	</brief_description>
 	<description>
 		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.

+ 1 - 1
doc/classes/Area3D.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class name="Area3D" inherits="CollisionObject3D" version="4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		3D area for detection and physics and audio influence.
+		3D area for detection, as well as physics and audio influence.
 	</brief_description>
 	<description>
 		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.