chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[svn r17900] minor change var get_lang see FS#3458

Browse Source
skala
Carlos Vargas 16 years ago
parent 7101711cd7
commit 10904dcda2
4 changed files with 8 additions and 8 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      main/dropbox/dropbox_functions.inc.php
  2. 4
      main/dropbox/dropbox_submit.php
  3. 2
      main/exercice/exercice_history.php
  4. 6
      main/survey/survey.php

4
main/dropbox/dropbox_functions.inc.php
Unescape View File

@ -943,11 +943,11 @@ function store_add_dropbox()
{ {
if ( ($w->recipients[0]['id'] > dropbox_cnf("mailingIdBase")) xor $thisIsAMailing) if ( ($w->recipients[0]['id'] > dropbox_cnf("mailingIdBase")) xor $thisIsAMailing)
{ {
return get_lang('mailingNonMailingError'); return get_lang('MailingNonMailingError');
} }
if ( ($w->recipients[0]['id'] == $_user['user_id']) xor $thisIsJustUpload) if ( ($w->recipients[0]['id'] == $_user['user_id']) xor $thisIsJustUpload)
{ {
return get_lang('mailingJustUploadNoOther'); return get_lang('MailingJustUploadSelectNoOther');
} }
$dropbox_filename = $w->filename; $dropbox_filename = $w->filename;
$found = true; // note: do we still need this? $found = true; // note: do we still need this?

4
main/dropbox/dropbox_submit.php
Unescape View File

@ -143,7 +143,7 @@ if ( isset( $_POST["submitWork"]))
{ {
$error = TRUE; $error = TRUE;
$errormsg = dropbox_lang("mailingJustUploadNoOther"); $errormsg = get_lang("MailingJustUploadSelectNoOther");
} }
elseif ( empty( $_FILES['file']['name'])) elseif ( empty( $_FILES['file']['name']))
{ {
@ -225,7 +225,7 @@ if ( isset( $_POST["submitWork"]))
if ( ($w->recipients[0]['id'] == $_user['user_id']) xor $thisIsJustUpload) if ( ($w->recipients[0]['id'] == $_user['user_id']) xor $thisIsJustUpload)
{ {
$error = TRUE; $error = TRUE;
$errormsg = dropbox_lang("mailingJustUploadNoOther"); $errormsg = get_lang("MailingJustUploadSelectNoOther");
} }
$dropbox_filename = $w->filename; $found = true; $dropbox_filename = $w->filename; $found = true;
break; break;

2
main/exercice/exercice_history.php
Unescape View File

@ -88,7 +88,7 @@ $TBL_TRACK_ATTEMPT_RECORDING= Database::get_statistic_table(TABLE_STATISTIC_TRAC
<tr class="row_odd"> <tr class="row_odd">
<th><?php echo get_lang('Question'); ?></th> <th><?php echo get_lang('Question'); ?></th>
<th><?php echo get_lang('Value'); ?></th> <th><?php echo get_lang('Value'); ?></th>
<th><?php echo get_lang('FeedBack'); ?></th> <th><?php echo get_lang('Feedback'); ?></th>
<th><?php echo get_lang('Date'); ?></th> <th><?php echo get_lang('Date'); ?></th>
<th><?php echo get_lang('Author'); ?></th> <th><?php echo get_lang('Author'); ?></th>
</tr> </tr>

6
main/survey/survey.php
Unescape View File

@ -1,4 +1,4 @@
<?php // $Id: survey.php 16967 2008-11-26 22:22:07Z yannoo $ <?php // $Id: survey.php 17900 2009-01-21 17:02:59Z cvargas1 $
/* /*
============================================================================== ==============================================================================
Dokeos - elearning and course management software Dokeos - elearning and course management software
@ -26,7 +26,7 @@
* @package dokeos.survey * @package dokeos.survey
* @author unknown * @author unknown
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University: cleanup, refactoring and rewriting large parts of the code * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University: cleanup, refactoring and rewriting large parts of the code
* @version $Id: survey.php 16967 2008-11-26 22:22:07Z yannoo $ * @version $Id: survey.php 17900 2009-01-21 17:02:59Z cvargas1 $
* *
* @todo use quickforms for the forms * @todo use quickforms for the forms
*/ */
@ -117,7 +117,7 @@ if (isset($_GET['action']))
if (($_GET['action'] == 'moveup' OR $_GET['action'] == 'movedown') AND isset($_GET['question_id'])) if (($_GET['action'] == 'moveup' OR $_GET['action'] == 'movedown') AND isset($_GET['question_id']))
{ {
survey_manager::move_survey_question($_GET['action'], $_GET['question_id'], $_GET['survey_id']); survey_manager::move_survey_question($_GET['action'], $_GET['question_id'], $_GET['survey_id']);
Display::display_confirmation_message('SurveyQuestionMoved', false); Display::display_confirmation_message(get_lang('SurveyQuestionMoved'), false);
} }
if ($_GET['action'] == 'delete' AND is_numeric($_GET['question_id'])) if ($_GET['action'] == 'delete' AND is_numeric($_GET['question_id']))
{ {

Write Preview
Loading…
Cancel
Save