Changeset 25005


Ignore:
Timestamp:
10/19/13 13:04:11 (6 years ago)
Author:
mistic100
Message:

feature 2978: remove useless sprintf in the core

Location:
trunk
Files:
43 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/album_notification.php

    r19703 r25005  
    116116  array_push( 
    117117    $page['infos'], 
    118     sprintf( 
    119       l10n('An information email was sent to group "%s"'), 
     118    l10n( 
     119      'An information email was sent to group "%s"', 
    120120      $group_name 
    121121      ) 
  • trunk/admin/batch_manager_global.php

    r24834 r25005  
    416416  { 
    417417    if ($_POST['regenerateSuccess'] != '0') 
    418       array_push($page['infos'], sprintf(l10n('%s photos have been regenerated'), $_POST['regenerateSuccess'])); 
     418      array_push($page['infos'], l10n('%s photos have been regenerated', $_POST['regenerateSuccess'])); 
    419419 
    420420    if ($_POST['regenerateError'] != '0') 
    421       array_push($page['warnings'], sprintf(l10n('%s photos can not be regenerated'), $_POST['regenerateError'])); 
     421      array_push($page['warnings'], l10n('%s photos can not be regenerated', $_POST['regenerateError'])); 
    422422 
    423423  } 
  • trunk/admin/cat_modify.php

    r24834 r25005  
    269269  if ($min_date == $max_date) 
    270270  { 
    271     $intro = sprintf( 
    272       l10n('This album contains %d photos, added on %s.'), 
     271    $intro = l10n( 
     272      'This album contains %d photos, added on %s.', 
    273273      $image_count, 
    274274      format_date($min_date) 
     
    277277  else 
    278278  { 
    279     $intro = sprintf( 
    280       l10n('This album contains %d photos, added between %s and %s.'), 
     279    $intro = l10n( 
     280      'This album contains %d photos, added between %s and %s.', 
    281281      $image_count, 
    282282      format_date($min_date), 
     
    290290} 
    291291 
    292 $intro.= '<br>'.sprintf(l10n('Numeric identifier : %d'), $category['id']); 
     292$intro.= '<br>'.l10n('Numeric identifier : %d', $category['id']); 
    293293 
    294294$template->assign('INTRO', $intro); 
  • trunk/admin/group_list.php

    r20740 r25005  
    7373    pwg_query($query); 
    7474 
    75     array_push( 
    76       $page['infos'], 
    77       sprintf(l10n('group "%s" added'), $_POST['groupname']) 
    78       ); 
     75    $page['infos'][] = l10n('group "%s" added', $_POST['groupname']); 
    7976  } 
    8077} 
     
    154151      pwg_query($query); 
    155152     
    156       array_push( 
    157         $page['infos'], 
    158         sprintf(l10n('group "%s" deleted'), $groupname) 
    159         ); 
     153      $page['infos'][] = l10n('group "%s" deleted', $groupname); 
    160154    } 
    161155  } 
     
    237231    mass_inserts(USER_GROUP_TABLE, array('user_id','group_id'), $usr_grp); 
    238232    mass_inserts(GROUP_ACCESS_TABLE, array('group_id','cat_id'), $grp_access); 
    239     array_push( 
    240       $page['infos'], 
    241       sprintf(l10n('group "%s" added'), $_POST['merge']) 
    242       ); 
     233     
     234    $page['infos'][] = l10n('group "%s" added', $_POST['merge']); 
    243235  } 
    244236   
     
    314306      mass_inserts(USER_GROUP_TABLE, array('user_id','group_id'), $usr_grp); 
    315307   
    316       array_push( 
    317         $page['infos'], 
    318         sprintf(l10n('group "%s" added'), $_POST['duplicate_'.$group.'']) 
    319         ); 
     308      $page['infos'][] = l10n('group "%s" added', $_POST['duplicate_'.$group.'']); 
    320309    } 
    321310  } 
     
    345334      pwg_query($query); 
    346335     
    347       array_push( 
    348         $page['infos'], 
    349         sprintf(l10n('group "%s" updated'), $groupname) 
    350         ); 
     336      $page['infos'][] = l10n('group "%s" updated', $groupname); 
    351337    } 
    352338  } 
  • trunk/admin/group_perm.php

    r19703 r25005  
    132132  array( 
    133133    'TITLE' => 
    134       sprintf( 
    135         l10n('Manage permissions for group "%s"'), 
    136         get_groupname($page['group'] 
    137           ) 
     134      l10n( 
     135        'Manage permissions for group "%s"', 
     136        get_groupname($page['group']) 
    138137        ), 
    139138    'L_CAT_OPTIONS_TRUE'=>l10n('Authorized'), 
  • trunk/admin/history.php

    r23185 r25005  
    534534      'MEMBERS' => sprintf( 
    535535        l10n_dec('%d member', '%d members', $summary['nb_members']).': %s', 
    536         implode( 
    537           ', ', 
    538           $member_strings 
    539           ) 
     536        implode(', ', $member_strings) 
    540537        ), 
    541538      'GUESTS' => l10n_dec( 
  • trunk/admin/intro.php

    r20462 r25005  
    213213    'DB_USERS' => l10n_dec('%d user', '%d users', $nb_users), 
    214214    'DB_GROUPS' => l10n_dec('%d group', '%d groups', $nb_groups), 
    215     'DB_RATES' => ($nb_rates == 0) ? l10n('no rate') : sprintf(l10n('%d rates'), $nb_rates), 
     215    'DB_RATES' => ($nb_rates == 0) ? l10n('no rate') : l10n('%d rates', $nb_rates), 
    216216    'U_CHECK_UPGRADE' => PHPWG_ROOT_PATH.'admin.php?action=check_upgrade', 
    217217    'U_PHPINFO' => PHPWG_ROOT_PATH.'admin.php?action=phpinfo', 
     
    244244      array( 
    245245        'URL' => PHPWG_ROOT_PATH.'admin.php?page=comments', 
    246         'INFO' => sprintf(l10n('%d waiting for validation'), $nb_comments) 
     246        'INFO' => l10n('%d waiting for validation', $nb_comments) 
    247247        ) 
    248248      ); 
     
    262262    array( 
    263263      'DB_DATE' => 
    264       sprintf( 
    265         l10n('first photo added on %s'), 
    266         format_date($first_date) 
    267         ) 
     264      l10n('first photo added on %s', format_date($first_date)) 
    268265      ) 
    269266    ); 
  • trunk/admin/languages_new.php

    r13962 r25005  
    4343if (!is_writable($languages_dir)) 
    4444{ 
    45   array_push( 
    46     $page['errors'], 
    47     sprintf( 
    48       l10n('Add write access to the "%s" directory'), 
    49       'language' 
    50       ) 
    51     ); 
     45  $page['errors'][] = l10n('Add write access to the "%s" directory', 'language'); 
    5246} 
    5347 
     
    10094      array_push( 
    10195        $page['errors'], 
    102         sprintf(l10n('An error occured during extraction (%s).'), htmlspecialchars($_GET['installstatus'])) 
     96        l10n('An error occured during extraction (%s).', htmlspecialchars($_GET['installstatus'])) 
    10397      ); 
    10498  }   
  • trunk/admin/notification_by_mail.php

    r19703 r25005  
    174174      ( 
    175175        $page['infos'], 
    176         sprintf( 
    177           l10n('User %s [%s] added.'), 
     176        l10n( 
     177          'User %s [%s] added.', 
    178178          stripslashes($nbm_user['username']), 
    179179          get_email_address_as_display_text($nbm_user['mail_address']) 
  • trunk/admin/picture_modify.php

    r24946 r25005  
    307307 
    308308$intro_vars = array( 
    309   'file' => sprintf(l10n('Original file : %s'), $row['file']), 
    310   'add_date' => sprintf(l10n('Posted %s on %s'), time_since($row['date_available'], 'year'), format_date($row['date_available'], false, false)), 
    311   'added_by' => sprintf(l10n('Added by %s'), $row['added_by']), 
     309  'file' => l10n('Original file : %s', $row['file']), 
     310  'add_date' => l10n('Posted %s on %s', time_since($row['date_available'], 'year'), format_date($row['date_available'], false, false)), 
     311  'added_by' => l10n('Added by %s', $row['added_by']), 
    312312  'size' => $row['width'].'&times;'.$row['height'].' pixels, '.sprintf('%.2f', $row['filesize']/1024).'MB', 
    313   'stats' => sprintf(l10n('Visited %d times'), $row['hit']), 
    314   'id' => sprintf(l10n('Numeric identifier : %d'), $row['id']), 
     313  'stats' => l10n('Visited %d times', $row['hit']), 
     314  'id' => l10n('Numeric identifier : %d', $row['id']), 
    315315  ); 
    316316 
  • trunk/admin/plugins_new.php

    r19703 r25005  
    7777    default: 
    7878      array_push($page['errors'], 
    79         sprintf(l10n('An error occured during extraction (%s).'), htmlspecialchars($_GET['installstatus'])), 
     79        l10n('An error occured during extraction (%s).', htmlspecialchars($_GET['installstatus'])), 
    8080        l10n('Please check "plugins" folder and sub-folders permissions (CHMOD).')); 
    8181  }   
  • trunk/admin/tags.php

    r24834 r25005  
    7272        array_push( 
    7373          $page['errors'], 
    74           sprintf( 
    75             l10n('Tag "%s" already exists'), 
     74          l10n( 
     75            'Tag "%s" already exists', 
    7676            $tag_name 
    7777            ) 
     
    137137        array_push( 
    138138          $page['errors'], 
    139           sprintf( 
    140             l10n('Tag "%s" already exists'), 
     139          l10n( 
     140            'Tag "%s" already exists', 
    141141            $tag_name 
    142142            ) 
     
    191191        array_push( 
    192192          $page['infos'], 
    193           sprintf( 
    194             l10n('Tag "%s" is now a duplicate of "%s"'), 
     193          l10n( 
     194            'Tag "%s" is now a duplicate of "%s"', 
    195195            stripslashes($tag_name), 
    196196            $current_name_of[$tag_id] 
     
    301301      array_push( 
    302302        $page['infos'], 
    303         sprintf( 
    304           l10n('Tags <em>%s</em> merged into tag <em>%s</em>'), 
     303        l10n( 
     304          'Tags <em>%s</em> merged into tag <em>%s</em>', 
    305305          implode(', ', $tags_deleted), 
    306306          $name_of_tag[$destination_tag_id] 
     
    381381    array_push( 
    382382      $page['infos'], 
    383       sprintf( 
    384         l10n('Tag "%s" was added'), 
     383      l10n( 
     384        'Tag "%s" was added', 
    385385        stripslashes($tag_name) 
    386386        ) 
     
    391391    array_push( 
    392392      $page['errors'], 
    393       sprintf( 
    394         l10n('Tag "%s" already exists'), 
     393      l10n( 
     394        'Tag "%s" already exists', 
    395395        stripslashes($tag_name) 
    396396        ) 
  • trunk/admin/themes/default/template/batch_manager_global.tpl

    r23526 r25005  
    678678         
    679679        <blockquote> 
    680           {'Width'|@translate} <span id="filter_dimension_width_info">{'between %d and %d pixels'|@translate|sprintf:$dimensions.selected.min_width:$dimensions.selected.max_width}</span> 
     680          {'Width'|@translate} <span id="filter_dimension_width_info">{'between %d and %d pixels'|@translate:$dimensions.selected.min_width:$dimensions.selected.max_width}</span> 
    681681          | <a class="dimensions-choice" data-type="width" data-min="{$dimensions.bounds.min_width}" data-max="{$dimensions.bounds.max_width}">{'Reset'|@translate}</a> 
    682682          <div id="filter_dimension_width_slider"></div> 
    683683           
    684           {'Height'|@translate} <span id="filter_dimension_height_info">{'between %d and %d pixels'|@translate|sprintf:$dimensions.selected.min_height:$dimensions.selected.max_height}</span> 
     684          {'Height'|@translate} <span id="filter_dimension_height_info">{'between %d and %d pixels'|@translate:$dimensions.selected.min_height:$dimensions.selected.max_height}</span> 
    685685          | <a class="dimensions-choice" data-type="height" data-min="{$dimensions.bounds.min_height}" data-max="{$dimensions.bounds.max_height}">{'Reset'|@translate}</a> 
    686686          <div id="filter_dimension_height_slider"></div> 
    687687           
    688           {'Ratio'|@translate} ({'Width'|@translate}/{'Height'|@translate}) <span id="filter_dimension_ratio_info">{'between %.2f and %.2f'|@translate|sprintf:$dimensions.selected.min_ratio:$dimensions.selected.max_ratio}</span> 
     688          {'Ratio'|@translate} ({'Width'|@translate}/{'Height'|@translate}) <span id="filter_dimension_ratio_info">{'between %.2f and %.2f'|@translate:$dimensions.selected.min_ratio:$dimensions.selected.max_ratio}</span> 
    689689{if isset($dimensions.ratio_portrait)} 
    690690          | <a class="dimensions-choice" data-type="ratio" data-min="{$dimensions.ratio_portrait.min}" data-max="{$dimensions.ratio_portrait.max}">{'Portrait'|@translate}</a> 
  • trunk/admin/themes/default/template/cat_perm.tpl

    r23430 r25005  
    7777{if isset($nb_users_granted_indirect)} 
    7878  <p> 
    79     {'%u users have automatic permission because they belong to a granted group.'|@translate|@sprintf:$nb_users_granted_indirect} 
     79    {'%u users have automatic permission because they belong to a granted group.'|@translate:$nb_users_granted_indirect} 
    8080    <a href="#" id="indirectPermissionsDetailsHide" style="display:none">{'hide details'|@translate}</a> 
    8181    <a href="#" id="indirectPermissionsDetailsShow">{'show details'|@translate}</a> 
  • trunk/admin/themes/default/template/configuration.tpl

    r23643 r25005  
    611611      <label> 
    612612        <input type="checkbox" name="menubar_filter_icon" {if ($display.menubar_filter_icon)}checked="checked"{/if}> 
    613         {'Activate icon "%s"'|@translate|@sprintf:('display only recently posted photos'|@translate|@ucfirst)} 
     613        {'Activate icon "%s"'|@translate:('display only recently posted photos'|@translate|@ucfirst)} 
    614614      </label> 
    615615    </li> 
     
    625625      <label> 
    626626        <input type="checkbox" name="index_sort_order_input" {if ($display.index_sort_order_input)}checked="checked"{/if}> 
    627         {'Activate icon "%s"'|@translate|@sprintf:('Sort order'|@translate)} 
     627        {'Activate icon "%s"'|@translate:('Sort order'|@translate)} 
    628628      </label> 
    629629    </li> 
     
    632632      <label> 
    633633        <input type="checkbox" name="index_flat_icon" {if ($display.index_flat_icon)}checked="checked"{/if}> 
    634         {'Activate icon "%s"'|@translate|@sprintf:('display all photos in all sub-albums'|@translate|@ucfirst)} 
     634        {'Activate icon "%s"'|@translate:('display all photos in all sub-albums'|@translate|@ucfirst)} 
    635635      </label> 
    636636    </li> 
     
    639639      <label> 
    640640        <input type="checkbox" name="index_posted_date_icon" {if ($display.index_posted_date_icon)}checked="checked"{/if}> 
    641         {'Activate icon "%s"'|@translate|@sprintf:('display a calendar by posted date'|@translate|@ucfirst)} 
     641        {'Activate icon "%s"'|@translate:('display a calendar by posted date'|@translate|@ucfirst)} 
    642642      </label> 
    643643    </li> 
     
    646646      <label> 
    647647        <input type="checkbox" name="index_created_date_icon" {if ($display.index_created_date_icon)}checked="checked"{/if}> 
    648         {'Activate icon "%s"'|@translate|@sprintf:('display a calendar by creation date'|@translate|@ucfirst)} 
     648        {'Activate icon "%s"'|@translate:('display a calendar by creation date'|@translate|@ucfirst)} 
    649649      </label> 
    650650    </li> 
     
    653653      <label> 
    654654        <input type="checkbox" name="index_slideshow_icon" {if ($display.index_slideshow_icon)}checked="checked"{/if}> 
    655         {'Activate icon "%s"'|@translate|@sprintf:('slideshow'|@translate|@ucfirst)} 
     655        {'Activate icon "%s"'|@translate:('slideshow'|@translate|@ucfirst)} 
    656656      </label> 
    657657    </li> 
     
    672672      <label> 
    673673        <input type="checkbox" name="picture_slideshow_icon" {if ($display.picture_slideshow_icon)}checked="checked"{/if}> 
    674         {'Activate icon "%s"'|@translate|@sprintf:('slideshow'|@translate|@ucfirst)} 
     674        {'Activate icon "%s"'|@translate:('slideshow'|@translate|@ucfirst)} 
    675675      </label> 
    676676    </li> 
     
    679679      <label> 
    680680        <input type="checkbox" name="picture_metadata_icon" {if ($display.picture_metadata_icon)}checked="checked"{/if}> 
    681         {'Activate icon "%s"'|@translate|@sprintf:('Show file metadata'|@translate)} 
     681        {'Activate icon "%s"'|@translate:('Show file metadata'|@translate)} 
    682682      </label> 
    683683    </li> 
     
    686686      <label> 
    687687        <input type="checkbox" name="picture_download_icon" {if ($display.picture_download_icon)}checked="checked"{/if}> 
    688         {'Activate icon "%s"'|@translate|@sprintf:('Download this file'|@translate|@ucfirst)} 
     688        {'Activate icon "%s"'|@translate:('Download this file'|@translate|@ucfirst)} 
    689689      </label> 
    690690    </li> 
     
    693693      <label> 
    694694        <input type="checkbox" name="picture_favorite_icon" {if ($display.picture_favorite_icon)}checked="checked"{/if}> 
    695         {'Activate icon "%s"'|@translate|@sprintf:('add this photo to your favorites'|@translate|@ucfirst)} 
     695        {'Activate icon "%s"'|@translate:('add this photo to your favorites'|@translate|@ucfirst)} 
    696696      </label> 
    697697    </li> 
  • trunk/admin/themes/default/template/install.tpl

    r23212 r25005  
    280280        <label> 
    281281          <input type="checkbox" name="newsletter_subscribe"{if $F_NEWSLETTER_SUBSCRIBE} checked="checked"{/if}> 
    282           <span class="cluetip" title="{'Piwigo Announcements Newsletter'|@translate}|{'Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will receive emails when a new release is available (sometimes including a security bug fix, it\'s important to know and upgrade) and when major events happen to the project. Only a few emails a year.'|@translate|@htmlspecialchars|@nl2br}">{'Subscribe %s to Piwigo Announcements Newsletter'|@translate|@sprintf:$EMAIL}</span> 
     282          <span class="cluetip" title="{'Piwigo Announcements Newsletter'|@translate}|{'Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will receive emails when a new release is available (sometimes including a security bug fix, it\'s important to know and upgrade) and when major events happen to the project. Only a few emails a year.'|@translate|@htmlspecialchars|@nl2br}">{'Subscribe %s to Piwigo Announcements Newsletter'|@translate:$EMAIL}</span> 
    283283        </label> 
    284284        <br> 
  • trunk/admin/themes/default/template/intro.tpl

    r24836 r25005  
    4343      <li><a href="{$U_CHECK_UPGRADE}">{'Check for upgrade'|@translate}</a></li> 
    4444{if isset($SUBSCRIBE_BASE_URL)} 
    45       <li><a href="{$SUBSCRIBE_BASE_URL}{$EMAIL}" class="externalLink cluetip" title="{'Piwigo Announcements Newsletter'|@translate}|{'Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will receive emails when a new release is available (sometimes including a security bug fix, it\'s important to know and upgrade) and when major events happen to the project. Only a few emails a year.'|@translate|@htmlspecialchars|@nl2br}">{'Subscribe %s to Piwigo Announcements Newsletter'|@translate|@sprintf:$EMAIL}</a></li> 
     45      <li><a href="{$SUBSCRIBE_BASE_URL}{$EMAIL}" class="externalLink cluetip" title="{'Piwigo Announcements Newsletter'|@translate}|{'Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will receive emails when a new release is available (sometimes including a security bug fix, it\'s important to know and upgrade) and when major events happen to the project. Only a few emails a year.'|@translate|@htmlspecialchars|@nl2br}">{'Subscribe %s to Piwigo Announcements Newsletter'|@translate:$EMAIL}</a></li> 
    4646{/if} 
    4747    </ul> 
  • trunk/admin/themes/default/template/photos_add_direct.tpl

    r24980 r25005  
    291291      <legend>{'Select files'|@translate}</legend> 
    292292  
    293     {if isset($original_resize_maxheight)}<p class="uploadInfo">{'The picture dimensions will be reduced to %dx%d pixels.'|@translate|@sprintf:$original_resize_maxwidth:$original_resize_maxheight}</p>{/if} 
     293    {if isset($original_resize_maxheight)}<p class="uploadInfo">{'The picture dimensions will be reduced to %dx%d pixels.'|@translate:$original_resize_maxwidth:$original_resize_maxheight}</p>{/if} 
    294294 
    295295    <p id="uploadWarningsSummary">{$upload_max_filesize_shorthand}B. {$upload_file_types}. {if isset($max_upload_resolution)}{$max_upload_resolution}Mpx{/if} <a class="icon-info-circled-1 showInfo" title="{'Learn more'|@translate}"></a></p> 
    296296 
    297297    <p id="uploadWarnings"> 
    298 {'Maximum file size: %sB.'|@translate|@sprintf:$upload_max_filesize_shorthand} 
    299 {'Allowed file types: %s.'|@translate|@sprintf:$upload_file_types} 
     298{'Maximum file size: %sB.'|@translate:$upload_max_filesize_shorthand} 
     299{'Allowed file types: %s.'|@translate:$upload_file_types} 
    300300  {if isset($max_upload_resolution)} 
    301 {'Approximate maximum resolution: %dM pixels (that\'s %dx%d pixels).'|@translate|@sprintf:$max_upload_resolution:$max_upload_width:$max_upload_height} 
     301{'Approximate maximum resolution: %dM pixels (that\'s %dx%d pixels).'|@translate:$max_upload_resolution:$max_upload_width:$max_upload_height} 
    302302  {/if} 
    303303    </p> 
     
    311311      </div> 
    312312 
    313     <p id="uploadModeInfos">{'You are using the Browser uploader. Try the <a href="%s">Flash uploader</a> instead.'|@translate|@sprintf:$switch_url}</p> 
     313    <p id="uploadModeInfos">{'You are using the Browser uploader. Try the <a href="%s">Flash uploader</a> instead.'|@translate:$switch_url}</p> 
    314314 
    315315{elseif $upload_mode eq 'multiple'} 
     
    318318    <div id="fileQueue" style="display:none"></div> 
    319319 
    320     <p id="uploadModeInfos">{'You are using the Flash uploader. Problems? Try the <a href="%s">Browser uploader</a> instead.'|@translate|@sprintf:$switch_url}</p> 
     320    <p id="uploadModeInfos">{'You are using the Flash uploader. Problems? Try the <a href="%s">Browser uploader</a> instead.'|@translate:$switch_url}</p> 
    321321 
    322322{/if} 
     
    346346 
    347347<div id="uploadProgress" style="display:none"> 
    348 {'Photo %s of %s'|@translate|@sprintf:'<span id="progressCurrent">1</span>':'<span id="progressMax">10</span>'} 
     348{'Photo %s of %s'|@translate:'<span id="progressCurrent">1</span>':'<span id="progressMax">10</span>'} 
    349349<br> 
    350350<div id="progressbar"></div> 
  • trunk/admin/themes/default/template/plugins_installed.tpl

    r23426 r25005  
    163163             
    164164          {if not empty($author)} 
    165             | {'By %s'|@translate|@sprintf:$author} 
     165            | {'By %s'|@translate:$author} 
    166166          {/if} 
    167167 
     
    184184      <div class="pluginMiniBoxNameCell"> 
    185185        {$plugin.NAME} 
    186         <a class="icon-info-circled-1 showInfo" title="{if !empty($author)}{'By %s'|@translate|@sprintf:$author} | {/if}{'Version'|@translate} {$version}<br/>{$plugin.DESC|@escape:'html'}"></a> 
     186        <a class="icon-info-circled-1 showInfo" title="{if !empty($author)}{'By %s'|@translate:$author} | {/if}{'Version'|@translate} {$version}<br/>{$plugin.DESC|@escape:'html'}"></a> 
    187187      </div> 
    188188      <div class="pluginActions"> 
  • trunk/admin/themes/default/template/plugins_new.tpl

    r18630 r25005  
    7878        <em>{'Downloads'|@translate}: {$plugin.DOWNLOADS}</em> 
    7979        {'Version'|@translate} {$plugin.VERSION} 
    80         | {'By %s'|@translate|@sprintf:$plugin.AUTHOR} 
     80        | {'By %s'|@translate:$plugin.AUTHOR} 
    8181        | <a class="externalLink" href="{$plugin.EXT_URL}">{'Visit plugin site'|@translate}</a> 
    8282      </td> 
  • trunk/admin/themes/default/template/themes_installed.tpl

    r23426 r25005  
    5959    <div class="themeName"> 
    6060      {$theme.NAME} {if $theme.IS_DEFAULT}<em>({'default'|@translate})</em>{/if} {if $theme.IS_MOBILE}<em>({'Mobile'|@translate})</em>{/if} 
    61       <a class="icon-info-circled-1 showInfo" title="{if !empty($author)}{'By %s'|@translate|@sprintf:$author} | {/if}{'Version'|@translate} {$version}<br/>{$theme.DESC|@escape:'html'}"></a> 
     61      <a class="icon-info-circled-1 showInfo" title="{if !empty($author)}{'By %s'|@translate:$author} | {/if}{'Version'|@translate} {$version}<br/>{$theme.DESC|@escape:'html'}"></a> 
    6262    </div> 
    6363    <div class="themeShot"><a href="{$theme.SCREENSHOT}" class="preview-box" title="{$theme.NAME}"><img src="{$theme.SCREENSHOT}" alt=""></a></div> 
  • trunk/admin/themes/default/template/updates_ext.tpl

    r22338 r25005  
    181181        <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/minus.gif" alt="" class="button_{$plugin.ID}" style="display:none;"> 
    182182        {'New Version'|@translate} : {$plugin.NEW_VERSION} 
    183         | {'By %s'|@translate|@sprintf:$plugin.AUTHOR} 
     183        | {'By %s'|@translate:$plugin.AUTHOR} 
    184184      </td> 
    185185    </tr> 
     
    223223        <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/minus.gif" alt="" class="button_{$theme.ID}" style="display:none;"> 
    224224        {'New Version'|@translate} : {$theme.NEW_VERSION} 
    225         | {'By %s'|@translate|@sprintf:$theme.AUTHOR} 
     225        | {'By %s'|@translate:$theme.AUTHOR} 
    226226      </td> 
    227227    </tr> 
     
    265265        <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/minus.gif" alt="" class="button_{$language.ID}" style="display:none;"> 
    266266        {'New Version'|@translate} : {$language.NEW_VERSION} 
    267         | {'By %s'|@translate|@sprintf:$language.AUTHOR} 
     267        | {'By %s'|@translate:$language.AUTHOR} 
    268268      </td> 
    269269    </tr> 
  • trunk/admin/themes/default/template/updates_pwg.tpl

    r12261 r25005  
    4242<p> 
    4343<ul> 
    44   <li><a href="admin.php?page=updates&amp;step=2&amp;to={$MINOR_VERSION}"><strong>{'Update to Piwigo %s'|@translate|@sprintf:$MINOR_VERSION}</strong></a>: {'This is a minor update, with only bug corrections.'|@translate}</li> 
    45   <li><a href="admin.php?page=updates&amp;step=3&amp;to={$MAJOR_VERSION}"><strong>{'Update to Piwigo %s'|@translate|@sprintf:$MAJOR_VERSION}</strong></a>: {'This is a major update, with <a href="%s">new exciting features</a>.'|@translate|@sprintf:$RELEASE_URL} {'Some themes and plugins may be not available yet.'|@translate}</li> 
     44  <li><a href="admin.php?page=updates&amp;step=2&amp;to={$MINOR_VERSION}"><strong>{'Update to Piwigo %s'|@translate:$MINOR_VERSION}</strong></a>: {'This is a minor update, with only bug corrections.'|@translate}</li> 
     45  <li><a href="admin.php?page=updates&amp;step=3&amp;to={$MAJOR_VERSION}"><strong>{'Update to Piwigo %s'|@translate:$MAJOR_VERSION}</strong></a>: {'This is a major update, with <a href="%s">new exciting features</a>.'|@translate:$RELEASE_URL} {'Some themes and plugins may be not available yet.'|@translate}</li> 
    4646</ul> 
    4747</p> 
    48 <p>{'You can update to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'|@translate|@sprintf:$MAJOR_VERSION:$MINOR_VERSION}</p> 
     48<p>{'You can update to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'|@translate:$MAJOR_VERSION:$MINOR_VERSION}</p> 
    4949{/if} 
    5050 
     
    5555</p> 
    5656<form action="" method="post"> 
    57 <p><input type="submit" name="submit" value="{'Update to Piwigo %s'|@translate|@sprintf:$UPGRADE_TO}"></p> 
     57<p><input type="submit" name="submit" value="{'Update to Piwigo %s'|@translate:$UPGRADE_TO}"></p> 
    5858<p class="autoupdate_bar" style="display:none;">&nbsp; {'Update in progress...'|@translate}<br><img src="admin/themes/default/images/ajax-loader-bar.gif"></p> 
    5959<p><input type="hidden" name="upgrade_to" value="{$UPGRADE_TO}"></p> 
     
    6464<p> 
    6565  {'A new version of Piwigo is available.'|@translate}<br> 
    66   {'This is a major update, with <a href="%s">new exciting features</a>.'|@translate|@sprintf:$RELEASE_URL} {'Some themes and plugins may be not available yet.'|@translate} 
     66  {'This is a major update, with <a href="%s">new exciting features</a>.'|@translate:$RELEASE_URL} {'Some themes and plugins may be not available yet.'|@translate} 
    6767</p> 
    6868<form action="" method="post"> 
     
    7777{counter assign=i} 
    7878<fieldset> 
    79   <legend>{'Update to Piwigo %s'|@translate|@sprintf:$UPGRADE_TO}</legend> 
     79  <legend>{'Update to Piwigo %s'|@translate:$UPGRADE_TO}</legend> 
    8080  {if !empty($missing.plugins)} 
    8181  <p><i>{'Following plugins may not be compatible with the new version of Piwigo:'|@translate}</i></p> 
     
    9090  <p><label><input type="checkbox" name="understand"> &nbsp;{'I decide to update anyway'|@translate}</label></p> 
    9191  {/if} 
    92   <p><input type="submit" name="submit" value="{'Update to Piwigo %s'|@translate|@sprintf:$UPGRADE_TO}" {if !empty($missing.plugins) or !empty($missing.themes)}disabled="disabled"{/if}> 
     92  <p><input type="submit" name="submit" value="{'Update to Piwigo %s'|@translate:$UPGRADE_TO}" {if !empty($missing.plugins) or !empty($missing.themes)}disabled="disabled"{/if}> 
    9393  </p> 
    9494  <p class="autoupdate_bar" style="display:none;">&nbsp; {'Update in progress...'|@translate}<br><img src="admin/themes/default/images/ajax-loader-bar.gif"></p> 
  • trunk/admin/themes/default/template/upgrade.tpl

    r9596 r25005  
    162162</table> 
    163163 
    164 <p>{'This page proposes to upgrade your database corresponding to your old version of Piwigo to the current version. The upgrade assistant thinks you are currently running a <strong>release %s</strong> (or equivalent).'|@translate|@sprintf:$introduction.CURRENT_RELEASE}</p> 
     164<p>{'This page proposes to upgrade your database corresponding to your old version of Piwigo to the current version. The upgrade assistant thinks you are currently running a <strong>release %s</strong> (or equivalent).'|@translate:$introduction.CURRENT_RELEASE}</p> 
    165165{if isset($login)} 
    166166<p>{'Only administrator can run upgrade: please sign in below.'|@translate}</p> 
     
    181181</fieldset> 
    182182<p style="text-align: center;"> 
    183 <input class="submit" type="submit" name="submit" value="{'Upgrade from version %s to %s'|@translate|@sprintf:$introduction.CURRENT_RELEASE:$RELEASE}"> 
     183<input class="submit" type="submit" name="submit" value="{'Upgrade from version %s to %s'|@translate:$introduction.CURRENT_RELEASE:$RELEASE}"> 
    184184</p> 
    185185</form> 
    186186<!-- 
    187187<p style="text-align: center;"> 
    188 <a href="{$introduction.RUN_UPGRADE_URL}">{'Upgrade from version %s to %s'|@translate|@sprintf:$introduction.CURRENT_RELEASE:$RELEASE}</a> 
     188<a href="{$introduction.RUN_UPGRADE_URL}">{'Upgrade from version %s to %s'|@translate:$introduction.CURRENT_RELEASE:$RELEASE}</a> 
    189189</p> 
    190190--> 
     
    193193 
    194194{if isset($upgrade)} 
    195 <h2>{'Upgrade from version %s to %s'|@translate|@sprintf:$upgrade.VERSION:$RELEASE}</h2> 
     195<h2>{'Upgrade from version %s to %s'|@translate:$upgrade.VERSION:$RELEASE}</h2> 
    196196 
    197197<fieldset> 
  • trunk/admin/themes_installed.php

    r23259 r25005  
    122122      $tpl_theme['ACTIVABLE'] = false; 
    123123 
    124       $tpl_theme['ACTIVABLE_TOOLTIP'] = sprintf( 
    125         l10n('Impossible to activate this theme, the parent theme is missing: %s'), 
     124      $tpl_theme['ACTIVABLE_TOOLTIP'] = l10n( 
     125        'Impossible to activate this theme, the parent theme is missing: %s', 
    126126        $missing_parent 
    127127        ); 
     
    137137      $tpl_theme['DELETABLE'] = false; 
    138138 
    139       $tpl_theme['DELETE_TOOLTIP'] = sprintf( 
    140         l10n('Impossible to delete this theme. Other themes depends on it: %s'), 
     139      $tpl_theme['DELETE_TOOLTIP'] = l10n( 
     140        'Impossible to delete this theme. Other themes depends on it: %s', 
    141141        implode(', ', $children) 
    142142        ); 
  • trunk/admin/themes_new.php

    r19703 r25005  
    4040if (!is_writable($themes_dir)) 
    4141{ 
    42   array_push( 
    43     $page['errors'], 
    44     sprintf( 
    45       l10n('Add write access to the "%s" directory'), 
    46       'themes' 
    47       ) 
    48     ); 
     42  $page['errors'][] = l10n('Add write access to the "%s" directory', 'themes'); 
    4943} 
    5044 
     
    10397      array_push( 
    10498        $page['errors'], 
    105         sprintf(l10n('An error occured during extraction (%s).'), htmlspecialchars($_GET['installstatus'])) 
     99        l10n('An error occured during extraction (%s).', htmlspecialchars($_GET['installstatus'])) 
    106100        ); 
    107101  }   
  • trunk/admin/user_list.php

    r19703 r25005  
    215215        array_push( 
    216216          $page['infos'], 
    217           sprintf( 
    218             l10n('user "%s" added'), 
     217          l10n( 
     218            'user "%s" added', 
    219219            $_POST['login'] 
    220220          ) 
     
    235235      array_push( 
    236236        $page['infos'], 
    237         sprintf( 
    238           l10n('user "%s" added'), 
     237        l10n( 
     238          'user "%s" added', 
    239239          stripslashes($_POST['login']) 
    240240          ) 
  • trunk/admin/user_perm.php

    r22950 r25005  
    8686  array( 
    8787    'TITLE' => 
    88       sprintf( 
    89         l10n('Manage permissions for user "%s"'), 
    90         get_username($page['user'] 
    91           ) 
     88      l10n( 
     89        'Manage permissions for user "%s"', 
     90        get_username($page['user']) 
    9291        ), 
    9392    'L_CAT_OPTIONS_TRUE'=>l10n('Authorized'), 
  • trunk/comments.php

    r22142 r25005  
    7979  1 => array('label' => l10n('today'), 
    8080             'clause' => 'date > '.pwg_db_get_recent_period_expression(1)), 
    81   2 => array('label' => sprintf(l10n('last %d days'), 7), 
     81  2 => array('label' => l10n('last %d days', 7), 
    8282             'clause' => 'date > '.pwg_db_get_recent_period_expression(7)), 
    83   3 => array('label' => sprintf(l10n('last %d days'), 30), 
     83  3 => array('label' => l10n('last %d days', 30), 
    8484             'clause' => 'date > '.pwg_db_get_recent_period_expression(30)), 
    8585  4 => array('label' => l10n('the beginning'), 
  • trunk/feed.php

    r19703 r25005  
    123123  { 
    124124    $item = new FeedItem(); 
    125     $item->title = sprintf(l10n('New on %s'), format_date($dbnow) ); 
     125    $item->title = l10n('New on %s', format_date($dbnow) ); 
    126126    $item->link = get_gallery_home_url(); 
    127127 
  • trunk/include/calendar_weekly.class.php

    r19703 r25005  
    4545    for ($i=1; $i<=53; $i++) 
    4646    { 
    47       $week_no_labels[$i] = sprintf( l10n("Week %d"), $i); 
     47      $week_no_labels[$i] = l10n('Week %d', $i); 
    4848      //$week_no_labels[$i] = $i; 
    4949    } 
  • trunk/include/category_cats.inc.php

    r22879 r25005  
    353353          else 
    354354          { 
    355             $info = sprintf( 
    356               l10n('from %s to %s'), 
     355            $info = l10n( 
     356              'from %s to %s', 
    357357              format_date($from), 
    358358              format_date($to) 
  • trunk/include/functions.inc.php

    r24988 r25005  
    607607    if ($diff->invert) 
    608608    { 
    609       $print = sprintf(l10n('%s ago'), $print); 
     609      $print = l10n('%s ago', $print); 
    610610    } 
    611611    else 
    612612    { 
    613       $print = sprintf(l10n('%s in the future'), $print); 
     613      $print = l10n('%s in the future', $print); 
    614614    } 
    615615  } 
     
    15791579  if (!isset($cache['get_icon']['title'])) 
    15801580  { 
    1581     $cache['get_icon']['title'] = sprintf( 
    1582       l10n('photos posted during the last %d days'), 
     1581    $cache['get_icon']['title'] = l10n( 
     1582      'photos posted during the last %d days', 
    15831583      $user['recent_period'] 
    15841584      ); 
     
    17061706        $label .= ', '; 
    17071707      } 
    1708       $label .= l10n( sprintf('Level %d',$level) ); 
     1708      $label .= l10n( sprintf('Level %d', $level) ); 
    17091709    } 
    17101710    $options[$level] = $label; 
  • trunk/include/no_photo_yet.inc.php

    r19703 r25005  
    7777        array( 
    7878          'step' => 2, 
    79           'intro' => sprintf( 
    80             l10n('Hello %s, your Piwigo photo gallery is empty!'), 
     79          'intro' => l10n( 
     80            'Hello %s, your Piwigo photo gallery is empty!', 
    8181            $user['username'] 
    8282            ), 
  • trunk/include/template.class.php

    r24988 r25005  
    7474        load_language('admin.lang'); 
    7575        fatal_error( 
    76           sprintf( 
    77             l10n('Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'), 
     76          l10n( 
     77            'Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation', 
    7878            $conf['data_location'] 
    7979            ), 
  • trunk/include/ws_functions.inc.php

    r23060 r25005  
    33583358  { 
    33593359    case 'ok': 
    3360       return sprintf(l10n('%s has been successfully updated.'), $extension_name); 
     3360      return l10n('%s has been successfully updated.', $extension_name); 
    33613361 
    33623362    case 'temp_path_error': 
     
    33703370 
    33713371    default: 
    3372       return new PwgError(null, sprintf(l10n('An error occured during extraction (%s).'), $upgrade_status)); 
     3372      return new PwgError(null, l10n('An error occured during extraction (%s).', $upgrade_status)); 
    33733373  } 
    33743374} 
  • trunk/install.php

    r22570 r25005  
    440440    'EMAIL' => '<span class="adminEmail">'.$admin_mail.'</span>', 
    441441    'F_NEWSLETTER_SUBSCRIBE' => $is_newsletter_subscribe, 
    442     'L_INSTALL_HELP' => sprintf(l10n('Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'), PHPWG_URL.'/forum'), 
     442    'L_INSTALL_HELP' => l10n('Need help ? Ask your question on <a href="%s">Piwigo message board</a>.', PHPWG_URL.'/forum'), 
    443443    )); 
    444444 
  • trunk/password.php

    r20609 r25005  
    8585    array_push( 
    8686      $page['errors'], 
    87       sprintf( 
    88         l10n('User "%s" has no email address, password reset is not possible'), 
     87      l10n( 
     88        'User "%s" has no email address, password reset is not possible', 
    8989        $userdata['username'] 
    9090        ) 
     
    109109   
    110110  $message = l10n('Someone requested that the password be reset for the following user account:') . "\r\n\r\n"; 
    111   $message.= sprintf( 
    112     l10n('Username "%s" on gallery %s'), 
     111  $message.= l10n( 
     112    'Username "%s" on gallery %s', 
    113113    $userdata['username'], 
    114114    get_gallery_home_url() 
  • trunk/picture.php

    r23882 r25005  
    860860if (!empty($picture['current']['filesize'])) 
    861861{ 
    862   $infos['INFO_FILESIZE'] = 
    863     sprintf(l10n('%d Kb'), $picture['current']['filesize']); 
     862  $infos['INFO_FILESIZE'] = l10n('%d Kb', $picture['current']['filesize']); 
    864863} 
    865864 
  • trunk/plugins/LocalFilesEditor/admin.php

    r20715 r25005  
    9393      { 
    9494        @copy($edited_file, get_bak_file($edited_file)); 
    95         array_push($page['infos'], sprintf(l10n('locfiledit_saved_bak'), substr(get_bak_file($edited_file), 2))); 
     95        array_push($page['infos'], l10n('locfiledit_saved_bak', substr(get_bak_file($edited_file), 2))); 
    9696      } 
    9797       
  • trunk/search.php

    r20609 r25005  
    109109    $search['fields'][$type_date.'-after'] = array( 
    110110      'date' => sprintf( 
    111         '%d-%02d-%02d', 
    112         $_POST['start_year'], 
    113         $_POST['start_month'] != 0 ? $_POST['start_month'] : '01', 
    114         $_POST['start_day']   != 0 ? $_POST['start_day']   : '01' 
     111        '%d-%02d-%02d', 
     112        $_POST['start_year'], 
     113        $_POST['start_month'] != 0 ? $_POST['start_month'] : '01', 
     114        $_POST['start_day']   != 0 ? $_POST['start_day']   : '01' 
    115115        ), 
    116116      'inc' => true, 
     
    122122    $search['fields'][$type_date.'-before'] = array( 
    123123      'date' => sprintf( 
    124         '%d-%02d-%02d', 
    125         $_POST['end_year'], 
    126         $_POST['end_month'] != 0 ? $_POST['end_month'] : '12', 
    127         $_POST['end_day']   != 0 ? $_POST['end_day']   : '31' 
     124        '%d-%02d-%02d', 
     125        $_POST['end_year'], 
     126        $_POST['end_month'] != 0 ? $_POST['end_month'] : '12', 
     127        $_POST['end_day']   != 0 ? $_POST['end_day']   : '31' 
    128128      ), 
    129129      'inc' => true, 
  • trunk/search_rules.php

    r19703 r25005  
    7878if (isset($search['fields']['allwords'])) 
    7979{ 
    80   $template->append( 'search_words', 
    81       sprintf( 
    82         l10n('searched words : %s'), 
     80  $template->append( 
     81      'search_words', 
     82      l10n( 
     83        'searched words : %s', 
    8384        join(', ', $search['fields']['allwords']['words']) 
    8485        ) 
     
    104105{ 
    105106  $template->append( 
    106     'search_words', 
    107      sprintf( 
    108           l10n('author(s) : %s'), 
    109           join(', ', $search['fields']['author']['words']) 
     107      'search_words', 
     108      l10n( 
     109        'author(s) : %s', 
     110        join(', ', $search['fields']['author']['words']) 
    110111        ) 
    111112      ); 
  • trunk/upgrade.php

    r22570 r25005  
    235235$template->assign(array( 
    236236  'RELEASE' => PHPWG_VERSION, 
    237   'L_UPGRADE_HELP' => sprintf(l10n('Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'), PHPWG_URL.'/forum'), 
     237  'L_UPGRADE_HELP' => l10n('Need help ? Ask your question on <a href="%s">Piwigo message board</a>.', PHPWG_URL.'/forum'), 
    238238  ) 
    239239); 
Note: See TracChangeset for help on using the changeset viewer.