r94734 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r94733‎ | r94734 | r94735 >
Date:08:24, 17 August 2011
Author:siebrand
Status:resolved (Comments)
Tags:
Comment:
Update punctuation on error messages
Update capitalisation after colon for US English.
Modified paths:
  • /trunk/extensions/ParserFunctions/ParserFunctions.i18n.php (modified) (history)

Diff [purge]

Index: trunk/extensions/ParserFunctions/ParserFunctions.i18n.php
@@ -10,31 +10,31 @@
1111
1212 $messages['en'] = array(
1313 'pfunc_desc' => 'Enhance parser with logical functions',
14 - 'pfunc_time_error' => 'Error: invalid time',
15 - 'pfunc_time_too_long' => 'Error: too many #time calls',
16 - 'pfunc_time_too_big' => 'Error: #time only supports years up to 9999',
17 - 'pfunc_rel2abs_invalid_depth' => 'Error: Invalid depth in path: "$1" (tried to access a node above the root node)',
18 - 'pfunc_expr_stack_exhausted' => 'Expression error: Stack exhausted',
19 - 'pfunc_expr_unexpected_number' => 'Expression error: Unexpected number',
20 - 'pfunc_expr_preg_match_failure' => 'Expression error: Unexpected preg_match failure',
21 - 'pfunc_expr_unrecognised_word' => 'Expression error: Unrecognised word "$1"',
22 - 'pfunc_expr_unexpected_operator' => 'Expression error: Unexpected $1 operator',
23 - 'pfunc_expr_missing_operand' => 'Expression error: Missing operand for $1',
24 - 'pfunc_expr_unexpected_closing_bracket' => 'Expression error: Unexpected closing bracket',
25 - 'pfunc_expr_unrecognised_punctuation' => 'Expression error: Unrecognised punctuation character "$1"',
26 - 'pfunc_expr_unclosed_bracket' => 'Expression error: Unclosed bracket',
27 - 'pfunc_expr_division_by_zero' => 'Division by zero',
28 - 'pfunc_expr_invalid_argument' => 'Invalid argument for $1: < -1 or > 1',
29 - 'pfunc_expr_invalid_argument_ln' => 'Invalid argument for ln: <= 0',
30 - 'pfunc_expr_unknown_error' => 'Expression error: Unknown error ($1)',
31 - 'pfunc_expr_not_a_number' => 'In $1: result is not a number',
32 - 'pfunc_string_too_long' => 'Error: string exceeds $1 character limit',
33 - 'pfunc-convert-dimensionmismatch' => 'Error: cannot convert between units of "$1" and "$2"',
34 - 'pfunc-convert-unknownunit' => 'Error: unknown unit "$1"',
35 - 'pfunc-convert-unknowndimension' => 'Error: unknown dimension "$1"',
36 - 'pfunc-convert-invalidcompoundunit' => 'Error: invalid compound unit "$1"',
37 - 'pfunc-convert-nounit' => 'Error: no source unit given',
38 - 'pfunc-convert-doublecompoundunit' => 'Error: cannot parse double compound units like "$1"',
 14+ 'pfunc_time_error' => 'Error: Invalid time.',
 15+ 'pfunc_time_too_long' => 'Error: Too many #time calls.',
 16+ 'pfunc_time_too_big' => 'Error: #time only supports years up to 9999.',
 17+ 'pfunc_rel2abs_invalid_depth' => 'Error: Invalid depth in path: "$1" (tried to access a node above the root node).',
 18+ 'pfunc_expr_stack_exhausted' => 'Expression error: Stack exhausted.',
 19+ 'pfunc_expr_unexpected_number' => 'Expression error: Unexpected number.',
 20+ 'pfunc_expr_preg_match_failure' => 'Expression error: Unexpected preg_match failure.',
 21+ 'pfunc_expr_unrecognised_word' => 'Expression error: Unrecognised word "$1".',
 22+ 'pfunc_expr_unexpected_operator' => 'Expression error: Unexpected $1 operator.',
 23+ 'pfunc_expr_missing_operand' => 'Expression error: Missing operand for $1.',
 24+ 'pfunc_expr_unexpected_closing_bracket' => 'Expression error: Unexpected closing bracket.',
 25+ 'pfunc_expr_unrecognised_punctuation' => 'Expression error: Unrecognised punctuation character "$1".',
 26+ 'pfunc_expr_unclosed_bracket' => 'Expression error: Unclosed bracket.',
 27+ 'pfunc_expr_division_by_zero' => 'Division by zero.',
 28+ 'pfunc_expr_invalid_argument' => 'Invalid argument for $1: < -1 or > 1.',
 29+ 'pfunc_expr_invalid_argument_ln' => 'Invalid argument for ln: <= 0.',
 30+ 'pfunc_expr_unknown_error' => 'Expression error: Unknown error ($1).',
 31+ 'pfunc_expr_not_a_number' => 'In $1: Result is not a number.',
 32+ 'pfunc_string_too_long' => 'Error: String exceeds $1 character limit',
 33+ 'pfunc-convert-dimensionmismatch' => 'Error: Cannot convert between units of "$1" and "$2".',
 34+ 'pfunc-convert-unknownunit' => 'Error: Unknown unit "$1".',
 35+ 'pfunc-convert-unknowndimension' => 'Error: Unknown dimension "$1".',
 36+ 'pfunc-convert-invalidcompoundunit' => 'Error: Invalid compound unit "$1".',
 37+ 'pfunc-convert-nounit' => 'Error: No source unit given',
 38+ 'pfunc-convert-doublecompoundunit' => 'Error: Cannot parse double compound units like "$1".',
3939
4040 # DIMENSION NAMES
4141 'pfunc-convert-dimension-length' => 'length',

Follow-up revisions

RevisionCommit summaryAuthorDate
r94735Two more punctuation issues missed in r94734.siebrand08:27, 17 August 2011
r94745Follow-up r94734. Should fix broken tests 10 and 13 for ParserFunctions becau...siebrand12:04, 17 August 2011

Comments

#Comment by Nikerabbit (talk | contribs)   10:54, 17 August 2011

This seems to have broken some tests: http://ci.tesla.usability.wikimedia.org/cruisecontrol/buildresults/mw?tab=testResults Should be easy to fix.

#Comment by Siebrand (talk | contribs)   16:18, 17 August 2011

Tests are fixed with r94745 AFAICT: Unit Tests: (1891): All Tests Passed.

Status & tagging log