language: cleanup unused, uniformization and no more L_ variables in

category.php and tpl

git-svn-id: http://piwigo.org/svn/trunk@1083 68402e56-0260-453c-a942-63ccdbb3a9ee

7 files changed, 34 insertions, 58 deletions

diff --git a/category.php b/category.php
index b467836e8..cf41e75ab 100644
--- a/category.php
+++ b/category.php
@@ -145,7 +145,7 @@ if (!isset($page['chronology_type']))
       'URL' => $calendar_view_link.'created'
       )
     );
-  
+
   $template->assign_block_vars(
     'mode_posted',
     array(
@@ -191,29 +191,9 @@ $template->assign_vars(
     'TOP_NUMBER' => $conf['top_number'],
     'MENU_CATEGORIES_CONTENT' => get_categories_menu(),
 
-    'L_CATEGORIES' => $lang['categories'],
-    'L_HINT_CATEGORY' => $lang['hint_category'],
-    'L_SUBCAT' => $lang['sub-cat'],
-    'L_IMG_AVAILABLE' => $lang['images_available'],
-    'L_TOTAL' => $lang['total'],
-    'L_SPECIAL_CATEGORIES' => $lang['special_categories'],
-    'L_SUMMARY' => $lang['title_menu'],
-    'L_UPLOAD' => $lang['upload_picture'],
-    'L_COMMENT' => $lang['comments'],
-    'L_IDENTIFY' => $lang['identification'],
-    'L_PASSWORD' => $lang['password'],
-    'L_HELLO' => $lang['hello'],
-    'L_REGISTER' => $lang['ident_register'],
-    'L_LOGOUT' => $lang['logout'],
-    'L_ADMIN' => $lang['admin'],
-    'L_ADMIN_HINT' => $lang['hint_admin'],
-    'L_PROFILE' => $lang['customize'],
-    'L_PROFILE_HINT' => $lang['hint_customize'],
-    'L_REMEMBER_ME' => $lang['remember_me'],
-    
     'F_IDENTIFY' => PHPWG_ROOT_PATH.'identification.php',
     'T_RECENT' => $icon_recent,
-    
+
     'U_HOME' => make_index_URL(),
     'U_REGISTER' => PHPWG_ROOT_PATH.'register.php',
     'U_LOST_PASSWORD' => PHPWG_ROOT_PATH.'password.php',
@@ -479,7 +459,7 @@ if (isset($page['category']))
         )
       );
   }
