r65169 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r65168‎ | r65169 | r65170 >
Date:18:38, 17 April 2010
Author:siebrand
Status:deferred
Tags:
Comment:
Remove HTML from 'sig-anonymous' and 'sig-private'
Modified paths:
  • /trunk/extensions/SignDocument/SignDocumentHelpers.php (modified) (history)
  • /trunk/extensions/SignDocument/SpecialSignDocument.i18n.php (modified) (history)
  • /trunk/extensions/SignDocument/SpecialSignDocument.php (modified) (history)

Diff [purge]

Index: trunk/extensions/SignDocument/SpecialSignDocument.i18n.php
@@ -65,8 +65,8 @@
6666 'sign-viewsignatures' => 'view signatures',
6767 'sign-closed' => 'closed',
6868 'sign-error-closed' => 'Signing of this document is currently disabled.',
69 - 'sig-anonymous' => '<i>Anonymous</i>',
70 - 'sig-private' => '<i>Private</i>',
 69+ 'sig-anonymous' => "''Anonymous''",
 70+ 'sig-private' => "''Private''",
7171 'sign-sigdetails' => 'Signature details',
7272 'sign-emailto' => '<a href="mailto:$1">$1</a>',
7373 'sign-iptools' => '<span class="plainlinksneverexpand"><!--
Index: trunk/extensions/SignDocument/SpecialSignDocument.php
@@ -620,7 +620,7 @@
621621
622622 private function getDetailTableRow( $fieldid, $val, $priv = false ) {
623623 return '<tr><td><strong>' . wfMsg( "sign-viewfield-$fieldid" ) . ':</strong></td><td>'
624 - . $val . ( ( $priv ) ? ( ' (' . wfMsg( 'sig-private' ) . ')' ):'' ) . '</td></tr>';
 624+ . $val . ( ( $priv ) ? wfMsg( 'parentheses', wfMsgExt( 'sig-private', 'parseinline' ) ) : '' ) . '</td></tr>';
625625 }
626626
627627 private function runDetailUniqueQuery( $sig ) {
Index: trunk/extensions/SignDocument/SignDocumentHelpers.php
@@ -1,5 +1,4 @@
2 -<?PHP
3 -
 2+<?php
43 /**
54 * Helper classes for the SignDocument extensions. This file provides the classes
65 * SignDocumentForm, which represents a document signing form generated by a
@@ -624,47 +623,47 @@
625624 }
626625
627626 public function getRealName() {
628 - return ( $this->canView( 'realname' ) ) ? $this->mRealName:wfMsg( 'sig-anonymous' );
 627+ return ( $this->canView( 'realname' ) ) ? $this->mRealName : wfMsgExt( 'sig-anonymous', 'parseinline' );
629628 }
630629
631630 public function getAddress() {
632 - return ( $this->canView( 'address' ) ) ? $this->mAddress:wfMsg( 'sig-private' );
 631+ return ( $this->canView( 'address' ) ) ? $this->mAddress : wfMsgExt( 'sig-private', 'parseinline' );
633632 }
634633
635634 public function getCity() {
636 - return ( $this->canView( 'extaddress' ) ) ? $this->mCity:wfMsg( 'sig-private' );
 635+ return ( $this->canView( 'extaddress' ) ) ? $this->mCity : wfMsgExt( 'sig-private', 'parseinline' );
637636 }
638637
639638 public function getState() {
640 - return ( $this->canView( 'extaddress' ) ) ? $this->mState:wfMsg( 'sig-private' );
 639+ return ( $this->canView( 'extaddress' ) ) ? $this->mState : wfMsgExt( 'sig-private', 'parseinline' );
641640 }
642641
643642 public function getCountry() {
644 - return ( $this->canView( 'extaddress' ) ) ? $this->mCountry:wfMsg( 'sig-private' );
 643+ return ( $this->canView( 'extaddress' ) ) ? $this->mCountry : wfMsgExt( 'sig-private', 'parseinline' );
645644 }
646645
647646 public function getZip() {
648 - return ( $this->canView( 'extaddress' ) ) ? $this->mZip:wfMsg( 'sig-private' );
 647+ return ( $this->canView( 'extaddress' ) ) ? $this->mZip : wfMsgExt( 'sig-private', 'parseinline' );
649648 }
650649
651650 public function getPhone() {
652 - return ( $this->canView( 'phone' ) ) ? $this->mPhone:wfMsg( 'sig-private' );
 651+ return ( $this->canView( 'phone' ) ) ? $this->mPhone : wfMsgExt( 'sig-private', 'parseinline' );
653652 }
654653
655654 public function getEmail() {
656 - return ( $this->canView( 'email' ) ) ? $this->mEmail:wfMsg( 'sig-private' );
 655+ return ( $this->canView( 'email' ) ) ? $this->mEmail : wfMsg( 'sig-private', 'parseinline' );
657656 }
658657
659658 public function getBday() {
660 - return ( $this->canView( 'bday' ) ) ? $this->mBday:wfMsg( 'sig-private' );
 659+ return ( $this->canView( 'bday' ) ) ? $this->mBday : wfMsg( 'sig-private', 'parseinline' );
661660 }
662661
663662 public function getIp() {
664 - return ( $this->isPrivileged() ) ? $this->mIp:wfMsg( 'sig-private' );
 663+ return ( $this->isPrivileged() ) ? $this->mIp : wfMsgExt( 'sig-private', 'parseinline' );
665664 }
666665
667666 public function getAgent() {
668 - return ( $this->isPrivileged() ) ? $this->mAgent:wfMsg( 'sig-private' );
 667+ return ( $this->isPrivileged() ) ? $this->mAgent : wfMsgExt( 'sig-private', 'parseinline' );
669668 }
670669
671670 public function getReviewedBy() {

Status & tagging log