[svn r17746] minor change name var get_lang see FS#3458

skala
Carlos Vargas 16 years ago
parent b38a981332
commit 80d2d9aac3
  1. 4
      main/calendar/agenda.inc.php
  2. 4
      main/document/document.php
  3. 10
      main/gradebook/gradebook_view_result.php
  4. 2
      main/gradebook/lib/fe/evalform.class.php
  5. 7
      main/work/work.php

@ -1,4 +1,4 @@
<?php //$Id: agenda.inc.php 17661 2009-01-12 19:32:21Z cvargas1 $
<?php //$Id: agenda.inc.php 17746 2009-01-15 20:33:37Z cvargas1 $
/*
==============================================================================
@ -4809,7 +4809,7 @@ function get_global_agenda_items($agendaitems, $day = "", $month = "", $year = "
// if we have a day_view we use a half hour as index => key 33 = 16h30
if ($type !== "day_view") // This is the array construction for the WEEK or MONTH view
{
$agendaitems[$day] .= "<div><i>$hour:$minute</i> <b>".get_lang('Evento Global'). ": </b>".$item['title']."</div>";
$agendaitems[$day] .= "<div><i>$hour:$minute</i> <b>".get_lang('GlobalEvent'). ": </b>".$item['title']."</div>";
}
else // this is the array construction for the DAY view
{

@ -1,4 +1,4 @@
<?php // $Id: document.php 17724 2009-01-14 18:30:19Z herodoto $
<?php // $Id: document.php 17746 2009-01-15 20:33:37Z cvargas1 $
/*
==============================================================================
Dokeos - elearning and course management software
@ -667,7 +667,7 @@ if($folders===false)
<a href="quota.php?<?php echo api_get_cidreq();?>"><?php Display::display_icon('statistics.gif', get_lang("ShowCourseQuotaUse")); ?><?php echo get_lang("ShowCourseQuotaUse"); ?></a>
<?php
}
if ($docs_and_folders!=null) {
?>
<!-- download zipped folder -->

@ -430,7 +430,7 @@ if (isset ($_GET['editallresults'])) {
}
if (isset ($_GET['importok'])) {
Display :: display_confirmation_message(get_lang('ImportOk'),false);
Display :: display_confirmation_message(get_lang('FileUploadComplete'),false);
}
if (isset ($_GET['importnofile'])) {
@ -441,7 +441,7 @@ if (isset ($_GET['incorrectdata'])) {
Display :: display_warning_message(get_lang('IncorrectData'),false);
}
if (isset ($_GET['nothingadded'])) {
Display :: display_warning_message(get_lang('NothingAdded'),false);
Display :: display_warning_message(get_lang('ProblemUploadingFile'),false);
}
if (isset ($_GET['massdelete'])) {
Display :: display_confirmation_message(get_lang('ResultsDeleted'),false);
@ -453,12 +453,12 @@ if (isset ($_GET['overwritemax'])) {
Display :: display_warning_message(get_lang('OverWriteMax'),false);
}
if (isset ($_GET['importoverwritescore'])) {
Display :: display_confirmation_message(get_lang('ImportOverwriteScore') . ' ' . $_GET['importoverwritescore']);
Display :: display_confirmation_message(get_lang('ImportOverWriteScore') . ' ' . $_GET['importoverwritescore']);
}
if (isset ($_GET['import_user_error'])) {
$userinfo= get_user_info_from_id($_GET['import_user_error']);
Display :: display_warning_message(get_lang('UserInfoDoesNotMatch') . '<br /><br /><b>' . $userinfo['lastname'] . ' ' . $userinfo['firstname'] . '</b>');
Display :: display_warning_message(get_lang('UserInfoDoesNotMatch') . ' ' . $userinfo['lastname'] . ' ' . $userinfo['firstname']);
}
if (isset ($_GET['allresdeleted'])) {
Display :: display_confirmation_message(get_lang('AllResultDeleted'));
@ -466,7 +466,7 @@ if (isset ($_GET['allresdeleted'])) {
if (isset ($_GET['import_score_error'])) {
$userinfo= get_user_info_from_id($_GET['import_score_error']);
Display :: display_warning_message(get_lang('ScoreDoesNotMatch') . '<br /><br /><b>' . $userinfo['lastname'] . ' ' . $userinfo['firstname'] . '</b>');
Display :: display_warning_message(get_lang('ScoreDoesNotMatch') . ' ' . $userinfo['lastname'] . ' ' . $userinfo['firstname']);
}
if ($file_type == null) { //show the result header
if (isset ($export_result_form) && !(isset ($edit_res_form))) {

@ -324,7 +324,7 @@ class EvalForm extends FormValidator
'maxlength' => '4',
'disabled' => 'disabled'
));
$this->addElement('static','label','','<small>'.get_lang('NoMaxChange').'</small>');
$this->addElement('static','label','','<small>'.get_lang('CannotChangeTheMaxNote').'</small>');
}
} else {
$this->add_textfield('max', get_lang('Max'), true, array (

@ -27,7 +27,7 @@
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University - ability for course admins to specify wether uploaded documents are visible or invisible by default.
* @author Roan Embrechts, code refactoring and virtual course support
* @author Frederic Vauthier, directories management
* @version $Id: work.php 17627 2009-01-09 21:50:35Z cvargas1 $
* @version $Id: work.php 17746 2009-01-15 20:33:37Z cvargas1 $
*
* @todo refactor more code into functions, use quickforms, coding standards, ...
*/
@ -87,7 +87,8 @@
$language_file = array (
'work',
'document',
'admin'
'admin',
'exercice'
);
require("../inc/global.inc.php");
// @todo why is this needed?
@ -1317,7 +1318,7 @@ if (!$display_upload_form && !$display_tool_options) {
isset($_REQUEST['filter'])?$filter = (int)$_REQUEST['filter']:$filter='';
$form_filter = '<form method="post" action="'.api_get_self().'?cidReq='.$cidreq.'&curdirpath='.$curdirpath.'">';
$form_filter .= make_select('filter',array(0=>get_lang('SelectAFilter'),1=>get_lang('FilterByNotRevised'),2=>get_lang('FilterByRevised'),3=>get_lang('FilterByNotExpired')),$filter);
$form_filter .= '<input type="submit" value="'.get_lang('FilterAssigments').'"</form>';
$form_filter .= '<input type="submit" value="'.get_lang('FilterAssignments').'"</form>';
echo $form_filter;
}
display_student_publications_list($base_work_dir . '/' . $my_cur_dir_path, 'work/' . $my_cur_dir_path, $currentCourseRepositoryWeb, $link_target_parameter, $dateFormatLong, $origin,$add_query);

Loading…
Cancel
Save