Skip to content

Commit

Permalink
Timeline lang strings: bad position specifiers
Browse files Browse the repository at this point in the history
Missing '$' after parameter numbers causes sprintf to display the
parameters in sequential order instead of respecting the specified
position.

Issue #19288
  • Loading branch information
dregad committed Jan 28, 2015
1 parent c0029e8 commit ad6e75e
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions lang/strings_english.txt
Expand Up @@ -1567,18 +1567,18 @@ $s_month_november = 'November';
$s_month_december = 'December';

# Timeline Feature Strings
$s_timeline_issue_created = '<span class="username">%1s</span> created issue <span class="issue_id">%2s</span>';
$s_timeline_issue_note_created = '<span class="username">%1s</span> commented on issue <span class="issue_id">%2s</span>';
$s_timeline_issue_monitor = '<span class="username">%1s</span> is monitoring issue <span class="issue_id">%2s</span>';
$s_timeline_issue_unmonitor = '<span class="username">%1s</span> stopped monitoring issue <span class="issue_id">%2s</span>';
$s_timeline_issue_tagged = '<span class="username">%1s</span> tagged issue <span class="issue_id">%2s</span> with <span class="tag_name">%3s</span>';
$s_timeline_issue_untagged = '<span class="username">%1s</span> removed <span class="tag_name">%3s</span> from issue <span class="issue_id">%2s</span>';
$s_timeline_issue_resolved = '<span class="username">%1s</span> resolved issue <span class="issue_id">%2s</span>';
$s_timeline_issue_closed = '<span class="username">%1s</span> closed issue <span class="issue_id">%2s</span>';
$s_timeline_issue_reopened = '<span class="username">%1s</span> reopened issue <span class="issue_id">%2s</span>';
$s_timeline_issue_assigned = '<span class="username">%1s</span> assigned issue <span class="issue_id">%2s</span> to <span class="username">%3s</span>';
$s_timeline_issue_assigned_to_self = '<span class="username">%1s</span> picked up issue <span class="issue_id">%2s</span>';
$s_timeline_issue_unassigned = '<span class="username">%1s</span> unassigned issue <span class="issue_id">%2s</span>';
$s_timeline_issue_created = '<span class="username">%1$s</span> created issue <span class="issue_id">%2$s</span>';
$s_timeline_issue_note_created = '<span class="username">%1$s</span> commented on issue <span class="issue_id">%2$s</span>';
$s_timeline_issue_monitor = '<span class="username">%1$s</span> is monitoring issue <span class="issue_id">%2$s</span>';
$s_timeline_issue_unmonitor = '<span class="username">%1$s</span> stopped monitoring issue <span class="issue_id">%2$s</span>';
$s_timeline_issue_tagged = '<span class="username">%1$s</span> tagged issue <span class="issue_id">%2$s</span> with <span class="tag_name">%3$s</span>';
$s_timeline_issue_untagged = '<span class="username">%1$s</span> removed tag <span class="tag_name">%3$s</span> from issue <span class="issue_id">%2$s</span>';
$s_timeline_issue_resolved = '<span class="username">%1$s</span> resolved issue <span class="issue_id">%2$s</span>';
$s_timeline_issue_closed = '<span class="username">%1$s</span> closed issue <span class="issue_id">%2$s</span>';
$s_timeline_issue_reopened = '<span class="username">%1$s</span> reopened issue <span class="issue_id">%2$s</span>';
$s_timeline_issue_assigned = '<span class="username">%1$s</span> assigned issue <span class="issue_id">%2$s</span> to <span class="username">%3$s</span>';
$s_timeline_issue_assigned_to_self = '<span class="username">%1$s</span> picked up issue <span class="issue_id">%2$s</span>';
$s_timeline_issue_unassigned = '<span class="username">%1$s</span> unassigned issue <span class="issue_id">%2$s</span>';
$s_timeline_no_activity = 'No activity within time range.';
$s_timeline_title = 'Timeline';
$s_timeline_more = 'More events...';
Expand Down

7 comments on commit ad6e75e

@atrol
Copy link
Member

@atrol atrol commented on ad6e75e Jan 28, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I hope our translators will update their languages.
Maybe you want to write to our localization mailing list.

@dregad
Copy link
Member Author

@dregad dregad commented on ad6e75e Jan 28, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nemobis
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No problem, we can do this mass replacement on translatewiki.net itself and export it at next round. I think siebrand will notice the change and remember to perform the replacement when he syncs; but if you don't see the other languages updated at next export please just poke me by replying here.

@vboctor
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this causing PHP errors that I missed or was it silently doing the sequential behavior?

@dregad
Copy link
Member Author

@dregad dregad commented on ad6e75e Jan 28, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vboctor this was causing the inversion of issue number and tag name in the tag deletion message, without any PHP error.

@siebrand
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixes in translations imminent.

@dregad
Copy link
Member Author

@dregad dregad commented on ad6e75e Jan 29, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@siebrand thanks !

Please sign in to comment.