anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Localize format prettyName in some more places (#11954)

Browse Source 
(cherry picked from commit 6f476b960e)
This commit is contained in:
Juergen Spitzmueller 2020-08-29 11:50:43 +02:00
parent 0638574dc9
commit 316a6470ad
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Buffer.cpp
View File

@ -4480,7 +4480,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
// file (not for previewing). // file (not for previewing).
Alert::error(_("Couldn't export file"), bformat( Alert::error(_("Couldn't export file"), bformat(
_("No information for exporting the format %1$s."), _("No information for exporting the format %1$s."),
theFormats().prettyName(format))); translateIfPossible(theFormats().prettyName(format))));
} }
return ExportNoPathToFormat; return ExportNoPathToFormat;
} }
@ -4664,13 +4664,13 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
} else { } else {
message(bformat(_("Document exported as %1$s " message(bformat(_("Document exported as %1$s "
"to file `%2$s'"), "to file `%2$s'"),
theFormats().prettyName(format), translateIfPossible(theFormats().prettyName(format)),
makeDisplayPath(result_file))); makeDisplayPath(result_file)));
} }
} else { } else {
// This must be a dummy converter like fax (bug 1888) // This must be a dummy converter like fax (bug 1888)
message(bformat(_("Document exported as %1$s"), message(bformat(_("Document exported as %1$s"),
theFormats().prettyName(format))); translateIfPossible(theFormats().prettyName(format))));
} }
return success ? ExportSuccess : ExportConverterError; return success ? ExportSuccess : ExportConverterError;

4
src/Format.cpp
View File

@ -680,7 +680,7 @@ bool Formats::view(Buffer const & buffer, FileName const & filename,
// by the caller (this should be "utility" code) // by the caller (this should be "utility" code)
Alert::error(_("Cannot view file"), Alert::error(_("Cannot view file"),
bformat(_("No information for viewing %1$s"), bformat(_("No information for viewing %1$s"),
prettyName(format_name))); translateIfPossible(prettyName(format_name))));
return false; return false;
} }
// viewer is 'auto' // viewer is 'auto'
@ -784,7 +784,7 @@ bool Formats::edit(Buffer const & buffer, FileName const & filename,
// be done by the caller (this should be "utility" code) // be done by the caller (this should be "utility" code)
Alert::error(_("Cannot edit file"), Alert::error(_("Cannot edit file"),
bformat(_("No information for editing %1$s"), bformat(_("No information for editing %1$s"),
prettyName(format_name))); translateIfPossible(prettyName(format_name))));
return false; return false;
} }

8
src/frontends/qt4/GuiView.cpp
View File

@ -682,7 +682,7 @@ QVector<GuiWorkArea*> GuiView::GuiViewPrivate::guiWorkAreas()
static void handleExportStatus(GuiView * view, Buffer::ExportStatus status, static void handleExportStatus(GuiView * view, Buffer::ExportStatus status,
string const & format) string const & format)
{ {
docstring const fmt = theFormats().prettyName(format); docstring const fmt = translateIfPossible(theFormats().prettyName(format));
docstring msg; docstring msg;
switch (status) { switch (status) {
case Buffer::ExportSuccess: case Buffer::ExportSuccess:
@ -2386,7 +2386,7 @@ static bool import(GuiView * lv, FileName const & filename,
if (loader_format.empty()) { if (loader_format.empty()) {
frontend::Alert::error(_("Couldn't import file"), frontend::Alert::error(_("Couldn't import file"),
bformat(_("No information for importing the format %1$s."), bformat(_("No information for importing the format %1$s."),
theFormats().prettyName(format))); translateIfPossible(theFormats().prettyName(format))));
return false; return false;
} }
} else } else
@ -2433,13 +2433,13 @@ void GuiView::importDocument(string const & argument)
} }
docstring const text = bformat(_("Select %1$s file to import"), docstring const text = bformat(_("Select %1$s file to import"),
theFormats().prettyName(format)); translateIfPossible(theFormats().prettyName(format)));
FileDialog dlg(toqstr(text)); FileDialog dlg(toqstr(text));
dlg.setButton1(qt_("Documents|#o#O"), toqstr(lyxrc.document_path)); dlg.setButton1(qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
dlg.setButton2(qt_("Examples|#E#e"), toqstr(lyxrc.example_path)); dlg.setButton2(qt_("Examples|#E#e"), toqstr(lyxrc.example_path));
docstring filter = theFormats().prettyName(format); docstring filter = translateIfPossible(theFormats().prettyName(format));
filter += " (*.{"; filter += " (*.{";
// FIXME UNICODE // FIXME UNICODE
filter += from_utf8(theFormats().extensions(format)); filter += from_utf8(theFormats().extensions(format));

3
src/frontends/qt4/Menus.cpp
View File

@ -2247,7 +2247,8 @@ void Menus::Impl::expand(MenuDefinition const & frommenu,
break; break;
string const format = buf->params().getDefaultOutputFormat(); string const format = buf->params().getDefaultOutputFormat();
Format const * f = theFormats().getFormat(format); Format const * f = theFormats().getFormat(format);
docstring const name = f ? f->prettyname() : from_utf8(format); docstring const name = f ? translateIfPossible(f->prettyname())
: from_utf8(format);
docstring const label = bformat(_("Export [%1$s]|E"), name); docstring const label = bformat(_("Export [%1$s]|E"), name);
MenuItem item(MenuItem::Command, toqstr(label), MenuItem item(MenuItem::Command, toqstr(label),
FuncRequest(LFUN_BUFFER_EXPORT)); FuncRequest(LFUN_BUFFER_EXPORT));

2
status.23x
View File

@ -109,6 +109,8 @@ What's new
- Fix behavior of Edit button in Include dialog. - Fix behavior of Edit button in Include dialog.
- Localize some previously unlocalized strings (bug 11954 ).
* INTERNALS * INTERNALS