From a5e46bad36f84fb62e859d3de5290097bdc47a7d Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Sun, 3 Dec 2000 06:39:28 +0000 Subject: [PATCH] nl_langinfo() was a bad idea, don't use it. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@948 dbcabf3a-b0e7-0310-adc4-f8d773084564 --- configure.in | 3 +-- po/de.po | 8 ++++++-- po/fr.po | 11 ++++++----- po/pl.po | 11 ++++++----- po/pt_BR.po | 8 ++++++-- po/sv.po | 8 ++++++-- src/fe-common/core/fe-settings.c | 2 +- src/nls.h | 9 --------- src/perl/Makefile.am | 1 + 9 files changed, 33 insertions(+), 28 deletions(-) diff --git a/configure.in b/configure.in index 74484919..ab91269c 100644 --- a/configure.in +++ b/configure.in @@ -25,8 +25,7 @@ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ $libtool_flags --disable-static --output=libtool-static --no-verify $ac_aux_dir/ltmain.sh $lt_target \ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } -AC_CHECK_HEADERS(string.h stdlib.h unistd.h dirent.h sys/ioctl.h) -AC_CHECK_HEADERS(libintl.h langinfo.h) +AC_CHECK_HEADERS(string.h stdlib.h unistd.h dirent.h sys/ioctl.h libintl.h) # check posix headers.. AC_CHECK_HEADERS(sys/time.h sys/utsname.h regex.h) diff --git a/po/de.po b/po/de.po index 019d26a4..d6e373c3 100644 --- a/po/de.po +++ b/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Irssi 0.7.23\n" -"POT-Creation-Date: 2000-12-03 07:31+0200\n" +"POT-Creation-Date: 2000-12-03 08:38+0200\n" "PO-Revision-Date: 1999-12-01 10:35-0200\n" "Last-Translator: Thomas Heinen \n" "Language-Team: Brazilian Portuguese \n" @@ -102,6 +102,10 @@ msgid "" "%s" msgstr "" +#: src/fe-common/core/fe-settings.c:259 +msgid "Y" +msgstr "" + #: src/fe-common/core/fe-settings.c:279 msgid "Overwrite config (y/N)?" msgstr "" @@ -139,7 +143,7 @@ msgstr "Bitte Nickname angeben" msgid "Specify host name to use" msgstr "Bitte Nickname angeben" -#: src/fe-text/irssi.c:235 +#: src/fe-text/irssi.c:239 msgid "Can't initialize screen handling, quitting.\n" msgstr "" diff --git a/po/fr.po b/po/fr.po index dbdf63ab..0de75306 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: irssi-0.7.23\n" -"POT-Creation-Date: 2000-12-03 07:31+0200\n" +"POT-Creation-Date: 2000-12-03 08:38+0200\n" "PO-Revision-Date: 2000-01-26 16:33+0100\n" "Last-Translator: Julien Boulnois \n" "Language-Team: LANGUAGE \n" @@ -102,6 +102,10 @@ msgid "" "%s" msgstr "" +#: src/fe-common/core/fe-settings.c:259 +msgid "Y" +msgstr "Y" + #: src/fe-common/core/fe-settings.c:279 msgid "Overwrite config (y/N)?" msgstr "" @@ -139,7 +143,7 @@ msgstr "Sp msgid "Specify host name to use" msgstr "Spécifiez un nick ą utiliser" -#: src/fe-text/irssi.c:235 +#: src/fe-text/irssi.c:239 msgid "Can't initialize screen handling, quitting.\n" msgstr "" @@ -1039,9 +1043,6 @@ msgstr "derniers messages priv #~ msgid "X" #~ msgstr "X" -#~ msgid "Y" -#~ msgstr "Y" - #~ msgid "Default window" #~ msgstr "Fenźtre par défaut" diff --git a/po/pl.po b/po/pl.po index feb9e1d3..3686a7a2 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-12-03 07:31+0200\n" +"POT-Creation-Date: 2000-12-03 08:38+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -96,6 +96,10 @@ msgid "" "%s" msgstr "" +#: src/fe-common/core/fe-settings.c:259 +msgid "Y" +msgstr "Y" + #: src/fe-common/core/fe-settings.c:279 msgid "Overwrite config (y/N)?" msgstr "" @@ -132,7 +136,7 @@ msgstr "" msgid "Specify host name to use" msgstr "" -#: src/fe-text/irssi.c:235 +#: src/fe-text/irssi.c:239 msgid "Can't initialize screen handling, quitting.\n" msgstr "" @@ -984,9 +988,6 @@ msgstr "" #~ msgid "X" #~ msgstr "X" -#~ msgid "Y" -#~ msgstr "Y" - #~ msgid "Default window" #~ msgstr "Domy¶lne okno" diff --git a/po/pt_BR.po b/po/pt_BR.po index c005e606..a42dacfd 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: irssi 0.7.23\n" -"POT-Creation-Date: 2000-12-03 07:31+0200\n" +"POT-Creation-Date: 2000-12-03 08:38+0200\n" "PO-Revision-Date: 2000-02-10 09:50-0200\n" "Last-Translator: Frédéric L. W. Meunier \n" "Language-Team: Brazilian Portuguese \n" @@ -103,6 +103,10 @@ msgid "" "%s" msgstr "" +#: src/fe-common/core/fe-settings.c:259 +msgid "Y" +msgstr "" + #: src/fe-common/core/fe-settings.c:279 msgid "Overwrite config (y/N)?" msgstr "" @@ -140,7 +144,7 @@ msgstr "Espeficar nick para usar" msgid "Specify host name to use" msgstr "Espeficar nick para usar" -#: src/fe-text/irssi.c:235 +#: src/fe-text/irssi.c:239 msgid "Can't initialize screen handling, quitting.\n" msgstr "" diff --git a/po/sv.po b/po/sv.po index 1f62e83e..3f781aae 100644 --- a/po/sv.po +++ b/po/sv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: irssi 0.7.95\n" -"POT-Creation-Date: 2000-12-03 07:31+0200\n" +"POT-Creation-Date: 2000-12-03 08:38+0200\n" "PO-Revision-Date: 2000-08-14 01:51+0200\n" "Last-Translator: Per von Zweigbergk \n" "Language-Team: Per von Zweigbergh \n" @@ -107,6 +107,10 @@ msgstr "" "Ignorerade felaktigheter i tema:\n" "%s" +#: src/fe-common/core/fe-settings.c:259 +msgid "Y" +msgstr "" + #: src/fe-common/core/fe-settings.c:279 msgid "Overwrite config (y/N)?" msgstr "" @@ -143,7 +147,7 @@ msgstr "V msgid "Specify host name to use" msgstr "Välj vilket värdnamn du vill använda" -#: src/fe-text/irssi.c:235 +#: src/fe-text/irssi.c:239 msgid "Can't initialize screen handling, quitting.\n" msgstr "Ett skärmhanteringsinitieringsfel uppstod, avslutar.\n" diff --git a/src/fe-common/core/fe-settings.c b/src/fe-common/core/fe-settings.c index 0af8451f..8bb09a72 100644 --- a/src/fe-common/core/fe-settings.c +++ b/src/fe-common/core/fe-settings.c @@ -256,7 +256,7 @@ static void settings_save_fe(const char *fname) static void settings_save_confirm(const char *line, char *fname) { - if (regexp_match(line, nl_langinfo(YESEXPR))) + if (g_strncasecmp(line, _("Y"), 1) == 0) settings_save_fe(fname); g_free(fname); } diff --git a/src/nls.h b/src/nls.h index fe6ed0e5..d8148620 100644 --- a/src/nls.h +++ b/src/nls.h @@ -12,15 +12,6 @@ # else # define N_(String) (String) # endif - -# ifdef HAVE_LANGINFO_H -# include -# else -# define nl_langinfo(x) x -# endif -# ifndef YESEXPR -# define YESEXPR "^[yY]" -# endif #else /* Stubs that do something close enough. */ # define textdomain(String) (String) diff --git a/src/perl/Makefile.am b/src/perl/Makefile.am index 775ccff9..33b97304 100644 --- a/src/perl/Makefile.am +++ b/src/perl/Makefile.am @@ -51,6 +51,7 @@ CORE_SOURCES = \ common/Rawlog.xs \ common/Server.xs \ common/Settings.xs \ + common/Themes.xs \ common/Window.xs \ common/Irssi.xs \ common/Irssi.pm \