From 251eeb05aba7ddb79afafd4143a5435fc368b0e7 Mon Sep 17 00:00:00 2001
From: rvelices <rv-github@modusoptimus.com>
Date: Sat, 20 Mar 2010 20:28:35 +0000
Subject: less warnings + language fixes

git-svn-id: http://piwigo.org/svn/trunk@5206 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/group_perm.php                                 |  2 +-
 admin/themes/default/template/element_set_global.tpl |  5 +----
 admin/user_perm.php                                  |  2 +-
 include/filter.inc.php                               |  4 ++--
 include/functions_notification.inc.php               | 10 +++++-----
 profile.php                                          |  8 ++++----
 6 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/admin/group_perm.php b/admin/group_perm.php
index 75282a00f..52d7554fa 100644
--- a/admin/group_perm.php
+++ b/admin/group_perm.php
@@ -132,7 +132,7 @@ $template->assign(
   array(
     'TITLE' =>
       sprintf(
-        l10n('Manage permissions for group \"%s\"'),
+        l10n('Manage permissions for group "%s"'),
         get_groupname($page['group']
           )
         ),
diff --git a/admin/themes/default/template/element_set_global.tpl b/admin/themes/default/template/element_set_global.tpl
index 8100db457..960c229cb 100644
--- a/admin/themes/default/template/element_set_global.tpl
+++ b/admin/themes/default/template/element_set_global.tpl
@@ -82,7 +82,7 @@
 
   </fieldset>
 
-  {if $show_delete_form}
+  {if isset($show_delete_form) }
   <fieldset>
     <legend>{'Deletions'|@translate}</legend>
     <p style="font-style:italic">{'Note: Only deletes photos added with pLoader'|@translate}</p>
@@ -128,9 +128,6 @@
         <td>{'add tags'|@translate}</td>
         <td>
 <select id="tags" name="add_tags">
-{foreach from=$tags item=tag}
-  <option value="{$tag.value}" class="selected">{$tag.caption}</option>
-{/foreach}
 </select>
         </td>
       </tr>
diff --git a/admin/user_perm.php b/admin/user_perm.php
index 877254623..063683fab 100644
--- a/admin/user_perm.php
+++ b/admin/user_perm.php
@@ -126,7 +126,7 @@ $template->assign(
   array(
     'TITLE' =>
       sprintf(
-        l10n('Manage permissions for user \"%s\"'),
+        l10n('Manage permissions for user "%s"'),
         get_username($page['user']
           )
         ),
diff --git a/include/filter.inc.php b/include/filter.inc.php
index 1fb9663bd..2ba928686 100644
--- a/include/filter.inc.php
+++ b/include/filter.inc.php
@@ -123,7 +123,7 @@ WHERE ';
   unset($filter_key);
   if (get_filter_page_value('add_notes'))
   {
-    $header_notes[] = l10n_dec('note_filter_day', 'note_filter_days', $filter['recent_period']);
+    $header_notes[] = l10n_dec('Elements posted within the last %d day.', 'Elements posted within the last %d days.', $filter['recent_period']);
   }
   include_once(PHPWG_ROOT_PATH.'include/functions_filter.inc.php');
 }
@@ -140,4 +140,4 @@ else
 }
 
 
-?>
+?>
\ No newline at end of file
diff --git a/include/functions_notification.inc.php b/include/functions_notification.inc.php
index 2220817d2..9a5afe762 100644
--- a/include/functions_notification.inc.php
+++ b/include/functions_notification.inc.php
@@ -391,7 +391,7 @@ function news($start, $end, $exclude_img_cats=false, $add_url=false)
   if (!$exclude_img_cats)
   {
     add_news_line( $news,
-      nb_new_elements($start, $end), '%d new element', '%d new elements',
+      nb_new_elements($start, $end), '%d new image', '%d new images',
       make_index_url(array('section'=>'recent_pics')), $add_url );
   }
 
@@ -526,7 +526,7 @@ function get_html_description_recent_post_date($date_detail)
 
   $description .=
         '<li>'
-        .l10n_dec('%d new element', '%d new elements', $date_detail['nb_elements'])
+        .l10n_dec('%d new image', '%d new images', $date_detail['nb_elements'])
         .' ('
         .'<a href="'.make_index_url(array('section'=>'recent_pics')).'">'
           .l10n('Recent pictures').'</a>'
@@ -558,8 +558,8 @@ function get_html_description_recent_post_date($date_detail)
           '<li>'
           .get_cat_display_name_cache($cat['uppercats'])
           .' ('.
-          l10n_dec('%d new element',
-                   '%d new elements', $cat['img_count']).')'
+          l10n_dec('%d new image',
+                   '%d new images', $cat['img_count']).')'
           .'</li>';
   }
   $description .= '</ul>';
@@ -601,7 +601,7 @@ function get_title_recent_post_date($date_detail)
   $date = $date_detail['date_available'];
   $exploded_date = explode_mysqldt($date);
 
-  $title = l10n_dec('%d new element', '%d new elements', $date_detail['nb_elements']);
+  $title = l10n_dec('%d new image', '%d new images', $date_detail['nb_elements']);
   $title .= ' ('.$lang['month'][(int)$exploded_date['month']].' '.$exploded_date['day'].')';
 
   return $title;
diff --git a/profile.php b/profile.php
index 4d7bfde96..4b3d03138 100644
--- a/profile.php
+++ b/profile.php
@@ -61,7 +61,7 @@ SELECT '.implode(',', $fields).'
 
   save_profile_from_post($userdata, $errors);
 
-  $title= l10n('Your Gallery Customization ');
+  $title= l10n('Your Gallery Customization');
   $page['body_id'] = 'theProfilePage';
   include(PHPWG_ROOT_PATH.'include/page_header.php');
 
@@ -163,7 +163,7 @@ function save_profile_from_post($userdata, &$errors)
     WHERE '.$conf['user_fields']['id'].' = \''.$userdata['id'].'\'
   ;';
       list($current_password) = pwg_db_fetch_row(pwg_query($query));
-  
+
       if ($conf['pass_convert']($_POST['password']) != $current_password)
       {
         $errors[] = l10n('Current password is wrong');
@@ -220,7 +220,7 @@ function save_profile_from_post($userdata, &$errors)
                  array($data));
 
     trigger_action( 'save_profile_from_post', $userdata['id'] );
-    
+
     if (!empty($_POST['redirect']))
     {
       redirect($_POST['redirect']);
@@ -277,7 +277,7 @@ function load_profile_in_template($url_action, $url_redirect, $userdata)
 
   // allow plugins to add their own form data to content
   trigger_action( 'load_profile_in_template', $userdata );
-  
+
   $template->assign_var_from_handle('PROFILE_CONTENT', 'profile_content');
 }
 ?>
-- 
cgit v1.2.3