AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Remove #ifdef ENABLE_NLS

Browse Source 
libintl API is guaranteed to always be available, glib will fallback to
proxy-libintl in case gettext is not found.
This commit is contained in:
Xavier Claessens 2022-03-31 11:41:34 -04:00 committed by Matthias Clasen
parent 66117d1017
commit 91c60dcac0
6 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdk/gdkintl.h
View File

@ -27,10 +27,6 @@
#include <glib/gi18n-lib.h> #include <glib/gi18n-lib.h>
#ifdef ENABLE_NLS #define P_(String) dgettext (GETTEXT_PACKAGE "-properties", String)
#define P_(String) dgettext(GETTEXT_PACKAGE "-properties",String)
#else
#define P_(String) (String)
#endif
#endif #endif

6
gtk/gtkintl.h
View File

@ -3,11 +3,7 @@
#include <glib/gi18n-lib.h> #include <glib/gi18n-lib.h>
#ifdef ENABLE_NLS #define P_(String) g_dgettext (GETTEXT_PACKAGE "-properties", String)
#define P_(String) g_dgettext(GETTEXT_PACKAGE "-properties",String)
#else
#define P_(String) (String)
#endif
/* not really I18N-related, but also a string marker macro */ /* not really I18N-related, but also a string marker macro */
#define I_(string) g_intern_static_string (string) #define I_(string) g_intern_static_string (string)

4
gtk/gtkmain.c
View File

@ -505,13 +505,11 @@ gettext_initialization (void)
{ {
setlocale_initialization (); setlocale_initialization ();
#ifdef ENABLE_NLS
bindtextdomain (GETTEXT_PACKAGE, _gtk_get_localedir ()); bindtextdomain (GETTEXT_PACKAGE, _gtk_get_localedir ());
bindtextdomain (GETTEXT_PACKAGE "-properties", _gtk_get_localedir ()); bindtextdomain (GETTEXT_PACKAGE "-properties", _gtk_get_localedir ());
# ifdef HAVE_BIND_TEXTDOMAIN_CODESET #ifdef HAVE_BIND_TEXTDOMAIN_CODESET
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
bind_textdomain_codeset (GETTEXT_PACKAGE "-properties", "UTF-8"); bind_textdomain_codeset (GETTEXT_PACKAGE "-properties", "UTF-8");
# endif
#endif #endif
} }

2
tools/encodesymbolic.c
View File

@ -59,11 +59,9 @@ main (int argc, char **argv)
setlocale (LC_ALL, ""); setlocale (LC_ALL, "");
#ifdef ENABLE_NLS
bindtextdomain (GETTEXT_PACKAGE, GTK_LOCALEDIR); bindtextdomain (GETTEXT_PACKAGE, GTK_LOCALEDIR);
#ifdef HAVE_BIND_TEXTDOMAIN_CODESET #ifdef HAVE_BIND_TEXTDOMAIN_CODESET
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
#endif
#endif #endif
g_set_prgname ("gtk-encode-symbolic-svg"); g_set_prgname ("gtk-encode-symbolic-svg");

2
tools/gtk-launch.c
View File

@ -60,12 +60,10 @@ main (int argc, char *argv[])
setlocale (LC_ALL, ""); setlocale (LC_ALL, "");
#ifdef ENABLE_NLS
bindtextdomain (GETTEXT_PACKAGE, GTK_LOCALEDIR); bindtextdomain (GETTEXT_PACKAGE, GTK_LOCALEDIR);
textdomain (GETTEXT_PACKAGE); textdomain (GETTEXT_PACKAGE);
#ifdef HAVE_BIND_TEXTDOMAIN_CODESET #ifdef HAVE_BIND_TEXTDOMAIN_CODESET
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
#endif
#endif #endif
context = context =

2
tools/updateiconcache.c
View File

@ -1703,11 +1703,9 @@ main (int argc, char **argv)
setlocale (LC_ALL, ""); setlocale (LC_ALL, "");
#ifdef ENABLE_NLS
bindtextdomain (GETTEXT_PACKAGE, GTK_LOCALEDIR); bindtextdomain (GETTEXT_PACKAGE, GTK_LOCALEDIR);
#ifdef HAVE_BIND_TEXTDOMAIN_CODESET #ifdef HAVE_BIND_TEXTDOMAIN_CODESET
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
#endif
#endif #endif
context = g_option_context_new ("ICONPATH"); context = g_option_context_new ("ICONPATH");