fix bug 1807: New on-screen translations do not work

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

lib/ChangeLog

@@ -1,3 +1,18 @@
+2005-05-18  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* layouts/report.layout: no need to change LabelString here
+
+	* layouts/heb-article.layout: 
+	* layouts/heb-letter.layout: 
+	* layouts/dinbrief.layout: avoid 8bit characters
+
+	* layouts/scrclass.inc: no need to reset LabelString here
+
+	* layouts/amsbook.layout: no need to remove numbering of paragraph
+	layout. 
+
+	* layouts/amsdefs.inc: fix case of LabelString
+
 2005-05-10  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* layouts/llncs.layout: fix some font sizes; change description;

lib/layouts/amsbook.layout

@@ -97,11 +97,9 @@ Style Section
 End
 
 
-# Paragraph doesn't have numbered labels
 Style Paragraph
-	LabelString          ""
-	LabelStringAppendix  ""
 	Font
+	  Series Medium
 	EndFont
 End
 

lib/layouts/amsdefs.inc

@@ -175,7 +175,7 @@ Style Email
 	CopyStyle             Address
 	Margin                First_Dynamic
 	LatexName             email
-	labelString           "E-mail address: "
+	LabelString           "E-mail address: "
 End
 
 
@@ -183,7 +183,7 @@ Style URL
 	CopyStyle             Address
 	Margin                First_Dynamic
 	LatexName             urladdr
-	labelString           "URL: "
+	LabelString           "URL: "
 End
 
 

lib/layouts/dinbrief.layout

@@ -70,7 +70,7 @@ End
 
 Style Closing
 	LeftMargin            Unterschr
-	LabelString           Gruß:
+	LabelString           "Gruss:"
 	LabelSep              x
 	LabelFont
 	  Series              Medium

lib/layouts/heb-article.layout

@@ -14,11 +14,6 @@ Preamble
 EndPreamble
 
 
-Style Abstract
-	LabelString           "øéö÷ú"
-End
-
-
 Style Theorem
 	Margin                First_Dynamic
 	LatexType             Environment
@@ -34,7 +29,7 @@ Style Theorem
 	Align                 Block
 	AlignPossible         Block, Left
 	LabelType             Static
-	LabelString           ".# èôùî"
+	LabelString           "Theorem #."
 	Font
 	  Shape               Up
 	  Size                Normal
@@ -49,7 +44,7 @@ End
 Style Lemma
 	CopyStyle             Theorem
 	LatexName             lemma
-	LabelString           ".# äîì"
+	LabelString           "Lemma #."
 	Preamble
 		\newtheorem{lemma}[theorem]{\R{ìîä}}
 	EndPreamble
@@ -59,7 +54,7 @@ End
 Style Corollary
 	CopyStyle             Theorem
 	LatexName             corollary
-	LabelString           ".# äð÷ñî"
+	LabelString           "Corollary #."
 	Preamble
 		\newtheorem{corollary}[theorem]{\R{îñ÷ðä}}
 	EndPreamble
@@ -69,7 +64,7 @@ End
 Style Claim
 	CopyStyle             Theorem
 	LatexName             claim
-	LabelString           ".# äðòè"
+	LabelString           "Claim #."
 	Preamble
 		\newtheorem{claim}[theorem]{\R{èòðä}}
 	EndPreamble
@@ -79,7 +74,7 @@ End
 Style Definition
 	CopyStyle             Theorem
 	LatexName             definition
-	LabelString           ".# äøãâä"
+	LabelString           "Definition #."
 	Preamble
 		\newtheorem{definition}[theorem]{\R{äâãøä}}
 	EndPreamble
@@ -89,7 +84,7 @@ End
 Style Remarks
 	CopyStyle             Theorem
 	LatexName             remark
-	LabelString           ".# äøòä"
+	LabelString           "Remarks #."
 	Preamble
 		\newtheorem{remark}[theorem]{\R{äòøä}}
 	EndPreamble
@@ -111,7 +106,7 @@ Style Proof
 	Align                 Block
 	AlignPossible         Block, Left
 	LabelType             Static
-	LabelString           ":äçëåä"
+	LabelString           "Proof:"
 	EndLabelType          Filled_Box
 	Font
 	  Shape               Up

lib/layouts/heb-letter.layout

@@ -15,17 +15,3 @@ Style Send_To_Address
 	Align                 Right
 End
 
-
-Style Opening
-	LabelString           :äçéúô
-End
-
-
-Style Closing
-	LabelString           :íåéñ
-End
-
-
-Style Signature
-	LabelString           :äîéúç
-End

lib/layouts/report.layout

@@ -8,12 +8,6 @@
 Input stdclass.inc
 Input numreport.inc
 
-Style Chapter
-	LabelString           "Chapter \arabic{chapter}"
-	LabelStringAppendix   "Appendix \Alph{chapter}"
-End
-
-
 Style Bibliography
 	TopSep                4
 	LabelString           Bibliography

lib/layouts/scrclass.inc

@@ -55,7 +55,6 @@ End
 
 
 Style Chapter
-	LabelString           ""
 	Font
 	  Family              Sans
 	  Size                Largest

po/ChangeLog

@@ -1,3 +1,7 @@
+2005-05-18  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* Makefile.in.in: add the layout LabelString entries in pot file.
+
 2005-05-02  Angus Leeming  <leeming@lyx.org>
 
 	* po/POTFILES.in: src/SpellBase.C now contains a translatable string.

po/Makefile.in.in

