Browse Source

Merge branch 'chamilo10'

Julio Montoya 11 years ago
parent
commit
23a70c79d9
41 changed files with 1746 additions and 7360 deletions
  1. 1 4
      console.php
  2. 1 0
      main/admin/configure_homepage.php
  3. 1 0
      main/admin/course_add.php
  4. 1 0
      main/admin/course_edit.php
  5. 4 0
      main/admin/course_list.php
  6. 3 3
      main/admin/settings.lib.php
  7. 5 2
      main/admin/user_list.php
  8. 1 1
      main/auth/courses_controller.php
  9. 4 0
      main/course_info/infocours.php
  10. 13 0
      main/exercice/exercise.lib.php
  11. 8 2
      main/exercice/overview.php
  12. BIN
      main/img/bullet_grey.gif
  13. 5 0
      main/inc/lib/login.lib.php
  14. 1 1
      main/inc/lib/social.lib.php
  15. 2 1
      main/lang/dutch/admin.inc.php
  16. 3 1
      main/lang/dutch/create_course.inc.php
  17. 1 1
      main/lang/dutch/registration.inc.php
  18. 4 3
      main/lang/dutch/trad4all.inc.php
  19. 0 1
      main/lang/dutch/userInfo.inc.php
  20. 3 0
      main/lang/dutch/work.inc.php
  21. 17 5
      main/lang/english/admin.inc.php
  22. 1 0
      main/lang/english/exercice.inc.php
  23. 1 0
      main/lang/english/learnpath.inc.php
  24. 44 0
      main/lang/english/trad4all.inc.php
  25. 0 1
      main/lang/english/userInfo.inc.php
  26. 1 0
      main/lang/french/admin.inc.php
  27. 1 0
      main/lang/french/exercice.inc.php
  28. 1 0
      main/lang/french/learnpath.inc.php
  29. 0 1
      main/lang/french/userInfo.inc.php
  30. 551 1
      main/lang/spanish/admin.inc.php
  31. 1 0
      main/lang/spanish/exercice.inc.php
  32. 1 0
      main/lang/spanish/learnpath.inc.php
  33. 44 0
      main/lang/spanish/trad4all.inc.php
  34. 0 1
      main/lang/spanish/userInfo.inc.php
  35. 3 0
      main/lang/spanish/work.inc.php
  36. 342 2444
      main/locale/en.po
  37. 346 2449
      main/locale/es.po
  38. 327 2435
      main/locale/fr.po
  39. 2 2
      main/newscorm/lp_add_audio.php
  40. 1 1
      main/template/default/auth/courses_categories.php
  41. 1 0
      plugin/dashboard/block_global_info/block_global_info.class.php

+ 1 - 4
console.php

