From: Richard Heck <rgheck@comcast.net>
Date: Mon, 29 Mar 2010 18:50:31 +0000 (+0000)
Subject: Make the default format translatable, and load the cite formats in
X-Git-Tag: 2.0.0~3658
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=0c135d1c4e4b0fa0641a06917f71d76aa1ad5f21;p=features.git

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 745b51ce0f..99d1d5c8f1 100644
--- 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 5a51cef315..ee43150547 100644
--- 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())