From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sat, 29 Aug 2020 09:50:43 +0000 (+0200)
Subject: Localize format prettyName in some more places (#11954)
X-Git-Tag: 2.3.6~33
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=316a6470ad7f34ec71b86432bcb9c697feb8f206;p=features.git

Localize format prettyName in some more places (#11954)

(cherry picked from commit 6f476b960edf2d774f0a4ba7d39b391034f093c7)
---

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 4006a95c91..0e09908340 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -4480,7 +4480,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 				// file (not for previewing).
 				Alert::error(_("Couldn't export file"), bformat(
 					_("No information for exporting the format %1$s."),
-					theFormats().prettyName(format)));
+					translateIfPossible(theFormats().prettyName(format))));
 			}
 			return ExportNoPathToFormat;
 		}
@@ -4664,13 +4664,13 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 		} else {
 			message(bformat(_("Document exported as %1$s "
 				"to file `%2$s'"),
-				theFormats().prettyName(format),
+				translateIfPossible(theFormats().prettyName(format)),
 				makeDisplayPath(result_file)));
 		}
 	} else {
 		// This must be a dummy converter like fax (bug 1888)
 		message(bformat(_("Document exported as %1$s"),
-			theFormats().prettyName(format)));
+			translateIfPossible(theFormats().prettyName(format))));
 	}
 
 	return success ? ExportSuccess : ExportConverterError;
diff --git a/src/Format.cpp b/src/Format.cpp
index 51dd0541d4..da93457165 100644
--- a/src/Format.cpp
+++ b/src/Format.cpp
@@ -680,7 +680,7 @@ bool Formats::view(Buffer const & buffer, FileName const & filename,
 // by the caller (this should be "utility" code)
 		Alert::error(_("Cannot view file"),
 			bformat(_("No information for viewing %1$s"),
-				prettyName(format_name)));
+				translateIfPossible(prettyName(format_name))));
 		return false;
 	}
 	// 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)
 		Alert::error(_("Cannot edit file"),
 			bformat(_("No information for editing %1$s"),
-				prettyName(format_name)));
+				translateIfPossible(prettyName(format_name))));
 		return false;
 	}
 
diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index c4d7e03a0b..b7102207ca 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -682,7 +682,7 @@ QVector<GuiWorkArea*> GuiView::GuiViewPrivate::guiWorkAreas()
 static void handleExportStatus(GuiView * view, Buffer::ExportStatus status,
 	string const & format)
 {
-	docstring const fmt = theFormats().prettyName(format);
+	docstring const fmt = translateIfPossible(theFormats().prettyName(format));
 	docstring msg;
 	switch (status) {
 	case Buffer::ExportSuccess:
@@ -2386,7 +2386,7 @@ static bool import(GuiView * lv, FileName const & filename,
 		if (loader_format.empty()) {
 			frontend::Alert::error(_("Couldn't import file"),
 					 bformat(_("No information for importing the format %1$s."),
-					 theFormats().prettyName(format)));
+					 translateIfPossible(theFormats().prettyName(format))));
 			return false;
 		}
 	} else
@@ -2433,13 +2433,13 @@ void GuiView::importDocument(string const & argument)
 		}
 
 		docstring const text = bformat(_("Select %1$s file to import"),
-			theFormats().prettyName(format));
+			translateIfPossible(theFormats().prettyName(format)));
 
 		FileDialog dlg(toqstr(text));
 		dlg.setButton1(qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
 		dlg.setButton2(qt_("Examples|#E#e"), toqstr(lyxrc.example_path));
 
-		docstring filter = theFormats().prettyName(format);
+		docstring filter = translateIfPossible(theFormats().prettyName(format));
 		filter += " (*.{";
 		// FIXME UNICODE
 		filter += from_utf8(theFormats().extensions(format));
diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp
index 0872152e34..5f9eb9068d 100644
--- a/src/frontends/qt4/Menus.cpp
+++ b/src/frontends/qt4/Menus.cpp
@@ -2247,7 +2247,8 @@ void Menus::Impl::expand(MenuDefinition const & frommenu,
 				break;
 			string const format = buf->params().getDefaultOutputFormat();
 			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);
 			MenuItem item(MenuItem::Command, toqstr(label),
 			              FuncRequest(LFUN_BUFFER_EXPORT));
diff --git a/status.23x b/status.23x
index 57906bef36..295286c2fb 100644
--- a/status.23x
+++ b/status.23x
@@ -109,6 +109,8 @@ What's new
 
 - Fix behavior of Edit button in Include dialog.
 
+- Localize some previously unlocalized strings (bug 11954 ).
+
 
 * INTERNALS