Changeset 25005

Timestamp:

Oct 19, 2013, 1:04:11 PM (11 years ago)

Author:

mistic100

Message:

feature 2978: remove useless sprintf in the core

Location:

trunk

Files:

• admin/album_notification.php (modified) (1 diff)
• admin/batch_manager_global.php (modified) (1 diff)
• admin/cat_modify.php (modified) (3 diffs)
• admin/group_list.php (modified) (5 diffs)
• admin/group_perm.php (modified) (1 diff)
• admin/history.php (modified) (1 diff)
• admin/intro.php (modified) (3 diffs)
• admin/languages_new.php (modified) (2 diffs)
• admin/notification_by_mail.php (modified) (1 diff)
• admin/picture_modify.php (modified) (1 diff)
• admin/plugins_new.php (modified) (1 diff)
• admin/tags.php (modified) (6 diffs)
• admin/themes/default/template/batch_manager_global.tpl (modified) (1 diff)
• admin/themes/default/template/cat_perm.tpl (modified) (1 diff)
• admin/themes/default/template/configuration.tpl (modified) (10 diffs)
• admin/themes/default/template/install.tpl (modified) (1 diff)
• admin/themes/default/template/intro.tpl (modified) (1 diff)
• admin/themes/default/template/photos_add_direct.tpl (modified) (4 diffs)
• admin/themes/default/template/plugins_installed.tpl (modified) (2 diffs)
• admin/themes/default/template/plugins_new.tpl (modified) (1 diff)
• admin/themes/default/template/themes_installed.tpl (modified) (1 diff)
• admin/themes/default/template/updates_ext.tpl (modified) (3 diffs)
• admin/themes/default/template/updates_pwg.tpl (modified) (5 diffs)
• admin/themes/default/template/upgrade.tpl (modified) (3 diffs)
• admin/themes_installed.php (modified) (2 diffs)
• admin/themes_new.php (modified) (2 diffs)
• admin/user_list.php (modified) (2 diffs)
• admin/user_perm.php (modified) (1 diff)
• comments.php (modified) (1 diff)
• feed.php (modified) (1 diff)
• include/calendar_weekly.class.php (modified) (1 diff)
• include/category_cats.inc.php (modified) (1 diff)
• include/functions.inc.php (modified) (3 diffs)
• include/no_photo_yet.inc.php (modified) (1 diff)
• include/template.class.php (modified) (1 diff)
• include/ws_functions.inc.php (modified) (2 diffs)
• install.php (modified) (1 diff)
• password.php (modified) (2 diffs)
• picture.php (modified) (1 diff)
• plugins/LocalFilesEditor/admin.php (modified) (1 diff)
• search.php (modified) (2 diffs)
• search_rules.php (modified) (2 diffs)
• upgrade.php (modified) (1 diff)

trunk/admin/album_notification.php

@@ -116 +116 @@
   array_push(
     $page['infos'],
-    sprintf(
-      l10n('An information email was sent to group "%s"'),
+    l10n(
+      'An information email was sent to group "%s"',
       $group_name
       )

trunk/admin/batch_manager_global.php

@@ -416 +416 @@
   {
     if ($_POST['regenerateSuccess'] != '0')
-      array_push($page['infos'], sprintf(l10n('%s photos have been regenerated'), $_POST['regenerateSuccess']));
+      array_push($page['infos'], l10n('%s photos have been regenerated', $_POST['regenerateSuccess']));
 
     if ($_POST['regenerateError'] != '0')
-      array_push($page['warnings'], sprintf(l10n('%s photos can not be regenerated'), $_POST['regenerateError']));
+      array_push($page['warnings'], l10n('%s photos can not be regenerated', $_POST['regenerateError']));
 
   }

trunk/admin/cat_modify.php

@@ -269 +269 @@
   if ($min_date == $max_date)
   {
-    $intro = sprintf(
-      l10n('This album contains %d photos, added on %s.'),
+    $intro = l10n(
+      'This album contains %d photos, added on %s.',
       $image_count,
       format_date($min_date)
@@ -277 +277 @@
   else
   {
-    $intro = sprintf(
-      l10n('This album contains %d photos, added between %s and %s.'),
+    $intro = l10n(
+      'This album contains %d photos, added between %s and %s.',
       $image_count,
       format_date($min_date),
@@ -290 +290 @@
 }
 
-$intro.= '<br>'.sprintf(l10n('Numeric identifier : %d'), $category['id']);
+$intro.= '<br>'.l10n('Numeric identifier : %d', $category['id']);
 
 $template->assign('INTRO', $intro);

trunk/admin/group_list.php

@@ -73 +73 @@
     pwg_query($query);
 
-    array_push(
-      $page['infos'],
-      sprintf(l10n('group "%s" added'), $_POST['groupname'])
-      );
+    $page['infos'][] = l10n('group "%s" added', $_POST['groupname']);
   }
 }
@@ -154 +151 @@
       pwg_query($query);
     
-      array_push(
-        $page['infos'],
-        sprintf(l10n('group "%s" deleted'), $groupname)
-        );
+      $page['infos'][] = l10n('group "%s" deleted', $groupname);
     }
   }
@@ -237 +231 @@
     mass_inserts(USER_GROUP_TABLE, array('user_id','group_id'), $usr_grp);
     mass_inserts(GROUP_ACCESS_TABLE, array('group_id','cat_id'), $grp_access);
-    array_push(
-      $page['infos'],
-      sprintf(l10n('group "%s" added'), $_POST['merge'])
-      );
+    
+    $page['infos'][] = l10n('group "%s" added', $_POST['merge']);
   }
   
@@ -314 +306 @@
       mass_inserts(USER_GROUP_TABLE, array('user_id','group_id'), $usr_grp);
   
-      array_push(
-        $page['infos'],
-        sprintf(l10n('group "%s" added'), $_POST['duplicate_'.$group.''])
-        );
+      $page['infos'][] = l10n('group "%s" added', $_POST['duplicate_'.$group.'']);
     }
   }
