From 210810bacb084392f552966eb5b970a415d6ed6e Mon Sep 17 00:00:00 2001 From: Haoyu Qiu Date: Sun, 29 Sep 2024 22:30:41 +0800 Subject: [PATCH] Fix `atr_n()` behavior when auto translation is disabled --- scene/main/node.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scene/main/node.h b/scene/main/node.h index 298cbc7e595..799478fa356 100644 --- a/scene/main/node.h +++ b/scene/main/node.h @@ -743,8 +743,13 @@ public: virtual void set_translation_domain(const StringName &p_domain) override; void set_translation_domain_inherited(); - _FORCE_INLINE_ String atr(const String p_message, const StringName p_context = "") const { return can_auto_translate() ? tr(p_message, p_context) : p_message; } - _FORCE_INLINE_ String atr_n(const String p_message, const StringName &p_message_plural, int p_n, const StringName p_context = "") const { return can_auto_translate() ? tr_n(p_message, p_message_plural, p_n, p_context) : p_message; } + _FORCE_INLINE_ String atr(const String &p_message, const StringName &p_context = "") const { return can_auto_translate() ? tr(p_message, p_context) : p_message; } + _FORCE_INLINE_ String atr_n(const String &p_message, const StringName &p_message_plural, int p_n, const StringName &p_context = "") const { + if (can_auto_translate()) { + return tr_n(p_message, p_message_plural, p_n, p_context); + } + return p_n == 1 ? p_message : String(p_message_plural); + } /* THREADING */