* src/MenuBackend.C

	(expandFormats): Document hack

	* lib/configure.py
	(checkFormatEntries): s/Plain text (paragraphs)/Plain Text, Join Lines/
	since this is the term we use elsewhere and it shows up in the file
	filter.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17039 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/configure.py b/lib/configure.py
index ccd572e8527ecfcd11a291bca289b06d972ca4c8..048e85ab71e670623add730beaa6babd02b0275a 100644 (file)
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -271,7 +271,7 @@ def checkFormatEntries(dtl_tools):
 \Format text2      txt    "Plain text (pstotext)" "" ""        "%%"    "document"
 \Format text3      txt    "Plain text (ps2ascii)" "" ""        "%%"    "document"
 \Format text4      txt    "Plain text (catdvi)"   "" ""        "%%"    "document"
-\Format textparagraph txt "Plain text (paragraphs)"    "" ""   "%%"    "document"''' ])
+\Format textparagraph txt "Plain Text, Join Lines" "" ""       "%%"    "document"''' ])
     #
     #checkProg('a Postscript interpreter', ['gs'],
     #  rc_entry = [ r'\ps_command "%%"' ])

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index 9dfede0ab1a081375c3d0c63398a7c1cef332917..5419f6d8b718fb8ffa923724cd6e2073d18e3481 100644 (file)
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -536,6 +536,8 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, Buffer const * buf)
 
                switch (kind) {
                case MenuItem::ImportFormats:
+                       // FIXME: This is a hack, we should rather solve
+                       // FIXME: bug 2488 instead.
                        if ((*fit)->name() == "text")
                                label = _("Plain Text");
                        else if ((*fit)->name() == "textparagraph")