-  
+
   // category comment
   if (isset($page['comment']) and $page['comment'] != '')
   {
diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php
index 9e1459257..71a28413e 100644
--- a/language/en_UK.iso-8859-1/common.lang.php
+++ b/language/en_UK.iso-8859-1/common.lang.php
@@ -137,7 +137,6 @@ $lang['calendar_monthly_c'] = 'Monthly calendar';
 $lang['calendar_picture_hint'] = 'displays pictures added on ';
 $lang['calendar_view'] = 'View';
 $lang['calendar_weekly_l'] = 'Weekly list';
-$lang['categories'] = 'Categories';
 $lang['click_to_redirect'] = 'Click here if your browser does not automatically forward you';
 $lang['comment date'] = 'comment date';
 $lang['comment'] = 'Comment';
@@ -177,7 +176,7 @@ $lang['edit'] = 'edit';
 $lang['err_date'] = 'wrong date';
 $lang['excluded'] = 'excluded';
 $lang['favorite_cat'] = 'My favorites';
-$lang['favorite_cat_hint'] = 'display my favorites pictures';
+$lang['favorite_cat_hint'] = 'displays my favorites pictures';
 $lang['favorites'] = 'Favorites';
 $lang['first_page'] = 'First';
 $lang['gallery_locked_message'] = 'The gallery is locked for maintenance. Please, come back later.';
@@ -252,13 +251,13 @@ $lang['powered_by'] = 'Powered by';
 $lang['preferences'] = 'Preferences';
 $lang['previous_page'] = 'Previous';
 $lang['random_cat'] = 'Random pictures';
-$lang['random_cat_hint'] = 'Displays a set of random pictures';
+$lang['random_cat_hint'] = 'displays a set of random pictures';
 $lang['recent_cats_cat'] = 'Last categories';
-$lang['recent_cats_cat_hint'] = 'Displays recently updated categories';
+$lang['recent_cats_cat_hint'] = 'displays recently updated categories';
 $lang['recent_image'] = 'Image within the';
 $lang['recent_period'] = 'Recent period';
 $lang['recent_pics_cat'] = 'Last pictures';
-$lang['recent_pics_cat_hint'] = 'Displays most recent pictures';
+$lang['recent_pics_cat_hint'] = 'displays most recent pictures';
 $lang['reg_confirm'] = 'Confirm password';
 $lang['reg_err_login1'] = 'Please, enter a login';
 $lang['reg_err_login2'] = 'login mustn\'t end with a space character';
@@ -300,7 +299,6 @@ $lang['slideshow'] = 'slideshow';
 $lang['slideshow_stop'] = 'stop the slideshow';
 $lang['special_categories'] = 'Specials';
 $lang['sql_queries_in'] = 'SQL queries in';
-$lang['sub-cat'] = 'subcategories';
 $lang['submit'] = 'Submit';
 $lang['the beginning'] = 'the beginning';
 $lang['theme'] = 'Interface theme';
diff --git a/language/fr_FR.iso-8859-1/common.lang.php b/language/fr_FR.iso-8859-1/common.lang.php
index c14341f1e..49adaee76 100644
--- a/language/fr_FR.iso-8859-1/common.lang.php
+++ b/language/fr_FR.iso-8859-1/common.lang.php
@@ -126,17 +126,16 @@ $lang['became available before %s (%s)'] = 'mis à disposition avant le %s (%s)';
 $lang['became available between %s (%s) and %s (%s)'] = 'mis à disposition entre le %s (%s) et le %s (%s)';
 $lang['became available on %s'] = 'mis à disposition le %s';
 $lang['best_rated_cat'] = 'Mieux notées';
-$lang['best_rated_cat_hint'] = 'affiche les images les mieux notées';
+$lang['best_rated_cat_hint'] = 'afficher les images les mieux notées';
 $lang['caddie'] = 'Panier';
 $lang['calendar'] = 'Calendrier';
 $lang['calendar_any'] = 'Tout';
 $lang['calendar_hint'] = 'affichage année par année, mois par mois, jour par jour';
 $lang['calendar_monthly_l'] = 'Liste mensuelle';
 $lang['calendar_monthly_c'] = 'Calendrier mensuel';
-$lang['calendar_picture_hint'] = 'affiche les images du ';
+$lang['calendar_picture_hint'] = 'afficher les images du ';
 $lang['calendar_view'] = 'Vue';
 $lang['calendar_weekly_l'] = 'Liste hebdomadaire';
-$lang['categories'] = 'Catégories';
 $lang['click_to_redirect'] = 'Cliquez ici si votre navigateur ne vous redirige pas.';
 $lang['comment date'] = 'date du commentaire';
 $lang['comment'] = 'Commentaire';
@@ -211,8 +210,8 @@ $lang['maxheight_error'] = 'La hauteur maximum des images doit être supérieure à
 $lang['maxwidth'] = 'Largeur maximum des images';
 $lang['maxwidth_error'] = 'La largeur des images doit être supérieure à 50';
 $lang['mode_normal_hint'] = 'retourne à la vue normale';
-$lang['mode_created_hint'] = 'affiche un calendrier par date de création';
-$lang['mode_posted_hint'] = 'affiche un calendrier par date d\'ajout';
+$lang['mode_created_hint'] = 'afficher un calendrier par date de création';
+$lang['mode_posted_hint'] = 'afficher un calendrier par date d\'ajout';
 $lang['month'][10] = 'Octobre';
 $lang['month'][11] = 'Novembre';
 $lang['month'][12] = 'Decembre';
@@ -251,13 +250,13 @@ $lang['powered_by'] = 'Propulsé par';
 $lang['preferences'] = 'Préférences';
 $lang['previous_page'] = 'Précédent';
 $lang['random_cat'] = 'Images au hasard';
-$lang['random_cat_hint'] = 'Affiche un ensemble aléatoire d\'images';
+$lang['random_cat_hint'] = 'afficher un ensemble aléatoire d\'images';
 $lang['recent_cats_cat'] = 'Dernières catégories';
-$lang['recent_cats_cat_hint'] = 'Affiche les catégories récemment mises à jour ou créées';
+$lang['recent_cats_cat_hint'] = 'afficher les catégories récemment mises à jour ou créées';
 $lang['recent_image'] = 'Image de moins de';
 $lang['recent_period'] = 'Période récente';
 $lang['recent_pics_cat'] = 'Dernières images';
-$lang['recent_pics_cat_hint'] = 'Affiche les images les plus récentes';
+$lang['recent_pics_cat_hint'] = 'afficher les images les plus récentes';
 $lang['reg_confirm'] = 'Confirmer le mot de passe';
 $lang['reg_err_login1'] = 'S\'il vous plaît, entrer un nom utilisateur';
 $lang['reg_err_login2'] = 'le nom utilisateur ne doit pas terminer par un espace';
@@ -300,7 +299,6 @@ $lang['slideshow'] = 'diaporama';
 $lang['slideshow_stop'] = 'arrêter le diaporama';
 $lang['special_categories'] = 'Spéciales';
 $lang['sql_queries_in'] = 'requêtes SQL en';
-$lang['sub-cat'] = 'sous-catégories';
 $lang['submit'] = 'Valider';
 $lang['the beginning'] = 'le début';
 $lang['theme'] = 'Thème de l\'interface';
diff --git a/search_rules.php b/search_rules.php
index ef51ffe49..3319dc17b 100644
--- a/search_rules.php
+++ b/search_rules.php
@@ -110,7 +110,7 @@ if (isset($search['fields']['cat']))
   $template->assign_block_vars(
     'categories',
     array(
-      'LIST_INTRO' => l10n('categories'),
+      'LIST_INTRO' => l10n('Categories'),
       )
     );
 
diff --git a/template/yoga/admin.tpl b/template/yoga/admin.tpl
index b548d3bf4..ca789c1d0 100644
--- a/template/yoga/admin.tpl
+++ b/template/yoga/admin.tpl
@@ -31,7 +31,7 @@
       </ul>
     </dd>
 
-    <dt>{lang:categories}</dt>
+    <dt>{lang:Categories}</dt>
     <dd>
       <ul>
 	<li><a href="{U_CATEGORIES}">{lang:manage}</a></li>
diff --git a/template/yoga/admin/site_manager.tpl b/template/yoga/admin/site_manager.tpl
index 91a81f268..9ceb369aa 100644
--- a/template/yoga/admin/site_manager.tpl
+++ b/template/yoga/admin/site_manager.tpl
@@ -20,11 +20,11 @@
 <table border="1" cellpadding="0" cellspacing="0">
   <!-- BEGIN site -->
   <tr align="left"><td>
-    <a href="{sites.site.NAME}" target="_blank">{sites.site.NAME}</a><br>({sites.site.TYPE}, {sites.site.CATEGORIES} {lang:categories}, {sites.site.IMAGES} {lang:picture}s)
-  </td><td>  
+    <a href="{sites.site.NAME}" target="_blank">{sites.site.NAME}</a><br>({sites.site.TYPE}, {sites.site.CATEGORIES} {lang:Categories}, {sites.site.IMAGES} {lang:picture}s)
+  </td><td>
     [<a href="{sites.site.U_SYNCHRONIZE}" title="{lang:site_synchronize_hint}">{lang:site_synchronize}</a>]
     <!-- BEGIN delete -->
-      [<a href="{sites.site.delete.U_DELETE}" onclick="return confirm('{lang:Are you sure?}');" 
+      [<a href="{sites.site.delete.U_DELETE}" onclick="return confirm('{lang:Are you sure?}');"
                 title="{lang:site_delete_hint}">{lang:site_delete}</a>]
     <!-- END delete -->
     <!-- BEGIN remote -->
@@ -40,7 +40,7 @@
 
 <form action="{F_ACTION}" method="post">
   <p>
-    <label for="galleries_url" >{lang:site_create}</label> 
+    <label for="galleries_url" >{lang:site_create}</label>
     <input type="text" name="galleries_url" id="galleries_url" />
   </p>
   <p>
diff --git a/template/yoga/category.tpl b/template/yoga/category.tpl
index 7d75751c2..35cb29c88 100644
--- a/template/yoga/category.tpl
+++ b/template/yoga/category.tpl
@@ -13,14 +13,14 @@
 </dl>
 <!-- END links -->
 <dl>
-  <dt><a href="{U_HOME}">{L_CATEGORIES}</a></dt>
+  <dt><a href="{U_HOME}">{lang:Categories}</a></dt>
   <dd>
     {MENU_CATEGORIES_CONTENT}
-    <p class="totalImages">{NB_PICTURE} {L_TOTAL}</p>
+    <p class="totalImages">{NB_PICTURE} {lang:total}</p>
   </dd>
 </dl>
 <dl>
-  <dt>{L_SPECIAL_CATEGORIES}</dt>
+  <dt>{lang:special_categories}</dt>
   <dd>
     <ul>
       <!-- BEGIN special_cat -->
@@ -30,39 +30,39 @@
   </dd>
 </dl>
 <dl>
-  <dt>{L_SUMMARY}</dt>
+  <dt>{lang:title_menu}</dt>
   <dd>
     <ul>
       <!-- BEGIN summary -->
       <li><a href="{summary.U_SUMMARY}" title="{summary.TITLE}" {summary.REL}>{summary.NAME}</a></li>
       <!-- END summary -->
       <!-- BEGIN upload -->
-      <li><a href="{upload.U_UPLOAD}">{L_UPLOAD}</a></li>
+      <li><a href="{upload.U_UPLOAD}">{lang:upload_picture}</a></li>
       <!-- END upload -->
     </ul>
   </dd>
 </dl>
 <dl>
-  <dt>{L_IDENTIFY}</dt>
+  <dt>{lang:identification}</dt>
   <dd>
     <!-- BEGIN hello -->
-    <p>{L_HELLO}&nbsp;{USERNAME}&nbsp;!</p>
+    <p>{lang:hello}&nbsp;{USERNAME}&nbsp;!</p>
     <!-- END hello -->
     <ul>
       <!-- BEGIN register -->
-      <li><a href="{U_REGISTER}" rel="nofollow">{L_REGISTER}</a></li>
+      <li><a href="{U_REGISTER}" rel="nofollow">{lang:ident_register}</a></li>
       <!-- END register -->
       <!-- BEGIN login -->
       <li><a href="{F_IDENTIFY}" rel="nofollow">{lang:Connection}</a></li>
       <!-- END login -->
       <!-- BEGIN logout -->
-      <li><a href="{U_LOGOUT}">{L_LOGOUT}</a></li>
+      <li><a href="{U_LOGOUT}">{lang:logout}</a></li>
       <!-- END logout -->
       <!-- BEGIN profile -->
-      <li><a href="{U_PROFILE}" title="{L_PROFILE_HINT}">{L_PROFILE}</a></li>
+      <li><a href="{U_PROFILE}" title="{lang:hint_customize}">{lang:customize}</a></li>
       <!-- END profile -->
       <!-- BEGIN admin -->
-      <li><a href="{U_ADMIN}" title="{L_ADMIN_HINT}">{L_ADMIN}</a></li>
+      <li><a href="{U_ADMIN}" title="{lang:hint_admin}">{lang:admin}</a></li>
       <!-- END admin -->
     </ul>
     <!-- BEGIN quickconnect -->
@@ -76,13 +76,13 @@
         </label>
 
         <label>
-          {L_PASSWORD}
+          {lang:password}
           <input type="password" name="password" size="15">
         </label>
 
         <!-- BEGIN remember_me -->
         <label>
-          {L_REMEMBER_ME}
+          {lang:remember_me}
           <input type="checkbox" name="remember_me" value="1">
         </label>
         <!-- END remember_me -->
@@ -203,7 +203,7 @@
       <!-- END category_name -->
       {thumbnails.line.thumbnail.IMAGE_TS}
       <!-- BEGIN nb_comments -->
-      <br />{thumbnails.line.thumbnail.nb_comments.NB_COMMENTS} {L_COMMENT}
+      <br />{thumbnails.line.thumbnail.nb_comments.NB_COMMENTS} {lang:comments}
       <!-- END nb_comments -->
       </span>
     </span>