| Index: trunk/extensions/DataTransclusion/DataTransclusion.i18n.php |
| — | — | @@ -23,9 +23,10 @@ |
| 24 | 24 | 'datatransclusion-missing-source' => 'No data source specified. |
| 25 | 25 | First argument is required.', |
| 26 | 26 | 'datatransclusion-unknown-source' => 'Bad data source specified. |
| 27 | | -$1 is not known.', |
| | 27 | +"$1" is not known.', |
| 28 | 28 | 'datatransclusion-bad-argument-by' => 'Bad key field specified. |
| 29 | | -$2 is not a key field in data source $1, valid keys are: $3.', |
| | 29 | +"$2" is not a key field in data source "$1". |
| | 30 | +{{PLURAL:$4|Valid key|Valid keys are}}: $3.', |
| 30 | 31 | 'datatransclusion-missing-argument-key' => 'No key value specified. |
| 31 | 32 | Second or "key" argument is required.', |
| 32 | 33 | 'datatransclusion-missing-argument-template' => 'No template specified. |
| Index: trunk/extensions/DataTransclusion/DataTransclusionHandler.php |
| — | — | @@ -112,8 +112,10 @@ |
| 113 | 113 | |
| 114 | 114 | $keyFields = $source->getKeyFields(); |
| 115 | 115 | if ( ! in_array( $by, $keyFields ) ) { |
| | 116 | + global $wgContLang; |
| 116 | 117 | wfDebugLog( 'DataTransclusion', "bad 'by' argument: $by (not a known key field)\n" ); |
| 117 | | - return DataTransclusionHandler::errorMessage( 'datatransclusion-bad-argument-by', $asHTML, $sourceName, $by, join( ', ', $keyFields ) ); |
| | 118 | + return DataTransclusionHandler::errorMessage( 'datatransclusion-bad-argument-by', $asHTML, $sourceName, $by, |
| | 119 | + $wgContLang->commaList( $keyFields ), count( $keyFields ) ); |
| 118 | 120 | } |
| 119 | 121 | |
| 120 | 122 | if ( !empty( $argv['key'] ) ) { |