Changeset 1615

Timestamp:

Nov 22, 2006, 3:49:58 AM (17 years ago)

Author:

rvelices

Message:

language cleanup (removed duplicate messages and use {lang:} instead of
template->assign_var)

Location:

trunk

Files:

• identification.php (modified) (1 diff)
• language/en_UK.iso-8859-1/common.lang.php (modified) (1 diff)
• language/fr_FR.iso-8859-1/common.lang.php (modified) (1 diff)
• register.php (modified) (1 diff)
• template/yoga/identification.tpl (modified) (5 diffs)
• template/yoga/menubar.tpl (modified) (1 diff)

trunk/identification.php

@@ -86 +86 @@
 $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',

trunk/language/en_UK.iso-8859-1/common.lang.php

@@ -463 +463 @@
 $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';

trunk/language/fr_FR.iso-8859-1/common.lang.php

@@ -462 +462 @@
 $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';

trunk/register.php

@@ -87 +87 @@
 $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(),
 

trunk/template/yoga/identification.tpl

@@ -30 +30 @@
       <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}" />
@@ -37 +37 @@
       <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" />
@@ -45 +45 @@
       <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">
@@ -53 +53 @@
   </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>
 
@@ -61 +61 @@
 
   <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>

trunk/template/yoga/menubar.tpl

@@ -74 +74 @@
     <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 -->