Changeset 627

Timestamp:

07/05/08 01:09:56 (3 months ago)

Author:

aarkerio

Message:

Internatiantilzation

Location:

trunk/app

Files:

• controllers/forums_controller.php (modified) (6 diffs)
• controllers/users_controller.php (modified) (5 diffs)
• locale/spa/LC_MESSAGES/default.po (modified) (5 diffs)
• views/users/admin_edit.ctp (modified) (2 diffs)
• views/users/register.ctp (modified) (3 diffs)

trunk/app/controllers/forums_controller.php

@@ -119 +119 @@
  public function admin_topics( $f_id )
  {  
-    $forum_id = (int) $f_id;
-    
-    if ( !is_int($forum_id) )
-    {
-      $this->redirect('/');
-    }
+    $forum_id = (int) $f_id;
+    
+    if ( !is_int($forum_id) ):
+       $this->redirect('/');
+       return false;
+    endif;
     
     $this->layout = 'admin';
@@ -139 +139 @@
    $this->set('vclassrooms', $this->Forum->getVclassrooms($this->Auth->user('id')));
 
-   if ( !empty( $this->data['Forum'] ) )
-   {
+   if ( !empty( $this->data['Forum'] ) ):
+
      $this->Sanitize = new Sanitize;
      
@@ -149 +149 @@
      $this->Forum->create();
      
-     if ( $this->Forum->save($this->data['Forum']) )
-     {
-         $this->msgFlash('Forum created', '/admin/catforums/listing');
-     }
-   }
-   else
-   {
+     if ( $this->Forum->save($this->data['Forum']) ):
+         $this->msgFlash(__('Forum created', true), '/admin/catforums/listing');
+     endif;
+  
+   else:
       $this->set('catforum_id', $catforum_id);
-   }
+   endif;
  }
  
@@ -165 +163 @@
   $this->set('vclassrooms', $this->Forum->getVclassrooms($this->Auth->user('id')));
 
-  if (empty($this->data['Forum']))
-  {   
+  if (empty($this->data['Forum'])):
+   
         $this->layout = 'admin';
         
@@ -172 +170 @@
         
         $this->data = $this->Forum->read();
-  }
-  else
-  {
-       $this->Sanitize = new Sanitize;
+  
+  else:
+        $this->Sanitize = new Sanitize;
        
-       $this->Sanitize->clean($this->data['Forum']);
+        $this->Sanitize->clean($this->data['Forum']);
        
-       if ($this->Forum->save($this->data['Forum']))
-       {
-            $this->msgFlash('Forum updated', '/admin/catforums/listing');
-       }
-    }
+        if ($this->Forum->save($this->data['Forum'])):
+            $this->msgFlash(__('Data saved', true), '/admin/catforums/listing');
+        endif;
+   endif;
  }
  // change status published/draft
@@ -202 +198 @@
  }
  
- public function admin_delete($id)
+ public function admin_delete($forum_id)
  {
-    if ( $this->Forum->del($id) )
-    {           
-         $this->msgFlash('Forum deleted', '/admin/catforums/listing');
-    }
- }
-
+    if ( $this->Forum->del($forum_id) ):           
+         $this->msgFlash(__('Forum deleted', true), '/admin/catforums/listing');
+    endif;
+ }
 }
 ?>

trunk/app/controllers/users_controller.php

@@ -527 +527 @@
  public function admin_edit() 
  {
-    if ( empty($this->data['User']) )
-    {
-        $this->layout    = 'admin';
+   if ( empty($this->data['User']) ):
+       $this->layout    = 'admin';
         
-        $this->set('Groups', Set::combine($this->User->Group->find('all', array('order' => 'name')), "{n}.Group.id","{n}.Group.name"));
+       $this->set('Groups', Set::combine($this->User->Group->find('all', array('order' => 'name')), "{n}.Group.id","{n}.Group.name"));
         
-        $this->User->unbindModel($this->User->notNow);
+       $this->User->unbindModel($this->User->notNow);
             
-                $this->data = $this->User->read(null, $this->Auth->user('id'));
-    }
-    else
-    {
-        //die( debug($this->data['User']) );
-        if ($this->User->save($this->data['User']))
-        {
-            $this->msgFlash('User has been updated.','/admin/users/edit/');
-        }
-    }
+       $this->data = $this->User->read(null, $this->Auth->user('id'));
+   
+    else:
+       //die( debug($this->data['User']) );
+       if ($this->User->save($this->data['User'])):
+            $this->msgFlash(__('User has been updated', true), '/admin/users/edit/');
+       endif;
+    endif;
  }
 
