Fix i18n as suggested by Jürgen:

You cannot use params.type for that, because that's not flagged for
translation. Have a look at InsetCollapsable::floatName().

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

diff --git a/src/frontends/qt4/FloatPlacement.cpp b/src/frontends/qt4/FloatPlacement.cpp
index 3ae2c086f46413e2241714e4658f5e814355d6c3..875c3c036192c78b1009483f75ca8f951db18ea1 100644 (file)
--- a/src/frontends/qt4/FloatPlacement.cpp
+++ b/src/frontends/qt4/FloatPlacement.cpp
@@ -112,7 +112,7 @@ void FloatPlacement::paramsToDialog(Inset const * inset)
        InsetFloatParams const & params = fl->params();
 
        float_type_ = params.type;
-       floatType->setText(qt_(float_type_));
+       floatType->setText(toqstr(fl->floatName(float_type_)));
 
        set(params.placement);
 

diff --git a/src/insets/InsetCollapsable.h b/src/insets/InsetCollapsable.h
index 74dfbdf6e4e158d54ac36fa81e972cb59f594f5c..221795dd3b8ee336c4121d953c079b52f25f9460 100644 (file)
--- a/src/insets/InsetCollapsable.h
+++ b/src/insets/InsetCollapsable.h
@@ -138,6 +138,8 @@ public:
        virtual bool usePlainLayout() const { return true; }
        ///
        virtual docstring contextMenu(BufferView const & bv, int x, int y) const;
+       ///
+       docstring floatName(std::string const & type) const;
 protected:
        ///
        void doDispatch(Cursor & cur, FuncRequest & cmd);
@@ -147,8 +149,6 @@ protected:
        ///
        Inset * editXY(Cursor & cur, int x, int y);
        ///
-       docstring floatName(std::string const & type) const;
-       ///
        mutable CollapseStatus status_;
 private:
        ///