Skip to content

Commit 009bab0

Browse files
ywarnierywarnier
committed
merge
2 parents 2820a05 + 2ebae1b commit 009bab0

29 files changed

+282
-173
lines changed

‎courses/index.html‎

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
</head>
44
<body>
55
</body>
6-
</html>
6+
</html>

‎main/group/group_space.php‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,9 @@
282282
$table->set_column_filter(3, 'email_filter');
283283
}
284284
}
285+
//the order of these calls is important
286+
$table->set_column_filter(1, 'user_name_filter');
287+
$table->set_column_filter(2, 'user_name_filter');
285288
$table->set_column_filter(0, 'user_icon_filter');
286289
$table->display();
287290

@@ -414,6 +417,20 @@ function user_icon_filter($user_id) {
414417
$photo = '<center><img src="'.$image_repository.$existing_image.'" alt="'.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).'" width="22" height="22" title="'.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).'" /></center>';
415418
return '<a href="../user/userInfo.php?origin='.$origin.'&amp;uInfo='.$user_id.'">'.$photo;
416419
}
420+
/**
421+
* Return user profile link around the given user name.
422+
*
423+
* The parameters use a trick of the sorteable table, where the first param is
424+
* the original value of the column
425+
* @param string User name (value of the column at the time of calling)
426+
* @param string URL parameters
427+
* @param array Row of the "sortable table" as it is at the time of function call - we extract the user ID from there
428+
* @return string HTML link
429+
*/
430+
function user_name_filter($name, $url_params, $row) {
431+
global $origin;
432+
return '<a href="../user/userInfo.php?uInfo='.$row[0].'&amp;'.$url_params.'">'.$name.'</a>';
433+
}
417434

418435
// Footer
419436
$orig = isset($origin) ? $origin : '';

‎main/inc/lib/document.lib.php‎

Lines changed: 176 additions & 151 deletions
Large diffs are not rendered by default.

‎main/lang/english/admin.inc.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1467,4 +1467,5 @@
14671467
$ArchiveDirCleanupProceedButton = "Proceed with cleanup";
14681468
$ArchiveDirCleanupSucceeded = "The archive/ directory cleanup has been executed successfully.";
14691469
$ArchiveDirCleanupFailed = "For some reason, the archive/ directory could not be cleaned up. Please clean it up by manually connecting to the server and deleting the contents of the chamilo/archive/ directory, except the .htaccess file.";
1470+
$LocalTimeUsingPortalTimezoneXIsY = "The local time in the portal timezone (%s) is %s";
14701471
?>

‎main/lang/english/agenda.inc.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,5 @@
8080
$SelectACourse = "Select a course";
8181
$PleaseSelectACourseOrASessionInTheLeftColumn = "Please select a course or a session in the sidebar.";
8282
$DisableEndDate = "Disable end date";
83+
$AllEvents = "All events";
8384
?>

‎main/lang/english/exercice.inc.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,4 +412,5 @@
412412
$ShowScoreAndRightAnswer = "Auto-evaluation mode: show score and expected answers";
413413
$DoNotShowScoreNorRightAnswer = "Exam mode: Do not show score nor answers";
414414
$LoadUsersExtraData = "Load users' extra data";
415+
$StartTest = "Start test";
415416
?>

‎main/lang/english/gradebook.inc.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
$CurrentCategory = "Current training";
2020
$RootCat = "Main folder";
2121
$NewCategory = "New category";
22-
$NewEvaluation = "Add classroom assessment";
22+
$NewEvaluation = "Add classroom activity";
2323
$Weight = "Weight";
2424
$PickACourse = "Pick a course";
2525
$CategoryName = "Folder name";
@@ -223,4 +223,5 @@
223223
$SumOfActivitiesWeightMustBeEqualToTotalWeight = "The sum of all activity weights must be equal to the total weight indicated in your assessment settings, otherwise the students will not be able to reach the sufficient score to achieve their certification.";
224224
$TotalSumOfWeights = "The sum of all weights of activities inside this assessment has to be equivalent to this number.";
225225
$TotalWeightMustBeX = "The sum of all weights of activities must be %s";
226+
$ExportAsDOC = "Export as .doc";
226227
?>

‎main/lang/english/trad4all.inc.php‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -976,7 +976,7 @@
976976
$OnlyAccessFromYourGroup = "Only accessible from your group";
977977
$UserFolders = "Folders of users";
978978
$CertificatesFiles = "Certificates";
979-
$ChatFiles = "Conversation history in chat";
979+
$ChatFiles = "Chat conversations history";
980980
$Flash = "Flash";
981981
$Video = "Video";
982982
$Images = "Images";
@@ -1090,7 +1090,7 @@
10901090
$Prev = "Prev";
10911091
$Configuration = "Configuration";
10921092
$ToGroup = "To social group";
1093-
$XWroteY = "%s wrote: <br /><i>%y</i>";
1093+
$XWroteY = "%s wrote: <br /><i>%s</i>";
10941094
$BackToGroup = "Back to the group";
10951095
$GoAttendance = "Go to attendances";
10961096
$GoAssessments = "Go assessments";
@@ -1124,4 +1124,12 @@
11241124
$CourseAssistant = "Assistant";
11251125
$SupportedScormContentMakers = "Scorm Authoring tools supported";
11261126
$Copy = "Copy";
1127+
$EnableStartTime = "Enable start time";
1128+
$EnableEndTime = "Enable end time";
1129+
$Wrong = "Wrong";
1130+
$Certification = "Certification";
1131+
$CertificateOnlineLink = "Online link to certificate";
1132+
$NewExercises = "New exercises";
1133+
$MyAverage = "My average";
1134+
$AllAttempts = "All attempts";
11271135
?>

‎main/lang/french/admin.inc.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1470,4 +1470,5 @@
14701470
$ArchiveDirCleanupProceedButton = "Vidanger";
14711471
$ArchiveDirCleanupSucceeded = "Le répertoire archive/ a été vidangé.";
14721472
$ArchiveDirCleanupFailed = "Le répertoire archive/ n'a pas pu être vidé entièrement. Veuillez le vider manuellement en vous connectant au serveur et en supprimant tou les fichiers dans le répertoire chamilo/archive/, à l'exception du fichier caché .htaccess.";
1473+
$LocalTimeUsingPortalTimezoneXIsY = "L'heure locale selon la zone horaire du portail (%s) est %s";
14731474
?>

‎main/lang/french/agenda.inc.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,5 @@
8080
$SelectACourse = "Sélectionnez un cours";
8181
$PleaseSelectACourseOrASessionInTheLeftColumn = "Veuillez sélectionner un cours ou une session dans le menu latéral.";
8282
$DisableEndDate = "Désactiver date de fin";
83+
$AllEvents = "Tous les évènements";
8384
?>

0 commit comments

Comments
 (0)