From: Christian Herdtweck <christian.herdtweck@intra2net.com>
Date: Thu, 18 Apr 2019 15:35:21 +0000 (+0200)
Subject: Revert "Add another convenience function allowing i18n_noops("foo")+"bar""
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=49ee03b8f8540d2f09ebd416d2f3e09350300573;hp=38b8c82588521975e4c5e606a958170e7329ddd5;p=libi2ncommon

Revert "Add another convenience function allowing i18n_noops("foo")+"bar""

Such string-return aliases for i18n functions encourage creation of texts
using concatenation (+). However, such strings might not be translateable
in the future (e.g. into languages with very different word order).

To encourage using i18n_get_string() which is a translation-friendly way
to dynamically assemble strings, we remove this

This reverts commit 0562a0f617437d45d9e344da14980598d7c6c93d.
---

diff --git a/src/i18n.h b/src/i18n.h
index 0344092..2ed1ea8 100644
--- a/src/i18n.h
+++ b/src/i18n.h
@@ -34,7 +34,6 @@ on this file might be covered by the GNU General Public License.
 #define i18n(String) gettext(String)
 #define i18n_plural(String1, String2, Count) ngettext(String1, String2, Count)
 #define i18n_noop(String) (String)
-#define i18n_noops(String) std::string(String)
 
 void i18n_init(const std::string& domain, const std::string& path=".");
 void i18n_set_language(const std::string &lang="");