nano

commit 837a02b2566871aaca66280a588aad0464441c80
parent d7fd200a6a533c692b0f10d3c6c20b27f2144fcb
Author: David Lawrence Ramsey <pooka109@gmail.com>
Date:   Tue, 18 May 2004 15:23:31 +0000

add missing bit from DB's refactoring of do_credits(): translate the
messages in xlcredits[] after they're initialized in order to avoid an
error when compiling with -pedantic


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1746 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

Diffstat:
M
ChangeLog
 | 
4
+++-
M
src/winio.c
 | 
18
+++++++++---------

2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -214,7 +214,9 @@ CVS code -
 	- Use napms() instead of nanosleep(), as it does the same thing
 	  (aside from taking an argument in milliseconds instead of
 	  microseconds) and curses includes it. (DLR)
-	- Overhaul for efficiency. (David Benbennick)
+	- Overhaul for efficiency, and make sure the xlcredits
+	  translations are done after initialization in order to avoid
+	  an error when compiling with -pedantic. (David Benbennick)
 - configure.ac:
 	- Add tests for isblank() and strcasestr(), and define
 	  _GNU_SOURCE so that the tests work properly.  Increase the
diff --git a/src/winio.c b/src/winio.c
@@ -2750,14 +2750,14 @@ void do_credits(void)
     };
 
     const char *xlcredits[XLCREDIT_LEN] = {
-	_("The nano text editor"),
-	_("version"),
-	_("Brought to you by:"),
-	_("Special thanks to:"),
-	_("The Free Software Foundation"),
-	_("For ncurses:"),
-	_("and anyone else we forgot..."),
-	_("Thank you for using nano!")
+	"The nano text editor",
+	"version",
+	"Brought to you by:",
+	"Special thanks to:",
+	"The Free Software Foundation",
+	"For ncurses:",
+	"and anyone else we forgot...",
+	"Thank you for using nano!"
     };
 
     curs_set(0);
@@ -2780,7 +2780,7 @@ void do_credits(void)
 
 	    if (what == NULL) {
 		assert(0 <= xlpos && xlpos < XLCREDIT_LEN);
-		what = xlcredits[xlpos];
+		what = _(xlcredits[xlpos]);
 		xlpos++;
 	    }
 	    start_x = COLS / 2 - strlen(what) / 2 - 1;