@@ -596 +593 @@
      $this->data['User']['id']     = $id;
      
-     if ($this->User->save($this->data))
-     {
+     if ($this->User->save($this->data['User'])):
            $this->msgFlash('User status changed', '/admin/users/listing/');
-     } 
-     else 
-     {
+     else:
             $this->flash('Problem!!', '/admi/users/listing/');
-     }
+     endif;
  }
  
  /*** DELETE  **/ 
- public function admin_delete($id)
- {
-    if ($this->User->del($id))
-    {
-       $this->msgFlash('User has been deleted.', '/admin/users/listing');
-    }
+ public function admin_delete($user_id)
+ {
+   if ($this->User->del($user_id)):
+       $this->msgFlash(__('User deleted', true), '/admin/users/listing');
+   endif;
  }
  
@@ -658 +651 @@
     /** Security: checks to see if file is an image, if not do not allow upload ==*/
     
-    if ( $type != "image/jpeg" && $type != "image/pjpeg" && $type != "image/png" && $type != "image/gif") 
-    {   /** is this a valid file? */
-        $ErrMsg   = "<h1>ERROR</h1> the file $imgfile_name $imgfile is not valid.<br>";
-        $ErrMsg  .= "<p>Only .jpg, .gif or .png files<br><br>";
-        $ErrMsg  .= "Current type file: " . $type . "</p>\n";
-            
-        /** delete uploaded file  */
-        unlink($imgfile);
-        die($this->flash($ErrMsg, '/admin/users/edit/') );
-    }
-    
-    if ( $imgfile_size > $maxfilesize) 
-    {
-     $ErrMsg  = "<h1>ERROR</h1> The image is too big.<br />";
-         $ErrMsg .= "<p>Bigger than 2.0 MB <br /><br />";
-         $ErrMsg .= "Current size: " . $imgfile_size ."</p>\n";
-             
-         /** delete uploaded file */
-         unlink($imgfile);
-         die( $this->flash($ErrMsg,'/admin/users/edit/') );
-    }
+    if ( $type != "image/jpeg" && $type != "image/pjpeg" && $type != "image/png" && $type != "image/gif"): 
+       /** is this a valid file? */
+       $msg   = "Error, the file $imgfile_name $imgfile is not valid, only .jpg, .gif or .png, current type file: " . $type;
+       unlink($imgfile); /** delete uploaded file  */
+       $this->flash($msg, '/admin/users/edit/');
+       return false;
+    endif;
+    
+    if ( $imgfile_size > $maxfilesize):
+       $msg  = ">Error. The image is bigger than 2.0 MB Current size: " . $imgfile_size;
+       unlink($imgfile); /** delete uploaded file */
+       $this->flash($msg,'/admin/users/edit/');
+       return false;
+    endif;
 
     //check size
-    if ($width > 100 || $height > 100)
-    {
-         $ErrMsg  = "<h1>ERROR</h1> The image is too large.<br>";
-         $ErrMsg .= "<p>Widht or height is larger than 100 pixels <br /><br />";
-         $ErrMsg .= "Current size: width ". $width ."px  height ". $height ."px</p>\n";
-             
-         /** delete uploaded file */
-         unlink($imgfile);
-         die( $this->flash($ErrMsg,'/admin/users/edit/') );
-
-    }
+    if ($width > 100 || $height > 100):
+         $msg  = "Error. Width or height is larger than 100 pixels. Width ". $width ."px,  height ". $height ."px</p>\n";
+         unlink($imgfile); /** delete uploaded file */
+         $this->flash($msg,'/admin/users/edit/');
+         return false;
+    endif;
         
     $extension   = $this->Adds->get_extension($type);
@@ -703 +684 @@
     $newfile = $uploaddir . "/" . $final_filename;
     
-    /** do extra security check to prevent malicious abuse */
-    if (is_uploaded_file($imgfile))
-    {
+   /** do extra security check to prevent malicious abuse */
+   if (is_uploaded_file($imgfile)):
        /** move file to proper directory ==*/
-       if (!copy($imgfile, $newfile))
-       {
+      if (!copy($imgfile, $newfile)):
           /** if an error occurs the file could not be written, read or possibly does not exist */
-          die($this->flash('Error Uploading File.', '/users/edit/'.$this->Auth->user('id')));
-       }
-   }
+          die($this->flash('Error Uploading File.', '/admin/users/edit/'));
+       endif;
+   endif;
    
    /** Database stuff  **/
@@ -718 +697 @@
    $this->data['User']['avatar'] = $final_filename;
    
-   if ($this->User->save($this->data))
-    {
-           $this->redirect('/admin/users/edit/'. $this->Auth->user('id'));
-    }
+   if ($this->User->save($this->data)):
+           $this->redirect('/admin/users/edit/');
+    endif;
     
     /** delete the temporary uploaded file **/

trunk/app/locale/spa/LC_MESSAGES/default.po

@@ +1 @@
+msgid  "Group"
+msgstr "Grupo"
+
+msgid  "Email"
+msgstr "Correo"
+
+msgid  "Name and last name"
+msgstr "Nombre y apellido"
+
+msgid  "Left empty if you do not want to change"
+msgstr "Dejar vacío si no se desea cambiarlo"
+
 msgid  "Delete"
 msgstr "Eliminar"
 
+msgid  "Layout"
+msgstr "Diseño"
+
+msgid  "Quote"
+msgstr "Frase"
+
+msgid  "Subscribe to newsletter"
+msgstr "Deseo recibir el boletín"
+
+msgid  "Upload new avatar"
+msgstr "Subir nuevo avatar"
+
 msgid  "Data saved"
 msgstr "Datos guardados"
@@ -14 +38 @@
 msgstr "Agregar"
 
+msgid  "New user"
+msgstr "Nuevo usuario"
+
+msgid  "About you and your interests"
+msgstr "Escribe acerca de ti y tus interéses"
+
+msgid  "I read and I do agree with terms"
+msgstr "He leído y acepto los términos del servicio"
+
 msgid  "Finishing date"
 msgstr "Fecha de fin de curso"
@@ -55 +88 @@
 msgid  "Send comment"
 msgstr "Enviar comentario"
+
+msgid  "Send"
+msgstr "Enviar"
+
+msgid  "At least 5 characters, only lowercase. No spaces."
+msgstr "Al menos cinco caracteres, sólo minúsculas, no usar espacios."
+
+msgid  "At least 6 characters"
+msgstr "Al menos seis caracteres"
 
 msgid  "Write comment"
@@ -215 +257 @@
 msgstr "Subir archivo"
 
-msgid  "read_terms"
-msgstr "He leido y aceptado los terminos"
-
 msgid  "Welcome"
 msgstr "Bienvenido"
@@ -260 +299 @@
 msgstr "Estado modificado"
 
+msgid  "Registration form"
+msgstr "Forma de registro"
+
 msgid  "Hidden"
 msgstr "Oculto"

trunk/app/views/users/admin_edit.ctp

@@ -20 +20 @@
   
   echo '<legend>'.$session->read('Auth.User.username') .'\'s account</legend>';
-  echo $form->input('User.pwd', array("size"=>9, "maxlength"=>9,"value"=>"")) . '  Left empty if you do not want to change';
-  echo $form->error('User.pwd', 'A name is required.'); 
+  echo $form->input('User.pwd', array('size'=>9, 'maxlength'=>9, 'value'=>'', 'label'=>__('Password', true))) . '  '.__('Left empty if you do not want to change', true);
+  echo $html->para(null, '<br />'); 
   
-  echo $form->input('User.name', array("size" => 35, "maxlength"=>50)); 
+  echo $form->input('User.name', array('size' => 35, 'maxlength'=>50)); 
   echo $form->error('User.name', 'A name is required.');
   
-  echo $form->input('User.email', array("size" => 30, "maxlength"=>50));
+  echo $form->input('User.email', array('size' => 30, 'maxlength'=>50));
   echo $form->error('User.email', 'An email is required.'); 
   
-  // if the user belongs to admin group  
-  if ($session->read('Auth.User.group_id') == 1):
-     echo $form->label('User.group_id', 'Group:' );
-     echo $form->select('User.group_id', $Groups);
-  endif; 
-  
-  echo $form->label('User.layout', 'Layout:' ); 
+  echo $form->label('User.layout', __('Layout',true).': '); 
   $designs = array('rubyx'=>'Rubyx', 'school'=>'School', 'paris'=>'Paris');
   echo $form->select('User.layout', $designs, null, null, false);
   
-  echo $form->label('User.cv', 'Profile:' );
-  echo $form->textarea('User.cv', array("cols" => 70, "rows" => 7));
+  echo $form->label('User.cv', __('Profile',true) );
+  echo $form->textarea('User.cv', array('cols' => 70, 'rows' => 7));
   
-  echo $form->input('User.quote', array("size" => 70, "maxlength" => 150));
+  echo $form->input('User.quote', array('size' => 70, 'maxlength' => 150, 'label'=>__('Quote', true)));
   
-  echo $form->input('User.name_blog', array("size" => 45, "maxlength" => 150)); 
+  echo $form->input('User.name_blog', array('size' => 45, 'maxlength' => 150)); 
    
-  echo $form->label('User.newsletter', 'Subscribe to newsletter:' );
-  echo $form->checkbox('User.newsletter', array("value" => 1)); 
+  echo $form->label('User.newsletter', __('Subscribe to newsletter', true).': ');
+  echo $form->checkbox('User.newsletter', array('value' => 1)); 
   
-  echo $form->end('Save'); 
+  echo $form->end(__('Save', true)); 
  ?>
 </fieldset>
@@ -63 +57 @@
 <fieldset>
   <legend><?php __('Upload new avatar'); ?></legend>
-  <br />
-   <p>An image 40 x 40 pixels</p>
-   <?php 
-     echo $form->label('User.file', 'Avatar:' );
-     echo $form->file('User.file'); 
-     echo $form->error('User.file', 'Title is required.'); 
-     echo $form->end('Upload'); 
+  <?php
+    echo $html->div(null, 'An image 40 x 40 pixels');
+    echo $form->file('User.file'); 
+    echo $form->error('User.file', 'Title is required.'); 
+    echo $form->end(__('Upload', true)); 
 ?>
 </fieldset>

trunk/app/views/users/register.ctp

@@ -4 +4 @@
 else:
 ?>
-<div style="border-bottom:1px dotted gray;font-size:16pt;color:green;font-weigth:bold;margin-top:15px">Registration form </div>
+<div style="border-bottom:1px dotted gray;font-size:16pt;color:green;font-weigth:bold;margin-top:15px">
+<?php __('Registration form'); ?> </div>
 
 <div id="charging" style="display:none;"><?php echo $html->image('static/loading.gif', array("alt"=>"Loading")); ?></div>
@@ -15 +16 @@
 
 <fieldset>
-  <legend>New User:</legend>     
-     <?php echo $form->input('User.username', array("size" => 10, "maxlength" => 10, "between"=>": ", "onBlur"=>"this.value=this.value.toLowerCase()")); ?><span class="small">At least 5 characters, only lowercase. No spaces.</span>
-     <br />
+  <legend><?php __('New user'); ?></legend>     
+    <?php echo $form->input('User.username', array("size" => 10, "maxlength" => 10, "between"=>": ", "onBlur"=>"this.value=this.value.toLowerCase()")); ?>
+  <span class="small"><?php __('At least 5 characters, only lowercase. No spaces.');?></span>
+     <div><br /></div>
+    <?php echo $form->label('User.pwd', __('Password'.': ', true)) . $form->password('User.pwd', array('size'=>9,'maxlength'=>9)); ?>
+   <span class="small"><?php __('At least 6 characters'); ?></span>
+  <?php
+    echo $html->div(null, '<br />');
+    echo $form->input('User.name', array('size' => 25, 'maxlength' => 50, 'between'=>': ', 'label'=>__('Name and last name', true)));
+ 
+    echo $html->div(null, '<br />');
+    echo $form->input('User.email', array('size' => 20, 'maxlength' => 45, 'between'=>': ', 'label'=>__('Email', true))); 
+     
+    echo $html->div(null, '<br />');
+    echo $form->label('User.group_id', __('Group'.': ', true));
+      
+    $fieldName      = 'User.group_id';
+    $selected       = 3;
+    $showEmpty      = false;
+    $return         = true;
+     
+    echo $form->select($fieldName, $groups, $selected, null, null, $showEmpty, $return); 
     
-     <?php echo $form->input('User.email', array("size" => 20, "maxlength" => 45, "between"=>": ")); ?>
-     <br />
+    echo $html->div(null, '<br />');
+    echo $form->input('User.code', array('size' => 7, 'maxlength' => 7, 'between'=>': '));    
     
-     <?php echo $form->input('User.name', array("size" => 25, "maxlength" => 50, "between"=>": ")); ?>
-     <br />
-     <?php echo $form->label('User.group_id', 'Group:' );?>
-     <?php 
-     $fieldName      = 'User.group_id';
-     $selected       = 3;
-     $showEmpty      = false;
-     $return         = true;
-     
-     echo $form->select($fieldName, $groups, $selected, null, null, $showEmpty, $return); 
- ?>
-   <br />
-     
-     <?php echo $form->input('User.code', array("size" => 7, "maxlength" => 7)); ?>
-     
-     <?php echo $form->label('User.pwd', 'Password: ') . $form->password('User.pwd', array('size' => 9, 'maxlength' => 9)); ?>
-   <span class="small">At least 6 characters</span>
-     <br /><br />
-     <?php echo $form->label('User.description', 'About you and your interests:' );?><br />
-     <?php echo $form->textarea('User.description', array("rows"=>4, "cols"=>50)) ?>
-     <br /><br />
-<?php 
+    echo $html->div(null, '<br />');  
+    echo $form->label('User.description', __('About you and your interests', true) ) . '<br />';
+    echo $form->textarea('User.description', array("rows"=>4, "cols"=>50)).'<br />'; 
         
-$tmp = $html->link('I read the terms:','#header',
+    $tmp = $html->link(__('I read and I do agree with terms', true),'#header',
                                     array("onclick"=>"javascript:window.open('/colleges/terms', 'blank', 'toolbar=no, scrollbars=yes,width=700,height=400')")) . ' ';
 
-  echo $form->label('User.agree', $tmp);
-  echo $form->checkbox('User.agree', array("value"=>1)); 
-    
-  echo $ajax->submit('Send', array("url" => "/users/insert/", 
+    echo $form->label('User.agree', $tmp);
+    echo $form->checkbox('User.agree', array('value'=>1)); 
+
+    echo $html->div(null, '<br />');
+
+    echo $ajax->submit(__('Send', true), array("url" => "/users/insert/", 
                                          "update"=>"updater", 
                      "before" => "if ( !validateData() ) return false;",
@@ -62 +65 @@
 
 <?php
-echo $html->para(null, 
+echo $html->para(null,
 'Please contact <a href="mailto:webmaster@conrad-college.edu">webmaster@conrad-college.edu</a> if you have doubts or comments about this registration process.');
 ?>