John's patch resulting in grammatically correct but clumsy names for

the various lists of floats. Awaiting Dekel's fix to add a multilingual
plural to the float name ;-)

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

diff --git a/src/ChangeLog b/src/ChangeLog
index b5852607534f7bb651d8513e4b5f83bda5d389c3..8bbdf52891b011abe730e9c2820e4b745b6e500f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -21,6 +21,10 @@
  
        * lyxfunc.C: remove unneeded assert, fix typo
  
+2001-08-16  John Levon  <moz@compsoc.man.ac.uk>
+
+       * MenuBackend.C: use "Floatname List"
+
 2001-08-14  Dekel Tsur  <dekelts@tau.ac.il>
 
        * buffer.C (parseSingleLyXformat2Token): Do not generate errors

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index 4f44e3fa60379ddf7c9fe124c45aeeebef122161..2525758134db97639d67da6bc4a9f52f2462dfe9 100644 (file)
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -366,8 +366,7 @@ void Menu::expand(Menu & tomenu, Buffer * buf) const
                                int const action =  lyxaction
                                        .getPseudoAction(LFUN_FLOAT_LIST,
                                                         cit->second.type());
-                               string label = _("List of ");
-                               label += cit->second.name();
+                               string const label = cit->second.name() + _(" List");
                                tomenu.add(MenuItem(MenuItem::Command,
                                                    label, action));
                        }

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index ce461cfbb50f959dabc5b980f252bc4ce9310a6b..27f4ab5c95d37382cc3de9eac804dba521250052 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -6,6 +6,10 @@
 
        * inset.h: added more FINISHED states for cursor right,up,down
 
+2001-08-16  John Levon  <moz@compsoc.man.ac.uk>
+
+       * insetfloatlist.C: use "FloatName List" 
+ 
 2001-08-14  Juergen Vigna  <jug@sad.it>
 
        * insetert.C (edit): forgot to set status_ in edit calls!

diff --git a/src/insets/insetfloatlist.C b/src/insets/insetfloatlist.C
index f6378fa87c0559e75ba5bd9dfbfd32bda121796b..4d63ab69cc8488c9da06096b3cd652a54e1c6ab5 100644 (file)
--- a/src/insets/insetfloatlist.C
+++ b/src/insets/insetfloatlist.C
@@ -16,7 +16,7 @@ string const InsetFloatList::getScreenLabel(Buffer const *) const
 {
        string const guiName = floatList[float_type]->second.name();
        if (!guiName.empty()) {
-               string const res = _("List of ") + guiName;
+               string const res = guiName + _(" List");
                return res;
        }
        return _("ERROR nonexistant float type!");