| Index: trunk/extensions/TemplateAdventures/TemplateAdventures.i18n.php |
| — | — | @@ -5,16 +5,17 @@ |
| 6 | 6 | /** English */ |
| 7 | 7 | $messages['en'] = array ( |
| 8 | 8 | # citation separators |
| 9 | | - 'ta-citesep-section' => ',', # separator between sections |
| 10 | | - 'ta-citesep-name' => ', ', # separator between surname and givenname |
| 11 | | - 'ta-citesep-author' => '; ', # separator between authors |
| 12 | | - 'ta-citesep-authorlast' => ' & ', # last separator between authors |
| | 9 | + 'ta-citesep-section' => '.', # separator between sections |
| | 10 | + 'ta-citesep-end' => '.', # final separator (not really a separator) |
| | 11 | + 'ta-citesep-name' => ',', # separator between surname and givenname |
| | 12 | + 'ta-citesep-author' => ';', # separator between authors |
| | 13 | + 'ta-citesep-authorlast' => ' &', # last separator between authors |
| 13 | 14 | 'ta-citesep-beforepublication' => ':', # separator between periodical |
| 14 | 15 | # and publication |
| 15 | 16 | |
| 16 | 17 | # citation messages |
| 17 | 18 | 'ta-citeetal' => "$1 ''et al''.", # $1 = list of authors |
| 18 | | - 'ta-citecoauthors' => '$1$2 $3', # $1 = authors, $2 = separator |
| | 19 | + 'ta-citecoauthors' => '$1$2 $3', # $1 = authors, $2 = separator |
| 19 | 20 | 'ta-citeauthordate' => '$1 ($2)', # $1 = authors or separator |
| 20 | 21 | 'ta-citeauthoryearnote' => '$1 [$2]', # $1 = date |
| 21 | 22 | 'ta-citeeditorsplural' => '$1, eds', # $1 = editors |
| — | — | @@ -22,27 +23,27 @@ |
| 23 | 24 | 'ta-includedworktitle' => "''$1''", |
| 24 | 25 | 'ta-citepubmed-url' => 'http://www.pubmedcentral.nih.gov/articlerender.fcgi?tool=pmcentrez&artid=$1', |
| 25 | 26 | 'ta-citetranstitle-render' => '[$1]', |
| 26 | | - 'ta-citewrittenat' => '$1 written at $2', # $1 = separator |
| 27 | | - 'ta-citeother' => '$1 $2', # $1 = separator |
| | 27 | + 'ta-citewrittenat' => 'written at $1', |
| | 28 | + 'ta-citeother' => '$1', |
| 28 | 29 | 'ta-citeinlanguage' => '$1 (in $2)', # $1 = title/link |
| 29 | 30 | 'ta-citeformatrender' => '$1 ($2)', # $1 = title/link |
| 30 | 31 | 'ta-citeperiodical' => "''$1''", |
| 31 | 32 | 'ta-citeperiodicaltitle' => "''$1''", |
| 32 | | - 'ta-series' => '$1 $2', # $1 = separator |
| 33 | | - 'ta-citepublicationplaceandpublisher' => '$1 ($2: $3)', # $1 = separator |
| 34 | | - 'ta-citepublicationplace' => '$1 ($2)', # $1 = separator |
| 35 | | - 'ta-citevolumerender' => "$1 '''$2'''", # $1 = separator |
| | 33 | + 'ta-series' => '$1', |
| | 34 | + 'ta-citepublicationplaceandpublisher' => '($1: $2)', |
| | 35 | + 'ta-citepublicationplace' => '($1)', |
| | 36 | + 'ta-citevolumerender' => "'''$1'''", |
| 36 | 37 | 'ta-citeissuerender' => '$1 ($2)', # $1 = volume |
| 37 | 38 | 'ta-citeatrender' => '$1: $2', # $1 = title info |
| 38 | | - 'ta-citeatseparated' => '$1 $2', # $1 = separator |
| | 39 | + 'ta-citeatseparated' => '$1', |
| 39 | 40 | 'ta-citetitletyperender' => '$1 ($2)', # $1 = title/link |
| 40 | | - 'ta-citepublisherrender' => '$1 $2', # $1 = separator |
| | 41 | + 'ta-citepublisherrender' => '$1', |
| 41 | 42 | 'ta-citepublished' => '$1 (published $2)', # $1 = title/link |
| 42 | 43 | 'ta-citeeditionrender' => '$1', |
| 43 | | - 'ta-citepublication' => '$1 $2', # $1 = separator |
| 44 | | - 'ta-citepublicationdate' => '$1 $2', # $1 = separator |
| 45 | | - 'ta-citeretrievedupper' => '$1 Retrieved $2', # $1 = separator |
| 46 | | - 'ta-citeretrievedlower' => '$1 retrieved $2', # $1 = separator |
| | 44 | + 'ta-citepublication' => '$1', |
| | 45 | + 'ta-citepublicationdate' => '$1', |
| | 46 | + 'ta-citeretrievedupper' => 'Retrieved $1', |
| | 47 | + 'ta-citeretrievedlower' => 'retrieved $1', |
| 47 | 48 | |
| 48 | 49 | # citation span messages |
| 49 | 50 | 'ta-citeprintonlyspan' => '<span class="printonly">$1</span>', |
| Index: trunk/extensions/TemplateAdventures/Templates/Citation.php |
| — | — | @@ -4,9 +4,10 @@ |
| 5 | 5 | |
| 6 | 6 | private $dSeparators = array( # separators between names, items, etc. |
| 7 | 7 | 'section' => ',', |
| 8 | | - 'author' => '; ', |
| 9 | | - 'name' => ', ', |
| 10 | | - 'authorlast' => ' & ', |
| | 8 | + 'end' => '.', |
| | 9 | + 'author' => ';', |
| | 10 | + 'name' => ',', |
| | 11 | + 'authorlast' => ' &', |
| 11 | 12 | 'beforepublication' => ':', |
| 12 | 13 | ); |
| 13 | 14 | private $dAuthorTruncate = 8; # the amount of authors it should display, |
| — | — | @@ -88,6 +89,7 @@ |
| 89 | 90 | $this->dSeparators['name'] = wfMsg ( 'ta-citesep-name' ); |
| 90 | 91 | $this->dSeparators['authorlast'] = wfMsg ( 'ta-citesep-authorlast' ); |
| 91 | 92 | $this->dSeparators['beforepublication'] = wfMsg ( 'ta-citesep-beforepublication' ); |
| | 93 | + $this->dSeparators['end'] = wfMsg ( 'ta-citesep-end' ); |
| 92 | 94 | $this->readOptions( ); |
| 93 | 95 | $this->parseData(); |
| 94 | 96 | } |
| — | — | @@ -107,7 +109,7 @@ |
| 108 | 110 | if ( $this->notNull ( $this->dYearNote ) ) |
| 109 | 111 | $authorArea = wfMsg ( 'ta-citeauthoryearnote', $authorArea, $this->dYearNote ); |
| 110 | 112 | } |
| 111 | | - $this->mOutput .= $authorArea; |
| | 113 | + $this->mOutput .= $authorArea . $this->getSeparator ( 'section' ); |
| 112 | 114 | # editors |
| 113 | 115 | } elseif ( count ( $this->dEditors ) > 1 ) { |
| 114 | 116 | $editorArea = $this->createWriterSection ( $this->dEditors, $this->dEditorLinks, $this->dEditorTruncate ); |
| — | — | @@ -121,17 +123,13 @@ |
| 122 | 124 | if ( $this->notNull ( $this->dYearNote ) ) |
| 123 | 125 | $editorArea .= wfMsg ( 'ta-citeauthoryearnote', $editorArea, $this->dYearNote ); |
| 124 | 126 | } |
| 125 | | - $this->mOutput .= $editorArea; |
| | 127 | + $this->mOutput .= $editorArea . $this->getSeparator ( 'section' ); |
| 126 | 128 | } |
| 127 | 129 | # included work title |
| 128 | 130 | if ( $this->notNull( $this->dWorkTitle['includedwork'] ) |
| 129 | 131 | && ( $this->notNull( $this->dPeriodical['name'] ) |
| 130 | 132 | || $this->notNull( $this->dWorkTitle['transitalic'] ) |
| 131 | 133 | || $this->notNull( $this->dWorkTitle['transtitle'] ) ) ) { |
| 132 | | - if ( $authorArea != '' |
| 133 | | - || $editorArea != '' ) { |
| 134 | | - $this->mOutput .= $this->getSeparator( 'section' ); |
| 135 | | - } |
| 136 | 134 | # let's get the url |
| 137 | 135 | if ( $this->notNull ( $this->dWorkLink['includedwork'] ) ) { |
| 138 | 136 | $url = $this->dWorkLink['includedwork']; |
| — | — | @@ -173,7 +171,7 @@ |
| 174 | 172 | || $this->notNull ( $this->dWorkTitle['includedwork'] ) |
| 175 | 173 | ) |
| 176 | 174 | ) { |
| 177 | | - $this->mOutput .= wfMsg ( 'ta-citewrittenat', $this->getSeparator ( 'section' ), $this->dPlace ); |
| | 175 | + $this->mOutput .= wfMsg ( 'ta-citewrittenat', $this->dPlace ) . $this->getSeparator ( 'section' ); |
| 178 | 176 | } |
| 179 | 177 | # editor of complication... eerrr... |
| 180 | 178 | # TODO: we'll do this later... |
| — | — | @@ -182,11 +180,7 @@ |
| 183 | 181 | if ( $this->notNull ( $this->dPeriodical['name'] ) ) { |
| 184 | 182 | $perArea = ''; |
| 185 | 183 | if ( $this->notNull ( $this->dOther ) ) |
| 186 | | - $perArea .= wfMsg ( 'ta-citeother', $this->getSeparator ( 'section' ), $this->dOther ); |
| 187 | | - if ( $authorArea != '' |
| 188 | | - || $editorArea != '' |
| 189 | | - || $this->notNull ( $this->dWorkTitle['includedwork'] ) ) |
| 190 | | - $perArea .= $this->getSeparator ( 'section' ); |
| | 184 | + $perArea .= wfMsg ( 'ta-citeother', $this->dOther ); |
| 191 | 185 | # make the link! |
| 192 | 186 | if ( $this->notNull ( $this->dWorkTitle['title'] ) || $this->notNull ( $this->dWorkTitle['transtitle'] ) ) { |
| 193 | 187 | # let's get the url |
| — | — | @@ -225,68 +219,52 @@ |
| 226 | 220 | $tmp .= wfMsg ( 'ta-citetranstitle-render', $this->dWorkTitle['transtitle'] ); |
| 227 | 221 | } |
| 228 | 222 | $title = "\"$tmp\""; |
| 229 | | - $perArea .= $this->makeLink ( $url, $title ); |
| | 223 | + $perArea .= $this->makeLink ( $url, $title ) . $this->getSeparator ( 'section' ); |
| 230 | 224 | if ( $this->notNull ( $this->dWorkTitle['note'] ) ) { |
| 231 | | - $perArea .= $this->getSeparator ( 'section' ) . ' ' . $this->dWorkTitle['note']; |
| | 225 | + $perArea .= $this->dWorkTitle['note'] . $this->getSeparator ( 'section' ); |
| 232 | 226 | } |
| 233 | 227 | } |
| 234 | 228 | $this->mOutput .= $perArea; |
| 235 | 229 | } |
| 236 | 230 | # language |
| 237 | 231 | if ( $this->notNull ( $this->dLanguage ) ) { |
| 238 | | - # yes, I am cheating right now |
| 239 | | - $this->mOutput .= wfMsg ( 'ta-citeinlanguage', '', $this->dLanguage ); |
| | 232 | + $this->mOutput .= wfMsg ( 'ta-citeinlanguage', $this->dLanguage ); |
| 240 | 233 | } |
| 241 | 234 | # format |
| 242 | 235 | if ( $this->notNull ( $this->dFormat ) ) { |
| 243 | | - # also here! |
| 244 | | - $this->mOutput .= wfMsg ( 'ta-citeformatrender', '', $this->dFormat ); |
| | 236 | + $this->mOutput .= wfMsg ( 'ta-citeformatrender', $this->dFormat ); |
| 245 | 237 | } |
| 246 | 238 | # more periodical! |
| 247 | 239 | if ( $this->notNull ( $this->dPeriodical['name'] ) ) { |
| 248 | 240 | $newPerArea = ''; |
| 249 | | - if ( $this->notNull ( $this->dWorkTitle['includedwork'] ) |
| 250 | | - || $this->notNull ( $this->dWorkTitle['title'] ) |
| 251 | | - || $this->notNull ( $this->dWorkTitle['transtitle'] ) |
| 252 | | - ) { |
| 253 | | - $newPerArea .= $this->getSeparator ( 'section' ) . ' '; |
| 254 | | - } |
| 255 | 241 | $newPerArea .= wfMsg ( 'ta-citeperiodical', $this->clean ( $this->dPeriodical['name'] ) ); |
| 256 | 242 | if ( $this->notNull ( $this->dSeries ) ) { |
| 257 | | - $newPerArea .= wfMsg ( 'ta-citeseries', $this->getSeparator ( 'section' ), $this->dSeries ); |
| | 243 | + $newPerArea .= wfMsg ( 'ta-citeseries', $this->dSeries ); |
| 258 | 244 | } |
| 259 | 245 | if ( $this->notNull ( $this->dPublication['place'] ) ) { |
| 260 | 246 | if ( $this->notNull ( $this->dPublisher ) ) { |
| 261 | | - # so cheating with these messages, I think, blanks?! |
| 262 | | - $newPerArea .= wfMsg ( 'ta-citepublicationplaceandpublisher', '', $this->dPublication['place'], $this->dPublisher ); |
| | 247 | + $newPerArea .= wfMsg ( 'ta-citepublicationplaceandpublisher', $this->dPublication['place'], $this->dPublisher ); |
| 263 | 248 | } else { |
| 264 | | - # Blank? BLANK!? You're not looking at the big picture! |
| 265 | | - $newPerArea .= wfMsg ( 'ta-citepublicationplace', '', $this->dPublication['place'] ); |
| | 249 | + $newPerArea .= wfMsg ( 'ta-citepublicationplace', $this->dPublication['place'] ); |
| 266 | 250 | } |
| 267 | 251 | } |
| 268 | 252 | if ( $this->notNull ( $this->dVolume ) ) { |
| 269 | | - $newPerArea .= wfMsg ( 'ta-citevolumerender', '', $this->dVolume ); |
| | 253 | + $newPerArea .= wfMsg ( 'ta-citevolumerender', $this->dVolume ); |
| 270 | 254 | if ( $this->notNUll ( $this->dIssue ) ) { |
| 271 | | - $newPerArea .= wfMsg ( 'ta-citeissuerender', '', $this->dIssue ); |
| | 255 | + $newPerArea .= wfMsg ( 'ta-citeissuerender', $this->dIssue ); |
| 272 | 256 | } |
| 273 | 257 | } else { |
| 274 | 258 | if ( $this->notNUll ( $this->dIssue ) ) { |
| 275 | | - $newPerArea .= wfMsg ( 'ta-citeissuerender', '', $this->dIssue ); |
| | 259 | + $newPerArea .= wfMsg ( 'ta-citeissuerender', $this->dIssue ); |
| 276 | 260 | } |
| 277 | 261 | } |
| 278 | 262 | if ( $this->notNull ( $this->dAt ) ) { |
| 279 | | - $newPerArea .= wfMsg ( 'ta-citeatrender', '', $this->dAt ); |
| | 263 | + $newPerArea .= wfMsg ( 'ta-citeatrender', $this->dAt ); |
| 280 | 264 | } |
| | 265 | + $newPerArea .= $this->getSeparator ( 'section' ); |
| 281 | 266 | # now we get to the title! Exciting stuff! |
| 282 | 267 | if ( $this->notNull ( $this->dWorkTitle['title'] ) |
| 283 | 268 | || $this->notNull ( $this->dWorkTitle['transitalic'] ) ) { |
| 284 | | - if ( $authorArea != '' |
| 285 | | - || $editorArea != '' |
| 286 | | - || $this->notNull ( $this->dWorkTitle['includedwork'] ) |
| 287 | | - || $this->notNull ( $this->dPeriodical['name'] ) |
| 288 | | - ) { |
| 289 | | - $newPerArea .= $this->getSeparator ( 'section' ); |
| 290 | | - } |
| 291 | 269 | # let's get the url |
| 292 | 270 | if ( $this->notNull ( $this->dWorkTitle['includedwork'] ) ) { |
| 293 | 271 | if ( $this->notNull ( $this->dWorkLink['includedwork'] ) ) { |
| — | — | @@ -330,55 +308,59 @@ |
| 331 | 309 | # it is easier to write this, but it also means that all of the |
| 332 | 310 | # second input is actually evaluated, even if it contains nothing. |
| 333 | 311 | $newPerArea .= $this->addNotNull ( $this->dWorkTitle['type'], |
| 334 | | - wfMsg ( 'ta-citetitletyperender', '', $this->dWorkTitle['type'] ) ); |
| | 312 | + wfMsg ( 'ta-citetitletyperender', $this->dWorkTitle['type'] ) . $this->getSeparator ( 'section' ) ); |
| 335 | 313 | $newPerArea .= $this->addNotNull ( $this->dSeries, |
| 336 | | - wfMsg ( 'ta-citeseries', $this->getSeparator ( 'section' ), $this->dSeries ) ); |
| | 314 | + wfMsg ( 'ta-citeseries', $this->dSeries ) . $this->getSeparator ( 'section' ) ); |
| 337 | 315 | $newPerArea .= $this->addNotNull ( $this->dVolume, |
| 338 | | - wfMsg ( 'ta-citevolumerender', $this->getSeparator ( 'section' ), $this->dVolume ) ); |
| | 316 | + wfMsg ( 'ta-citevolumerender', $this->dVolume ) . $this->getSeparator ( 'section' ) ); |
| 339 | 317 | $newPerArea .= $this->addNotNull ( $this->dOther, |
| 340 | | - wfMsg ( 'ta-citeother', $this->getSeparator ( 'section' ), $this->dOther ) ); |
| | 318 | + wfMsg ( 'ta-citeother', $this->dOther ) ); |
| 341 | 319 | $newPerArea .= $this->addNotNull ( $this->dEdition, |
| 342 | | - wfMsg ( 'ta-citeeditionrender', $this->dEdition ) ); |
| | 320 | + wfMsg ( 'ta-citeeditionrender', $this->dEdition ) . $this->getSeparator ( 'section' ) ); |
| 343 | 321 | $newPerArea .= $this->addNotNull ( $this->dPublication['place'], |
| 344 | | - wfMsg ( 'ta-citepublication', $this->getSeparator ( 'section' ), $this->dPublication['place'] ) ); |
| | 322 | + wfMsg ( 'ta-citepublication', $this->dPublication['place'] ) ); |
| 345 | 323 | if ( $this->notNull ( $this->dPublisher ) ) { |
| 346 | 324 | if ( $this->notNull ( $this->dPublication['place'] ) ) { |
| 347 | 325 | $sep = $this->getSeparator ( 'beforepublication' ); |
| 348 | 326 | } else { |
| 349 | 327 | $sep = $this->getSeparator ( 'section' ); |
| 350 | 328 | } |
| 351 | | - $newPerArea .= wfMsg ( 'ta-citepublisherrender', $sep, $this->dPublisher ); |
| | 329 | + $newPerArea .= $sep . wfMsg ( 'ta-citepublisherrender', $this->dPublisher ); |
| 352 | 330 | } |
| 353 | | - $this->mOutput .= $newPerArea; |
| | 331 | + $this->mOutput .= $newPerArea . $this->getSeparator ( 'section' ); |
| 354 | 332 | } |
| 355 | 333 | # date if no author/editor |
| 356 | 334 | if ( $authorArea == '' && $editorArea == '' ) { |
| 357 | 335 | if ( $this->notNull ( $this->dDate ) ) { |
| 358 | | - $this->mOutput .= wfMsg ( 'ta-citeauthordate', $this->getSeparator ( 'section' ), $this->dDate ); |
| | 336 | + $this->mOutput .= wfMsg ( 'ta-citeauthordate', $this->dDate ); |
| 359 | 337 | if ( $this->notNull ( $this->dYearNote ) ) { |
| 360 | | - $this->mOutput .= wfMsg ( 'ta-citeauthoryearnote', '', $this->dYearNote ); |
| | 338 | + $this->mOutput .= wfMsg ( 'ta-citeauthoryearnote', $this->dYearNote ); |
| 361 | 339 | } |
| | 340 | + $this->mOutput .= $this->getSeparator ( 'section' ); |
| 362 | 341 | } |
| 363 | 342 | } |
| 364 | 343 | # publication date |
| 365 | | - if ( $this->notNull ( $this->dPublication['date'] ) && $this->dPublication['date'] != $this->dDate ) { |
| | 344 | + if ( $this->notNull ( $this->dPublication['date'] ) |
| | 345 | + && $this->dPublication['date'] != $this->dDate ) { |
| 366 | 346 | if ( isset ( $this->dEditors[1] ) ) { |
| 367 | 347 | if ( isset ( $this->dAuthors[1] ) ) { |
| 368 | | - $this->mOutput .= wfMsg ( 'ta-citepublicationdate', $this->getSeparator ( 'section' ), $this->dPublication['date'] ); |
| | 348 | + $this->mOutput .= wfMsg ( 'ta-citepublicationdate', $this->dPublication['date'] ); |
| 369 | 349 | } else { |
| 370 | | - $this->mOutput .= wfMsg ( 'ta-citepublished', '', $this->dPublication['date'] ); |
| | 350 | + $this->mOutput .= wfMsg ( 'ta-citepublished', $this->dPublication['date'] ); |
| 371 | 351 | } |
| 372 | 352 | } else { |
| 373 | 353 | if ( $this->notNull ( $this->dPeriodical['name'] ) ) { |
| 374 | | - $this->mOutput .= wfMsg ( 'ta-citepublicationdate', $this->getSeparator ( 'section' ), $this->dPublication['date'] ); |
| | 354 | + $this->mOutput .= wfMsg ( 'ta-citepublicationdate', $this->dPublication['date'] ); |
| 375 | 355 | } else { |
| 376 | | - $this->mOutput .= wfMsg ( 'ta-citepublished', '', $this->dPublication['date'] ); |
| | 356 | + $this->mOutput .= wfMsg ( 'ta-citepublished', $this->dPublication['date'] ); |
| 377 | 357 | } |
| 378 | 358 | } |
| | 359 | + $this->mOutput .= $this->getSeparator ( 'section' ); |
| 379 | 360 | } |
| 380 | 361 | # page within included work |
| 381 | | - if ( !$this->notNull ( $this->dPeriodical['name'] ) && $this->notNull ( $this->dAt ) ) { |
| 382 | | - $this->mOutput .= wfMsg ( 'ta-citeatseparated', $this->getSeparator ( 'section' ), $this->dAt ); |
| | 362 | + if ( !$this->notNull ( $this->dPeriodical['name'] ) |
| | 363 | + && $this->notNull ( $this->dAt ) ) { |
| | 364 | + $this->mOutput .= wfMsg ( 'ta-citeatseparated', $this->dAt ); |
| 383 | 365 | } |
| 384 | 366 | # doi |
| 385 | 367 | # TODO: I'll do this code later: |
| — | — | @@ -437,12 +419,11 @@ |
| 438 | 420 | || $this->notNull ( $this->dWorkTitle['includedwork'] ) |
| 439 | 421 | || $this->notNull ( $this->dWorkTitle['transtitle'] ) ) { |
| 440 | 422 | $this->mOutput .= $this->printOnly ( |
| 441 | | - $this->getSeparator ( 'section' ) . ' ' . |
| 442 | 423 | ( $this->notNull ( $this->dWorkLink['includedwork'] ) |
| 443 | 424 | ? $this->dWorkLink['includedwork'] |
| 444 | 425 | : $this->dWorkLink['url'] ) ); |
| 445 | 426 | } else { |
| 446 | | - $this->mOutput .= $this->getSeparator ( 'section' ) . ' ' . |
| | 427 | + $this->mOutput .= |
| 447 | 428 | ( $this->notNull ( $this->dWorkLink['includedwork'] ) |
| 448 | 429 | ? $this->dWorkLink['includedwork'] |
| 449 | 430 | : $this->dWorkLink['url'] ); |
| — | — | @@ -465,6 +446,12 @@ |
| 466 | 447 | # some other shit nobody cares about. |
| 467 | 448 | # COinS? waaaaat |
| 468 | 449 | # TODO |
| | 450 | + $this->mOutput = trim($this->mOutput); |
| | 451 | + if ( $this->mOutput[strlen($this->mOutput)-1] == $this->getSeparator ( 'section', false ) ) { |
| | 452 | + $this->mOutput[strlen($this->mOutput)-1] = $this->getSeparator ( 'end', false ); |
| | 453 | + } elseif ( $this->mOutput[strlen($this->mOutput)-1] != $this->getSeparator ( 'end', false ) ) { |
| | 454 | + $this->mOutput .= $this->getSeparator ( 'end', false ); |
| | 455 | + } |
| 469 | 456 | } |
| 470 | 457 | |
| 471 | 458 | /** |
| — | — | @@ -513,7 +500,7 @@ |
| 514 | 501 | break; |
| 515 | 502 | } |
| 516 | 503 | if ( $n == count($writers)-1 && $i != 1 ) |
| 517 | | - $area .= $this->getSeparator( 'ampersand' ); |
| | 504 | + $area .= $this->getSeparator( 'authorlast' ); |
| 518 | 505 | elseif ( $n > 1 ) |
| 519 | 506 | $area .= $this->getSeparator( 'author' ); |
| 520 | 507 | $tmp = ''; |
| — | — | @@ -553,12 +540,15 @@ |
| 554 | 541 | * they are using a set separator message or just using a default one. |
| 555 | 542 | * |
| 556 | 543 | * @param $name Name of separator; section, author, name or authorlast |
| | 544 | + * @param $addSpace Whether to add a space at the end; default true |
| 557 | 545 | * @return $separator Blank if none found. |
| 558 | 546 | */ |
| 559 | | - private function getSeparator ( $name ) { |
| | 547 | + private function getSeparator ( $name, $addSpace=true ) { |
| 560 | 548 | if ( !isset($this->dSeparators[$name]) ) |
| 561 | 549 | return ''; |
| 562 | 550 | $sep = $this->dSeparators[$name]; |
| | 551 | + if ( $addSpace ) |
| | 552 | + return $sep.' '; |
| 563 | 553 | return $sep; |
| 564 | 554 | } |
| 565 | 555 | |