* src/insets/InsetCollapsable.cpp:

* src/insets/InsetFoot.cpp:
	- make button labels translatable

PLEASE, people, do not forget i18n !!!

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

diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index fd182e580c8ee5de212a8a7096901dda2112d8bf..c3570d6015a75560a20d7b36cb221ef8dfbc6b54 100644 (file)
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -108,7 +108,7 @@ docstring InsetCollapsable::toolTip(BufferView const & bv, int x, int y) const
 {
        Dimension dim = dimensionCollapsed();
        if (geometry() == NoButton)
-               return layout_->labelstring();
+               return translateIfPossible(layout_->labelstring());
        if (x > xo(bv) + dim.wid || y > yo(bv) + dim.des)
                return docstring();
 
@@ -132,7 +132,7 @@ void InsetCollapsable::setLayout(DocumentClass const * const dc)
 {
        if (dc) {
                layout_ = &(dc->insetLayout(name()));
-               labelstring_ = layout_->labelstring();
+               labelstring_ = translateIfPossible(layout_->labelstring());
        } else {
                layout_ = &DocumentClass::emptyInsetLayout();
                labelstring_ = _("UNDEFINED");

diff --git a/src/insets/InsetFoot.cpp b/src/insets/InsetFoot.cpp
index 310ab27edceb770eb2bb72cf46dd7be949c153de..d320476733a531ff6c6cf3ca25c73a5a70dbc603 100644 (file)
--- a/src/insets/InsetFoot.cpp
+++ b/src/insets/InsetFoot.cpp
@@ -56,8 +56,8 @@ void InsetFoot::updateLabels(ParIterator const & it)
        if (!outer.layout().intitle && cnts.hasCounter(foot)) {
                cnts.step(foot);
                // FIXME: the counter should format itself.
-               custom_label_= support::bformat(from_ascii("%1$s %2$s"),
-                                         getLayout(buffer().params()).labelstring(),
+               custom_label_= support::bformat(from_utf8("%1$s %2$s"),
+                                         translateIfPossible(getLayout(buffer().params()).labelstring()),
                                          cnts.theCounter(foot));
                setLabel(custom_label_);