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

Fixing api_is_western_name_order wrong uses in BT#1636

Browse Source
skala
Julio Montoya 15 years ago
parent 19f176e2f9
commit 3573dc8e93
2 changed files with 10 additions and 10 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/admin/configure_inscription.php
  2. 16
      main/gradebook/gradebook_view_result.php

4
main/admin/configure_inscription.php
Unescape View File

@ -187,8 +187,8 @@ if ($display_all_form) {
if (api_is_western_name_order()) { if (api_is_western_name_order()) {
// FIRST NAME and LAST NAME // FIRST NAME and LAST NAME
$form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40, 'disabled' => 'disabled')); $form->addElement('text', 'firstname', get_lang('FirstName'), array('size' => 40, 'disabled' => 'disabled'));
$form->addElement('text', 'firstname', get_lang('FirstName'), array('size' => 40, 'disabled' => 'disabled')); $form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40, 'disabled' => 'disabled'));
} else { } else {
// LAST NAME and FIRST NAME // LAST NAME and FIRST NAME
$form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40, 'disabled' => 'disabled')); $form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40, 'disabled' => 'disabled'));

16
main/gradebook/gradebook_view_result.php
Unescape View File

@ -219,8 +219,8 @@ if ($export_result_form->validate()) {
// set headers data table // set headers data table
$head_ape_name = ''; $head_ape_name = '';
if (!api_is_western_name_order()) { if (api_is_western_name_order()) {
$head_ape_name = get_lang('FirstName').' '.get_lang('LastName'); $head_ape_name = get_lang('FirstName').' '.get_lang('LastName');
} else { } else {
$head_ape_name = get_lang('LastName').' '.get_lang('FirstName'); $head_ape_name = get_lang('LastName').' '.get_lang('FirstName');
} }
@ -233,12 +233,12 @@ if ($export_result_form->validate()) {
$head_letter = get_lang('Letters'); $head_letter = get_lang('Letters');
} }
$head_table = array( $head_table = array(
array(get_lang('Item'),5), array('#',3),
array(get_lang('Code'),15), array(get_lang('Code'),12),
array($head_ape_name, 50), array($head_ape_name, 50),
array(get_lang('Score'),15), array(get_lang('Score'),12),
array($head_letter,15), array($head_letter,15),
array($head_display_score,15) array($head_display_score,30)
); );
// get data table // get data table
@ -252,8 +252,8 @@ if ($export_result_form->validate()) {
$result = array(); $result = array();
$user_info = api_get_user_info($data['id']); $user_info = api_get_user_info($data['id']);
$result[] = $user_info['username']; $result[] = $user_info['username'];
if (!api_is_western_name_order()) { if (api_is_western_name_order()) {
$result[] = $user_info['firstname'].', '.$user_info['lastname']; $result[] = $user_info['firstname'].', '.$user_info['lastname'];
} else { } else {
$result[] = $user_info['lastname'].', '.$user_info['firstname']; $result[] = $user_info['lastname'].', '.$user_info['firstname'];
} }

Write Preview
Loading…
Cancel
Save