| Index: trunk/extensions/UsabilityInitiative/PrefSwitch/PrefSwitch.i18n.php |
| — | — | @@ -65,11 +65,12 @@ |
| 66 | 66 | * Search improvements: We\'ve improved search suggestions to get you to the article you\'re looking for more quickly. |
| 67 | 67 | * Other new features: We\'ve also introduced a table wizard to make creating tables easier and find and a replace feature to simplify article editing. |
| 68 | 68 | |
| 69 | | -Feedback? We\'ve love to hear from you. Please visit our <a href="$3">feedback page</a>. |
| 70 | | -Take me back. If you would like to turn off the new features, please <a href="$2">click here</a>. |
| | 69 | +;Feedback? |
| | 70 | +We\'ve love to hear from you. Please visit our [$4 feedback page]. |
| | 71 | +;Take me back! |
| | 72 | +If you would like to turn off the new features, please [$3 click here]. |
| 71 | 73 | |
| 72 | | - |
| 73 | | - Provide feedback</a>, turn stuff off</a> or return to $1.', |
| | 74 | +or return to [$1 $2].', |
| 74 | 75 | 'prefswitch-survey-intro-feedback' => 'We\'d love to hear from you. Please fill out the optional survey below.', |
| 75 | 76 | 'prefswitch-survey-intro-off' => 'Thanks for trying out our new features. To help us improve them, please fill out the optional survey below ', |
| 76 | 77 | ); |
| Index: trunk/extensions/UsabilityInitiative/PrefSwitch/SpecialPrefSwitch.php |
| — | — | @@ -14,7 +14,7 @@ |
| 15 | 15 | private $originTitle = null; |
| 16 | 16 | private $originQuery = ''; |
| 17 | 17 | private $originLink = ''; |
| 18 | | - private $originURL = ''; |
| | 18 | + private $originUrl = ''; |
| 19 | 19 | |
| 20 | 20 | /* Static Functions */ |
| 21 | 21 | |
| — | — | @@ -92,7 +92,7 @@ |
| 93 | 93 | $this->origin = $this->originTitle->getPrefixedDBKey(); |
| 94 | 94 | $this->originQuery = $wgRequest->getVal( 'fromquery' ); |
| 95 | 95 | $this->originLink = $wgUser->getSkin()->link( $this->originTitle, null, array(), $this->originQuery ); |
| 96 | | - $this->originURL = $this->originTitle->getLinkUrl( $this->originQuery ); |
| | 96 | + $this->originUrl = $this->originTitle->getLinkUrl( $this->originQuery ); |
| 97 | 97 | } |
| 98 | 98 | // Begin output |
| 99 | 99 | $this->setHeaders(); |
| — | — | @@ -174,7 +174,7 @@ |
| 175 | 175 | $this->render( 'main' ); |
| 176 | 176 | } |
| 177 | 177 | } |
| 178 | | - |
| | 178 | + |
| 179 | 179 | /* Private Functions */ |
| 180 | 180 | |
| 181 | 181 | private function render( $mode = null ) { |
| — | — | @@ -215,11 +215,12 @@ |
| 216 | 216 | $wgOut->addWikiMsgArray( |
| 217 | 217 | 'prefswitch-main', |
| 218 | 218 | array( |
| 219 | | - $this->originLink, |
| | 219 | + $this->originUrl, |
| | 220 | + $this->originTitle, |
| 220 | 221 | $this->getTitle()->getLinkURL( array_merge( $query, array( 'mode' => 'off' ) ) ), |
| 221 | 222 | $this->getTitle()->getLinkURL( array_merge( $query, array( 'mode' => 'feedback' ) ) ) |
| 222 | 223 | ), |
| 223 | | - array( 'parse', 'replaceafter' ) |
| | 224 | + array( 'parse' ) |
| 224 | 225 | ); |
| 225 | 226 | } |
| 226 | 227 | } |