Changeset 59156

Timestamp:

Mar 1, 2014, 9:55:31 AM (10 years ago)

Author:

marisn

Message:

Introduce ngettext support and a new macro _n for it

Location:

grass/trunk

Files:

• include/defs/glocale.h (modified) (1 diff)
• include/glocale.h (modified) (1 diff)
• lib/gis/locale.c (modified) (1 diff)

grass/trunk/include/defs/glocale.h

@@ -4 +4 @@
 extern void G_init_locale(void);
 extern char *G_gettext(const char *, const char *) __attribute__((format_arg (2)));
+extern char *G_ngettext(const char *, const char *, const char *, unsigned long int) __attribute__((format_arg (2), format_arg (3)));
 
 #endif

grass/trunk/include/glocale.h

@@ -9 +9 @@
 #include <libintl.h>
 #define _(str) G_gettext(PACKAGE,(str))
+#define _n(strs,strp,num) G_ngettext(PACKAGE,(strs),(strp),num)
 #else
 #define _(str) (str)

grass/trunk/lib/gis/locale.c

@@ -71 +71 @@
 #endif
 }
+
+/**
+ * \brief Gets localized text with correct plural forms.
+ *
+ * \param[in] package
+ * \param[in] msgids A singular version of string
+ * \param[in] msgidp A plural version of string
+ * \param[in] n The number
+ * \retval char * Pointer to string
+ */
+
+char *G_ngettext(const char *package, const char *msgids, const char *msgidp, unsigned long int n)
+{
+#if defined(HAVE_LIBINTL_H) && defined(USE_NLS)
+    G_init_locale();
+
+    return dngettext(package, msgids, msgidp, n);
+#else
+    return n == 1 ? (char *)msgids : (char *)msgidp;
+#endif
+}