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

[libi2ncommon] / src / i18n.h

diff --git a/src/i18n.h b/src/i18n.h
index 5d1a699..2ed1ea8 100644 (file)
--- a/src/i18n.h
+++ b/src/i18n.h
@@ -32,6 +32,7 @@ on this file might be covered by the GNU General Public License.
 #include <vector>
 
 #define i18n(String) gettext(String)
+#define i18n_plural(String1, String2, Count) ngettext(String1, String2, Count)
 #define i18n_noop(String) (String)
 
 void i18n_init(const std::string& domain, const std::string& path=".");
@@ -39,12 +40,12 @@ void i18n_set_language(const std::string &lang="");
 std::string i18n_get_current_language(void);
 std::string i18n_get_default_language(void);
 
-void i18n_get_string (const char *source, std::string &target, const std::vector<std::string> &data);
-void i18n_get_string (const std::string &source, std::string &target, const std::vector<std::string> &data);
-
 std::string i18n_get_string (const char *source, const std::vector<std::string> &data);
 std::string i18n_get_string (const std::string &source, const std::vector<std::string> &data);
+std::string i18n_get_string (const std::string &source, const std::string &arg0);
+std::string i18n_get_string (const std::string &source, const std::string &arg0, const std::string &arg1);
+std::string i18n_get_string (const std::string &source, const std::string &arg0, const std::string &arg1, const std::string &arg2);
 
-std::string i18n_locale2language(const std::string locale);
+std::string i18n_locale2language(const std::string &locale);
 
 #endif