X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCounters.cpp;h=e73e2d89139c6da6a12d0308633980ee72779284;hb=4db3e641ed6765e005343010cb90ee8af26f8f99;hp=4960eed5be87c10617f53695f4ea27be359741ff;hpb=152aba682f5dd5e7568b1508676374315f66e827;p=lyx.git

diff --git a/src/Counters.cpp b/src/Counters.cpp
index 4960eed5be..e73e2d8913 100644
--- a/src/Counters.cpp
+++ b/src/Counters.cpp
@@ -109,6 +109,7 @@ bool Counter::read(Lexer & lex)
 	return getout;
 }
 
+
 void Counter::set(int v)
 {
 	value_ = v;
@@ -260,7 +261,7 @@ void Counters::step(docstring const & ctr, UpdateType utype)
 
 	it->second.step();
 	if (utype == OutputUpdate) {
-		LASSERT(!counter_stack_.empty(), /* */);
+		LBUFERR(!counter_stack_.empty());
 		counter_stack_.pop_back();
 		counter_stack_.push_back(ctr);
 	}
@@ -292,7 +293,7 @@ void Counters::reset()
 
 void Counters::reset(docstring const & match)
 {
-	LASSERT(!match.empty(), /**/);
+	LASSERT(!match.empty(), return);
 
 	CounterList::iterator it = counterList_.begin();
 	CounterList::iterator end = counterList_.end();
@@ -363,7 +364,6 @@ char hebrewCounter(int const n)
 }
 
 
-
 // On the special cases, see http://mathworld.wolfram.com/RomanNumerals.html
 // and for a list of roman numerals up to and including 3999, see 
 // http://www.research.att.com/~njas/sequences/a006968.txt. (Thanks to Joost
@@ -587,7 +587,8 @@ docstring Counters::prettyCounter(docstring const & name,
 	Counter const & ctr = it->second;
 
 	docstring const value = theCounter(name, lang);
-	docstring const & format = ctr.prettyFormat();
+	docstring const & format =
+	    translateIfPossible(ctr.prettyFormat(), lang);
 	if (format.empty())
 		return value;
 	return subst(format, from_ascii("##"), value);
@@ -596,7 +597,7 @@ docstring Counters::prettyCounter(docstring const & name,
 
 docstring Counters::currentCounter() const
 { 
-	LASSERT(!counter_stack_.empty(), /* */);
+	LBUFERR(!counter_stack_.empty());
 	return counter_stack_.back(); 
 }