09a2e0edfe3404ca212d64c6642a66cac63baf6e

Author: AD7six

Date: 2009-04-02 20:04:29 +0200

updating __() lookups to have explicit place references

diff --git a/app_controller.php b/app_controller.php index 28ac23a..c9104c1 100644 --- a/app_controller.php +++ b/app_controller.php @@ -293,7 +293,7 @@ class AppController extends Controller { $this->redirect(array('action' => 'index')); } $this->__conditions = $this->{$this->modelClass}->searchConditions($term); - $this->Session->setFlash(sprintf(__('All %s matching the term "%s"', true), Inflector::humanize($this->name), htmlspecialchars($term))); + $this->Session->setFlash(sprintf(__('All %1$s matching the term "%2$s"', true), Inflector::humanize($this->name), htmlspecialchars($term))); $this->admin_index(); $this->render('admin_index'); } @@ -312,6 +312,5 @@ class AppController extends Controller { $this->Session->setFlash('Whoops! nothing to see there'); $this->redirect('/'); } - } ?> \ No newline at end of file diff --git a/app_model.php b/app_model.php index 56cef9e..4e1b0b5 100644 --- a/app_model.php +++ b/app_model.php @@ -1,5 +1,4 @@ <?php - /** * Application model for Cake. * diff --git a/controllers/attachments_controller.php b/controllers/attachments_controller.php index 6ad73e2..a6c63ae 100755 --- a/controllers/attachments_controller.php +++ b/controllers/attachments_controller.php @@ -103,9 +103,9 @@ class AttachmentsController extends AppController { } if ($this->Attachment->save($this->data)) { if ($id) { - $this->Session->setFlash(sprintf(__('Existing Attachment for %s, id %s updated', true), $class, $this->data[$this->modelClass]['foreign_id'])); + $this->Session->setFlash(sprintf(__('Existing Attachment for %1$s, id %2$s updated', true), $class, $this->data[$this->modelClass]['foreign_id'])); } else { - $this->Session->setFlash(sprintf(__('New Attachment for %s, id %s added', true), $class, $this->data[$this->modelClass]['foreign_id'])); + $this->Session->setFlash(sprintf(__('New Attachment for %1$s, id %2$s added', true), $class, $this->data[$this->modelClass]['foreign_id'])); } $this->redirect(array( 'controller' => Inflector::underscore(Inflector::Pluralize($class)), @@ -130,7 +130,7 @@ class AttachmentsController extends AppController { if (!empty($this->data)) { $this->data[$this->modelClass]['user_id'] = $this->Auth->user('id'); if ($this->Attachment->save($this->data)) { - $this->Session->setFlash(sprintf(__('%s with id %s updated', true), $this->modelClass, $id)); + $this->Session->setFlash(sprintf(__('%1$s with id %2$s updated', true), $this->modelClass, $id)); $this->_back(); } else { $this->Session->setFlash(__('errors in form', true)); diff --git a/controllers/changes_controller.php b/controllers/changes_controller.php index 8d7dc5f..7d9f9c2 100644 --- a/controllers/changes_controller.php +++ b/controllers/changes_controller.php @@ -124,7 +124,7 @@ class ChangesController extends AppController { $title .= $node['Node']['sequence'] . ' - '; } $title .= $node['Revision']['title']; - $this->pageTitle = sprintf(__('Recent Changes for %s', true), $title); + $this->pageTitle = sprintf(__('Recent Changes for %1$s', true), $title); $conditions['Revision.node_id'] = $nodeId; } else { if ($language == '*') { @@ -138,12 +138,12 @@ class ChangesController extends AppController { $userId = $this->Change->User->field('id', array('username' => $this->params['named']['user'])); if ($userId) { $conditions['Change.author_id'] = $userId; - $this->pageTitle .= ' ' . sprintf(__('by %s', true), $this->params['named']['user']); + $this->pageTitle .= ' ' . sprintf(__('by %1$s', true), $this->params['named']['user']); } } if (isset($this->params['named']['status'])) { $conditions['Change.status_to'] = $this->params['named']['status']; - $this->pageTitle .= ' ' . sprintf(__('restricted to status: %s', true), $this->params['named']['status']); + $this->pageTitle .= ' ' . sprintf(__('restricted to status: %1$s', true), $this->params['named']['status']); } $this->data = $this->paginate($conditions); } diff --git a/controllers/comments_controller.php b/controllers/comments_controller.php index 0cf4144..af83f24 100644 --- a/controllers/comments_controller.php +++ b/controllers/comments_controller.php @@ -133,7 +133,7 @@ class CommentsController extends AppController { $title .= $Node['Node']['sequence'] . ' - '; } $title .= $Node['Revision']['title']; - $this->pageTitle = sprintf(__('Comments for %s', true), $title); + $this->pageTitle = sprintf(__('Comments for %1$s', true), $title); $conditions['Comment.node_id'] = $Node['Node']['id']; $conditions['Comment.lang'] = $this->params['lang']; $conditions['Comment.published'] = 1; @@ -196,7 +196,7 @@ class CommentsController extends AppController { $userId = $this->Comment->User->field('id', array('username' => $this->params['named']['user'])); if ($userId) { $conditions['Comment.user_id'] = $userId; - $this->pageTitle .= ' ' . sprintf(__('by %s', true), $this->params['named']['user']); + $this->pageTitle .= ' ' . sprintf(__('by %1$s', true), $this->params['named']['user']); } } $this->data = $this->paginate($conditions); diff --git a/controllers/nodes_controller.php b/controllers/nodes_controller.php index b14a726..622908c 100644 --- a/controllers/nodes_controller.php +++ b/controllers/nodes_controller.php @@ -929,7 +929,7 @@ class NodesController extends AppController { if ($this->data['Revision']['id']) { $this->data['Revision']['reason'] = __('Edit/Correction', true); } else { - $this->data['Revision']['reason'] = sprintf(__('Translation to %s', true), $this->params['lang']); + $this->data['Revision']['reason'] = sprintf(__('Translation to %1$s', true), $this->params['lang']); } $this->data['Revision']['preview'] = true; $this->data['Node']['show_in_toc'] = true; diff --git a/views/changes/index.ctp b/views/changes/index.ctp index 2e0c7a6..74059f5 100644 --- a/views/changes/index.ctp +++ b/views/changes/index.ctp @@ -13,7 +13,7 @@ foreach ($data as $row) { } echo '<ul>'; if ($row['Change']['status_from'] == 'new') { - echo '<li>' . sprintf(__('change submitted by %s, %s', true), + echo '<li>' . sprintf(__('change submitted by %1$s, %2$s', true), isset($row['User']['username'])?$row['User']['username']:'unknown', $time->niceShort($row['Change']['created'])) . '</li>'; } else { @@ -30,13 +30,13 @@ foreach ($data as $row) { default: $to = __($row['Change']['status_to'], true); } - echo '<li>' . sprintf(__('changed from %s to %s by %s, %s', true), + echo '<li>' . sprintf(__('changed from %1$s to %2$s by %3$s, %4$s', true), $row['Change']['status_from'], $to, isset($row['User']['username'])?$row['User']['username']:'unknown', $time->niceShort($row['Change']['created'])) . '</li>'; $author = isset($row['Author']['username'])?$row['Author']['username']:'unknown'; - echo '<li>' . sprintf(__('submitted by %s', true), $author) . '</li>'; + echo '<li>' . sprintf(__('submitted by %1$s', true), $author) . '</li>'; } echo '<li>' . $html->clean($row['Change']['comment']) . '</li>'; echo '</ul></li>'; diff --git a/views/changes/rss/index.ctp b/views/changes/rss/index.ctp index 59fb5ee..10d5f93 100755 --- a/views/changes/rss/index.ctp +++ b/views/changes/rss/index.ctp @@ -24,9 +24,9 @@ $desc = '<ul>'; $author = isset($row['Author']['username'])?$row['Author']['username']:'unknown'; - $desc .= '<li>' . sprintf(__('Submitted by: %s', true), $author) . '</li>'; + $desc .= '<li>' . sprintf(__('Submitted by: %1$s', true), $author) . '</li>'; if ($row['Change']['status_to'] != 'pending'){ - $desc .= '<li>' . sprintf(__('Changed by: %s', true), $row['User']['username']) . '</li>'; + $desc .= '<li>' . sprintf(__('Changed by: %1$s', true), $row['User']['username']) . '</li>'; } $comment = $html->clean(trim($row['Change']['comment'])); if ($comment) { diff --git a/views/comments/admin_index.ctp b/views/comments/admin_index.ctp index 10d444c..8403749 100644 --- a/views/comments/admin_index.ctp +++ b/views/comments/admin_index.ctp @@ -5,7 +5,7 @@ $links = array(); foreach ($counts as $lang => $count) { $menu->add(array( 'section' => 'Options', - 'title' => sprintf(__n('%s %s comment', '%s %s comments', $count, true), $count, up($lang)), + 'title' => sprintf(__n('%1$s %2$s comment', '%1$s %2$s comments', $count, true), $count, up($lang)), 'url' => array('language' => $lang), 'under' => 'Comments' )); diff --git a/views/comments/index.ctp b/views/comments/index.ctp index e2c19bf..851ab87 100644 --- a/views/comments/index.ctp +++ b/views/comments/index.ctp @@ -1,6 +1,6 @@ <h2><?php if (isset($node)) { - echo $html->link(sprintf(__('Comments: %s', true), htmlspecialchars($node['Revision']['title'])), array('id' => $this->params['id'])); + echo $html->link(sprintf(__('Comments: %1$s', true), htmlspecialchars($node['Revision']['title'])), array('id' => $this->params['id'])); } else { __('Recent Comments'); } diff --git a/views/elements/comment.ctp b/views/elements/comment.ctp index da1d6f6..a60527d 100755 --- a/views/elements/comment.ctp +++ b/views/elements/comment.ctp @@ -12,9 +12,9 @@ if (isset($commenters[$user_id])) { echo "<div id='comment_{$id}' class=\"comment$class\">"; echo "<p class=\"commentmeta\">"; if (!empty($fixedDates)) { - echo sprintf(__('By %s on %s', true), $name, $time->nice($created)); + echo sprintf(__('By %1$s on %2$s', true), $name, $time->nice($created)); } else { - echo sprintf(__('By %s %s', true), $name, $time->timeAgoInWords($created)); + echo sprintf(__('By %1$s %2$s', true), $name, $time->timeAgoInWords($created)); } echo "</p>"; echo "<p class=\"commenttitle\">"; diff --git a/views/elements/comment_form.ctp b/views/elements/comment_form.ctp index 08e7ddd..ecb62ca 100644 --- a/views/elements/comment_form.ctp +++ b/views/elements/comment_form.ctp @@ -14,7 +14,7 @@ if (!isset($node)) { echo $form->create('Comment',array('id' => 'CommentAddForm' . $node['Node']['id'], 'url' => array('controller' => 'comments', 'action' => 'add', $node['Node']['id'], $node['Revision']['slug']))); $note = $this->element('comment_form_note'); -$legend = sprintf($html->tags['legend'], sprintf(__('Comment on %s', true), $node['Revision']['title'])); +$legend = sprintf($html->tags['legend'], sprintf(__('Comment on %1$s', true), $node['Revision']['title'])); $contents = $form->inputs(array ( 'fieldset' => false, 'title', diff --git a/views/elements/comment_form_note.ctp b/views/elements/comment_form_note.ctp index 9e56099..efffd99 100644 --- a/views/elements/comment_form_note.ctp +++ b/views/elements/comment_form_note.ctp @@ -2,16 +2,16 @@ <p><?php __('Is a comment appropriate?') ?></p> <ul> <li><?php echo sprintf( - __('Do you want to highlight a problem in the text? %s', true), + __('Do you want to highlight a problem in the text? %1$s', true), $html->link(__('You can change it', true), am($this->passedArgs, array('controller' => 'nodes', 'action' => 'edit')))) ?></li> <li><?php echo sprintf( - __('Do you want help with this topic? There are ways to %s and more appropriate places to %s for %s', true), + __('Do you want help with this topic? There are ways to %1$s and more appropriate places to %2$s for %3$s', true), $html->link(__('help yourself', true), array('controller' => 'nodes', 'action' => 'view', 9)), $html->link(__('ask', true), array('controller' => 'nodes', 'action' => 'view', 554)), $html->link(__('help', true), array('controller' => 'nodes', 'action' => 'view', 558))) ?></li> <li><?php echo sprintf( - __('Do you want to highlight a problem with the application? %s or %s', true), + __('Do you want to highlight a problem with the application? %1$s or %2$s', true), $html->link(__('You can ticket it', true), 'http://thechaw.com/cakebook/tickets/add'), $html->link(__('You can fix it', true), 'http://thechaw.com/cakebook/fork/it')) ?></li> </ul> -</div> +</div> \ No newline at end of file diff --git a/views/elements/content_form_note.ctp b/views/elements/content_form_note.ctp index 924fbdb..c02ca35 100644 --- a/views/elements/content_form_note.ctp +++ b/views/elements/content_form_note.ctp @@ -2,11 +2,13 @@ <p><?php __('Tips') ?></p> <ul> <li><?php echo sprintf( - __('Please review the %s for submitting to the Cookbook to ensure consistency.', true), - $html->link(__('Guidelines', true), array('controller' => 'nodes', 'action' => 'view', '482'))) ?></li> + __('Please review %1$s to ensure consistency.', true), + $html->link(__('the guidelines for submitting to the Cookbook', true), + array('controller' => 'nodes', 'action' => 'view', '482')) + ) ?></li> <?php if ($this->action == 'add' && $this->params['lang'] !== Configure::read('Languages.default')): ?> <li><?php echo sprintf( - __('Before being accepted, new content must be available in %s. Please submit your suggestion in %s if possible', true), + __('Before being accepted, new content must be available in %1$s. Please submit your suggestion in %2$s if possible', true), $html->link(__('English', true), am($this->passedArgs, array('lang' => Configure::read('Languages.default')))), $html->link(__('English', true), am($this->passedArgs, array('lang' => Configure::read('Languages.default')))) ) ?></li> diff --git a/views/elements/language_links.ctp b/views/elements/language_links.ctp index 1279c36..161d0e7 100644 --- a/views/elements/language_links.ctp +++ b/views/elements/language_links.ctp @@ -18,11 +18,11 @@ foreach (Configure::read('Languages.all') as $lang) { $options['title'] = $slugs[$lang]['Revision']['title']; } else { $options['class'] = 'lowlight'; - $options['title'] = sprintf(__('No %s translation yet for %s', true), $lang, $slugs[$defaultLang]['Revision']['title']); + $options['title'] = sprintf(__('No %1$s translation yet for %2$s', true), $lang, $slugs[$defaultLang]['Revision']['title']); } } $url['lang'] = $lang; $languages[] = $html->link($lang, $url, $options); } -echo sprintf(__('Also available in %s', true), implode (' &middot; ', $languages)); +echo sprintf(__('Also available in %1$s', true), implode (' &middot; ', $languages)); ?></span> \ No newline at end of file diff --git a/views/elements/node_options.ctp b/views/elements/node_options.ctp index b672986..bb78821 100644 --- a/views/elements/node_options.ctp +++ b/views/elements/node_options.ctp @@ -17,7 +17,7 @@ if ($data['Node']['depth'] >= $viewAllLevel) { => 'dialog')); } if ($data['Node']['comment_level'] <= $auth['User']['Level'] && $this->layout == 'default') { - $out[] = $html->link(sprintf(__('Comments (%s)', true), count($data['Comment'])), array('controller' => 'comments', 'action' => 'index', $data['Node']['id']), array('class' => 'dialog')); + $out[] = $html->link(sprintf(__('Comments (%1$s)', true), count($data['Comment'])), array('controller' => 'comments', 'action' => 'index', $data['Node']['id']), array('class' => 'dialog')); } $flags = explode(',', trim($data['Revision']['flags'])); $flagLis = ''; diff --git a/views/elements/secondary_nav.ctp b/views/elements/secondary_nav.ctp index 72e5ac3..7386d58 100644 --- a/views/elements/secondary_nav.ctp +++ b/views/elements/secondary_nav.ctp @@ -2,7 +2,7 @@ <ul class="navigation"> <?php if ($session->read('Auth.User.id')) { - echo '<li>' . $html->link(sprintf(__('Logged in as %s', true), $session->read('Auth.User.username')), '#', array('id' => 'loggedInAs')) . '</li>'; + echo '<li>' . $html->link(sprintf(__('Logged in as %1$s', true), $session->read('Auth.User.username')), '#', array('id' => 'loggedInAs')) . '</li>'; echo '<li>' . $html->link(__('Logout', true), array('admin' => false, 'plugin' => 'users', 'controller' => 'users', 'action' => 'logout')) . '</li>'; if ($session->read('Auth.User.Level') === ADMIN) { echo '<li>' . $html->link('Admin', array('plugin' => null, 'admin' => true, 'controller' => 'revisions', 'action' => 'pending')) . '</li>'; diff --git a/views/layouts/default.ctp b/views/layouts/default.ctp index 672b34f..7258871 100644 --- a/views/layouts/default.ctp +++ b/views/layouts/default.ctp @@ -116,7 +116,7 @@ echo $html->meta('keywords', if ($this->params['lang'] != $defaultLang) { $link .= $this->params['lang']; } - echo $html->link(sprintf(__('Welcome to %s', true), $app['name']), $link); + echo $html->link(sprintf(__('Welcome to %1$s', true), $app['name']), $link); ?> </h1> </div> diff --git a/views/nodes/edit.ctp b/views/nodes/edit.ctp index 60d58c7..da1bacb 100755 --- a/views/nodes/edit.ctp +++ b/views/nodes/edit.ctp @@ -41,7 +41,7 @@ if ($session->read('Auth.User.Level') == ADMIN) { $inputs = am(array('Node.show_in_toc' => array('type' => 'checkbox')), $inputs); } $note = $this->element('content_form_note'); -$legend = sprintf($html->tags['legend'], sprintf(__('Edit %s', true), $this->data['Revision']['title'])); +$legend = sprintf($html->tags['legend'], sprintf(__('Edit %1$s', true), $this->data['Revision']['title'])); $contents = $form->inputs($inputs); echo sprintf($html->tags['fieldset'], '', $legend . $note . $contents); diff --git a/views/nodes/stats.ctp b/views/nodes/stats.ctp index 97933b5..2aa01a6 100644 --- a/views/nodes/stats.ctp +++ b/views/nodes/stats.ctp @@ -3,9 +3,9 @@ <div class="summary"> <p><?php echo __('Here\'s a shout out to those who have dedicated time, sweat and tears to write, translate and edit the cookbook contents.', true) ?></p> </div> -<h3><?php echo sprintf(__('Top %s Contributors', true), 'EN') ?></h3> +<h3><?php echo sprintf(__('Top %1$s Contributors', true), 'EN') ?></h3> <div class="options"><ul class="node-options"> - <li><?php echo sprintf(__('Last update: %s', true), $time->niceShort($data[$defaultLang]['last_update'])) ?></li> + <li><?php echo sprintf(__('Last update: %1$s', true), $time->niceShort($data[$defaultLang]['last_update'])) ?></li> </ul></div> <div class="summary"> <?php @@ -23,7 +23,7 @@ } $menu->add(array( 'section' => $defaultLang, - 'title' => sprintf(__('%s (%s current)', true), $nick, $row[0]['count']), + 'title' => sprintf(__('%1$s (%2$s current)', true), $nick, $row[0]['count']), 'url' => $url )); } @@ -34,9 +34,9 @@ echo '</div>'; foreach ($counts as $lang => $count) { $row = $data[$lang]; - echo '<h3 id="' . $lang . '">' . $html->link(sprintf(__('Top %s Contributors', true), up($lang)), '#' . $lang) . '</h3><div class="options"><ul class="node-options">'; - echo '<li>' . sprintf(__('Last update: %s', true), $time->niceShort($row['last_update'])) . '</li>'; - echo '<li>' . sprintf(__('%s%% translated', true), (int)($count / $nodes * 100)) . '</li></ul></div><div class="summary">'; + echo '<h3 id="' . $lang . '">' . $html->link(sprintf(__('Top %1$s Contributors', true), up($lang)), '#' . $lang) . '</h3><div class="options"><ul class="node-options">'; + echo '<li>' . sprintf(__('Last update: %1$s', true), $time->niceShort($row['last_update'])) . '</li>'; + echo '<li>' . sprintf(__('%1$s%% translated', true), (int)($count / $nodes * 100)) . '</li></ul></div><div class="summary">'; if (!$row['last_update']) { echo '<p class="warning">' . __('The cookbook needs you! No submissions for this language!', true) . '</p>'; } else { @@ -60,7 +60,7 @@ foreach ($counts as $lang => $count) { } $menu->add(array( 'section' => $lang, - 'title' => sprintf(__('%s (%s current)', true), $nick, $row[0]['count']), + 'title' => sprintf(__('%1$s (%2$s current)', true), $nick, $row[0]['count']), 'url' => $url )); } diff --git a/views/nodes/todo.ctp b/views/nodes/todo.ctp index 935bb4e..c77894b 100644 --- a/views/nodes/todo.ctp +++ b/views/nodes/todo.ctp @@ -4,10 +4,10 @@ $i18n = I18n::getInstance(); if (file_exists(APP . 'locale' . DS . $i18n->l10n->locale . DS . 'LC_MESSAGES' . DS . 'default.po')) { - echo '<p class="note">' . sprintf(__('Want to check or update the <a href="%s">po file</a> for %s?', true), + echo '<p class="note">' . sprintf(__('Want to check or update the <a href="%1$s">po file</a> for %2$s?', true), 'http://thechaw.com/cakebook/source/locale/' . $i18n->l10n->locale . '/LC_MESSAGES/default.po', $i18n->l10n->language); } else { - echo '<p class="warning">' . sprintf(__('These is no <a href="%s">po file</a> for %s', true), + echo '<p class="warning">' . sprintf(__('These is no <a href="%1$s">po file</a> for %2$s', true), 'http://thechaw.com/cakebook/source/locale/eng/LC_MESSAGES/default.po', $i18n->l10n->language); } echo '. ' . __('Please use <a href="http://www.poedit.net">Po Edit</a> when editing po files', true); diff --git a/views/nodes/view_all.ctp b/views/nodes/view_all.ctp index 385f9f9..e15fbf2 100644 --- a/views/nodes/view_all.ctp +++ b/views/nodes/view_all.ctp @@ -104,24 +104,24 @@ $html->meta( 'rss', array('theme' => 'default', 'plugin' => null, 'controller' => 'comments', 'action' => 'index', $this->data['Node']['id'], $this->data['Revision']['slug'], 'ext' => 'rss'), - array('title' => sprintf(__('Comments for %s', true), $this->data['Revision']['title'])) + array('title' => sprintf(__('Comments for %1$s', true), $this->data['Revision']['title'])) , false); $html->meta('rss', array('theme' => 'default', 'plugin' => null, 'controller' => 'changes', 'action' => 'index', $this->data['Node']['id'], 'ext' => 'rss'), - array('title' => sprintf(__('Change history for %s', true), $this->data['Revision']['title'])) + array('title' => sprintf(__('Change history for %1$s', true), $this->data['Revision']['title'])) , false); ?><cake:nocache> <?php $menu->add(array( 'section' => 'Feeds', - 'title' => sprintf(__('Comments for %s', true), $this->data['Revision']['title']), + 'title' => sprintf(__('Comments for %1$s', true), $this->data['Revision']['title']), 'url' => array('theme' => 'default', 'plugin' => null, 'controller' => 'comments', 'action' => 'index', $this->data['Node']['id'], $this->data['Revision']['slug'], 'ext' => 'rss'), )); $menu->add(array( 'section' => 'Feeds', - 'title' => sprintf(__('Change history for %s', true), $this->data['Revision']['title']), + 'title' => sprintf(__('Change history for %1$s', true), $this->data['Revision']['title']), 'url' => array('theme' => 'default', 'plugin' => null, 'controller' => 'changes', 'action' => 'index', $this->data['Node']['id'], 'ext' => 'rss'), )); diff --git a/views/revisions/admin_pending.ctp b/views/revisions/admin_pending.ctp index bd0e325..bc7053c 100755 --- a/views/revisions/admin_pending.ctp +++ b/views/revisions/admin_pending.ctp @@ -4,7 +4,7 @@ foreach ($counts as $lang => $count) { $menu->add(array( 'section' => 'Options' , - 'title' => sprintf(__n('%s pending %s submission', '%s pending %s submissions', $count, true), $count, up($lang)), + 'title' => sprintf(__n('%1$s pending %2$s submission', '%3$s pending %4$s submissions', $count, true), $count, up($lang)), 'url' => array('language' => $lang), 'under' => 'Pending' )); diff --git a/views/revisions/rss/index.ctp b/views/revisions/rss/index.ctp index 65e088d..2c59297 100755 --- a/views/revisions/rss/index.ctp +++ b/views/revisions/rss/index.ctp @@ -10,7 +10,7 @@ } $desc = '<ul>'; $author = isset($row['User']['username'])?$row['User']['username']:'unknown'; - $desc .= '<li>' . sprintf(__('Submitted by: %s', true), $author) . '</li>'; + $desc .= '<li>' . sprintf(__('Submitted by: %1$s', true), $author) . '</li>'; $comment = $html->clean(trim($row['Revision']['reason'])); if ($comment) { $desc .= '<li>' . $comment . '</li>';