language cleanup (removed duplicate messages and use {lang:} instead of

template->assign_var)

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

6 files changed, 6 insertions, 28 deletions

diff --git a/identification.php b/identification.php
index 5800e109c..7a444dd51 100644
--- a/identification.php
+++ b/identification.php
@@ -85,14 +85,6 @@ $template->set_filenames( array('identification'=>'identification.tpl') );
 
 $template->assign_vars(
   array(
-    'L_TITLE' => $lang['identification'],
-    'L_USERNAME' => $lang['Username'],
-    'L_PASSWORD' => $lang['password'],
-    'L_LOGIN' => $lang['submit'],
-    'L_GUEST' => $lang['ident_guest_visit'],
-    'L_REGISTER' => $lang['ident_register'],
-    'L_FORGET' => $lang['ident_forgotten_password'],
-    'L_REMEMBER_ME'=>$lang['remember_me'],
 
     'U_REGISTER' => PHPWG_ROOT_PATH.'register.php',
     'U_LOST_PASSWORD' => PHPWG_ROOT_PATH.'password.php',
diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php
index 76b565a3f..5f6430ff2 100644
--- a/language/en_UK.iso-8859-1/common.lang.php
+++ b/language/en_UK.iso-8859-1/common.lang.php
@@ -462,9 +462,6 @@ $lang['hint_customize'] = 'customize the appareance of the gallery';
 $lang['hint_search'] = 'search';
 $lang['home'] = 'Home';
 $lang['home_hint'] = 'Back to the home page';
-$lang['ident_forgotten_password'] = 'Forget your password ?';
-$lang['ident_guest_visit'] = 'Go through the gallery as a visitor';
-$lang['ident_register'] = 'Register';
 $lang['ident_title'] = 'ident_title';
 $lang['identification'] = 'Identification';
 $lang['images_available'] = 'images in this category';
diff --git a/language/fr_FR.iso-8859-1/common.lang.php b/language/fr_FR.iso-8859-1/common.lang.php
index 9a6dbd467..45d9025b3 100644
--- a/language/fr_FR.iso-8859-1/common.lang.php
+++ b/language/fr_FR.iso-8859-1/common.lang.php
@@ -461,9 +461,6 @@ $lang['hint_customize'] = 'personnaliser l\'apparence de la galerie';
 $lang['hint_search'] = 'recherche';
 $lang['home'] = 'Accueil';
 $lang['home_hint'] = 'Retour à la page d\'accueil';
-$lang['ident_forgotten_password'] = 'Mot de passe oublié ?';
-$lang['ident_guest_visit'] = 'Parcourir la galerie en tant que visiteur';
-$lang['ident_register'] = 'S\'enregistrer';
 $lang['ident_title'] = 'Identification (FIXME)';
 $lang['identification'] = 'Identification';
 $lang['images_available'] = 'images dans cette catégorie';
diff --git a/register.php b/register.php
index c7dc95ee9..ceca0150c 100644
--- a/register.php
+++ b/register.php
@@ -86,14 +86,6 @@ include(PHPWG_ROOT_PATH.'include/page_header.php');
 
 $template->set_filenames( array('register'=>'register.tpl') );
 $template->assign_vars(array(
-  'L_TITLE' => $lang['register_title'],
-  'L_GUEST' => $lang['ident_guest_visit'],
-  'L_SUBMIT' => $lang['submit'],
-  'L_USERNAME' => $lang['login'],
-  'L_PASSWORD' => $lang['password'],
-  'L_CONFIRM_PASSWORD' => $lang['reg_confirm'],
-  'L_EMAIL' => $lang['mail_address'],
-
   'U_HOME' => make_index_url(),
 
   'F_ACTION' => 'register.php',
diff --git a/template/yoga/identification.tpl b/template/yoga/identification.tpl
index c96427aab..1a474ad18 100644
--- a/template/yoga/identification.tpl
+++ b/template/yoga/identification.tpl
@@ -29,14 +29,14 @@
     <ul>
       <li>
         <span class="property">
-          <label for="username">{L_USERNAME}</label>
+          <label for="username">{lang:Username}</label>
         </span>
         <input tabindex="1" class="login" type="text" name="username" id="username" size="25" maxlength="40" value="{USERNAME}" />
       </li>
 
       <li>
         <span class="property">
-          <label for="password">{L_PASSWORD}</label>
+          <label for="password">{lang:password}</label>
         </span>
         <input tabindex="2" class="login" type="password" name="password" id="password" size="25" maxlength="25" />
       </li>
@@ -44,7 +44,7 @@
       <!-- BEGIN remember_me -->
       <li>
         <span class="property">
-          <label for="remember_me">{L_REMEMBER_ME}</label>
+          <label for="remember_me">{lang:remember_me}</label>
         </span>
         <input tabindex="3" type="checkbox" name="remember_me" id="remember_me" value="1">
       </li>
@@ -52,7 +52,7 @@
     </ul>
   </fieldset>
 
-  <p><input tabindex="4" type="submit" name="login" value="{L_LOGIN}"></p>
+  <p><input tabindex="4" type="submit" name="login" value="{lang:submit}"></p>
 </form>
 
 <script type="text/javascript"><!--
@@ -60,7 +60,7 @@ document.login_form.username.focus();
 //--></script>
 
   <p>
-    <a href="{U_REGISTER}"><img src="{themeconf:icon_dir}/register.png" class="button" alt=""> {L_REGISTER}</a>
+    <a href="{U_REGISTER}"><img src="{themeconf:icon_dir}/register.png" class="button" alt=""> {lang:Register}</a>
     <a href="{U_LOST_PASSWORD}"><img src="{themeconf:icon_dir}/lost_password.png" class="button" alt=""> {lang:Forgot your password?}</a>
   </p>
 
diff --git a/template/yoga/menubar.tpl b/template/yoga/menubar.tpl
index cb613ec2e..bb7bc2db2 100644
--- a/template/yoga/menubar.tpl
+++ b/template/yoga/menubar.tpl
@@ -73,7 +73,7 @@
     <!-- END hello -->
     <ul>
       <!-- BEGIN register -->
-      <li><a href="{U_REGISTER}" rel="nofollow">{lang:ident_register}</a></li>
+      <li><a href="{U_REGISTER}" rel="nofollow">{lang:Register}</a></li>
       <!-- END register -->
       <!-- BEGIN login -->
       <li><a href="{F_IDENTIFY}" rel="nofollow">{lang:Connection}</a></li>