diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/calendar_weekly.class.php | 2 | ||||
| -rw-r--r-- | include/category_cats.inc.php | 4 | ||||
| -rw-r--r-- | include/functions.inc.php | 10 | ||||
| -rw-r--r-- | include/no_photo_yet.inc.php | 4 | ||||
| -rw-r--r-- | include/template.class.php | 4 | ||||
| -rw-r--r-- | include/ws_functions.inc.php | 4 |
6 files changed, 14 insertions, 14 deletions
diff --git a/include/calendar_weekly.class.php b/include/calendar_weekly.class.php index 548631338..5c2a346b1 100644 --- a/include/calendar_weekly.class.php +++ b/include/calendar_weekly.class.php @@ -44,7 +44,7 @@ class Calendar extends CalendarBase $week_no_labels=array(); 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; } diff --git a/include/category_cats.inc.php b/include/category_cats.inc.php index d96903700..8d334f6a0 100644 --- a/include/category_cats.inc.php +++ b/include/category_cats.inc.php @@ -352,8 +352,8 @@ if (count($categories) > 0) } else { - $info = sprintf( - l10n('from %s to %s'), + $info = l10n( + 'from %s to %s', format_date($from), format_date($to) ); diff --git a/include/functions.inc.php b/include/functions.inc.php index 09d104cdc..6f2df2880 100644 --- a/include/functions.inc.php +++ b/include/functions.inc.php @@ -606,11 +606,11 @@ function time_since($original, $stop='minute', $format=null, $with_text=true, $w { 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); } } @@ -1578,8 +1578,8 @@ function get_icon($date, $is_child_date = false) 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'] ); } @@ -1705,7 +1705,7 @@ function get_privacy_level_options() { $label .= ', '; } - $label .= l10n( sprintf('Level %d',$level) ); + $label .= l10n( sprintf('Level %d', $level) ); } $options[$level] = $label; } diff --git a/include/no_photo_yet.inc.php b/include/no_photo_yet.inc.php index 17907c51d..e8354debf 100644 --- a/include/no_photo_yet.inc.php +++ b/include/no_photo_yet.inc.php @@ -76,8 +76,8 @@ SELECT $template->assign( 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'] ), 'next_step_url' => $url, diff --git a/include/template.class.php b/include/template.class.php index 3ac6e78db..ac9b999bb 100644 --- a/include/template.class.php +++ b/include/template.class.php @@ -73,8 +73,8 @@ class Template { { 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'] ), l10n('an error happened'), diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php index 53e166873..f5f136279 100644 --- a/include/ws_functions.inc.php +++ b/include/ws_functions.inc.php @@ -3357,7 +3357,7 @@ function ws_extensions_update($params, $service) switch ($upgrade_status) { 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': return new PwgError(null, l10n('Can\'t create temporary file.')); @@ -3369,7 +3369,7 @@ function ws_extensions_update($params, $service) return new PwgError(null, l10n('Can\'t read or extract archive.')); 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)); } } |