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

Avoid double get_lang with extra fields - refs BT#11015

Browse Source
pull/2487/head
Angel Fernando Quiroz Campos 10 years ago
parent 9bdccc13af
commit f0a64701e7
2 changed files with 4 additions and 28 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. 6
      main/admin/settings.lib.php
  2. 26
      main/inc/lib/extra_field.lib.php

6
main/admin/settings.lib.php
Unescape View File

@ -752,7 +752,7 @@ function handle_search()
$group = array ();
if (is_array($values)) {
foreach ($values as $key => $value) {
$element = & $form->createElement('radio', 'search_enabled', '', get_lang($value['display_text']), $value['value']);
$element = & $form->createElement('radio', 'search_enabled', '', $value['display_text'], $value['value']);
$group[] = $element;
}
}
@ -777,7 +777,7 @@ function handle_search()
$values = api_get_settings_options('search_show_unlinked_results');
$group = array ();
foreach ($values as $key => $value) {
$element = & $form->createElement('radio', 'search_show_unlinked_results', '', get_lang($value['display_text']), $value['value']);
$element = & $form->createElement('radio', 'search_show_unlinked_results', '', $value['display_text'], $value['value']);
$group[] = $element;
}
$form->addGroup($group, 'search_show_unlinked_results', array(get_lang('SearchShowUnlinkedResultsTitle'),get_lang('SearchShowUnlinkedResultsComment')), '', false);
@ -1461,7 +1461,7 @@ function generate_settings_form($settings, $settings_by_access_list)
'radio',
$row['variable'],
'',
get_lang($value['display_text']),
$value['display_text'],
$value['value']
);
if ($hide_element) {

26
main/inc/lib/extra_field.lib.php
Unescape View File

@ -912,7 +912,7 @@ class ExtraField extends Model
foreach ($field_details['options'] as $option_details) {
$optionList[$option_details['id']] = $option_details;
if ($get_lang_variables) {
$options[$option_details['option_value']] = get_lang($option_details['display_text']);
$options[$option_details['option_value']] = $option_details['display_text'];
} else {
if ($optionsExists) {
// Adding always the default value
@ -965,10 +965,6 @@ class ExtraField extends Model
}
}
if ($get_lang_variables) {
$field_details['display_text'] = get_lang($field_details['display_text']);
}
// chzn-select doesn't work for sessions??
$form->addElement(
'select',
@ -1174,16 +1170,6 @@ class ExtraField extends Model
$variable = $field_details['variable'];
$field_id = $field_details['id'];
//Added for correctly translate the extra_field
$get_lang_variables = false;
if (in_array($variable, ['tags'])) {
$get_lang_variables = true;
}
if ($get_lang_variables) {
$field_details['display_text'] = get_lang($field_details['display_text']);
}
$tagsSelect = $form->addSelect(
"extra_{$field_details['variable']}",
$field_details['display_text']
@ -1478,16 +1464,6 @@ EOF;
}
break;
case ExtraField::FIELD_TYPE_VIDEO_URL:
//Added for correctly translate the extra_field
$get_lang_variables = false;
if (in_array($field_details['variable'], ['video_url'])) {
$get_lang_variables = true;
}
if ($get_lang_variables) {
$field_details['display_text'] = get_lang($field_details['display_text']);
}
$form->addUrl(
"extra_{$field_details['variable']}",
$field_details['display_text'],

Write Preview
Loading…
Cancel
Save