per Benno Schulenberg's patch, in do_writeout(), fix problem where the

modifiers at the "Write File" prompt were marked for translation via
gettext no-ops but never actually translated; also, in do_insertfile(),
use actual gettext calls instead of no-ops, for consistency

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

diff --git a/ChangeLog b/ChangeLog
index 7b2434a800157e08f14ceac38445c9b9e7aafa0e..a92a28d1993c19210ea871e8db50903941721816 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -182,6 +182,9 @@ CVS code -
   open_file()
        - Remove redundant wording in the error message when we try to
          open a device file. (DLR)
+  do_insertfile()
+       - Use actual gettext calls instead of no-ops, for consistency.
+         (DLR)
   safe_tempfile()
        - Don't ignore $TMPDIR if it's set but blank, for consistency.
          (DLR)
@@ -196,6 +199,10 @@ CVS code -
          writing one for prepending fails. (DLR)
        - Simplify the routine for closing the file just before we
          indicate success on the statusbar. (DLR)
+  do_writeout()
+       - Fix problem where the modifiers at the "Write File" prompt
+         were marked for translation via gettext no-ops but never
+         actually translated. (Benno Schulenberg)
   free_chararray()
        - Assert that array isn't NULL, for consistency with the other
          free_.*() functions. (DLR)

diff --git a/src/files.c b/src/files.c
index 08da9da6ad496665ce712ab61c7e3cf607af0100..716ffa890732e9f5ea2000cbec5a6378e5e5c3bb 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -693,17 +693,17 @@ void do_insertfile(
            msg = 
 #ifdef ENABLE_MULTIBUFFER
                ISSET(MULTIBUFFER) ? 
-               N_("Command to execute in new buffer [from %s] ") :
+               _("Command to execute in new buffer [from %s] ") :
 #endif
-               N_("Command to execute [from %s] ");
+               _("Command to execute [from %s] ");
        } else {
 #endif
            msg =
 #ifdef ENABLE_MULTIBUFFER
                ISSET(MULTIBUFFER) ? 
-               N_("File to insert into new buffer [from %s] ") :
+               _("File to insert into new buffer [from %s] ") :
 #endif
-               N_("File to insert [from %s] ");
+               _("File to insert [from %s] ");
 #ifndef NANO_TINY
        }
 #endif
@@ -719,10 +719,10 @@ void do_insertfile(
 #ifndef NANO_TINY
                NULL,
 #endif
-                edit_refresh, _(msg),
+               edit_refresh, msg,
 #ifndef DISABLE_OPERATINGDIR
-               operating_dir != NULL && strcmp(operating_dir, ".") != 0 ?
-               operating_dir :
+               operating_dir != NULL && strcmp(operating_dir,
+               ".") != 0 ? operating_dir :
 #endif
                "./");
 
@@ -1748,21 +1748,21 @@ int do_writeout(bool exiting)
        const char *formatstr, *backupstr;
 
        formatstr = (openfile->fmt == DOS_FILE) ?
-               N_(" [DOS Format]") : (openfile->fmt == MAC_FILE) ?
-               N_(" [Mac Format]") : "";
+               _(" [DOS Format]") : (openfile->fmt == MAC_FILE) ?
+               _(" [Mac Format]") : "";
 
-       backupstr = ISSET(BACKUP_FILE) ? N_(" [Backup]") : "";
+       backupstr = ISSET(BACKUP_FILE) ? _(" [Backup]") : "";
 
        if (openfile->mark_set && !exiting)
            msg = (append == PREPEND) ?
-               N_("Prepend Selection to File") : (append == APPEND) ?
-               N_("Append Selection to File") :
-               N_("Write Selection to File");
+               _("Prepend Selection to File") : (append == APPEND) ?
+               _("Append Selection to File") :
+               _("Write Selection to File");
        else
 #endif /* !NANO_TINY */
-           msg = (append == PREPEND) ? N_("File Name to Prepend to") :
-               (append == APPEND) ? N_("File Name to Append to") :
-               N_("File Name to Write");
+           msg = (append == PREPEND) ? _("File Name to Prepend to") :
+               (append == APPEND) ? _("File Name to Append to") :
+               _("File Name to Write");
 
        /* If we're using restricted mode, the filename isn't blank,
         * and we're at the "Write File" prompt, disable tab
@@ -1776,7 +1776,7 @@ int do_writeout(bool exiting)
 #ifndef NANO_TINY
                NULL,
 #endif
-                edit_refresh, "%s%s%s", _(msg),
+               edit_refresh, "%s%s%s", msg,
 #ifndef NANO_TINY
                formatstr, backupstr
 #else