Changeset 20863

Timestamp:

10/07/08 00:28:57 (3 months ago)

Author:

saturday06

Message:

whar_t support for libintl (wlibintl)

Files:

• lang/cplusplus/i3/intl/wlibintl.h (modified) (2 diffs)

lang/cplusplus/i3/intl/wlibintl.h

@@ -6 +6 @@
 #endif
 
+#define wgettext(msgid) wgettext_(msgid, L##msgid)
+inline static const wchar_t* wgettext_(const char* msgid, const wchar_t* wmsgid) {
+    const char* translated = gettext(msgid);
+    return translated != msgid ? (const wchar_t*)translated : wmsgid;
+}
+
+#define dwgettext(domainname, msgid) dwgettext_(domainname, msgid, L##msgid)
+inline static const wchar_t* dwgettext_(const char *domainname, const char* msgid, const wchar_t* wmsgid) {
+    const char* translated = dgettext(domainname, msgid);
+    return translated != msgid ? (const wchar_t*)translated : wmsgid;
+}
+
+#define dcwgettext(domainname, msgid, category) dwgettext_(domainname, msgid, category, L##msgid)
+inline static const wchar_t* dcwgettext_(const char *domainname, const char* msgid, int category,  const wchar_t* wmsgid) {
+    const char* translated = dcgettext(domainname, msgid, category);
+    return translated != msgid ? (const wchar_t*)translated : wmsgid;
+}
+
+#define nwgettext(msgid1, msgid2, n) nwgettext_(msgid1, msgid2, n, L##msgid1,  L##msgid2)
+inline static const wchar_t* nwgettext_(const char* msgid1, 
+                                        const char* msgid2, 
+                                        const char* n,
+                                        const wchar_t* wmsgid1, 
+                                        const wchar_t* wmsgid2) {
+    const char* translated = ngettext(msgid1, msgid2, n);
+    return translated == msgid1 ? wmsgid1 : (translated == msgid2 ? wmsgid2 : (const wchar_t*)translated)
+}
+
+#define dnwgettext(domainname, msgid1, msgid2, n) dnwgettext_(domainname, msgid1, msgid2, n, L##msgid1,  L##msgid2)
+inline static const wchar_t* dnwgettext_(const char* domainname,
+                                         const char* msgid1, 
+                                         const char* msgid2, 
+                                         const char* n,
+                                         const wchar_t* wmsgid1, 
+                                         const wchar_t* wmsgid2) {
+    const char* translated = dngettext(domainname, msgid1, msgid2, n);
+    return translated == msgid1 ? wmsgid1 : (translated == msgid2 ? wmsgid2 : (const wchar_t*)translated)
+}
+
+#define dcnwgettext(domainname, msgid1, msgid2, n, category) dnwgettext_(domainname, msgid1, msgid2, n, L##msgid1,  L##msgid2)
+inline static const wchar_t* dcnwgettext_(const char* domainname,
+                                          const char* msgid1, 
+                                          const char* msgid2, 
+                                          const char* n,
+                                          const wchar_t* wmsgid1, 
+                                          const wchar_t* wmsgid2,
+                                          int category) {
+    const char* translated = dcnwgettext(domainname, msgid1, msgid2, n, category);
+    return translated == msgid1 ? wmsgid1 : (translated == msgid2 ? wmsgid2 : (const wchar_t*)translated)
+}
+
 #if (defined(WIN32) || defined(_WIN32) || defined(_WIN64) || defined(_WIN32_WCE)) && !defined(__CYGWIN__)
 
 #include <windows.h>
+
+#undef bindtextdomain
+#define bindtextdomain windows_bindtextdomain
+#define wbindtextdomain windows_wbindtextdomain
 
 inline static const wchar_t* windows_wbindtextdomain(const char* domainname, const wchar_t* dirname16) {
@@ -55 +110 @@
 }
 
-#undef bindtextdomain
-#define bindtextdomain windows_bindtextdomain
-#define wbindtextdomain windows_wbindtextdomain
-
-#endif
-
-#define wgettext(x) wgettext_(x, L##x)
-inline static const wchar_t* wgettext_(const char* msgid, const wchar_t* wmsgid) {
-    const char* translated = gettext(msgid);
-    return translated != msgid ? (const wchar_t*)translated : wmsgid;
-}
+#endif // (defined(WIN32) || defined(_WIN32) || defined(_WIN64) || defined(_WIN32_WCE)) && !defined(__CYGWIN__)
 
 #ifdef __cplusplus