@@ -345 +334 @@
       pwg_query($query);
     
-      array_push(
-        $page['infos'],
-        sprintf(l10n('group "%s" updated'), $groupname)
-        );
+      $page['infos'][] = l10n('group "%s" updated', $groupname);
     }
   }

trunk/admin/group_perm.php

@@ -132 +132 @@
   array(
     'TITLE' =>
-      sprintf(
-        l10n('Manage permissions for group "%s"'),
-        get_groupname($page['group']
-          )
+      l10n(
+        'Manage permissions for group "%s"',
+        get_groupname($page['group'])
         ),
     'L_CAT_OPTIONS_TRUE'=>l10n('Authorized'),

trunk/admin/history.php

@@ -534 +534 @@
       'MEMBERS' => sprintf(
         l10n_dec('%d member', '%d members', $summary['nb_members']).': %s',
-        implode(
-          ', ',
-          $member_strings
-          )
+        implode(', ', $member_strings)
         ),
       'GUESTS' => l10n_dec(

trunk/admin/intro.php

@@ -213 +213 @@
     'DB_USERS' => l10n_dec('%d user', '%d users', $nb_users),
     'DB_GROUPS' => l10n_dec('%d group', '%d groups', $nb_groups),
-    'DB_RATES' => ($nb_rates == 0) ? l10n('no rate') : sprintf(l10n('%d rates'), $nb_rates),
+    'DB_RATES' => ($nb_rates == 0) ? l10n('no rate') : l10n('%d rates', $nb_rates),
     'U_CHECK_UPGRADE' => PHPWG_ROOT_PATH.'admin.php?action=check_upgrade',
     'U_PHPINFO' => PHPWG_ROOT_PATH.'admin.php?action=phpinfo',
@@ -244 +244 @@
       array(
         'URL' => PHPWG_ROOT_PATH.'admin.php?page=comments',
-        'INFO' => sprintf(l10n('%d waiting for validation'), $nb_comments)
+        'INFO' => l10n('%d waiting for validation', $nb_comments)
         )
       );
@@ -262 +262 @@
     array(
       'DB_DATE' =>
-      sprintf(
-        l10n('first photo added on %s'),
-        format_date($first_date)
-        )
+      l10n('first photo added on %s', format_date($first_date))
       )
     );

trunk/admin/languages_new.php

@@ -43 +43 @@
 if (!is_writable($languages_dir))
 {
-  array_push(
-    $page['errors'],
-    sprintf(
-      l10n('Add write access to the "%s" directory'),
-      'language'
-      )
-    );
+  $page['errors'][] = l10n('Add write access to the "%s" directory', 'language');
 }
 
@@ -100 +94 @@
       array_push(
         $page['errors'],
-        sprintf(l10n('An error occured during extraction (%s).'), htmlspecialchars($_GET['installstatus']))
+        l10n('An error occured during extraction (%s).', htmlspecialchars($_GET['installstatus']))
       );
   }  

trunk/admin/notification_by_mail.php