@@ -71,10 +71,7 @@ $cli->addCommands(
         new \Doctrine\DBAL\Migrations\Tools\Console\Command\VersionCommand(),
 
         // Chamilo commands.
-        /*new ChamiloLMS\Command\Database\UpgradeCommand(),
-        new ChamiloLMS\Command\Database\InstallCommand(),
-        new ChamiloLMS\Command\Database\StatusCommand(),
-        new ChamiloLMS\Command\Database\SetupCommand(),*/
+
         new ChamiloLMS\Command\Template\AsseticDumpCommand(),
         new ChamiloLMS\Command\Translation\ExportLanguagesCommand(),
 

+ 1 - 0
main/admin/configure_homepage.php

@@ -22,6 +22,7 @@ require_once api_get_path(LIBRARY_PATH).'WCAG/WCAG_rendering.php';
 $action = isset($_GET['action']) ? Security::remove_XSS($_GET['action']) : null;
 $tbl_category = Database::get_main_table(TABLE_MAIN_CATEGORY);
 $tool_name = get_lang('ConfigureHomePage');
+$_languages = api_get_languages();
 
 $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
 

+ 1 - 0
main/admin/course_add.php

@@ -90,6 +90,7 @@ $group[]= $form->createElement('radio', 'visibility', get_lang('CourseAccess'),
 $group[]= $form->createElement('radio', 'visibility', null, get_lang('OpenToThePlatform'), COURSE_VISIBILITY_OPEN_PLATFORM);
 $group[]= $form->createElement('radio', 'visibility', null, get_lang('Private'), COURSE_VISIBILITY_REGISTERED);
 $group[]= $form->createElement('radio', 'visibility', null, get_lang('CourseVisibilityClosed'), COURSE_VISIBILITY_CLOSED);
+$group[]= $form->createElement('radio', 'visibility', null, get_lang('CourseVisibilityHidden'), COURSE_VISIBILITY_HIDDEN);
 
 $form->addGroup($group,'', get_lang('CourseAccess'), '<br />');
 

+ 1 - 0
main/admin/course_edit.php

@@ -149,6 +149,7 @@ $group[]= $form->createElement('radio', 'visibility', get_lang("CourseAccess"),
 $group[]= $form->createElement('radio', 'visibility', null, get_lang('OpenToThePlatform'), COURSE_VISIBILITY_OPEN_PLATFORM);
 $group[]= $form->createElement('radio', 'visibility', null, get_lang('Private'), COURSE_VISIBILITY_REGISTERED);
 $group[]= $form->createElement('radio', 'visibility', null, get_lang('CourseVisibilityClosed'), COURSE_VISIBILITY_CLOSED);
+$group[]= $form->createElement('radio', 'visibility', null, get_lang('CourseVisibilityHidden'), COURSE_VISIBILITY_HIDDEN);
 $form->addGroup($group,'', get_lang('CourseAccess'), '<br />');
 
 $group = array();

+ 4 - 0
main/admin/course_list.php

@@ -157,6 +157,9 @@ function get_course_visibility_icon($v) {
         case 3:
             return Display::return_icon('bullet_blue.gif', get_lang('OpenToTheWorld'), array('style' => $style));
             break;
+        case 4:
+            return Display::return_icon('bullet_grey.gif', get_lang('CourseVisibilityHidden'), array('style' => $style));
+            break;
         default:
             return '';
     }
@@ -201,6 +204,7 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
     $form->addElement('radio', 'keyword_visibility', null, get_lang('OpenToThePlatform'), COURSE_VISIBILITY_OPEN_PLATFORM);
     $form->addElement('radio', 'keyword_visibility', null, get_lang('Private'), COURSE_VISIBILITY_REGISTERED);
     $form->addElement('radio', 'keyword_visibility', null, get_lang('CourseVisibilityClosed'), COURSE_VISIBILITY_CLOSED);
+    $form->addElement('radio', 'keyword_visibility', null, get_lang('CourseVisibilityHidden'), COURSE_VISIBILITY_HIDDEN);
     $form->addElement('radio', 'keyword_visibility', null, get_lang('All'), '%');
     $form->addElement('radio', 'keyword_subscribe', get_lang('Subscription'), get_lang('Allowed'), 1);
     $form->addElement('radio', 'keyword_subscribe', null, get_lang('Denied'), 0);

+ 3 - 3
main/admin/settings.lib.php

@@ -1261,13 +1261,13 @@ function generate_settings_form($settings, $settings_by_access_list, $settings_t
         switch ($row['variable']) {
             case 'pdf_export_watermark_enable':
                 $url =  PDF::get_watermark(null);
-                $form->addElement('file', 'pdf_export_watermark_path', get_lang('AddWaterMark'));
 
                 if ($url != false) {
-                    $delete_url = '<a href="?delete_watermark">'.Display::return_icon('delete.png',get_lang('DelImage')).'</a>';
-                    $form->addElement('html', '<a href="'.$url.'">'.$url.' '.$delete_url.'</a>');
+                    $delete_url = '<a href="?delete_watermark">'.get_lang('DelImage').' '.Display::return_icon('delete.png',get_lang('DelImage')).'</a>';
+                    $form->addElement('html', '<div style="max-height:100px; max-width:100px; margin-left:162px; margin-bottom:10px; clear:both;"><img src="'.$url.'" style="margin-bottom:10px;" />'.$delete_url.'</div>');
                 }
 
+                $form->addElement('file', 'pdf_export_watermark_path', get_lang('AddWaterMark'));
                 $allowed_picture_types = array ('jpg', 'jpeg', 'png', 'gif');
                 $form->addRule('pdf_export_watermark_path', get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')', 'filetype', $allowed_picture_types);
 

+ 5 - 2
main/admin/user_list.php

@@ -494,12 +494,15 @@ function modify_filter($user_id, $url_params, $row) {
 	}
 	$result = '';
 	if (!$user_is_anonymous) {
+        $icon = Display::return_icon('course.png', get_lang('Courses'), array('onmouseout' => 'clear_course_list (\'div_'.$user_id.'\')'));
 		$result .= '<a href="javascript:void(0)" onclick="load_course_list(\'div_'.$user_id.'\','.$user_id.')" >
-					<img onmouseout="clear_course_list (\'div_'.$user_id.'\')" src="../img/icons/22/course.png" title="'.get_lang('Courses').'" alt="'.get_lang('Courses').'"/>
+			        '.$icon.'
 					<div class="blackboard_hide" id="div_'.$user_id.'">&nbsp;&nbsp;</div>
 					</a>';
+
+        $icon = Display::return_icon('session.png', get_lang('Sessions'), array('onmouseout' => 'clear_session_list (\'div_s_'.$user_id.'\')'));
 		$result .= '<a href="javascript:void(0)" onclick="load_session_list(\'div_s_'.$user_id.'\','.$user_id.')" >
-					<img onmouseout="clear_session_list (\'div_s_'.$user_id.'\')" src="../img/icons/22/session.png" title="'.get_lang('Sessions').'" alt="'.get_lang('Sessions').'"/>
+					'.$icon.'
 					<div class="blackboard_hide" id="div_s_'.$user_id.'">&nbsp;&nbsp;</div>
 					</a>';
 	} else {

+ 1 - 1
main/auth/courses_controller.php

@@ -174,7 +174,7 @@ class CoursesController
         $data = array();
         $courseInfo = api_get_course_info($course_code);
         // The course must be open in order to access the auto subscription
-        if (in_array($courseInfo['visibility'], array(COURSE_VISIBILITY_CLOSED, COURSE_VISIBILITY_REGISTERED))) {
+        if (in_array($courseInfo['visibility'], array(COURSE_VISIBILITY_CLOSED, COURSE_VISIBILITY_REGISTERED, COURSE_VISIBILITY_HIDDEN))) {
             $error = get_lang('SubscribingNotAllowed');
             //$message = get_lang('SubscribingNotAllowed');
         } else {

+ 4 - 0
main/course_info/infocours.php

@@ -197,6 +197,10 @@ $group[]= $form->createElement('radio', 'visibility', get_lang("CourseAccess"),
 $group[]= $form->createElement('radio', 'visibility', null, get_lang('OpenToThePlatform'), COURSE_VISIBILITY_OPEN_PLATFORM);
 $group[]= $form->createElement('radio', 'visibility', null, get_lang('Private'), COURSE_VISIBILITY_REGISTERED);
 $group[]= $form->createElement('radio', 'visibility', null, get_lang('CourseVisibilityClosed'), COURSE_VISIBILITY_CLOSED);
+// The "hidden" visibility is only available to portal admins
+if (api_is_platform_admin()) {
+    $group[]= $form->createElement('radio', 'visibility', null, get_lang('CourseVisibilityHidden'), COURSE_VISIBILITY_HIDDEN);
+}
 $form->addGroup($group, '', array(get_lang("CourseAccess"), get_lang("CourseAccessConfigTip")), '');
 
 $url = api_get_path(WEB_CODE_PATH)."auth/inscription.php?c=$course_code&e=1";

+ 13 - 0
main/exercice/exercise.lib.php

@@ -2141,6 +2141,14 @@ function display_question_list_by_attempt($objExercise, $exe_id, $save_user_resu
         $show_only_score = true;
     }
 
+    // Not display expected answer, but score, and feedback
+    $show_all_but_expected_answer = false;
+    if ($objExercise->results_disabled == RESULT_DISABLE_SHOW_SCORE_ONLY && $objExercise->feedback_type == EXERCISE_FEEDBACK_TYPE_END) {
+        $show_all_but_expected_answer = true;
+        $show_results = true;
+        $show_only_score = false;
+    }
+
     if ($show_results || $show_only_score) {
         $user_info   = api_get_user_info($exercise_stat_info['exe_user_id']);
         //Shows exercise header
@@ -2273,12 +2281,17 @@ function display_question_list_by_attempt($objExercise, $exe_id, $save_user_resu
         echo Testcategory::get_stats_table_by_attempt($objExercise->id, $category_list);
     }
 
+    if ($show_all_but_expected_answer) {
+        $exercise_content .= "<div class='normal-message'>".get_lang("ExerciseWithFeedbackWithoutCorrectionComment")."</div>";
+    }
+
     echo $total_score_text;
     echo $exercise_content;
     if (!$show_only_score) {
         echo $total_score_text;
     }
 
+
     if ($save_user_result) {
 
         // Tracking of results

+ 8 - 2
main/exercice/overview.php

@@ -179,7 +179,8 @@ if (!empty($attempts)) {
 			$row['result'] = $score;
 		}
 
-		if (in_array($objExercise->results_disabled, array(RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS, RESULT_DISABLE_SHOW_FINAL_SCORE_ONLY_WITH_CATEGORIES))) {
+		if (in_array($objExercise->results_disabled, array(RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS, RESULT_DISABLE_SHOW_FINAL_SCORE_ONLY_WITH_CATEGORIES))
+            || ($objExercise->results_disabled == RESULT_DISABLE_SHOW_SCORE_ONLY && $objExercise->feedback_type == EXERCISE_FEEDBACK_TYPE_END)) {
 			$row['attempt_link'] = $attempt_link;
 		}
 		$my_attempt_array[] = $row;
@@ -198,7 +199,12 @@ if (!empty($attempts)) {
 			$header_names = array(get_lang('Attempt'), get_lang('StartDate'));
 			break;
 		case RESULT_DISABLE_SHOW_SCORE_ONLY:
-			$header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('Score'));
+            if ($objExercise->feedback_type != EXERCISE_FEEDBACK_TYPE_END) {
+			    $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('Score'));
+            }
+            else {
+                $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('Score'), get_lang('Details'));
+            }
 			break;
 	}
 	$column = 0;

BIN
main/img/bullet_grey.gif


+ 5 - 0
main/inc/lib/login.lib.php

@@ -667,6 +667,11 @@ class Login
                             $is_allowed_in_course = true;
                         }
                         break;
+                    case COURSE_VISIBILITY_HIDDEN: //4
+                        if ($is_platformAdmin) {
+                            $is_allowed_in_course = true;
+                        }
+                        break;
                 }
             }
 

+ 1 - 1
main/inc/lib/social.lib.php

@@ -408,7 +408,7 @@ class SocialManager extends UserManager {
         $result .= $s_htlm_status_icon;
 
         //show a hyperlink to the course, unless the course is closed and user is not course admin
-        if ($course_visibility != COURSE_VISIBILITY_CLOSED || $user_in_course_status == COURSEMANAGER) {
+        if ($course_visibility != COURSE_VISIBILITY_HIDDEN && ($course_visibility != COURSE_VISIBILITY_CLOSED || $user_in_course_status == COURSEMANAGER)) {
             $result .= '<a href="javascript:void(0)" id="ln_'.$count.'"  onclick=toogle_course(this,\''.$course_id.'\');>&nbsp;'.$course_title.'</a>';
         } else {
             $result .= $course_title." "." ".get_lang('CourseClosed')."";

+ 2 - 1
main/lang/dutch/admin.inc.php

@@ -2,6 +2,7 @@
 /*
 for more information: see languages.txt in the lang folder.
 */
+$CourseVisibilityHidden = "Verborgen - Volledig verborgen voor alle gebruikers behalve de platformbeheerders";
 $CasMainActivateComment = "Door CAS authentication te activeren, kunnen gebruikers inloggen met hun CAS gegevens. Ga naar Plugin om een 'CAS Login' knop toe te voegen voor uw Chamilo campus.";
 $UsersRegisteredInAnyGroup = "Gebruikers geregistreerd in om het even welke groep";
 $ShowHotCoursesComment = "De lijst van meest bezochte cursussen zal toegevoegd worden op de home-page";
@@ -691,7 +692,7 @@ $Nested = "Geneste weergave";
 $OpenIdAuthenticationComment = "Activeer de OpenID URL-gebaseerde authenticatie (er verschijnt een extra login-formulier op de homepage)";
 $VersionCheckEnabled = "Versieverificatie ingeschakeld";
 $InstallDirAccessibleSecurityThreat = "De map main/install van uw Chamilo-systeem is nog steeds toegankelijk voor webgebruikers. Dit houdt een beveiligingsrisico in voor uw installatie. Wij adviseren u deze map te verwijderen, of de permissies ervan te wijzigen zodat webgebruikers geen toegang krijgen tot de scripts in die map.";
-$GradebookActivation = "Gradebook activeren";
+$GradebookActivation = "Puntenboekje activeren";
 $GradebookActivationComment = "Het Gradebook activeren biedt de mogelijkheid leerdoelstellingen met scores te definiëren, maar indien u dit niet gebruikt, maakt het de interface onnodig complex. Wenst u het Gradebook te activeren?";
 $UserTheme = "Thema (stylesheet)";
 $UserThemeSelection = "Keuze van thema door de gebruiker";

+ 3 - 1
main/lang/dutch/create_course.inc.php

@@ -6,7 +6,7 @@ $langProfessors = "Lesgevers";
 $langExplanation = "Wanneer u op OK klikt, wordt een cursuspagina aangemaakt met o.a. de onderdelen: forum, links, oefeningen, agenda en cursusmateriaal. Met uw log-in kan u de inhoud later wijzigen.";
 $langEmpty = "U hebt niet alle velden ingevuld.<br />Gebruik de terugknop en herbegin.<br />Als u uw cursuscode niet kent, kunt u de cursuslijst raadplegen.";
 $langCodeTaken = "Deze cursuscode is al in gebruik. Gebruik de terugknop en herbegin.";
-$langFormula = "Vriendelijke groeten, uw lesgever";
+$langFormula = "Vriendelijke groeten,";
 $langMessage = "Wanneer u het testforum verwijdert, zal ook elk onderwerp hierin verwijderd worden.";
 $langExerciceEx = "Voorbeeldoefening";
 $langAntique = "Oude filosofie geschiedenis";
@@ -106,4 +106,6 @@ $Create = "Aanmaken";
 $MessageOfNewCourseToAdmin = "Er werd een nieuwe cursus aangemaakt op het platform:";
 $NewCourseCreatedIn = "Er werd een nieuwe cursus aangemaakt in";
 $ExplicationTrainers = "Je staat op dit moment ingesteld als cursusbeheerder. Je kan dit later aanpassen via de cursuseigenschappen.";
+$Objectives = "Doelstellingen";
+$TargetAudience = "Doelpubliek";
 ?>

+ 1 - 1
main/lang/dutch/registration.inc.php

@@ -72,7 +72,7 @@ $langNowGoChooseYourCourses = "U mag nu in de lijst de cursussen selecteren die
 $langMailHasBeenSent = "Een e-mail werd naar u opgestuurd ter herinnering van uw gebruikersnaam en wachtwoord.";
 $langPersonalSettings = "Uw persoonlijke gegevens zijn opgeslagen.";
 $langManager = "Platformbeheerder";
-$langFormula = "Vriendelijke groeten, uw lesgever";
+$langFormula = "Vriendelijke groeten,";
 $langProblem = "In geval van problemen kan u met ons contact opnemen.";
 $langIs = "is";
 $langAddress = "Het adres van";

+ 4 - 3
main/lang/dutch/trad4all.inc.php

@@ -480,8 +480,8 @@ $UplUnableToSaveFileFilteredExtension = "Upload van bestand is mislukt: bestands
 $OpenIDURL = "OpenID URL";
 $UplFileTooBig = "Het bestand is te groot om door te sturen.";
 $UplGenericError = "Het uploaden van uw bestand is mislukt. Probeer het later nog een keer, of neem contact op met uw platformbeheerder.";
-$MyGradebook = "Mijn gradebook";
-$Gradebook = "Gradebook";
+$MyGradebook = "Mijn puntenboekje";
+$Gradebook = "Puntenboekje";
 $OpenIDWhatIs = "Wat is OpenID?";
 $OpenIDDescription = "Met OpenID hebt u niet langer verschillende gebruikersnamen nodig voor allerlei websites, hetgeen uw webwerk aanzienlijk vereenvoudigt. Aan u de OpenID Provider te kiezen die het best aan uw behoeften beantwoordt en, nog belangrijker, die u vertrouwt. Anderzijds kunt u uw OpenID behouden, ongeacht de Provider die u kiest. Daarenboven is de OpenID technologie niet merkgebonden (proprietary) en volledig gratis. Voor webbedrijven betekent dit minder kosten voor het beheren van wachtwoorden en accounts, en tegelijk meer internetverkeer. OpenID voorkomt ook frustratie bij de gebruikers, omdat zij volledige controle hebben over hun login.<br /><br /><a href=\"http://openid.net/what/\">Meer info...</a>";
 $NoManager = "Geen beheerder";
@@ -824,7 +824,7 @@ $ToolLearnpath = "Leerpad";
 $ToolLink = "Links";
 $ToolQuiz = "Oefeningen";
 $ToolAnnouncement = "Aankondigingen";
-$ToolGradebook = "Gradebook";
+$ToolGradebook = "Puntenboekje";
 $ToolGlossary = "Woordenlijst";
 $ToolAttendance = "Aanwezigheden";
 $ToolCalendarEvent = "Agenda";
@@ -850,4 +850,5 @@ $SeeMessage = "Bekijk het bericht";
 $SeeInvitation = "Bekijk de uitnodiging";
 $YouHaveReceivedThisNotificationBecauseYouAreSubscribedOrInvolvedInItToChangeYourNotificationPreferencesPleaseClickHereX = "Je kreeg deze melding omdat je in je profiel aangaf dat je meldingen via e-mail wenst te ontvangen. Deze instelling kan je op volgende link aanpassen: %s";
 $UserList = "Gebruikerslijst";
+$CourseCatalog = "Cursuscatalogus";
 ?>

+ 0 - 1
main/lang/dutch/userInfo.inc.php

@@ -95,7 +95,6 @@ $UnsubscribeFromPlatformSuccess = "Uw account %s werd volledig verwijderd van he
 $ToChangeYourEmailMustTypeYourPassword = "Om uw e-mailadres te kunnen wijzigen, moet u uw wachtwoord bevestigen";
 $Invitations = "Invitaties";
 $MyGroups = "Mijn groepen";
-$EditProfile = "Profiel wijzigen";
 $Social = "Sociaal";
 $Profile = "Profiel";
 $MyFriends = "Mijn vrienden";

+ 3 - 0
main/lang/dutch/work.inc.php

@@ -2,6 +2,9 @@
 /*
 for more information: see languages.txt in the lang folder.
 */
+$HandedOutDate = "Ingediend datum";
+$HandedOut = "Aantal ingediend";
+$HandOutDateLimit = "Deadline";
 $Tools = "Functies";
 $SendWork = "Document opsturen";
 $langTooBig = "U hebt geen bestand gekozen op te verzenden, of het bestand is te groot.";

+ 17 - 5
main/lang/english/admin.inc.php

@@ -2,6 +2,8 @@
 /*
 for more information: see languages.txt in the lang folder.
 */
+$CourseVisibilityHidden = "Hidden - Completely hidden to all users except the administrators";
+$ApplyAllLanguages = "Apply this change to all available languages";
 $CareerUpdated = "Career updated successfully";
 $CasMainActivateComment = "Enabling CAS authentication will allow users to authenticate with their CAS credentials.<br/>Go to <a href='settings.php?category=CAS'>Plugin</a> to add a configurable 'CAS Login' button for your Chamilo campus.";
 $UsersRegisteredInAnyGroup = "Users registered in any group";
@@ -9,10 +11,10 @@ $ShowHotCoursesComment = "The hot courses list will be added in the index page";
 $ShowHotCoursesTitle = "Show hot courses";
 $EnableIframeInclusionComment = "Allowing arbitrary iframes in the HTML Editor will enhance the edition capabilities of the users, but it can represent a security risk. Please make sure you can rely on your users (i.e. you know who they are) before enabling this feature.";
 $EnableIframeInclusionTitle = "Allow iframes in HTML Editor";
-$MailTemplateRegistrationMessage = "Dear ((firstname)) ((lastname)),\n\nYou are registered on
-((sitename)) with the following settings:\n\nUsername :
-((username))\nPass : ((password))\n\nThe address of ((sitename)) is :
-((url))\n\nIn case of trouble, contact us.\n\nYours sincerely
+$MailTemplateRegistrationMessage = "Dear ((firstname)) ((lastname)),\n\nYou are registered on
+((sitename)) with the following settings:\n\nUsername :
+((username))\nPass : ((password))\n\nThe address of ((sitename)) is :
+((url))\n\nIn case of trouble, contact us.\n\nYours sincerely
 \n((admin_name)) ((admin_surname)).";
 $MailTemplateRegistrationTitle = "New user on ((sitename))";
 $AllowTeachersToCreateSessionsComment = "Teachers can create, edit and delete their own sessions.";
@@ -741,4 +743,14 @@ $FieldTypeDate = "Date";
 $FieldTypeDatetime = "Date and time";
 $UserFieldsAddHelp = "Adding a user field is very easy:<br />- pick a one-word, lowercase identifier,<br />- select a type,<br />- pick a text that should appear to the user (if you use an existing translated name like BirthDate or UserSex, it will automatically get translated to any language),<br />- if you picked a multiple type (radio, select, multiple select), provide the possible choices (again, it can make use of the language variables defined in Chamilo), split by semi-column characters,<br />- for text types, you can choose a default value.<br /><br />Once you're done, add the field and choose whether you want to make it visible and modifiable. Making it modifiable but not visible is useless.";
 $AllowCourseThemeTitle = "Allow course themes";
-$AllowCourseThemeComment = "Allows course graphical themes and makes it possible to change the style sheet used by a course to any of the possible style sheets available to Chamilo. When a user enters the course, the style sheet of the course will have priority over the user's own style sheet and the platf
+$AllowCourseThemeComment = "Allows course graphical themes and makes it possible to change the style sheet used by a course to any of the possible style sheets available to Chamilo. When a user enters the course, the style sheet of the course will have priority over the user's own style sheet and the platform's default style sheet.";
+$DisplayMiniMonthCalendarTitle = "Display the small month calendar in the agenda tool";
+$DisplayMiniMonthCalendarComment = "This setting enables or disables the small month calendar that appears in the left column of the agenda tool";
+$DisplayUpcomingEventsTitle = "Display the upcoming events in the agenda tool";
+$DisplayUpcomingEventsComment = "This setting enables or disables the upcoming events that appears in the left column of the agenda tool of the course";
+$NumberOfUpcomingEventsTitle = "Number of upcoming events that have to be displayed.";
+$NumberOfUpcomingEventsComment = "The number of upcoming events that have to be displayed in the agenda. This requires that the upcoming event functionlity is activated (see setting above).";
+$ShowClosedCoursesTitle = "Display closed courses on login page and portal start page?";
+$ShowClosedCoursesComment = "Display closed courses on the login page and courses start page? On the portal start page an icon will appear next to the courses to quickly subscribe to each courses. This will only appear on the portal's start page when the user is logged in and when the user is not subscribed to the portal yet.";
+$LDAPConnectionError = "LDAP Connection Error";
+$LDAP = "LDAP";

+ 1 - 0
main/lang/english/exercice.inc.php

@@ -384,6 +384,7 @@ $AreYouSureToDeleteResults = "Are you sure to delete results";
 $ExerciseCopied = "Exercise copied";
 $AreYouSureToCopy = "Are you sure to copy";
 $EditingExerciseCauseProblemsInLP = "Editing exercise cause problems in Learning Path";
+$ExerciseWithFeedbackWithoutCorrectionComment = "Note: This test has been setup to hide the expected answers.";
 $SessionIsReadOnly = "The session is read only";
 $EnableTimerControl = "Enable time control";
 $ExerciseTotalDurationInMinutes = "Total duration in minutes of the test";

+ 1 - 0
main/lang/english/learnpath.inc.php

@@ -2,6 +2,7 @@
 /*
 for more information: see languages.txt in the lang folder.
 */
+$AudioFile = "Audio file";
 $ViewModeImpress = "Current view mode: Impress";
 $NewForumCreated = "A new forum has now been created";
 $NewThreadCreated = "A new forum thread has now been created";

+ 44 - 0
main/lang/english/trad4all.inc.php

@@ -2,6 +2,50 @@
 /*
 for more information: see languages.txt in the lang folder.
 */
+$ToReviewXYZ = "%s to review (%s)";
+$UnansweredXYZ = "%s unanswered (%s)";
+$AnsweredXYZ = "%s answered (%s)+(%s)";
+$UnansweredZ = "(%s) Unanswered";
+$AnsweredZ = "(%s) Answered";
+$CurrentQuestionZ = "(%s) Current question";
+$ToReviewZ = "(%s) To review";
+$ReturnToExerciseList = "Return to exercises list";
+$ExerciseAutoLaunch = "Auto-launch for exercises";
+$AllowFastExerciseEdition = "Enable exercise fast edition mode";
+$Username = "Username";
+$SignIn = "Sign in";
+$YouAreReg = "Your are registered to";
+$ManageQuestionCategories = "Manage global questions categories";
+$ManageCourseFields = "Manage extra fields for courses";
+$ManageQuestionFields = "Manage extra fields for questions";
+$QuestionFields = "Questions fields";
+$FieldLoggeable = "Field changes should be logged";
+$EditExtraFieldWorkFlow = "Edit this field's workflow";
+$SelectRole = "Select role";
+$SelectAnOption = "Please select an option";
+$CurrentStatus = "Current status";
+$MyCourseCategories = "My courses categories";
+$SessionsCategories = "Sessions categories";
+$CourseSessionBlock = "Courses and sessions";
+$Committee = "Committee";
+$ModelType = "Exercise model type";
+$YourPasswordCannotBeTheSameAsYourUsername = "Your password cannot be the same as your username";
+$CheckEasyPasswords = "Check passwords too easy to guess";
+$PasswordVeryStrong = "Very strong";
+$PasswordStrong = "Strong";
+$PasswordMedium = "Medium";
+$PasswordNormal = "Normal";
+$PasswordWeak = "Weak";
+$PasswordIsTooShort = "The password is too short";
+$BadCredentials = "Bad credentials";
+$BreadcrumbNavigationDisplayComment = "Show or hide the breadcrumb navigation, the one appearing just below the main navigation tabs. It is highly recommended to have this navigation shown to users, as this allows them to locate their current position and navigate to previous pages easily. Sometimes, however, it might be necessary to hide it (for example in the case of exam platforms) to avoid users navigating to pages they should not see.";
+$BreadcrumbNavigationDisplayTitle = "Breadcrumb navigation";
+$AllowurlfopenIsSetToOff = "The PHP setting \"allow_url_fopen\" is set to off. This prevents the registration mechanism to work properly. This setting can be changed in you PHP configuration file (php.ini) or in the Apache Virtual Host configuration, using the php_admin_value directive";
+$ImpossibleToContactVersionServerPleaseTryAgain = "Impossible to contact the version server right now. Please try again later.";
+$VersionUpToDate = "Your version is up-to-date";
+$LatestVersionIs = "The latest version is";
+$YourVersionNotUpToDate = "Your version is not up-to-date";
+$Hotpotatoes = "Hotpotatoes";
 $CourseCategoriesAreGlobal = "Course categories are global over multiple portals configurations. Changes are only allowed in the main administrative portal.";
 $UserIsNotATeacher = "User is not a teacher";
 $ThisItemIsInvisibleForStudentsButYouHaveAccessAsTeacher = "This item is invisible for learner but you have access as teacher.";

+ 0 - 1
main/lang/english/userInfo.inc.php

@@ -95,7 +95,6 @@ $UnsubscribeFromPlatformSuccess = "Your account %s has been completely removed f
 $ToChangeYourEmailMustTypeYourPassword = "In order to change your e-mail address, you are required to confirm your password";
 $Invitations = "Invitations";
 $MyGroups = "My groups";
-$EditProfile = "Edit profile";
 $Social = "Social";
 $Profile = "Profile";
 $MyFriends = "My friends";

+ 1 - 0
main/lang/french/admin.inc.php

@@ -2,6 +2,7 @@
 /*
 for more information: see languages.txt in the lang folder.
 */
+$CourseVisibilityHidden = "Invisible - Complètement invisible et inaccessible pour tous les utilisateurs excepté les administrateurs";
 $ApplyAllLanguages = "Appliquer ces modifications à toutes les langues disponibles";
 $CareerUpdated = "Carrière mise à jour";
 $CasMainActivateComment = "Activer l'authentification CAS permettra aux utilisateurs de s'identifier à l'aide de leur compte CAS<br/>Vous trouverez dans les <a href='settings.php?category=CAS'>Plugin</a> un bouton 'Login CAS', paramétrable, qui s'ajoutera sur la page d'accueil de votre campus Chamilo.";

+ 1 - 0
main/lang/french/exercice.inc.php

@@ -382,6 +382,7 @@ $AreYouSureToDeleteResults = "Êtes-vous certain de vouloir supprimer les résul
 $ExerciseCopied = "Exercice copié";
 $AreYouSureToCopy = "Êtes-vous certain de vouloir procéder à la copie";
 $EditingExerciseCauseProblemsInLP = "Éditer l'exercice peut causer des problèmes dans les parcours d'apprentissage";
+$ExerciseWithFeedbackWithoutCorrectionComment = "Note : cet exercice est configuré pour ne pas montrer les corrections.";
 $SessionIsReadOnly = "La session est en mode de lecture seule";
 $EnableTimerControl = "Activer le contrôle du temps";
 $ExerciseTotalDurationInMinutes = "Durée totale du test en minutes";

+ 1 - 0
main/lang/french/learnpath.inc.php

@@ -2,6 +2,7 @@
 /*
 for more information: see languages.txt in the lang folder.
 */
+$AudioFile = "Fichier audio";
 $ViewModeImpress = "Affichage actuel: Impress";
 $NewForumCreated = "Le nouveau forum a bien été créé.";
 $NewThreadCreated = "Le nouveau sujet de forum a bien été créé.";

+ 0 - 1
main/lang/french/userInfo.inc.php

@@ -95,7 +95,6 @@ $UnsubscribeFromPlatformSuccess = "Votre compte %s a été complètement effacer
 $ToChangeYourEmailMustTypeYourPassword = "Afin de modifier votre adresse e-mail, veuillez confirmer votre mot de passe";
 $Invitations = "Invitations";
 $MyGroups = "Mes groupes";
-$EditProfile = "Éditer mon profil";
 $Social = "Social";
 $Profile = "Profil";
 $MyFriends = "Mes amis";

File diff suppressed because it is too large
+ 551 - 1
main/lang/spanish/admin.inc.php


+ 1 - 0
main/lang/spanish/exercice.inc.php

@@ -384,6 +384,7 @@ $AreYouSureToDeleteResults = "Está seguro de querer eliminar los resultados";
 $ExerciseCopied = "Ejercicio copiado";
 $AreYouSureToCopy = "Está seguro de querer copiar";
 $EditingExerciseCauseProblemsInLP = "Editar un ejercicio causará problemas en Lecciones";
+$ExerciseWithFeedbackWithoutCorrectionComment = "Nota: Este ejercicio ha sido configurado para ocultar las respuestas esperadas.";
 $SessionIsReadOnly = "La sesión es de sólo lectura";
 $EnableTimerControl = "Habilitar control de tiempo";
 $ExerciseTotalDurationInMinutes = "Duración del ejercicio (en minutos)";

+ 1 - 0
main/lang/spanish/learnpath.inc.php

@@ -2,6 +2,7 @@
 /*
 for more information: see languages.txt in the lang folder.
 */
+$AudioFile = "Archivo de audio";
 $ViewModeImpress = "Visualización actual: Impress";
 $NewForumCreated = "El foro ha sido añadido";
 $NewThreadCreated = "El tema del foro ha sido añadido";

+ 44 - 0
main/lang/spanish/trad4all.inc.php

@@ -2,6 +2,50 @@
 /*
 for more information: see languages.txt in the lang folder.
 */
+$ToReviewXYZ = "%s por revisar (%s)";
+$UnansweredXYZ = "%s sin responder (%s)";
+$AnsweredXYZ = "%s respondidas (%s)+(%s)";
+$UnansweredZ = "(%s) Sin responder";
+$AnsweredZ = "(%s) Respondida";
+$CurrentQuestionZ = "(%s) Pregunta actual";
+$ToReviewZ = "(%s) Por revisar";
+$ReturnToExerciseList = "Regresar a la lista de exámenes";
+$ExerciseAutoLaunch = "Modo de lanzamiento automático de exámenes";
+$AllowFastExerciseEdition = "Activar modo de edición rápida de exámenes";
+$Username = "Usuario";
+$SignIn = "Ingresar";
+$YouAreReg = "Está registrado a";
+$ManageQuestionCategories = "Gestionar categorías globales de preguntas";
+$ManageCourseFields = "Gestor de campos de cursos";
+$ManageQuestionFields = "Gestor de campos de preguntas";
+$QuestionFields = "Campos de preguntas";
+$FieldLoggeable = "Registrar cambios del valor de este campo";
+$EditExtraFieldWorkFlow = "Editar el flujo de trabajo de este campo";
+$SelectRole = "Elegir rol";
+$SelectAnOption = "Elegir una opción";
+$CurrentStatus = "Estado actual";
+$MyCourseCategories = "Mis categorías de cursos";
+$SessionsCategories = "Categorías de sesiones";
+$CourseSessionBlock = "Cursos y sesiones.";
+$Committee = "Comité";
+$ModelType = "Modelo de ejercicio";
+$YourPasswordCannotBeTheSameAsYourUsername = "Su contraseña no puede ser igual a su nombre de usuario";
+$CheckEasyPasswords = "Identificar contraseñas demasiado simples";
+$PasswordVeryStrong = "Muy fuerte";
+$PasswordStrong = "Fuerte";
+$PasswordMedium = "Moderada";
+$PasswordNormal = "Normal";
+$PasswordWeak = "Débil";
+$PasswordIsTooShort = "Contraseña demasiado corta";
+$BadCredentials = "Identificación no reconocida";
+$BreadcrumbNavigationDisplayComment = "Mostrar o esconder la navegación en migajas de pan, que aparece normalmente bajo la barra horizontal de pestañas del menú principal. Es áltamente recomendado dejar esta barra de navegación visible, ya que ayuda los alumnos a navegar en el sistema, identificar su ubicación actual y regresar a etapas anteriores de su navegación. En pocos casos, puede generarse la necesidad de esconder esta barra (por ejemplo en el caso de un sistema de exámenes) para evitar que los usuarios naveguen erróneamente a páginas que los podría confundir.";
+$BreadcrumbNavigationDisplayTitle = "Mostrar la navegación en migajas de pan";
+$AllowurlfopenIsSetToOff = "El parámetro de PHP \"allow_url_fopen\" está desactivado. Esto impide que el mecanismo de registro funcione correctamente. Este parámetro puede cambiarse en el archivo de configuración de PHP (php.ini) o en la configuración del Virtual Host de Apache, mediante la directiva php_admin_value";
+$ImpossibleToContactVersionServerPleaseTryAgain = "Imposible de conectarse al servidor de versiones. Por favor inténtelo de nuevo más tarde 	Imposible de conectarse al servidor de versiones. Por favor inténtelo de nuevo más tarde";
+$VersionUpToDate = "Su versión está actualizada";
+$LatestVersionIs = "La última versión es";
+$YourVersionNotUpToDate = "Su versión está actualizada";
+$Hotpotatoes = "Hotpotatoes";
 $CourseCategoriesAreGlobal = "Las categorías de cursos son globales en la configuración de múltiples portales, pero los cambios son permitidos solamente en la sesión administrativa del portal principal.";
 $UserIsNotATeacher = "El usuario no es un profesor.";
 $ThisItemIsInvisibleForStudentsButYouHaveAccessAsTeacher = "Este item no es visible para un estudiante pero podrá acceder a él como profesor";

+ 0 - 1
main/lang/spanish/userInfo.inc.php

@@ -95,7 +95,6 @@ $UnsubscribeFromPlatformSuccess = "Su cuenta %s ha sido eliminada por completo d
 $ToChangeYourEmailMustTypeYourPassword = "Para cambiar su correo electrónico debe escribir su contraseña";
 $Invitations = "Invitaciones";
 $MyGroups = "Mis grupos";
-$EditProfile = "Editar perfil";
 $Social = "Social";
 $Profile = "Perfil";
 $MyFriends = "Mis amigos";

+ 3 - 0
main/lang/spanish/work.inc.php

@@ -2,6 +2,9 @@
 /*
 for more information: see languages.txt in the lang folder.
 */
+$HandedOutDate = "Fecha de recepción";
+$HandedOut = "Entregado";
+$HandOutDateLimit = "Fecha límite de entrega";
 $Tools = "Herramientas";
 $SendWork = "Enviar el documento";
 $langTooBig = "No ha seleccionado el archivo a enviar o es demasiado grande";

File diff suppressed because it is too large
+ 342 - 2444
main/locale/en.po


File diff suppressed because it is too large
+ 346 - 2449
main/locale/es.po


File diff suppressed because it is too large
+ 327 - 2435
main/locale/fr.po


+ 2 - 2
main/newscorm/lp_add_audio.php

@@ -91,13 +91,13 @@ echo '</div>';
 
 echo '<div id="doc_form" class="span8">';
 
+$lp_item = new learnpathItem($lp_item_id);
 $form = new FormValidator('add_audio', 'post', api_get_self().'?action=add_audio&id='.$lp_item_id, null, array('enctype' => 'multipart/form-data'));
 $form->addElement('header', get_lang('UplUpload'));
+$form->addElement('html', $lp_item->get_title());
 $form->addElement('file', 'file', get_lang('AudioFile'), 'style="width: 250px"');
 $form->addElement('hidden', 'id', $lp_item_id);
 
-$lp_item = new learnpathItem($lp_item_id);
-
 if (isset($lp_item->audio) && !empty($lp_item->audio))  {
     $form->addElement('checkbox', 'delete_file', null, get_lang('RemoveAudio'));
 

+ 1 - 1
main/template/default/auth/courses_categories.php

@@ -147,7 +147,7 @@ $stok = Security::get_token();
 
             foreach ($browse_courses_in_category as $course) {
                 // if course is closed, don't show it.
-                if ($course['visibility'] == COURSE_VISIBILITY_CLOSED) {
+                if ($course['visibility'] == COURSE_VISIBILITY_CLOSED || $course['visibility'] == COURSE_VISIBILITY_HIDDEN) {
                     continue;
                 }
                 // course isn't closed

+ 1 - 0
plugin/dashboard/block_global_info/block_global_info.class.php

@@ -140,6 +140,7 @@ class BlockGlobalInfo extends Block
             array(get_lang('NumberOfCoursesOpen'), '<a href="'.$path.'admin/course_list.php?keyword_code=&amp;keyword_title=&amp;keyword_language=%25&amp;keyword_category=&amp;keyword_visibility='.COURSE_VISIBILITY_OPEN_PLATFORM.'&amp;keyword_subscribe=%25&amp;keyword_unsubscribe=%25&amp;submit=&amp;_qf__advanced_course_search=">'.Statistics::count_courses_by_visibility(COURSE_VISIBILITY_OPEN_PLATFORM).'</a>'),
             array(get_lang('NumberOfCoursesPrivate'), '<a href="'.$path.'admin/course_list.php?keyword_code=&amp;keyword_title=&amp;keyword_language=%25&amp;keyword_category=&amp;keyword_visibility='.COURSE_VISIBILITY_REGISTERED.'&amp;keyword_subscribe=%25&amp;keyword_unsubscribe=%25&amp;submit=&amp;_qf__advanced_course_search=">'.Statistics::count_courses_by_visibility(COURSE_VISIBILITY_REGISTERED).'</a>'),
             array(get_lang('NumberOfCoursesClosed'), '<a href="'.$path.'admin/course_list.php?keyword_code=&amp;keyword_title=&amp;keyword_language=%25&amp;keyword_category=&amp;keyword_visibility='.COURSE_VISIBILITY_CLOSED.'&amp;keyword_subscribe=%25&amp;keyword_unsubscribe=%25&amp;submit=&amp;_qf__advanced_course_search=">'.Statistics::count_courses_by_visibility(COURSE_VISIBILITY_CLOSED).'</a>')
+            array(get_lang('NumberOfCoursesHidden'), '<a href="'.$path.'admin/course_list.php?keyword_code=&amp;keyword_title=&amp;keyword_language=%25&amp;keyword_category=&amp;keyword_visibility='.COURSE_VISIBILITY_HIDDEN.'&amp;keyword_subscribe=%25&amp;keyword_unsubscribe=%25&amp;submit=&amp;_qf__advanced_course_search=">'.Statistics::count_courses_by_visibility(COURSE_VISIBILITY_HIDDEN).'</a>')
         );
         return $global_info;
     }

Some files were not shown because too many files changed in this diff