Index: plugins/citationFormats/apa/locale/vi_VN/locale.xml
===================================================================
RCS file: /cvs/ojs2/plugins/citationFormats/apa/locale/vi_VN/locale.xml,v
retrieving revision 1.5
diff -u -r1.5 locale.xml
--- plugins/citationFormats/apa/locale/vi_VN/locale.xml 17 Aug 2009 23:38:30 -0000 1.5
+++ plugins/citationFormats/apa/locale/vi_VN/locale.xml 15 Jan 2010 05:03:03 -0000
@@ -16,5 +16,5 @@
Công cụ định dạnh trích dẫn APA
APA
Công cụ này áp dụng định dạng trích dẫn APA.
- {$url}]]>
+ {$url}]]>
Index: plugins/citationFormats/apa/locale/fa_IR/locale.xml
===================================================================
RCS file: /cvs/ojs2/plugins/citationFormats/apa/locale/fa_IR/locale.xml,v
retrieving revision 1.4
diff -u -r1.4 locale.xml
--- plugins/citationFormats/apa/locale/fa_IR/locale.xml 17 Aug 2009 23:38:30 -0000 1.4
+++ plugins/citationFormats/apa/locale/fa_IR/locale.xml 15 Jan 2010 05:03:03 -0000
@@ -14,5 +14,5 @@
پلاگین الگوی مرجع نویسی آ پی آ
آ پی آ
این پلاگین الگوی مرجع نویسی آ پی آ را اعمال میکند.
- {$url} استخراج شد.]]>
+ {$url} استخراج شد.]]>
Index: plugins/citationFormats/apa/locale/da_DK/locale.xml
===================================================================
RCS file: /cvs/ojs2/plugins/citationFormats/apa/locale/da_DK/locale.xml,v
retrieving revision 1.3
diff -u -r1.3 locale.xml
--- plugins/citationFormats/apa/locale/da_DK/locale.xml 17 Aug 2009 23:38:30 -0000 1.3
+++ plugins/citationFormats/apa/locale/da_DK/locale.xml 15 Jan 2010 05:03:03 -0000
@@ -16,5 +16,5 @@
APA citeringsformat plugin
APA
Dette plugin implementerter APA citeringsformate.
- {$url}]]>
+ {$url}]]>
Index: plugins/citationFormats/mla/locale/en_US/locale.xml
===================================================================
RCS file: /cvs/ojs2/plugins/citationFormats/mla/locale/en_US/locale.xml,v
retrieving revision 1.4
diff -u -r1.4 locale.xml
--- plugins/citationFormats/mla/locale/en_US/locale.xml 8 Apr 2009 19:54:38 -0000 1.4
+++ plugins/citationFormats/mla/locale/en_US/locale.xml 15 Jan 2010 05:03:03 -0000
@@ -16,4 +16,5 @@
MLA citation format plugin
MLA
This plugin implements the MLA citation format.
+ n. pag.
Index: plugins/citationFormats/apa/locale/eu_ES/locale.xml
===================================================================
RCS file: /cvs/ojs2/plugins/citationFormats/apa/locale/eu_ES/locale.xml,v
retrieving revision 1.3
diff -u -r1.3 locale.xml
--- plugins/citationFormats/apa/locale/eu_ES/locale.xml 7 Oct 2009 21:06:33 -0000 1.3
+++ plugins/citationFormats/apa/locale/eu_ES/locale.xml 15 Jan 2010 05:03:03 -0000
@@ -16,6 +16,6 @@
APA aipamen-formatuaren plugina
APA
Plugin honek APA aipamenen formatua inplementatzen du.
- {$url}]]>
+ {$url}]]>
Index: plugins/citationFormats/apa/locale/hr_HR/locale.xml
===================================================================
RCS file: /cvs/ojs2/plugins/citationFormats/apa/locale/hr_HR/locale.xml,v
retrieving revision 1.3
diff -u -r1.3 locale.xml
--- plugins/citationFormats/apa/locale/hr_HR/locale.xml 8 Apr 2009 19:54:37 -0000 1.3
+++ plugins/citationFormats/apa/locale/hr_HR/locale.xml 15 Jan 2010 05:03:03 -0000
@@ -16,5 +16,5 @@
Dodatak za APA bibliografski standard
APA
Ovaj dodatak implementira APA bibliografski standard.
- {$url}]]>
+ {$url}]]>
Index: plugins/citationFormats/apa/locale/ca_ES/locale.xml
===================================================================
RCS file: /cvs/ojs2/plugins/citationFormats/apa/locale/ca_ES/locale.xml,v
retrieving revision 1.3
diff -u -r1.3 locale.xml
--- plugins/citationFormats/apa/locale/ca_ES/locale.xml 17 Aug 2009 23:38:30 -0000 1.3
+++ plugins/citationFormats/apa/locale/ca_ES/locale.xml 15 Jan 2010 05:03:03 -0000
@@ -16,5 +16,5 @@
Connector per al format de citació APA
APA
Aquest connector implementa el format de citació APA.
- {$url}]]>
+ {$url}]]>
Index: plugins/citationFormats/apa/locale/pt_PT/locale.xml
===================================================================
RCS file: /cvs/ojs2/plugins/citationFormats/apa/locale/pt_PT/locale.xml,v
retrieving revision 1.1
diff -u -r1.1 locale.xml
--- plugins/citationFormats/apa/locale/pt_PT/locale.xml 6 Dec 2009 21:26:04 -0000 1.1
+++ plugins/citationFormats/apa/locale/pt_PT/locale.xml 15 Jan 2010 05:03:03 -0000
@@ -16,5 +16,5 @@
Plugin Formato de Citação APA
APA
Este plugin implementa a citação sob o formato da APA.
- {$url}]]>
+ {$url}]]>
Index: plugins/citationFormats/apa/locale/el_GR/locale.xml
===================================================================
RCS file: /cvs/ojs2/plugins/citationFormats/apa/locale/el_GR/locale.xml,v
retrieving revision 1.3
diff -u -r1.3 locale.xml
--- plugins/citationFormats/apa/locale/el_GR/locale.xml 8 Apr 2009 19:54:37 -0000 1.3
+++ plugins/citationFormats/apa/locale/el_GR/locale.xml 15 Jan 2010 05:03:03 -0000
@@ -23,5 +23,5 @@
Plugin σχήματος παραπομπής APA
APA
Το plugin αυτό υλοποιεί το σχήμα παραπομπής APA.
- {$url}]]>
+ {$url}]]>
Index: plugins/citationFormats/mla/citation.tpl
===================================================================
RCS file: /cvs/ojs2/plugins/citationFormats/mla/citation.tpl,v
retrieving revision 1.9
diff -u -r1.9 citation.tpl
--- plugins/citationFormats/mla/citation.tpl 26 May 2009 01:31:17 -0000 1.9
+++ plugins/citationFormats/mla/citation.tpl 15 Jan 2010 05:03:03 -0000
@@ -14,9 +14,8 @@
{assign var=authors value=$article->getAuthors()}
{assign var=authorCount value=$authors|@count}
{foreach from=$authors item=author name=authors key=i}
- {assign var=firstName value=$author->getFirstName()}
- {$author->getLastName()|escape}, {$firstName|escape}{if $i==$authorCount-2}, {translate key="rt.context.and"} {elseif $i<$authorCount-1}, {else}.{/if}
+{if $smarty.foreach.authors.first}{$author->getLastName()|escape}, {$author->getFirstName()|escape}{else}{$author->getFullName()|escape}{/if}{if $i==$authorCount-2}, & {elseif $i lt $authorCount-1}, {else}.{/if}
{/foreach}
-"{$article->getLocalizedTitle()|strip_unsafe_html}" {$journal->getLocalizedTitle()|escape} [{translate key="rt.captureCite.online"}], {if $issue}{$issue->getVolume()|escape} {/if}{$article->getDatePublished()|date_format:'%e %b %Y'}
+"{$article->getLocalizedTitle()|strip_unsafe_html}." {$journal->getLocalizedTitle()|escape} [{translate key="rt.captureCite.online"}],{if $issue} {$issue->getVolume()|escape}{/if}{if $issue && $issue->getNumber()}.{$issue->getNumber()}{/if}{if $issue} ({$issue->getYear()}){/if}: {if $article->getPages()}{$article->getPages()}.{else}{translate key="plugins.citationFormats.mla.noPages"}{/if} {translate key="rt.captureCite.web"}. {$smarty.now|date_format:'%e %b. %Y'}
Index: plugins/citationFormats/apa/locale/es_ES/locale.xml
===================================================================
RCS file: /cvs/ojs2/plugins/citationFormats/apa/locale/es_ES/locale.xml,v
retrieving revision 1.5
diff -u -r1.5 locale.xml
--- plugins/citationFormats/apa/locale/es_ES/locale.xml 8 Apr 2009 19:54:37 -0000 1.5
+++ plugins/citationFormats/apa/locale/es_ES/locale.xml 15 Jan 2010 05:03:03 -0000
@@ -16,5 +16,5 @@
Complemento de Formato de Citas APA
APA
Este complemento implementa el formato de citas APA..
- {$url}]]>
+ {$url}]]>
Index: plugins/citationFormats/apa/locale/ru_RU/locale.xml
===================================================================
RCS file: /cvs/ojs2/plugins/citationFormats/apa/locale/ru_RU/locale.xml,v
retrieving revision 1.1
diff -u -r1.1 locale.xml
--- plugins/citationFormats/apa/locale/ru_RU/locale.xml 11 Dec 2009 22:18:30 -0000 1.1
+++ plugins/citationFormats/apa/locale/ru_RU/locale.xml 15 Jan 2010 05:03:03 -0000
@@ -16,5 +16,5 @@
Модуль формата ссылок APA
APA
Этот модул реализует формат ссылок APA.
- {$url}]]>
+ {$url}]]>
Index: plugins/citationFormats/apa/citation.tpl
===================================================================
RCS file: /cvs/ojs2/plugins/citationFormats/apa/citation.tpl,v
retrieving revision 1.11
diff -u -r1.11 citation.tpl
--- plugins/citationFormats/apa/citation.tpl 26 May 2009 01:31:17 -0000 1.11
+++ plugins/citationFormats/apa/citation.tpl 15 Jan 2010 05:03:03 -0000
@@ -19,6 +19,6 @@
({$article->getDatePublished()|date_format:'%Y'}).
{$article->getLocalizedTitle()}.
-{$journal->getLocalizedTitle()|capitalize}{if $issue}, {$issue->getVolume()|escape}({$issue->getNumber()|escape}){else}{/if}.
-{translate key="plugins.citationFormats.apa.retrieved" retrievedDate=$smarty.now|date_format:$dateFormatLong url=$articleUrl}
+{$journal->getLocalizedTitle()|capitalize}{if $issue}, {$issue->getVolume()|escape}{if $issue->getNumber()}({$issue->getNumber()|escape}){/if}{else}{/if}{if $article->getPages()}, {$article->getPages()}{/if}.
+{if $article->getDOI()}doi:{$article->getDOI()}{else}{translate key="plugins.citationFormats.apa.retrieved" retrievedDate=$smarty.now|date_format:$dateFormatLong url=$articleUrl}{/if}
Index: plugins/citationFormats/apa/locale/cs_CZ/locale.xml
===================================================================
RCS file: /cvs/ojs2/plugins/citationFormats/apa/locale/cs_CZ/locale.xml,v
retrieving revision 1.4
diff -u -r1.4 locale.xml
--- plugins/citationFormats/apa/locale/cs_CZ/locale.xml 17 Aug 2009 23:38:30 -0000 1.4
+++ plugins/citationFormats/apa/locale/cs_CZ/locale.xml 15 Jan 2010 05:03:03 -0000
@@ -18,5 +18,5 @@
Plugin pro citační formát APA
APA
Tento plugin zavádí citační formát APA.
- {$url}]]>
+ {$url}]]>
Index: plugins/citationFormats/apa/locale/en_US/locale.xml
===================================================================
RCS file: /cvs/ojs2/plugins/citationFormats/apa/locale/en_US/locale.xml,v
retrieving revision 1.5
diff -u -r1.5 locale.xml
--- plugins/citationFormats/apa/locale/en_US/locale.xml 8 Apr 2009 19:54:37 -0000 1.5
+++ plugins/citationFormats/apa/locale/en_US/locale.xml 15 Jan 2010 05:03:03 -0000
@@ -16,5 +16,5 @@
APA citation format plugin
APA
This plugin implements the APA citation format.
- {$url}]]>
+ {$url}]]>
Index: plugins/citationFormats/apa/locale/fr_CA/locale.xml
===================================================================
RCS file: /cvs/ojs2/plugins/citationFormats/apa/locale/fr_CA/locale.xml,v
retrieving revision 1.6
diff -u -r1.6 locale.xml
--- plugins/citationFormats/apa/locale/fr_CA/locale.xml 8 Apr 2009 19:54:37 -0000 1.6
+++ plugins/citationFormats/apa/locale/fr_CA/locale.xml 15 Jan 2010 05:03:03 -0000
@@ -16,5 +16,5 @@
Plugiciel de format de référence bibliographique APA
APA
Ce plugiciel implante le format de référence bibliographique APA.
- {$url}]]>
+ {$url}]]>
Index: plugins/citationFormats/apa/locale/pt_BR/locale.xml
===================================================================
RCS file: /cvs/ojs2/plugins/citationFormats/apa/locale/pt_BR/locale.xml,v
retrieving revision 1.8
diff -u -r1.8 locale.xml
--- plugins/citationFormats/apa/locale/pt_BR/locale.xml 10 Sep 2009 18:05:07 -0000 1.8
+++ plugins/citationFormats/apa/locale/pt_BR/locale.xml 15 Jan 2010 05:03:03 -0000
@@ -16,5 +16,5 @@
Plugin Formato de Citação APA
APA
This plugin implements the APA citation format.
- {$url}]]>
+ {$url}]]>
Index: plugins/citationFormats/apa/locale/it_IT/locale.xml
===================================================================
RCS file: /cvs/ojs2/plugins/citationFormats/apa/locale/it_IT/locale.xml,v
retrieving revision 1.6
diff -u -r1.6 locale.xml
--- plugins/citationFormats/apa/locale/it_IT/locale.xml 8 Apr 2009 19:54:37 -0000 1.6
+++ plugins/citationFormats/apa/locale/it_IT/locale.xml 15 Jan 2010 05:03:03 -0000
@@ -16,5 +16,5 @@
Plugin del formato di citazioni APA
APA
This plugin implements the APA citation format.
- {$url}]]>
+ {$url}]]>
Index: plugins/citationFormats/apa/locale/no_NO/locale.xml
===================================================================
RCS file: /cvs/ojs2/plugins/citationFormats/apa/locale/no_NO/locale.xml,v
retrieving revision 1.4
diff -u -r1.4 locale.xml
--- plugins/citationFormats/apa/locale/no_NO/locale.xml 17 Aug 2009 23:38:30 -0000 1.4
+++ plugins/citationFormats/apa/locale/no_NO/locale.xml 15 Jan 2010 05:03:03 -0000
@@ -16,5 +16,5 @@
APA referanseformat-plugin
APA
Denne plugin'en implementerer referanseformatet fra APA.
- {$url}]]>
+ {$url}]]>
Index: plugins/citationFormats/turabian/citation.tpl
===================================================================
RCS file: /cvs/ojs2/plugins/citationFormats/turabian/citation.tpl,v
retrieving revision 1.9
diff -u -r1.9 citation.tpl
--- plugins/citationFormats/turabian/citation.tpl 26 May 2009 01:31:17 -0000 1.9
+++ plugins/citationFormats/turabian/citation.tpl 15 Jan 2010 05:03:03 -0000
@@ -18,5 +18,5 @@
{$author->getLastName()|escape}, {$firstName|escape}{if $i==$authorCount-2}, {translate key="rt.context.and"} {elseif $i<$authorCount-1}, {else}.{/if}
{/foreach}
-"{$article->getLocalizedTitle()|strip_unsafe_html}" {$journal->getLocalizedTitle()|escape} [{translate key="rt.captureCite.online"}], {translate key="issue.volume"} {if $issue}{$issue->getVolume()|escape} {translate key="issue.number"} {$issue->getNumber()|escape} {/if}({$article->getDatePublished()|date_format:'%e %B %Y'|trim})
+"{$article->getLocalizedTitle()|strip_unsafe_html}" {$journal->getLocalizedTitle()|escape} [{translate key="rt.captureCite.online"}], {if $issue && $issue->getVolume()}{translate key="issue.volume"} {$issue->getVolume()|escape}{/if}{if $issue && $issue->getNumber()} {translate key="issue.number"} {$issue->getNumber()|escape} {/if}({$article->getDatePublished()|date_format:'%e %B %Y'|trim})