Changeset 624

Timestamp:

07/04/08 14:25:17 (3 months ago)

Author:

aarkerio

Message:

Internatiantilzation

Location:

trunk/app

Files:

• config/sql/postgresql/vclassrooms.sql (modified) (1 diff)
• controllers/vclassrooms_controller.php (modified) (3 diffs)
• locale/spa/LC_MESSAGES/default.po (modified) (1 diff)
• views/ecourses/admin_vclassrooms.ctp (modified) (1 diff)
• views/lessons/admin_add.ctp (modified) (2 diffs)
• views/lessons/admin_edit.ctp (modified) (2 diffs)
• views/vclassrooms/admin_add.ctp (modified) (1 diff)
• views/vclassrooms/admin_edit.ctp (modified) (2 diffs)

trunk/app/config/sql/postgresql/vclassrooms.sql

@@ -8 +8 @@
     "ecourse_id" int NOT NULL REFERENCES ecourses(id) ON DELETE CASCADE,
     "secret" varchar(6),   -- secret code to allow students register by themselves
+    "sdate" date NOT NULL DEFAULT now(), --starting date
+    "fdate" date NOT NULL DEFAULT now(), -- finish date
     "access" smallint NOT NULL DEFAULT 0 -- public / only with code
 );

trunk/app/controllers/vclassrooms_controller.php

@@ -143 +143 @@
  public function admin_listing($historic = null)
  {
-      $this->layout = 'admin';
-      $conditions = array("Vclassroom.user_id"=>$this->Auth->user('id'), "Vclassroom.status"=>1);
-      $fields     = array('id', 'name', 'created', 'user_id', 'ecourse_id', 'status');
-      $order      = "Vclassroom.id DESC";
-      
-      if ($historic === 'historic')
-      {
+  $this->layout = 'admin';
+  $conditions = array("Vclassroom.user_id"=>$this->Auth->user('id'), "Vclassroom.status"=>1);
+  $fields     = array('id', 'name', 'created', 'user_id', 'ecourse_id', 'status');
+  $order      = "Vclassroom.id DESC";
+      
+  if ($historic === 'historic'):
     $conditions['Vclassroom.status'] = 0;
         $this->set('historic', true);
-      }
-
-      $this->pageTitle = 'eClass';
-      
-      $this->set('data', $this->Vclassroom->findAll($conditions, $fields, $order, null, null, 2));
+  endif;
+
+  $this->pageTitle = 'eClass';
+      
+  $this->set('data', $this->Vclassroom->findAll($conditions, $fields, $order, null, null, 2));
  }
 
@@ -261 +260 @@
 
    if (!empty($this->data["Vclassroom"])):
-        $this->Sanitize = new Sanitize;
-        
-        $this->Sanitize->clean($this->data["Vclassroom"]); 
-
-        $this->data["Vclassroom"]["user_id"] = $this->Auth->user('id');
-       
-        $this->Vclassroom->create();
-        
-      if ($this->Vclassroom->save($this->data["Vclassroom"])):
+     $this->Sanitize = new Sanitize;
+        
+     $this->Sanitize->clean($this->data['Vclassroom']); 
+
+     $this->data['Vclassroom']['user_id'] = $this->Auth->user('id');
+
+     $this->Vclassroom->create();
+        
+     if ($this->Vclassroom->save($this->data["Vclassroom"])):
                $this->msgFlash('vClassroom added', '/admin/ecourses/vclassrooms/'.$this->data["Vclassroom"]["ecourse_id"]);
-      endif;
+     endif;
    else:     
           $this->data = $this->Vclassroom->Ecourse->read(null, $ecourse_id);
@@ -342 +341 @@
  }
  
