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
Этот коммит содержится в:
родитель
b0226fb86a
Коммит
4f2a073cf9
@ -182,6 +182,9 @@ CVS code -
|
|||||||
open_file()
|
open_file()
|
||||||
- Remove redundant wording in the error message when we try to
|
- Remove redundant wording in the error message when we try to
|
||||||
open a device file. (DLR)
|
open a device file. (DLR)
|
||||||
|
do_insertfile()
|
||||||
|
- Use actual gettext calls instead of no-ops, for consistency.
|
||||||
|
(DLR)
|
||||||
safe_tempfile()
|
safe_tempfile()
|
||||||
- Don't ignore $TMPDIR if it's set but blank, for consistency.
|
- Don't ignore $TMPDIR if it's set but blank, for consistency.
|
||||||
(DLR)
|
(DLR)
|
||||||
@ -196,6 +199,10 @@ CVS code -
|
|||||||
writing one for prepending fails. (DLR)
|
writing one for prepending fails. (DLR)
|
||||||
- Simplify the routine for closing the file just before we
|
- Simplify the routine for closing the file just before we
|
||||||
indicate success on the statusbar. (DLR)
|
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()
|
free_chararray()
|
||||||
- Assert that array isn't NULL, for consistency with the other
|
- Assert that array isn't NULL, for consistency with the other
|
||||||
free_.*() functions. (DLR)
|
free_.*() functions. (DLR)
|
||||||
|
34
src/files.c
34
src/files.c
@ -693,17 +693,17 @@ void do_insertfile(
|
|||||||
msg =
|
msg =
|
||||||
#ifdef ENABLE_MULTIBUFFER
|
#ifdef ENABLE_MULTIBUFFER
|
||||||
ISSET(MULTIBUFFER) ?
|
ISSET(MULTIBUFFER) ?
|
||||||
N_("Command to execute in new buffer [from %s] ") :
|
_("Command to execute in new buffer [from %s] ") :
|
||||||
#endif
|
#endif
|
||||||
N_("Command to execute [from %s] ");
|
_("Command to execute [from %s] ");
|
||||||
} else {
|
} else {
|
||||||
#endif
|
#endif
|
||||||
msg =
|
msg =
|
||||||
#ifdef ENABLE_MULTIBUFFER
|
#ifdef ENABLE_MULTIBUFFER
|
||||||
ISSET(MULTIBUFFER) ?
|
ISSET(MULTIBUFFER) ?
|
||||||
N_("File to insert into new buffer [from %s] ") :
|
_("File to insert into new buffer [from %s] ") :
|
||||||
#endif
|
#endif
|
||||||
N_("File to insert [from %s] ");
|
_("File to insert [from %s] ");
|
||||||
#ifndef NANO_TINY
|
#ifndef NANO_TINY
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@ -719,10 +719,10 @@ void do_insertfile(
|
|||||||
#ifndef NANO_TINY
|
#ifndef NANO_TINY
|
||||||
NULL,
|
NULL,
|
||||||
#endif
|
#endif
|
||||||
edit_refresh, _(msg),
|
edit_refresh, msg,
|
||||||
#ifndef DISABLE_OPERATINGDIR
|
#ifndef DISABLE_OPERATINGDIR
|
||||||
operating_dir != NULL && strcmp(operating_dir, ".") != 0 ?
|
operating_dir != NULL && strcmp(operating_dir,
|
||||||
operating_dir :
|
".") != 0 ? operating_dir :
|
||||||
#endif
|
#endif
|
||||||
"./");
|
"./");
|
||||||
|
|
||||||
@ -1748,21 +1748,21 @@ int do_writeout(bool exiting)
|
|||||||
const char *formatstr, *backupstr;
|
const char *formatstr, *backupstr;
|
||||||
|
|
||||||
formatstr = (openfile->fmt == DOS_FILE) ?
|
formatstr = (openfile->fmt == DOS_FILE) ?
|
||||||
N_(" [DOS Format]") : (openfile->fmt == MAC_FILE) ?
|
_(" [DOS Format]") : (openfile->fmt == MAC_FILE) ?
|
||||||
N_(" [Mac Format]") : "";
|
_(" [Mac Format]") : "";
|
||||||
|
|
||||||
backupstr = ISSET(BACKUP_FILE) ? N_(" [Backup]") : "";
|
backupstr = ISSET(BACKUP_FILE) ? _(" [Backup]") : "";
|
||||||
|
|
||||||
if (openfile->mark_set && !exiting)
|
if (openfile->mark_set && !exiting)
|
||||||
msg = (append == PREPEND) ?
|
msg = (append == PREPEND) ?
|
||||||
N_("Prepend Selection to File") : (append == APPEND) ?
|
_("Prepend Selection to File") : (append == APPEND) ?
|
||||||
N_("Append Selection to File") :
|
_("Append Selection to File") :
|
||||||
N_("Write Selection to File");
|
_("Write Selection to File");
|
||||||
else
|
else
|
||||||
#endif /* !NANO_TINY */
|
#endif /* !NANO_TINY */
|
||||||
msg = (append == PREPEND) ? N_("File Name to Prepend to") :
|
msg = (append == PREPEND) ? _("File Name to Prepend to") :
|
||||||
(append == APPEND) ? N_("File Name to Append to") :
|
(append == APPEND) ? _("File Name to Append to") :
|
||||||
N_("File Name to Write");
|
_("File Name to Write");
|
||||||
|
|
||||||
/* If we're using restricted mode, the filename isn't blank,
|
/* If we're using restricted mode, the filename isn't blank,
|
||||||
* and we're at the "Write File" prompt, disable tab
|
* and we're at the "Write File" prompt, disable tab
|
||||||
@ -1776,7 +1776,7 @@ int do_writeout(bool exiting)
|
|||||||
#ifndef NANO_TINY
|
#ifndef NANO_TINY
|
||||||
NULL,
|
NULL,
|
||||||
#endif
|
#endif
|
||||||
edit_refresh, "%s%s%s", _(msg),
|
edit_refresh, "%s%s%s", msg,
|
||||||
#ifndef NANO_TINY
|
#ifndef NANO_TINY
|
||||||
formatstr, backupstr
|
formatstr, backupstr
|
||||||
#else
|
#else
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user