Replace some $lang by l10n

Merge BSF 2013:2014 into branch-1_7

git-svn-id: http://piwigo.org/svn/branches/branch-1_7@2015 68402e56-0260-453c-a942-63ccdbb3a9ee

7 files changed, 20 insertions, 28 deletions

diff --git a/about.php b/about.php
index cb23cf1fa..5ac379ce5 100644
--- a/about.php
+++ b/about.php
@@ -2,10 +2,9 @@
 // +-----------------------------------------------------------------------+
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
+// | file          : $Id$
 // | last update   : $Date$
 // | last modifier : $Author$
 // | revision      : $Revision$
@@ -38,7 +37,7 @@ check_status(ACCESS_GUEST);
 //
 // Start output of page
 //
-$title= $lang['about_page_title'];
+$title= l10n('about_page_title');
 $page['body_id'] = 'theAboutPage';
 include(PHPWG_ROOT_PATH.'include/page_header.php');
 
diff --git a/identification.php b/identification.php
index b0d259841..ac546a642 100644
--- a/identification.php
+++ b/identification.php
@@ -2,10 +2,9 @@
 // +-----------------------------------------------------------------------+
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
+// | file          : $Id$
 // | last update   : $Date$
 // | last modifier : $Author$
 // | revision      : $Revision$
@@ -43,7 +42,7 @@ if ( !empty($_GET['redirect']) )
   $redirect_to = urldecode($_GET['redirect']);
   if ( $user['is_the_guest'] )
   {
-    array_push($errors, $lang['access_forbiden']);
+    array_push($errors, l10n('access_forbiden'));
   }
 }
 
@@ -57,7 +56,7 @@ if (isset($_POST['login']))
   }
   else
   {
-    array_push( $errors, $lang['invalid_pwd'] );
+    array_push( $errors, l10n('invalid_pwd') );
   }
 }
 
@@ -65,7 +64,7 @@ if (isset($_POST['login']))
 //
 // Start output of page
 //
-$title = $lang['identification'];
+$title = l10n('identification');
 $page['body_id'] = 'theIdentificationPage';
 include(PHPWG_ROOT_PATH.'include/page_header.php');
 
diff --git a/nbm.php b/nbm.php
index 1a7a3ff9a..defa68fa3 100644
--- a/nbm.php
+++ b/nbm.php
@@ -5,8 +5,7 @@
 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // | Copyright (C) 2006-2007   Ruben ARNAUD - team@phpwebgallery.net       |
 // +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
+// | file          : $Id$
 // | last update   : $Date$
 // | last modifier : $Author$
 // | revision      : $Revision$
@@ -61,15 +60,13 @@ if (isset($_GET['unsubscribe'])
 }
 else
 {
-/*  echo l10n('nbm_unknown_identifier');
-  exit();*/
   array_push($page['errors'], l10n('nbm_unknown_identifier'));
 }
 
 // +-----------------------------------------------------------------------+
 // | template initialization                                               |
 // +-----------------------------------------------------------------------+
-$title = $lang['nbm_item_notification'];
+$title = l10n('nbm_item_notification');
 $page['body_id'] = 'theNBMPage';
 include(PHPWG_ROOT_PATH.'include/page_header.php');
 
diff --git a/picture.php b/picture.php
index 71fb2d3eb..216355be4 100644
--- a/picture.php
+++ b/picture.php
@@ -4,7 +4,6 @@
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
 // | file          : $Id$
 // | last update   : $Date$
 // | last modifier : $Author$
@@ -598,8 +597,8 @@ SELECT COUNT(*) AS nb_fav
       array(
         'FAVORITE_IMG'  =>
           get_root_url().get_themeconf('icon_dir').'/favorite.png',
-        'FAVORITE_HINT' => $lang['add_favorites_hint'],
-        'FAVORITE_ALT'  => $lang['add_favorites_alt'],
+        'FAVORITE_HINT' => l10n('add_favorites_hint'),
+        'FAVORITE_ALT'  => l10n('add_favorites_alt'),
         'U_FAVORITE'    => add_url_params(
           $url_self,
           array('action'=>'add_to_favorites')
@@ -614,8 +613,8 @@ SELECT COUNT(*) AS nb_fav
       array(
         'FAVORITE_IMG'  =>
           get_root_url().get_themeconf('icon_dir').'/del_favorite.png',
-        'FAVORITE_HINT' => $lang['del_favorites_hint'],
-        'FAVORITE_ALT'  => $lang['del_favorites_alt'],
+        'FAVORITE_HINT' => l10n('del_favorites_hint'),
+        'FAVORITE_ALT'  => l10n('del_favorites_alt'),
         'U_FAVORITE'    => add_url_params(
           $url_self,
           array('action'=>'remove_from_favorites')
diff --git a/profile.php b/profile.php
index d612038d0..127ba3cc8 100644
--- a/profile.php
+++ b/profile.php
@@ -4,7 +4,6 @@
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
 // | file          : $Id$
 // | last update   : $Date$
 // | last modifier : $Author$
@@ -44,7 +43,7 @@ if (!defined('PHPWG_ROOT_PATH'))
 
   save_profile_from_post($userdata, $errors);
 
-  $title= $lang['customize_page_title'];
+  $title= l10n('customize_page_title');
   $page['body_id'] = 'theProfilePage';
   include(PHPWG_ROOT_PATH.'include/page_header.php');
 
diff --git a/register.php b/register.php
index 74980a156..eed28b847 100644
--- a/register.php
+++ b/register.php
@@ -45,7 +45,7 @@ if (isset($_POST['submit']))
 {
   if ($_POST['password'] != $_POST['password_conf'])
   {
-    array_push($errors, $lang['reg_err_pass']);
+    array_push($errors, l10n('reg_err_pass'));
   }
 
   $errors =
@@ -91,7 +91,7 @@ $email = !empty($_POST['mail_address'])?$_POST['mail_address']:'';
 //
 // Start output of page
 //
-$title= $lang['register_page_title'];
+$title= l10n('register_page_title');
 $page['body_id'] = 'theRegisterPage';
 include(PHPWG_ROOT_PATH.'include/page_header.php');
 
diff --git a/search.php b/search.php
index 7f011977f..31dea2605 100644
--- a/search.php
+++ b/search.php
@@ -4,8 +4,7 @@
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
+// | file          : $Id$
 // | last update   : $Date$
 // | last modifier : $Author$
 // | revision      : $Revision$
@@ -144,7 +143,7 @@ INSERT INTO '.SEARCH_TABLE.'
   }
   else
   {
-    array_push($errors, $lang['search_one_clause_at_least']);
+    array_push($errors, l10n('search_one_clause_at_least'));
   }
 }
 //----------------------------------------------------------------- redirection
@@ -171,7 +170,7 @@ get_month_list('end_month', @$_POST['end_month']);
 //
 // Start output of page
 //
-$title= $lang['search_title'];
+$title= l10n('search_title');
 $page['body_id'] = 'theSearchPage';
 
 $template->set_filenames( array('search'=>'search.tpl') );