- public function admin_delete($id, $ecourse_id)
- {
-    if ($this->Vclassroom->del($id)):
-       $this->msgFlash('Classroom deleted','/admin/ecourses/vclassrooms/'.$ecourse_id);
+ public function admin_delete($vclassroom_id, $ecourse_id)
+ {
+    if ($this->Vclassroom->del($vclassroom_id)):
+       $this->msgFlash(__('vClassroom deleted', true),'/admin/ecourses/vclassrooms/'.$ecourse_id);
     else:
            $this->flash('Error, call support', '/admin/ecourses/vclassrooms/'.$ecourse_id);

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

@@ -2 +2 @@
 msgstr "Eliminar"
 
+msgid  "Starting date"
+msgstr "Fecha de inicio"
+
+msgid  "Finishing date"
+msgstr "Fecha de fin de curso"
+
+msgid  "New Group for e-Course"
+msgstr "Nuevo grupo para el e-Course"
+
+msgid  "Filed classrooms"
+msgstr "Grupos archivados"
+
+msgid  "Edit vClass"
+msgstr "Editar vClass"
+
 msgid  "Edit"
 msgstr "Editar"
+
+msgid  "New Lesson"
+msgstr "Nueva lección"
+
+msgid  "Edit Lesson"
+msgstr "Editar lección"
 
 msgid  "New eCourse"

trunk/app/views/ecourses/admin_vclassrooms.ctp

@@ -25 +25 @@
 
 
+$msg   = __('Are you sure to want to delete this?', true);   
+
 foreach ($data['Vclassroom'] as $val):
  $s = ($val['status'] == 1) ? 'Enabled' : 'Filed';
 
-      $tmp  =  $html->div('butonright', $gags->sendEdit($val['id'], 'Vclassroom'));
-      $tmp .=  $html->link($val['name'], '/admin/vclassrooms/members/'.$val['id']);
-      $tmp .=  $html->div(null, 'Secret:'. $val['secret']);
-      $tmp .=  $html->para(null, 'Status: '.$html->link($s,'/admin/vclassrooms/change/'.$val['id'].'/'.$val['status'].'/'.$val['ecourse_id']));
-      $tmp .=  $html->div('butonright', $gags->confirmDel($val['id'], 'Vclassroom'));
-
-      echo $html->div('grayblock', $tmp);
+   $tmp  =  $html->div('butonright', $gags->sendEdit($val['id'], 'Vclassroom'));
+   $tmp .=  $html->link($val['name'], '/admin/vclassrooms/members/'.$val['id']);
+   $tmp .=  $html->div(null, 'Secret:'. $val['secret']);
+   $tmp .=  $html->para(null, 'Status: '.$html->link($s,'/admin/vclassrooms/change/'.$val['id'].'/'.$val['status'].'/'.$val['ecourse_id']));
+   $tmp .=  $html->div('butonright', 
+   $form->create('Vclassroom', array('action'=>'/admin_delete/'.$val['id'].'/'.$val['ecourse_id'], "onsubmit"=>"return confirm('".$msg."')")).
+   $form->end(__('Delete', true)));
+   echo $html->div('grayblock', $tmp);
 endforeach;
 
 if ( !isset( $historic ) ):
 echo $html->link(
-                $html->image('admin/historic.png', array('alt'=>'Filed classrooms', 'title'=>'Filed classrooms')), 
+                $html->image('admin/historic.png', array('alt'=>__('Filed classrooms', true), 'title'=>__('Filed classrooms', true))), 
                 '/admin/ecourses/vclassrooms/'.$data['Ecourse']['id'].'/historic', null, null, false);
 endif;

trunk/app/views/lessons/admin_add.ctp

@@ -6 +6 @@
 
 <fieldset>
-<legend>Add Lesson</legend>
+<legend><?php __('New Lesson'); ?></legend>
 <table>
 <tr><td>
-  <?php
+<?php
      echo $form->input('Lesson.title', array("size" => 50, "maxlength" => 120));
      echo $form->error('Lesson.title', 'Title is required.'); 
-  ?>
+?>
   </td>
   <td>
@@ -44 +44 @@
   ?>
   </td></tr>
-  <tr><td colspan="3"> </fieldset>
-  <?php echo $form->end('Save'); ?>
+  <tr><td colspan="3"> 
+  <?php echo $form->end(__('Save', true)); ?>
+</fieldset>
 </td></tr>
 </table>

trunk/app/views/lessons/admin_edit.ctp

@@ -12 +12 @@
 ?>
 <fieldset>
-<legend>Edit Lesson: <?php echo $this->data['Lesson']['title']; ?></legend>
+<legend><?php __('Edit Lesson');?> : <?php echo $this->data['Lesson']['title']; ?></legend>
 <table>
 <tr><td>
@@ -51 +51 @@
      ?>
   </td></tr>
-  <tr><td colspan="3"> </fieldset>
-  <?php echo $form->end('Save'); ?>
+  <tr><td colspan="3"> 
+  <?php echo $form->end(__('Save', true)); ?>
+</fieldset>
 </td></tr>
 </table>

trunk/app/views/vclassrooms/admin_add.ctp

@@ -12 +12 @@
 ?>
 <fieldset>
-  <legend>New Group for e-Course: <?php echo $this->data['Ecourse']['title']; ?></legend>  
-  <?php  
-    echo $form->input('Vclassroom.name', array('size' => 40, 'maxlength' => 60)); 
-    
-    echo $form->label('Vclassroom.status', 'Enabled:');  
-    echo $form->checkbox('Vclassroom.status', array('value'=>1));
+  <legend><?php __('New Group for e-Course'); ?>:<?php echo $this->data['Ecourse']['title']; ?></legend>  
+<?php  
+ echo $form->input('Vclassroom.name', array('size' => 40, 'maxlength' => 60)); 
  
+ echo $form->input('Vclassroom.sdate',array('type'=>'date','label'=>__('Starting date', true), 'dateFormat'=>'DMY'));
+ 
+ echo $html->para(null, '<br />');
 
-    echo $form->input('Vclassroom.secret', array('size' => 7, 'maxlength' => 6));
-    echo $form->end('Save'); 
+ echo $form->input('Vclassroom.fdate',array('type'=>'date','label'=>__('Finishing date', true), 'dateFormat'=>'DMY'));
+
+ echo $form->input('Vclassroom.secret', array('size' => 7, 'maxlength' => 6));
+
+ echo $form->label('Vclassroom.status', __('Enabled', true)); 
+ echo $form->checkbox('Vclassroom.status', array('value'=>1));
+
+ echo $form->end('Save'); 
 ?>
 </fieldset>

trunk/app/views/vclassrooms/admin_edit.ctp

@@ -1 +1 @@
 <?php 
- //exit(var_dump($this->data));
+//exit(debug($this->data));
  echo $javascript->link('fckeditor/fckeditor');
  echo $html->addCrumb('Control Panel', '/admin/entries/start');  
@@ -11 +11 @@
 
 <fieldset>
-  <legend>Edit Group</legend> 
+  <legend><?php __('Edit vClass');?></legend> 
 <?php
-    echo $form->input('Vclassroom.name', array('size' => 40, 'maxlength' => 60)); 
+ echo $form->input('Vclassroom.name', array('size' => 40, 'maxlength' => 60)); 
 
-    echo $form->label('Vclassroom.status', 'Status:');
-    echo $form->checkbox('Vclassroom.status'); 
+ echo $form->input('Vclassroom.sdate',array('type'=>'date','label'=>__('Starting date', true), 'dateFormat'=>'DMY'));
 
-     echo $form->input('Vclassroom.secret', array('size' => 6, 'maxlength' => 6))
+ echo $form->input('Vclassroom.fdate',array('type'=>'date','label'=>__('Finishing date', true), 'dateFormat'=>'DMY'));
+
+ echo $form->label('Vclassroom.status', 'Status:');
+ echo $form->checkbox('Vclassroom.status'); 
+
+ echo $form->input('Vclassroom.secret', array('size' => 6, 'maxlength' => 6));
+
+ echo $form->end(__('Save', true)); 
 ?>
- <div style="clear:both"></div>
- <?php echo $form->end('Save'); ?>
 </fieldset>
 </div>