mirrors
/
nano
mirror of git://git.sv.gnu.org/nano.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ken's ngettext fix 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1306 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Chris Allegretta 2002-10-25 01:41:31 +00:00
parent 573b61f2af
commit d45c5992d3
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -9,7 +9,8 @@ CVS code -
- Disable VSTOP keystroke. Stops people accidentally locking up - Disable VSTOP keystroke. Stops people accidentally locking up
nano (suggested by David Benbennick). nano (suggested by David Benbennick).
- Pluralize messages with ngettext() where needed. (David - Pluralize messages with ngettext() where needed. (David
Benbennick) Benbennick) Tweaked to compile on systems lacking ngettext()
by DLR (problem found by Ken Tyler).
- Update nano.1 and nano.1.html to show that nano now does an - Update nano.1 and nano.1.html to show that nano now does an
emergency save on receiving SIGHUP or SIGTERM. (DLR) emergency save on receiving SIGHUP or SIGTERM. (DLR)
- Don't include "nowrap" in the long options if - Don't include "nowrap" in the long options if

6
configure.ac
View File

@ -217,7 +217,11 @@ AC_MSG_WARN([*** Can not use slang when cross-compiling])),
esac], [AC_MSG_RESULT(no)]) esac], [AC_MSG_RESULT(no)])
dnl Checks for functions dnl Checks for functions
AC_CHECK_FUNCS(snprintf vsnprintf) AC_CHECK_FUNCS(ngettext snprintf vsnprintf)
if test "x$ac_cv_func_ngettext" = "xno"
then
AC_DEFINE(NO_NGETTEXT, 1, [Defined if ngettext() is unavailable])
fi
if test "x$ac_cv_func_snprintf" = "xno" -o "xac_cv_func_vsnprintf" = "xno" if test "x$ac_cv_func_snprintf" = "xno" -o "xac_cv_func_vsnprintf" = "xno"
then then
AM_PATH_GLIB(1.2.4,, AM_PATH_GLIB(1.2.4,,

3
nano.h
View File

@ -51,6 +51,9 @@
# include <libintl.h> # include <libintl.h>
# endif # endif
# define _(string) gettext(string) # define _(string) gettext(string)
# ifdef NO_NGETTEXT
# define ngettext(singular, plural, number) gettext(number == 1 ? singular : plural)
# endif
#else #else
# define _(string) (string) # define _(string) (string)
# define ngettext(singular, plural, number) number == 1 ? singular : plural # define ngettext(singular, plural, number) number == 1 ? singular : plural