@@ -174 +174 @@
       (
         $page['infos'],
-        sprintf(
-          l10n('User %s [%s] added.'),
+        l10n(
+          'User %s [%s] added.',
           stripslashes($nbm_user['username']),
           get_email_address_as_display_text($nbm_user['mail_address'])

trunk/admin/picture_modify.php

@@ -307 +307 @@
 
 $intro_vars = array(
-  'file' => sprintf(l10n('Original file : %s'), $row['file']),
-  'add_date' => sprintf(l10n('Posted %s on %s'), time_since($row['date_available'], 'year'), format_date($row['date_available'], false, false)),
-  'added_by' => sprintf(l10n('Added by %s'), $row['added_by']),
+  'file' => l10n('Original file : %s', $row['file']),
+  'add_date' => l10n('Posted %s on %s', time_since($row['date_available'], 'year'), format_date($row['date_available'], false, false)),
+  'added_by' => l10n('Added by %s', $row['added_by']),
   'size' => $row['width'].'×'.$row['height'].' pixels, '.sprintf('%.2f', $row['filesize']/1024).'MB',
-  'stats' => sprintf(l10n('Visited %d times'), $row['hit']),
-  'id' => sprintf(l10n('Numeric identifier : %d'), $row['id']),
+  'stats' => l10n('Visited %d times', $row['hit']),
+  'id' => l10n('Numeric identifier : %d', $row['id']),
   );
 

trunk/admin/plugins_new.php

@@ -77 +77 @@
     default:
       array_push($page['errors'],
-        sprintf(l10n('An error occured during extraction (%s).'), htmlspecialchars($_GET['installstatus'])),
+        l10n('An error occured during extraction (%s).', htmlspecialchars($_GET['installstatus'])),
         l10n('Please check "plugins" folder and sub-folders permissions (CHMOD).'));
   }  

trunk/admin/tags.php

@@ -72 +72 @@
         array_push(
           $page['errors'],
-          sprintf(
-            l10n('Tag "%s" already exists'),
+          l10n(
+            'Tag "%s" already exists',
             $tag_name
             )
@@ -137 +137 @@
         array_push(
           $page['errors'],
-          sprintf(
-            l10n('Tag "%s" already exists'),
+          l10n(
+            'Tag "%s" already exists',
             $tag_name
             )
@@ -191 +191 @@
         array_push(
           $page['infos'],
-          sprintf(
-            l10n('Tag "%s" is now a duplicate of "%s"'),
+          l10n(
+            'Tag "%s" is now a duplicate of "%s"',
             stripslashes($tag_name),
             $current_name_of[$tag_id]
@@ -301 +301 @@
       array_push(
         $page['infos'],
-        sprintf(
-          l10n('Tags <em>%s</em> merged into tag <em>%s</em>'),
+        l10n(
+          'Tags <em>%s</em> merged into tag <em>%s</em>',
           implode(', ', $tags_deleted),
           $name_of_tag[$destination_tag_id]
@@ -381 +381 @@
     array_push(
       $page['infos'],
-      sprintf(
-        l10n('Tag "%s" was added'),
+      l10n(
+        'Tag "%s" was added',
         stripslashes($tag_name)
         )
@@ -391 +391 @@
     array_push(
       $page['errors'],
-      sprintf(
-        l10n('Tag "%s" already exists'),
+      l10n(
+        'Tag "%s" already exists',
         stripslashes($tag_name)
         )

trunk/admin/themes/default/template/batch_manager_global.tpl

@@ -678 +678 @@
         
         <blockquote>
-          {'Width'|@translate} <span id="filter_dimension_width_info">{'between %d and %d pixels'|@translate|sprintf:$dimensions.selected.min_width:$dimensions.selected.max_width}</span>
+          {'Width'|@translate} <span id="filter_dimension_width_info">{'between %d and %d pixels'|@translate:$dimensions.selected.min_width:$dimensions.selected.max_width}</span>
           | <a class="dimensions-choice" data-type="width" data-min="{$dimensions.bounds.min_width}" data-max="{$dimensions.bounds.max_width}">{'Reset'|@translate}</a>
           <div id="filter_dimension_width_slider"></div>
           
-          {'Height'|@translate} <span id="filter_dimension_height_info">{'between %d and %d pixels'|@translate|sprintf:$dimensions.selected.min_height:$dimensions.selected.max_height}</span>
+          {'Height'|@translate} <span id="filter_dimension_height_info">{'between %d and %d pixels'|@translate:$dimensions.selected.min_height:$dimensions.selected.max_height}</span>
           | <a class="dimensions-choice" data-type="height" data-min="{$dimensions.bounds.min_height}" data-max="{$dimensions.bounds.max_height}">{'Reset'|@translate}</a>
           <div id="filter_dimension_height_slider"></div>
           
-          {'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>
+          {'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>
 {if isset($dimensions.ratio_portrait)}
           | <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

@@ -77 +77 @@
 {if isset($nb_users_granted_indirect)}
   <p>
-    {'%u users have automatic permission because they belong to a granted group.'|@translate|@sprintf:$nb_users_granted_indirect}
+    {'%u users have automatic permission because they belong to a granted group.'|@translate:$nb_users_granted_indirect}
     <a href="#" id="indirectPermissionsDetailsHide" style="display:none">{'hide details'|@translate}</a>
     <a href="#" id="indirectPermissionsDetailsShow">{'show details'|@translate}</a>

trunk/admin/themes/default/template/configuration.tpl

@@ -611 +611 @@
       <label>
         <input type="checkbox" name="menubar_filter_icon" {if ($display.menubar_filter_icon)}checked="checked"{/if}>
-        {'Activate icon "%s"'|@translate|@sprintf:('display only recently posted photos'|@translate|@ucfirst)}
+        {'Activate icon "%s"'|@translate:('display only recently posted photos'|@translate|@ucfirst)}
       </label>
     </li>
@@ -625 +625 @@
       <label>
         <input type="checkbox" name="index_sort_order_input" {if ($display.index_sort_order_input)}checked="checked"{/if}>
-        {'Activate icon "%s"'|@translate|@sprintf:('Sort order'|@translate)}
+        {'Activate icon "%s"'|@translate:('Sort order'|@translate)}
       </label>
     </li>
@@ -632 +632 @@
       <label>
         <input type="checkbox" name="index_flat_icon" {if ($display.index_flat_icon)}checked="checked"{/if}>
-        {'Activate icon "%s"'|@translate|@sprintf:('display all photos in all sub-albums'|@translate|@ucfirst)}
+        {'Activate icon "%s"'|@translate:('display all photos in all sub-albums'|@translate|@ucfirst)}
       </label>
     </li>
@@ -639 +639 @@
       <label>
         <input type="checkbox" name="index_posted_date_icon" {if ($display.index_posted_date_icon)}checked="checked"{/if}>
-        {'Activate icon "%s"'|@translate|@sprintf:('display a calendar by posted date'|@translate|@ucfirst)}
+        {'Activate icon "%s"'|@translate:('display a calendar by posted date'|@translate|@ucfirst)}
       </label>
     </li>
@@ -646 +646 @@
       <label>
         <input type="checkbox" name="index_created_date_icon" {if ($display.index_created_date_icon)}checked="checked"{/if}>
-        {'Activate icon "%s"'|@translate|@sprintf:('display a calendar by creation date'|@translate|@ucfirst)}
+        {'Activate icon "%s"'|@translate:('display a calendar by creation date'|@translate|@ucfirst)}
       </label>
     </li>
@@ -653 +653 @@
       <label>
         <input type="checkbox" name="index_slideshow_icon" {if ($display.index_slideshow_icon)}checked="checked"{/if}>
-        {'Activate icon "%s"'|@translate|@sprintf:('slideshow'|@translate|@ucfirst)}
+        {'Activate icon "%s"'|@translate:('slideshow'|@translate|@ucfirst)}
       </label>
     </li>
@@ -672 +672 @@
       <label>
         <input type="checkbox" name="picture_slideshow_icon" {if ($display.picture_slideshow_icon)}checked="checked"{/if}>
-        {'Activate icon "%s"'|@translate|@sprintf:('slideshow'|@translate|@ucfirst)}
+        {'Activate icon "%s"'|@translate:('slideshow'|@translate|@ucfirst)}
       </label>
     </li>
@@ -679 +679 @@
       <label>
         <input type="checkbox" name="picture_metadata_icon" {if ($display.picture_metadata_icon)}checked="checked"{/if}>
-        {'Activate icon "%s"'|@translate|@sprintf:('Show file metadata'|@translate)}
+        {'Activate icon "%s"'|@translate:('Show file metadata'|@translate)}
       </label>
     </li>
@@ -686 +686 @@
       <label>
         <input type="checkbox" name="picture_download_icon" {if ($display.picture_download_icon)}checked="checked"{/if}>
-        {'Activate icon "%s"'|@translate|@sprintf:('Download this file'|@translate|@ucfirst)}
+        {'Activate icon "%s"'|@translate:('Download this file'|@translate|@ucfirst)}
       </label>
     </li>
@@ -693 +693 @@
       <label>
         <input type="checkbox" name="picture_favorite_icon" {if ($display.picture_favorite_icon)}checked="checked"{/if}>
-        {'Activate icon "%s"'|@translate|@sprintf:('add this photo to your favorites'|@translate|@ucfirst)}
+        {'Activate icon "%s"'|@translate:('add this photo to your favorites'|@translate|@ucfirst)}
       </label>
     </li>

trunk/admin/themes/default/template/install.tpl

@@ -280 +280 @@
         <label>
           <input type="checkbox" name="newsletter_subscribe"{if $F_NEWSLETTER_SUBSCRIBE} checked="checked"{/if}>
-          <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>
+          <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>
         </label>
         <br>

trunk/admin/themes/default/template/intro.tpl

@@ -43 +43 @@
       <li><a href="{$U_CHECK_UPGRADE}">{'Check for upgrade'|@translate}</a></li>
 {if isset($SUBSCRIBE_BASE_URL)}
-      <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>
+      <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>
 {/if}
     </ul>

trunk/admin/themes/default/template/photos_add_direct.tpl

@@ -291 +291 @@
       <legend>{'Select files'|@translate}</legend>
  
-    {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}
+    {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}
 
     <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>
 
     <p id="uploadWarnings">
-{'Maximum file size: %sB.'|@translate|@sprintf:$upload_max_filesize_shorthand}
-{'Allowed file types: %s.'|@translate|@sprintf:$upload_file_types}
+{'Maximum file size: %sB.'|@translate:$upload_max_filesize_shorthand}
+{'Allowed file types: %s.'|@translate:$upload_file_types}
   {if isset($max_upload_resolution)}
-{'Approximate maximum resolution: %dM pixels (that\'s %dx%d pixels).'|@translate|@sprintf:$max_upload_resolution:$max_upload_width:$max_upload_height}
+{'Approximate maximum resolution: %dM pixels (that\'s %dx%d pixels).'|@translate:$max_upload_resolution:$max_upload_width:$max_upload_height}
   {/if}
     </p>
@@ -311 +311 @@
       </div>
 
-    <p id="uploadModeInfos">{'You are using the Browser uploader. Try the <a href="%s">Flash uploader</a> instead.'|@translate|@sprintf:$switch_url}</p>
+    <p id="uploadModeInfos">{'You are using the Browser uploader. Try the <a href="%s">Flash uploader</a> instead.'|@translate:$switch_url}</p>
 
 {elseif $upload_mode eq 'multiple'}
@@ -318 +318 @@
     <div id="fileQueue" style="display:none"></div>
 
-    <p id="uploadModeInfos">{'You are using the Flash uploader. Problems? Try the <a href="%s">Browser uploader</a> instead.'|@translate|@sprintf:$switch_url}</p>
+    <p id="uploadModeInfos">{'You are using the Flash uploader. Problems? Try the <a href="%s">Browser uploader</a> instead.'|@translate:$switch_url}</p>
 
 {/if}
@@ -346 +346 @@
 
 <div id="uploadProgress" style="display:none">
-{'Photo %s of %s'|@translate|@sprintf:'<span id="progressCurrent">1</span>':'<span id="progressMax">10</span>'}
+{'Photo %s of %s'|@translate:'<span id="progressCurrent">1</span>':'<span id="progressMax">10</span>'}
 <br>
 <div id="progressbar"></div>

trunk/admin/themes/default/template/plugins_installed.tpl

@@ -163 +163 @@
             
           {if not empty($author)}
-            | {'By %s'|@translate|@sprintf:$author}
+            | {'By %s'|@translate:$author}
           {/if}
 
@@ -184 +184 @@
       <div class="pluginMiniBoxNameCell">
         {$plugin.NAME}
-        <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>
+        <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>
       </div>
       <div class="pluginActions">

trunk/admin/themes/default/template/plugins_new.tpl

@@ -78 +78 @@
         <em>{'Downloads'|@translate}: {$plugin.DOWNLOADS}</em>
         {'Version'|@translate} {$plugin.VERSION}
-        | {'By %s'|@translate|@sprintf:$plugin.AUTHOR}
+        | {'By %s'|@translate:$plugin.AUTHOR}
         | <a class="externalLink" href="{$plugin.EXT_URL}">{'Visit plugin site'|@translate}</a>
       </td>

trunk/admin/themes/default/template/themes_installed.tpl

@@ -59 +59 @@
     <div class="themeName">
       {$theme.NAME} {if $theme.IS_DEFAULT}<em>({'default'|@translate})</em>{/if} {if $theme.IS_MOBILE}<em>({'Mobile'|@translate})</em>{/if}
-      <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>
+      <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>
     </div>
     <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

@@ -181 +181 @@
         <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/minus.gif" alt="" class="button_{$plugin.ID}" style="display:none;">
         {'New Version'|@translate} : {$plugin.NEW_VERSION}
-        | {'By %s'|@translate|@sprintf:$plugin.AUTHOR}
+        | {'By %s'|@translate:$plugin.AUTHOR}
       </td>
     </tr>
@@ -223 +223 @@
         <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/minus.gif" alt="" class="button_{$theme.ID}" style="display:none;">
         {'New Version'|@translate} : {$theme.NEW_VERSION}
-        | {'By %s'|@translate|@sprintf:$theme.AUTHOR}
+        | {'By %s'|@translate:$theme.AUTHOR}
       </td>
     </tr>
@@ -265 +265 @@
         <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/minus.gif" alt="" class="button_{$language.ID}" style="display:none;">
         {'New Version'|@translate} : {$language.NEW_VERSION}
-        | {'By %s'|@translate|@sprintf:$language.AUTHOR}
+        | {'By %s'|@translate:$language.AUTHOR}
       </td>
     </tr>

trunk/admin/themes/default/template/updates_pwg.tpl

@@ -42 +42 @@
 <p>
 <ul>
-  <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>
-  <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>
+  <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>
+  <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>
 </ul>
 </p>
-<p>{'You can update to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'|@translate|@sprintf:$MAJOR_VERSION:$MINOR_VERSION}</p>
+<p>{'You can update to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'|@translate:$MAJOR_VERSION:$MINOR_VERSION}</p>
 {/if}
 
@@ -55 +55 @@
 </p>
 <form action="" method="post">
-<p><input type="submit" name="submit" value="{'Update to Piwigo %s'|@translate|@sprintf:$UPGRADE_TO}"></p>
+<p><input type="submit" name="submit" value="{'Update to Piwigo %s'|@translate:$UPGRADE_TO}"></p>
 <p class="autoupdate_bar" style="display:none;">&nbsp; {'Update in progress...'|@translate}<br><img src="admin/themes/default/images/ajax-loader-bar.gif"></p>
 <p><input type="hidden" name="upgrade_to" value="{$UPGRADE_TO}"></p>
@@ -64 +64 @@
 <p>
   {'A new version of Piwigo is available.'|@translate}<br>
-  {'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}
+  {'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}
 </p>
 <form action="" method="post">
@@ -77 +77 @@
 {counter assign=i}
 <fieldset>
-  <legend>{'Update to Piwigo %s'|@translate|@sprintf:$UPGRADE_TO}</legend>
+  <legend>{'Update to Piwigo %s'|@translate:$UPGRADE_TO}</legend>
   {if !empty($missing.plugins)}
   <p><i>{'Following plugins may not be compatible with the new version of Piwigo:'|@translate}</i></p>
@@ -90 +90 @@
   <p><label><input type="checkbox" name="understand"> &nbsp;{'I decide to update anyway'|@translate}</label></p>
   {/if}
-  <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}>
+  <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}>
   </p>
   <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

@@ -162 +162 @@
 </table>
 
-<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>
+<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>
 {if isset($login)}
 <p>{'Only administrator can run upgrade: please sign in below.'|@translate}</p>
@@ -181 +181 @@
 </fieldset>
 <p style="text-align: center;">
-<input class="submit" type="submit" name="submit" value="{'Upgrade from version %s to %s'|@translate|@sprintf:$introduction.CURRENT_RELEASE:$RELEASE}">
+<input class="submit" type="submit" name="submit" value="{'Upgrade from version %s to %s'|@translate:$introduction.CURRENT_RELEASE:$RELEASE}">
 </p>
 </form>
 <!--
 <p style="text-align: center;">
-<a href="{$introduction.RUN_UPGRADE_URL}">{'Upgrade from version %s to %s'|@translate|@sprintf:$introduction.CURRENT_RELEASE:$RELEASE}</a>
+<a href="{$introduction.RUN_UPGRADE_URL}">{'Upgrade from version %s to %s'|@translate:$introduction.CURRENT_RELEASE:$RELEASE}</a>
 </p>
 -->
@@ -193 +193 @@
 
 {if isset($upgrade)}
-<h2>{'Upgrade from version %s to %s'|@translate|@sprintf:$upgrade.VERSION:$RELEASE}</h2>
+<h2>{'Upgrade from version %s to %s'|@translate:$upgrade.VERSION:$RELEASE}</h2>
 
 <fieldset>

trunk/admin/themes_installed.php

@@ -122 +122 @@
       $tpl_theme['ACTIVABLE'] = false;
 
-      $tpl_theme['ACTIVABLE_TOOLTIP'] = sprintf(
-        l10n('Impossible to activate this theme, the parent theme is missing: %s'),
+      $tpl_theme['ACTIVABLE_TOOLTIP'] = l10n(
+        'Impossible to activate this theme, the parent theme is missing: %s',
         $missing_parent
         );
@@ -137 +137 @@
       $tpl_theme['DELETABLE'] = false;
 
-      $tpl_theme['DELETE_TOOLTIP'] = sprintf(
-        l10n('Impossible to delete this theme. Other themes depends on it: %s'),
+      $tpl_theme['DELETE_TOOLTIP'] = l10n(
+        'Impossible to delete this theme. Other themes depends on it: %s',
         implode(', ', $children)
         );

trunk/admin/themes_new.php

@@ -40 +40 @@
 if (!is_writable($themes_dir))
 {
-  array_push(
-    $page['errors'],
-    sprintf(
-      l10n('Add write access to the "%s" directory'),
-      'themes'
-      )
-    );
+  $page['errors'][] = l10n('Add write access to the "%s" directory', 'themes');
 }
 
@@ -103 +97 @@
       array_push(
         $page['errors'],
-        sprintf(l10n('An error occured during extraction (%s).'), htmlspecialchars($_GET['installstatus']))
+        l10n('An error occured during extraction (%s).', htmlspecialchars($_GET['installstatus']))
         );
   }  

trunk/admin/user_list.php

@@ -215 +215 @@
         array_push(
           $page['infos'],
-          sprintf(
-            l10n('user "%s" added'),
+          l10n(
+            'user "%s" added',
             $_POST['login']
           )
@@ -235 +235 @@
       array_push(
         $page['infos'],
-        sprintf(
-          l10n('user "%s" added'),
+        l10n(
+          'user "%s" added',
           stripslashes($_POST['login'])
           )

trunk/admin/user_perm.php

@@ -86 +86 @@
   array(
     'TITLE' =>
-      sprintf(
-        l10n('Manage permissions for user "%s"'),
-        get_username($page['user']
-          )
+      l10n(
+        'Manage permissions for user "%s"',
+        get_username($page['user'])
         ),
     'L_CAT_OPTIONS_TRUE'=>l10n('Authorized'),

trunk/comments.php

@@ -79 +79 @@
   1 => array('label' => l10n('today'),
              'clause' => 'date > '.pwg_db_get_recent_period_expression(1)),
-  2 => array('label' => sprintf(l10n('last %d days'), 7),
+  2 => array('label' => l10n('last %d days', 7),
              'clause' => 'date > '.pwg_db_get_recent_period_expression(7)),
-  3 => array('label' => sprintf(l10n('last %d days'), 30),
+  3 => array('label' => l10n('last %d days', 30),
              'clause' => 'date > '.pwg_db_get_recent_period_expression(30)),
   4 => array('label' => l10n('the beginning'),

trunk/feed.php

@@ -123 +123 @@
   {
     $item = new FeedItem();
-    $item->title = sprintf(l10n('New on %s'), format_date($dbnow) );
+    $item->title = l10n('New on %s', format_date($dbnow) );
     $item->link = get_gallery_home_url();
 

trunk/include/calendar_weekly.class.php

@@ -45 +45 @@
     for ($i=1; $i<=53; $i++)
     {
-      $week_no_labels[$i] = sprintf( l10n("Week %d"), $i);
+      $week_no_labels[$i] = l10n('Week %d', $i);
       //$week_no_labels[$i] = $i;
     }

trunk/include/category_cats.inc.php

@@ -353 +353 @@
           else
           {
-            $info = sprintf(
-              l10n('from %s to %s'),
+            $info = l10n(
+              'from %s to %s',
               format_date($from),
               format_date($to)

trunk/include/functions.inc.php

@@ -607 +607 @@
     if ($diff->invert)
     {
-      $print = sprintf(l10n('%s ago'), $print);
+      $print = l10n('%s ago', $print);
     }
     else
     {
-      $print = sprintf(l10n('%s in the future'), $print);
+      $print = l10n('%s in the future', $print);
     }
   }
@@ -1579 +1579 @@
   if (!isset($cache['get_icon']['title']))
   {
-    $cache['get_icon']['title'] = sprintf(
-      l10n('photos posted during the last %d days'),
+    $cache['get_icon']['title'] = l10n(
+      'photos posted during the last %d days',
       $user['recent_period']
       );
@@ -1706 +1706 @@
         $label .= ', ';
       }
-      $label .= l10n( sprintf('Level %d',$level) );
+      $label .= l10n( sprintf('Level %d', $level) );
     }
     $options[$level] = $label;

trunk/include/no_photo_yet.inc.php

@@ -77 +77 @@
         array(
           'step' => 2,
-          'intro' => sprintf(
-            l10n('Hello %s, your Piwigo photo gallery is empty!'),
+          'intro' => l10n(
+            'Hello %s, your Piwigo photo gallery is empty!',
             $user['username']
             ),

trunk/include/template.class.php

@@ -74 +74 @@
         load_language('admin.lang');
         fatal_error(
-          sprintf(
-            l10n('Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'),
+          l10n(
+            'Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation',
             $conf['data_location']
             ),

trunk/include/ws_functions.inc.php

@@ -3358 +3358 @@
   {
     case 'ok':
-      return sprintf(l10n('%s has been successfully updated.'), $extension_name);
+      return l10n('%s has been successfully updated.', $extension_name);
 
     case 'temp_path_error':
@@ -3370 +3370 @@
 
     default:
-      return new PwgError(null, sprintf(l10n('An error occured during extraction (%s).'), $upgrade_status));
+      return new PwgError(null, l10n('An error occured during extraction (%s).', $upgrade_status));
   }
 }

trunk/install.php

@@ -440 +440 @@
     'EMAIL' => '<span class="adminEmail">'.$admin_mail.'</span>',
     'F_NEWSLETTER_SUBSCRIBE' => $is_newsletter_subscribe,
-    'L_INSTALL_HELP' => sprintf(l10n('Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'), PHPWG_URL.'/forum'),
+    'L_INSTALL_HELP' => l10n('Need help ? Ask your question on <a href="%s">Piwigo message board</a>.', PHPWG_URL.'/forum'),
     ));
 

trunk/password.php

@@ -85 +85 @@
     array_push(
       $page['errors'],
-      sprintf(
-        l10n('User "%s" has no email address, password reset is not possible'),
+      l10n(
+        'User "%s" has no email address, password reset is not possible',
         $userdata['username']
         )
@@ -109 +109 @@
   
   $message = l10n('Someone requested that the password be reset for the following user account:') . "\r\n\r\n";
-  $message.= sprintf(
-    l10n('Username "%s" on gallery %s'),
+  $message.= l10n(
+    'Username "%s" on gallery %s',
     $userdata['username'],
     get_gallery_home_url()

trunk/picture.php

@@ -860 +860 @@
 if (!empty($picture['current']['filesize']))
 {
-  $infos['INFO_FILESIZE'] =
-    sprintf(l10n('%d Kb'), $picture['current']['filesize']);
+  $infos['INFO_FILESIZE'] = l10n('%d Kb', $picture['current']['filesize']);
 }
 

trunk/plugins/LocalFilesEditor/admin.php

@@ -93 +93 @@
       {
         @copy($edited_file, get_bak_file($edited_file));
-        array_push($page['infos'], sprintf(l10n('locfiledit_saved_bak'), substr(get_bak_file($edited_file), 2)));
+        array_push($page['infos'], l10n('locfiledit_saved_bak', substr(get_bak_file($edited_file), 2)));
       }
       

trunk/search.php

@@ -109 +109 @@
     $search['fields'][$type_date.'-after'] = array(
       'date' => sprintf(
-        '%d-%02d-%02d',
-        $_POST['start_year'],
-        $_POST['start_month'] != 0 ? $_POST['start_month'] : '01',
-        $_POST['start_day']   != 0 ? $_POST['start_day']   : '01'
+        '%d-%02d-%02d',
+        $_POST['start_year'],
+        $_POST['start_month'] != 0 ? $_POST['start_month'] : '01',
+        $_POST['start_day']   != 0 ? $_POST['start_day']   : '01'
         ),
       'inc' => true,
@@ -122 +122 @@
     $search['fields'][$type_date.'-before'] = array(
       'date' => sprintf(
-        '%d-%02d-%02d',
-        $_POST['end_year'],
-        $_POST['end_month'] != 0 ? $_POST['end_month'] : '12',
-        $_POST['end_day']   != 0 ? $_POST['end_day']   : '31'
+        '%d-%02d-%02d',
+        $_POST['end_year'],
+        $_POST['end_month'] != 0 ? $_POST['end_month'] : '12',
+        $_POST['end_day']   != 0 ? $_POST['end_day']   : '31'
       ),
       'inc' => true,

trunk/search_rules.php

@@ -78 +78 @@
 if (isset($search['fields']['allwords']))
 {
-  $template->append( 'search_words',
-      sprintf(
-        l10n('searched words : %s'),
+  $template->append(
+      'search_words',
+      l10n(
+        'searched words : %s',
         join(', ', $search['fields']['allwords']['words'])
         )
@@ -104 +105 @@
 {
   $template->append(
-    'search_words',
-     sprintf(
-          l10n('author(s) : %s'),
-          join(', ', $search['fields']['author']['words'])
+      'search_words',
+      l10n(
+        'author(s) : %s',
+        join(', ', $search['fields']['author']['words'])
         )
       );

trunk/upgrade.php

@@ -235 +235 @@
 $template->assign(array(
   'RELEASE' => PHPWG_VERSION,
-  'L_UPGRADE_HELP' => sprintf(l10n('Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'), PHPWG_URL.'/forum'),
+  'L_UPGRADE_HELP' => l10n('Need help ? Ask your question on <a href="%s">Piwigo message board</a>.', PHPWG_URL.'/forum'),
   )
 );