| Index: trunk/extensions/UsabilityInitiative/PrefSwitch/PrefSwitch.i18n.php |
| — | — | @@ -65,12 +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 | +Return to [$1 $2].', |
| | 70 | + 'prefswitch-main-on' => ' |
| 69 | 71 | ;Feedback? |
| 70 | | -We\'ve love to hear from you. Please visit our [$4 feedback page]. |
| | 72 | +We\'ve love to hear from you. Please visit our [$1 feedback page]. |
| 71 | 73 | ;Take me back! |
| 72 | | -If you would like to turn off the new features, please [$3 click here]. |
| 73 | | - |
| 74 | | -or return to [$1 $2].', |
| | 74 | +If you would like to turn off the new features, please [$2 click here].', |
| 75 | 75 | 'prefswitch-survey-intro-feedback' => 'We\'d love to hear from you. Please fill out the optional survey below.', |
| 76 | 76 | 'prefswitch-survey-intro-off' => 'Thanks for trying out our new features. To help us improve them, please fill out the optional survey below ', |
| 77 | 77 | ); |
| Index: trunk/extensions/UsabilityInitiative/PrefSwitch/SpecialPrefSwitch.php |
| — | — | @@ -213,15 +213,18 @@ |
| 214 | 214 | $wgOut->addHtml( $html ); |
| 215 | 215 | } else { |
| 216 | 216 | $wgOut->addWikiMsgArray( |
| 217 | | - 'prefswitch-main', |
| 218 | | - array( |
| 219 | | - $this->originUrl, |
| 220 | | - $this->originTitle, |
| 221 | | - $this->getTitle()->getLinkURL( array_merge( $query, array( 'mode' => 'off' ) ) ), |
| 222 | | - $this->getTitle()->getLinkURL( array_merge( $query, array( 'mode' => 'feedback' ) ) ) |
| 223 | | - ), |
| 224 | | - array( 'parse' ) |
| | 217 | + 'prefswitch-main', array( $this->originUrl, $this->originTitle ), array( 'parse' ) |
| 225 | 218 | ); |
| | 219 | + if ( self::isSwitchedOn( $wgUser ) ) { |
| | 220 | + $wgOut->addWikiMsgArray( |
| | 221 | + 'prefswitch-main-on', |
| | 222 | + array( |
| | 223 | + $this->getTitle()->getLinkURL( array_merge( $query, array( 'mode' => 'off' ) ) ), |
| | 224 | + $this->getTitle()->getLinkURL( array_merge( $query, array( 'mode' => 'feedback' ) ) ) |
| | 225 | + ), |
| | 226 | + array( 'parse' ) |
| | 227 | + ); |
| | 228 | + } |
| 226 | 229 | } |
| 227 | 230 | } |
| 228 | 231 | } |