nacho       01/11/25 12:50:19

  Modified:    webapp/WEB-INF/templates/vm/navigations/html top.vm left.vm
               webapp/WEB-INF/templates/vm/screens/html NewAccount.vm
                        EditAccount.vm
               webapp/WEB-INF/templates/vm/emails new-user-confirmation.vm
  Log:
  First round at l10n of default templates..There are open
  positions for this job, there are a bunch of templates and jsp :
  
  Revision  Changes    Path
  1.4       +9 -9      jakarta-jetspeed/webapp/WEB-INF/templates/vm/navigations/html/top.vm
  
  Index: top.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/navigations/html/top.vm,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- top.vm	2001/07/22 20:32:47	1.3
  +++ top.vm	2001/11/25 20:50:18	1.4
  @@ -3,13 +3,13 @@
   <table cellspacing="2" border="0">
   <tr>
     <td align="center">
  -  Welcome to Jetspeed -> <a href="$link">Home</a> <br />
  +  $l10n.TOP_TITLE<a href="$link">$l10n.HOME</a> <br />
     <!-- this is a temporary link while the profile customization is not in place -->
  -  <a href="$link.setAction("controls.Customize")">Customize</a>
  +  <a href="$link.setAction("controls.Customize")">$l10n.TOP_CUSTOMIZE</a>
     &nbsp;&nbsp;&nbsp;
  -  <a href="$link.setPage("EditAccount")">Edit Account ($data.User.UserName)</a>
  +  <a href="$link.setPage("EditAccount")">$l10n.TOP_EDITACCOUNT ($data.User.UserName)</a>
     &nbsp;&nbsp;&nbsp;
  -  <a href="$link.setAction("LogoutUser")">Logout</a>
  +  <a href="$link.setAction("LogoutUser")">$l10n.TOP_LOGOUT</a>
     &nbsp;&nbsp;&nbsp;
     </td>
   </tr>
  @@ -18,24 +18,24 @@
   <table cellspacing="2" border="0">
   <tr>
     <td valign="middle">
  -    Welcome to Jetspeed -> <a href="$link">Home</a><br />
  -    <small><a href="$link.setPage("NewAccount")">Create a new account</a></small>
  +    $l10n.TOP_TITLE<a href="$link">$l10n.HOME</a><br />
  +    <small><a href="$link.setPage("NewAccount")">$l10n.TOP_CREATENEWACCOUNT</a></small>
     </td>
     <td valign="middle">
       <form method="POST" action="$link" enctype="application/x-www-form-urlencoded">
       <input name="$jlink.ActionKey" type="hidden" value="$config.getString("action.login")" />
       <table border="0" cellspacing="2" cellpadding="1">
         <tr>
  -        <td><small>Username:</small></td>
  +        <td><small>$l10n.USERFORM_USERNAMEMSG</small></td>
           <td><small><input size="10" value="$!data.Parameters.getString("username")" name="username" maxlength="25" type="text" /></small></td>
         </tr>
         <tr>
  -        <td><small>Password:</small></td>
  +        <td><small>$l10n.USERFORM_PASSWORDMSG</small></td>
           <td><small><input size="10" value="" name="password" maxlength="25" type="password" /></small></td>
         </tr>
         <tr>
           <td colspan="2" align="center">
  -          <small><input name="submit" type="submit" value="Login" /></small>
  +          <small><input name="submit" type="submit" value="$l10n.TOP_LOGINBTN" /></small>
           </td>
         </tr>
       </table>  
  
  
  
  1.3       +2 -2      jakarta-jetspeed/webapp/WEB-INF/templates/vm/navigations/html/left.vm
  
  Index: left.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/navigations/html/left.vm,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- left.vm	2001/07/22 20:32:47	1.2
  +++ left.vm	2001/11/25 20:50:18	1.3
  @@ -2,14 +2,14 @@
     <tr>
       <td>
         <a href="$link">
  -        <small>Home</small>
  +        <small>$l10n.HOME</small>
         </a>
       </td>
     </tr>
     <tr>
       <td>
         <a href="$clink.setURI("docs/")">
  -        <small>Documentation</small>
  +        <small>$l10n.LEFT_DOCUMENTATION</small>
         </a>
       </td>
     </tr>
  
  
  
  1.5       +34 -36    jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/NewAccount.vm
  
  Index: NewAccount.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/NewAccount.vm,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- NewAccount.vm	2001/11/19 07:54:42	1.4
  +++ NewAccount.vm	2001/11/25 20:50:19	1.5
  @@ -7,56 +7,54 @@
       <table cellpadding="4" cellspacing="0" border="0">
       <tr>
         <td>
  -        <h2>Create a new Jetspeed account</h2>
  -        <p>
  -          To create a new account, please fill in all of the fields below. <br />
  +        <h2>$l10n.NEWACCOUNT_TITLE</h2>
  +        <p>$l10n.NEWACCOUNT_NOTICE<br />
             #if ( $config.getString("new.user.approval") != "on" )
               #if ( $config.getString("confirm.email.enable") == "true" )
  -              After your account has been created, you will receive an email with a confirmation key. <br />
  -              Enter the confirmation key that you received in the email on the next screen in order to confirm your registration with the system. <br />
  +                $l10n.NEWACCOUNT_CONFIRMATION
               #end
             #else
  -            After your account has been created it will be passed to someone to deal with. <br />
  +              $l10n.NEWACCOUNT_APPROVAL<br />
             #end
  -          <b>A valid email address is required!</b>
  +          <b>$l10n.NEWACCOUNT_INFOEMAILMSG</b>
           </p>
   #if ($data.Message)
           <b>$data.Message</b>
           <p />
   #end
           <table cellpadding="0" cellspacing="0" border="0">
  +            <tr>
  +              <td> $l10n.USERFORM_USERNAMEMSG </td>
  +              <td> <input name="username" type="TEXT" value="$!data.Parameters.getString("username")" />  </td>
  +            </tr>
  +            <tr>
  +              <td> $l10n.USERFORM_PASSWORDMSG </td>
  +              <td> <input name="password" type="PASSWORD" value="" /> </td>
  +            </tr>
  +            <tr>
  +              <td> $l10n.USERFORM_PASSWORDCONFIRMMSG </td>
  +              <td> <input name="password_confirm" type="PASSWORD" value="" /> </td>
  +            </tr>
  +            <tr>
  +              <td colspan="2"> <hr size="1" noshade /> </td>
  +            </tr>
  +            <tr>
  +              <td> $l10n.USERFORM_FIRSTNAMEMSG </td>
  +              <td> <input name="firstname" type="TEXT" value="$!data.Parameters.getString("firstname")" /> </td> 
  +            </tr>
  +            <tr>
  +              <td> $l10n.USERFORM_LASTNAMEMSG </td>
  +              <td> <input name="lastname" type="TEXT" value="$!data.Parameters.getString("lastname")" /> </td>
  +            </tr>
  +            <tr>
  +              <td> $l10n.USERFORM_EMAILMSG </td>
  +              <td> <input name="email" type="TEXT" value="$!data.Parameters.getString("email")" /> </td>
  +            </tr> 
             <tr>
  -            <td> Username: </td>
  -            <td> <input name="username" type="TEXT" value="$!data.Parameters.getString("username")" /> </td>
  -          </tr>
  -          <tr>
  -            <td> Password: </td>
  -            <td> <input name="password" type="PASSWORD" value="" /> </td>
  -          </tr>
  -          <tr>
  -            <td> Password (confirm): </td>
  -            <td> <input name="password_confirm" type="PASSWORD" value="" /> </td>
  -          </tr>
  -          <tr>
  -            <td colspan="2"> <hr size="1" noshade /> </td>
  -          </tr>
  -          <tr>
  -            <td> First Name: </td>
  -            <td> <input name="firstname" type="TEXT" value="$!data.Parameters.getString("firstname")" /> </td> 
  -          </tr>
  -          <tr>
  -            <td> Last Name: </td>
  -            <td> <input name="lastname" type="TEXT" value="$!data.Parameters.getString("lastname")" /> </td>
  -          </tr>
  -          <tr>
  -            <td> Email: </td>
  -            <td> <input name="email" type="TEXT" value="$!data.Parameters.getString("email")" /> </td>
  -          </tr> 
  -          <tr>
               <td colspan="2" align="right">
  -              <input name="submit1" type="reset"  value="Reset" />
  +              <input name="submit1" type="reset"  value="$l10n.USERFORM_RESET" />
                 &nbsp;
  -              <input name="submit2" type="submit" value="Create New Account" />
  +              <input name="submit2" type="submit" value="$l10n.USERFORM_CREATE" />
               </td>
             </tr>
           </table>
  
  
  
  1.4       +9 -9      jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/EditAccount.vm
  
  Index: EditAccount.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/EditAccount.vm,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- EditAccount.vm	2001/07/22 20:32:47	1.3
  +++ EditAccount.vm	2001/11/25 20:50:19	1.4
  @@ -8,43 +8,43 @@
       <table cellpadding="4" cellspacing="0" border="0">
         <tr>
           <td>
  -          <h2><u>Edit your account details</u></h2>
  +          <h2><u>$l10n.EDITACCOUNT_TITLE</u></h2>
   #if ($data.Message)
             <p><b>$data.Message</b></p>
   #end
             <table cellpadding="0" cellspacing="0" border="0">
               <tr>
  -              <td> Username: </td>
  +              <td> $l10n.USERFORM_USERNAMEMSG </td>
                 <td> $data.User.UserName </td>
               </tr>
               <tr>
  -              <td> Password: </td>
  +              <td> $l10n.USERFORM_PASSWORDMSG </td>
                 <td> <input name="password" type="PASSWORD" value="" /> </td>
               </tr>
               <tr>
  -              <td> Password (confirm): </td>
  +              <td> $l10n.USERFORM_PASSWORDCONFIRMMSG </td>
                 <td> <input name="password_confirm" type="PASSWORD" value="" /> </td>
               </tr>
               <tr>
                 <td colspan="2"> <hr size="1" noshade /> </td>
               </tr>
               <tr>
  -              <td> First Name: </td>
  +              <td> $l10n.USERFORM_FIRSTNAMEMSG </td>
                 <td> <input name="firstname" type="TEXT" value="$!data.User.FirstName" /> </td> 
               </tr>
               <tr>
  -              <td> Last Name: </td>
  +              <td> $l10n.USERFORM_LASTNAMEMSG </td>
                 <td> <input name="lastname" type="TEXT" value="$!data.User.LastName" /> </td>
               </tr>
               <tr>
  -              <td> Email: </td>
  +              <td> $l10n.USERFORM_EMAILMSG </td>
                 <td> <input name="email" type="TEXT" value="$!data.User.Email" /> </td>
               </tr> 
               <tr>
                 <td colspan="2" align="right">
  -                <input name="cancelBtn" type="submit" value="Cancel" />
  +                <input name="cancelBtn" type="submit" value="$l10n.USERFORM_CANCEL" />
                   &nbsp;
  -                <input name="submit2"   type="submit" value="Update Account" />
  +                <input name="submit2"   type="submit" value="$l10n.USERFORM_UPDATE" />
                 </td>
               </tr>
           </table>
  
  
  
  1.2       +5 -7      jakarta-jetspeed/webapp/WEB-INF/templates/vm/emails/new-user-confirmation.vm
  
  Index: new-user-confirmation.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/emails/new-user-confirmation.vm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- new-user-confirmation.vm	2001/11/19 07:45:50	1.1
  +++ new-user-confirmation.vm	2001/11/25 20:50:19	1.2
  @@ -1,19 +1,17 @@
   ## Set Email headers 
   #set ($ignored = $email.addTo($user.Email, "$!{user.FirstName} $!{user.LastName}") )
   #set ($ignored = $email.setFrom($config.getString("newuser.confirm.email.from"),$config.getString("newuser.confirm.email.name") ))
  -#set ($ignored = $email.setSubject("Jetspeed new user registration"))
  +#set ($ignored = $email.setSubject($l10n.SENDCONFIRMATIONEMAIL_SUBJECT))
   ##
  -Dear $!{user.FirstName} $!{user.LastName},
  -Welcome to the Jetspeed Portal from Apache.  Your new account has been 
  -created.  Please login using the following secret key to confirm you 
  -registration:
  +$l10n.SENDCONFIRMATIONEMAIL_HEADER $!{user.FirstName} $!{user.LastName},
  +$l10n.SENDCONFIRMATIONEMAIL_BODY1
   
     ${user.Confirmed}
   
   #if (${urltojetspeed})
  -You can go to the following URL to confirm your account:
  +$l10n.SENDCONFIRMATIONEMAIL_BODY2
     ${urltojetspeed}
   #end
   
  -Regards,
  +$l10n.SENDCONFIRMATIONEMAIL_FOOT
   $config.getString("newuser.confirm.email.name")
  
  
  

--
To unsubscribe, e-mail:   <mailto:jetspeed-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:jetspeed-dev-help@jakarta.apache.org>