| Index: trunk/extensions/EtherpadLite/EtherpadLite.php |
| — | — | @@ -148,8 +148,9 @@ |
| 149 | 149 | |
| 150 | 150 | if ( count( $wgEtherpadLiteUrlWhitelist ) && !in_array( $src, $wgEtherpadLiteUrlWhitelist ) ) { |
| 151 | 151 | $listOfAllowed = $parser->getFunctionLang()->listToText( $wgEtherpadLiteUrlWhitelist ); |
| | 152 | + $numberAllowed = $parser->getFunctionLang()->formatNum( count( $wgEtherpadLiteUrlWhitelist ) ); |
| 152 | 153 | return wfEtherpadLiteError( 'etherpadlite-url-is-not-whitelisted', |
| 153 | | - array( $src, $listOfAllowed ) |
| | 154 | + array( $src, $listOfAllowed, $numberAllowed ) |
| 154 | 155 | ); |
| 155 | 156 | } |
| 156 | 157 | |
| Index: trunk/extensions/EtherpadLite/EtherpadLite.i18n.php |
| — | — | @@ -14,5 +14,10 @@ |
| 15 | 15 | $messages['en'] = array( |
| 16 | 16 | 'etherpadlite-desc' => 'Adds <eplite> parser tag to embed one or many Etherpad Lite pads (which are hosted on local or external Etherpad Lite server/s) on pages', |
| 17 | 17 | 'etherpadlite-invalid-pad-url' => '"$1" is not a valid Etherpad Lite URL or pad name.', |
| 18 | | - 'etherpadlite-url-is-not-whitelisted' => '"$1" is not in the whitelist of allowed Etherpad Lite servers. The allowed servers are as follows: $2', |
| | 18 | + 'etherpadlite-url-is-not-whitelisted' => '"$1" is not in the whitelist of allowed Etherpad Lite servers. {{PLURAL:$3|$2 is the only allowed server|The allowed servers are as follows: $2}}.', |
| 19 | 19 | ); |
| | 20 | + |
| | 21 | +$messages['qqq'] = array( |
| | 22 | + 'etherpadlite-invalid-pad-url' => 'Error if the url did not meet validation (for example, if it didn\'t start with an allowed protocol). $1 is the invalid url', |
| | 23 | + 'etherpadlite-url-is-not-whitelisted' => 'Error if url isn\'t in list of allowed urls. $1 is name of url specified by user, $2 is a comma separated list of allowed urls, $3 is the number of urls in the allowed list', |
| | 24 | +); |