Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

chamilo · Sep 14, 2018 · 6f935a7 · 6f935a7
2 parents 79690ae + 60c7844
commit 6f935a7
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/plugin/learning_calendar/lang/english.php b/plugin/learning_calendar/lang/english.php
@@ -8,9 +8,9 @@
 $strings['NumberDaysAccumulatedInCalendar'] = 'Number of days accumulated in the calendar: ';
 $strings['NumberDaysAccumulatedInLp'] = 'Number of days accumulated in the LP: ';
 $strings['NumberDaysInRetard'] = 'Number of days in retard: ';
-$strings['DifferenceOfDaysAndCalendar'] = 'Difference of days and calendar';
+$strings['DifferenceOfDaysAndCalendar'] = 'Difference of days with the calendar plan';
 
-$strings['EventTypeTaken'] = 'Taken';
+$strings['EventTypeTaken'] = 'Busy';
 $strings['EventTypeExam'] = 'Exam';
 $strings['EventTypeFree'] = 'Free';
 $strings['CourseHoursDuration'] = 'Course hours duration';

diff --git a/plugin/learning_calendar/lang/french.php b/plugin/learning_calendar/lang/french.php
@@ -4,11 +4,19 @@
 $strings['plugin_title'] = 'Learning calendar';
 $strings['plugin_comment'] = '';
 $strings['enabled'] = 'Enabled';
-$strings['LearningCalendar'] = 'Learning calendar';
+$strings['LearningCalendar'] = 'Calendrier d\'apprentissage';
 $strings['NumberDaysAccumulatedInCalendar'] = 'Nombre de jours cumulés dans le calendrier: ';
 $strings['NumberDaysAccumulatedInLp'] = 'Nombre de jours cumulés dans les parcours réalisés: ';
 $strings['NumberDaysInRetard'] = "Nombre de jour de retard ou d'avance à la date d'aujourd'hui: ";
 $strings['DifferenceOfDaysAndCalendar'] = 'Différence de nombre de jours avec le plan issu du learning_calendar';
+
 $strings['EventTypeTaken'] = 'Occupé';
 $strings['EventTypeExam'] = 'Examen';
 $strings['EventTypeFree'] = 'Libre';
+$strings['CourseHoursDuration'] = 'Durée du cours (h)';
+$strings['LearningCalendarOneDayMarker'] = 'Marqueur 1 jour calendrier';
+$strings['ControlPointAdded'] = 'Point de contrôle ajouté';
+$strings['NumberOfDays'] = 'Nombre de jours';
+$strings['Date'] = 'Date';
+$strings['AddMultipleUsersToCalendar'] = 'Ajouter plusieurs utilisateurs au calendrier';
+$strings['UpdateCalendar'] = 'Mettre à jour calendrier';
diff --git a/plugin/learning_calendar/lang/spanish.php b/plugin/learning_calendar/lang/spanish.php
@@ -4,4 +4,19 @@
 $strings['plugin_title'] = 'Learning calendar';
 $strings['plugin_comment'] = '';
 $strings['enabled'] = 'Activado';
-$strings['LearningCalendar'] = 'Learning calendar';
+$strings['LearningCalendar'] = 'Calendario de aprendizaje';
+$strings['NumberDaysAccumulatedInCalendar'] = 'Número de días acumulados en el calendario: ';
+$strings['NumberDaysAccumulatedInLp'] = 'Número de días acumulados en la lección: ';
+$strings['NumberDaysInRetard'] = 'Número de días de retraso: ';
+$strings['DifferenceOfDaysAndCalendar'] = 'Diferencia entre días y plan del calendario';
+
+$strings['EventTypeTaken'] = 'Ocupado';
+$strings['EventTypeExam'] = 'Examen';
+$strings['EventTypeFree'] = 'Libre';
+$strings['CourseHoursDuration'] = 'Duración del curso (h)';
+$strings['LearningCalendarOneDayMarker'] = 'Marcador 1 día del calendario de aprendizaje';
+$strings['ControlPointAdded'] = 'Puntos de control añadidos';
+$strings['NumberOfDays'] = 'Número de días';
+$strings['Date'] = 'Fecha';
+$strings['AddMultipleUsersToCalendar'] = 'Añadir usuarios múltiples a un calendario';
+$strings['UpdateCalendar'] = 'Actualizar calendario';
diff --git a/tests/scripts/multi_url_conversion.php b/tests/scripts/multi_url_conversion.php
@@ -6,6 +6,7 @@
  * This means creating a new URL of ID 1 and moving all previous records
  * referencing ID 1 to ID 2.
  */
+die();
 require __DIR__.'/../../main/inc/global.inc.php';
 
 $tableAccessUrl = Database::get_main_table(TABLE_MAIN_ACCESS_URL);