Make the default format translatable, and load the cite formats in

paper.layout.

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

diff --git a/lib/layouts/paper.layout b/lib/layouts/paper.layout
index 745b51ce0f66bd8a490e5bc88ac6ccbc60d8ae12..99d1d5c8f178e87e30416fd799de8cd699747ff6 100644 (file)
--- a/lib/layouts/paper.layout
+++ b/lib/layouts/paper.layout
@@ -35,6 +35,7 @@ Input stdsections.inc
 Input stdstarsections.inc
 Input stdlists.inc
 Input stdcounters.inc
+Input stdciteformats.inc
 
 # There are no chapters in a paper.
 NoStyle                 Chapter

diff --git a/src/TextClass.cpp b/src/TextClass.cpp
index 5a51cef31557d25a037e4d28e6e97f2cbd622c0a..ee4315054714250efac8484d11a0d55e4aa03e33 100644 (file)
--- a/src/TextClass.cpp
+++ b/src/TextClass.cpp
@@ -1352,7 +1352,7 @@ Layout const & DocumentClass::htmlTOCLayout() const
 
 string const & DocumentClass::getCiteFormat(string const & entry_type) const
 {
-       static string default_format = "{%author%[[%author%, ]][[{%editor%[[%editor%, %ed_text%, ]]}]]}\"%title%\"{%journal%[[, {!<i>!}%journal%{!</i>!}]][[{%publisher%[[, %publisher%]][[{%institution%[[, %institution%]]}]]}]]}{%year%[[ (%year%)]]}{%pages%[[, %pages%]]}.";
+       static string default_format = N_("{%author%[[%author%, ]][[{%editor%[[%editor%, ed., ]]}]]}\"%title%\"{%journal%[[, {!<i>!}%journal%{!</i>!}]][[{%publisher%[[, %publisher%]][[{%institution%[[, %institution%]]}]]}]]}{%year%[[ (%year%)]]}{%pages%[[, %pages%]]}.");
        
        map<string, string>::const_iterator it = cite_formats_.find(entry_type);
        if (it != cite_formats_.end())