mathed: bformat infoize messages

- should fix bug #1908
This commit is contained in:
Uwe Stöhr 2014-11-14 18:18:30 +01:00
parent 81badf8550
commit ff85a4902e
10 changed files with 40 additions and 12 deletions

View File

@ -19,10 +19,14 @@
#include "MathSupport.h" #include "MathSupport.h"
#include "MetricsInfo.h" #include "MetricsInfo.h"
#include "support/gettext.h"
#include "support/lstrings.h"
#include "frontends/Painter.h" #include "frontends/Painter.h"
#include <ostream> #include <ostream>
using namespace lyx::support;
namespace lyx { namespace lyx {
@ -92,7 +96,7 @@ void InsetMathBox::draw(PainterInfo & pi, int x, int y) const
void InsetMathBox::infoize(odocstream & os) const void InsetMathBox::infoize(odocstream & os) const
{ {
os << "Box: " << name_; os << bformat(_("Box: %1$s"), name_);
} }

View File

@ -19,8 +19,12 @@
#include "MathSupport.h" #include "MathSupport.h"
#include "MetricsInfo.h" #include "MetricsInfo.h"
#include "support/gettext.h"
#include "support/lstrings.h"
#include <ostream> #include <ostream>
using namespace lyx::support;
namespace lyx { namespace lyx {
@ -95,7 +99,7 @@ void InsetMathColor::normalize(NormalStream & os) const
void InsetMathColor::infoize(odocstream & os) const void InsetMathColor::infoize(odocstream & os) const
{ {
os << "Color: " << color_; os << bformat(_("Color: %1$s"), color_);
} }

View File

@ -23,10 +23,14 @@
#include "support/debug.h" #include "support/debug.h"
#include "support/docstring.h" #include "support/docstring.h"
#include "support/gettext.h"
#include "support/lassert.h" #include "support/lassert.h"
#include "support/lstrings.h"
#include <ostream> #include <ostream>
using namespace lyx::support;
using namespace std; using namespace std;
namespace lyx { namespace lyx {
@ -165,7 +169,7 @@ void InsetMathDecoration::normalize(NormalStream & os) const
void InsetMathDecoration::infoize(odocstream & os) const void InsetMathDecoration::infoize(odocstream & os) const
{ {
os << "Deco: " << key_->name; os << bformat(_("Decoration: %1$s"), key_->name);
} }

View File

@ -16,8 +16,12 @@
#include "MathStream.h" #include "MathStream.h"
#include "MathStream.h" #include "MathStream.h"
#include "support/gettext.h"
#include "support/lstrings.h"
#include <ostream> #include <ostream>
using namespace lyx::support;
namespace lyx { namespace lyx {
@ -61,7 +65,7 @@ void InsetMathEnv::normalize(NormalStream & os) const
void InsetMathEnv::infoize(odocstream & os) const void InsetMathEnv::infoize(odocstream & os) const
{ {
os << "Env: " << name_; os << bformat(_("Environment: %1$s"), name_);
} }

View File

@ -18,8 +18,12 @@
#include "MathParser.h" #include "MathParser.h"
#include "MetricsInfo.h" #include "MetricsInfo.h"
#include "support/gettext.h"
#include "support/lstrings.h"
#include <ostream> #include <ostream>
using namespace lyx::support;
namespace lyx { namespace lyx {
@ -200,7 +204,7 @@ void InsetMathFont::mathmlize(MathStream & os) const
void InsetMathFont::infoize(odocstream & os) const void InsetMathFont::infoize(odocstream & os) const
{ {
os << "Font: " << key_->name; os << bformat(_("Font: %1$s"), key_->name);
} }

View File

@ -18,8 +18,12 @@
#include "MathSupport.h" #include "MathSupport.h"
#include "MetricsInfo.h" #include "MetricsInfo.h"
#include "support/gettext.h"
#include "support/lstrings.h"
#include <ostream> #include <ostream>
using namespace lyx::support;
namespace lyx { namespace lyx {
@ -96,7 +100,7 @@ void InsetMathFontOld::normalize(NormalStream & os) const
void InsetMathFontOld::infoize(odocstream & os) const void InsetMathFontOld::infoize(odocstream & os) const
{ {
os << "Font: " << key_->name; os << bformat(_("Font: %1$s"), key_->name);
} }

View File

@ -1303,7 +1303,7 @@ void InsetMathHull::normalize(NormalStream & os) const
void InsetMathHull::infoize(odocstream & os) const void InsetMathHull::infoize(odocstream & os) const
{ {
os << "Type: " << hullName(type_); os << bformat(_("Type: %1$s"), hullName(type_));
} }

View File

@ -19,10 +19,13 @@
#include "output_xhtml.h" #include "output_xhtml.h"
#include "support/convert.h" #include "support/convert.h"
#include "support/gettext.h"
#include "support/lstrings.h"
#include <string> #include <string>
#include <ostream> #include <ostream>
using namespace lyx::support;
using namespace std; using namespace std;
namespace lyx { namespace lyx {
@ -101,7 +104,7 @@ void InsetMathSize::normalize(NormalStream & os) const
void InsetMathSize::infoize(odocstream & os) const void InsetMathSize::infoize(odocstream & os) const
{ {
os << "Size: " << key_->name; os << bformat(_("Size: %1$s"), key_->name);
} }

View File

@ -36,11 +36,13 @@
#include "support/debug.h" #include "support/debug.h"
#include "support/gettext.h" #include "support/gettext.h"
#include "support/lassert.h" #include "support/lassert.h"
#include "support/lstrings.h"
#include "support/textutils.h" #include "support/textutils.h"
#include <ostream> #include <ostream>
#include <vector> #include <vector>
using namespace lyx::support;
using namespace std; using namespace std;
namespace lyx { namespace lyx {
@ -806,14 +808,13 @@ void MathMacro::octave(OctaveStream & os) const
void MathMacro::infoize(odocstream & os) const void MathMacro::infoize(odocstream & os) const
{ {
os << "Macro: " << name(); os << bformat(_("Macro: %1$s"), name());
} }
void MathMacro::infoize2(odocstream & os) const void MathMacro::infoize2(odocstream & os) const
{ {
os << "Macro: " << name(); os << bformat(_("Macro: %1$s"), name());
} }

View File

@ -1360,7 +1360,7 @@ size_t MathMacroTemplate::numOptionals() const
void MathMacroTemplate::infoize(odocstream & os) const void MathMacroTemplate::infoize(odocstream & os) const
{ {
os << "Math Macro: \\" << name(); os << bformat(_("Math Macro: \\%1$s"), name());
} }