@@ -441,6 +441,15 @@ layouts_l10n.pot: $(top_srcdir)/lib/layouts/*.layout $(top_srcdir)/lib/layouts/*
 			printf("#: %s:%d\nmsgid \"%s\"\nmsgstr \"\"\n\n", \
 				fixupfilename(), FNR, line); \
 		} \
+		/LabelString[A-Za-z]*/ { \
+			line=$$0; \
+			sub(/[[:space:]]*LabelString[A-Za-z]*[[:space:]]*/, "", line); \
+			gsub(/"/, "", line); \
+			gsub(/\\/, "\\\\", line); \
+			if (line != "") \
+			  printf("#: %s:%d\nmsgid \"%s\"\nmsgstr \"\"\n\n", \
+				 fixupfilename(), FNR, line); \
+		} \
 		/GuiName/ { \
 			line=$$0; \
 			sub(/[[:space:]]*GuiName[[:space:]]*/, "", line); \

po/fr.po

@@ -14856,6 +14856,14 @@ msgstr "Encodage"
 msgid "Paragraph layout set"
 msgstr "Style du paragraphe redéfini"
 
+#: lib/layouts/numreport.inc:14
+msgid "Chapter \\arabic{chapter}"
+msgstr "Chapitre \\arabic{chapter}"
+
+#: lib/layouts/numreport.inc:15
+msgid "Appendix \\Alph{chapter}"
+msgstr "Appendice \\Alph{chapter}"
+
 #, fuzzy
 #~ msgid "To:|#T"
 #~ msgstr "Haute :|#H"

src/ChangeLog

@@ -1,3 +1,11 @@
+2005-05-18  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* buffer_funcs.C (expandLabel): take a Buffer as argument;
+	translate the labelstring.
+	(setCounter): translate labelstring as needed.
+
+	* output_docbook.C (makeCommand): fix expandLabel invokation
+
 2005-05-14  Michael Schmitt  <michael.schmitt@teststep.org>
 
 	* BufferView.C: fix dialog title

src/buffer_funcs.C

@@ -382,7 +382,7 @@ void setCounter(Buffer const & buf, ParIterator & it)
 		    && (layout->latextype != LATEX_ENVIRONMENT
 			|| isFirstInSequence(it.pit(), it.plist()))) {
 			counters.step(layout->counter);
-			string label = expandLabel(textclass, layout,
+			string label = expandLabel(buf, layout,
 						   par.params().appendix());
 			par.params().labelString(label);
 		}
@@ -442,7 +442,7 @@ void setCounter(Buffer const & buf, ParIterator & it)
 		int number = counters.value("bibitem");
 		if (par.bibitem()) 
 			par.bibitem()->setCounter(number);
-		par.params().labelString(layout->labelstring());
+		par.params().labelString(buf.B_(layout->labelstring()));
 		// In biblio should't be following counters but...
 	} else if (layout->labeltype == LABEL_SENSITIVE) {
 		// Search for the first float or wrap inset in the iterator
@@ -498,11 +498,13 @@ void updateCounters(Buffer const & buf)
 }
 
 
-string expandLabel(LyXTextClass const & textclass,
+string expandLabel(Buffer const & buf,
 	LyXLayout_ptr const & layout, bool appendix)
 {
-	string fmt = appendix ?
+	LyXTextClass const & tclass = buf.params().getLyXTextClass();
-		layout->labelstring_appendix() : layout->labelstring();
+
+	string fmt = buf.B_(appendix ? layout->labelstring_appendix() 
+			    : layout->labelstring());
 
 	// handle 'inherited level parts' in 'fmt',
 	// i.e. the stuff between '@' in   '@Section@.\arabic{subsection}'
@@ -511,12 +513,12 @@ string expandLabel(LyXTextClass const & textclass,
 		size_t const j = fmt.find('@', i + 1);
 		if (j != string::npos) {
 			string parent(fmt, i + 1, j - i - 1);
-			string label = expandLabel(textclass, textclass[parent], appendix);
+			string label = expandLabel(buf, tclass[parent], appendix);
 			fmt = string(fmt, 0, i) + label + string(fmt, j + 1, string::npos);
 		}
 	}
 
-	return textclass.counters().counterLabel(fmt);
+	return tclass.counters().counterLabel(fmt);
 }
 
 

src/buffer_funcs.h

@@ -20,7 +20,6 @@
 class Buffer;
 class DocIterator;
 class ErrorList;
-class LyXTextClass;
 class TeXErrors;
 
 /**
@@ -46,8 +45,8 @@ void bufferErrors(Buffer const &, ErrorList const &);
 int countWords(DocIterator const & from, DocIterator const & to);
 
 /// Expand the counters for the labelstring of \c layout
-std::string expandLabel(LyXTextClass const & textclass,
+std::string expandLabel(Buffer const & buf, LyXLayout_ptr const & layout, 
-		LyXLayout_ptr const & layout, bool appendix);
+			bool appendix);
 
 /// updates all counters
 void updateCounters(Buffer const &);

src/output_docbook.C

@@ -233,7 +233,7 @@ ParagraphList::const_iterator makeCommand(Buffer const & buf,
 	// Label around sectioning number:
 	if (!bstyle->labeltag().empty()) {
 		sgml::openTag(os, bstyle->labeltag());
-		os << expandLabel(buf.params().getLyXTextClass(), bstyle, false);
+		os << expandLabel(buf, bstyle, false);
 		sgml::closeTag(os, bstyle->labeltag());
 	}