Browse Source

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

jmontoya 9 years ago
parent
commit
70ce77cb54
36 changed files with 3791 additions and 9 deletions
  1. 1 0
      .scrutinizer.yml
  2. 1 1
      main/admin/course_add.php
  3. BIN
      main/default_course_document/images/mr_chamilo/assistance.png
  4. BIN
      main/default_course_document/images/mr_chamilo/collaborative.png
  5. BIN
      main/default_course_document/images/mr_chamilo/doubts.png
  6. BIN
      main/default_course_document/images/mr_chamilo/gotowork.png
  7. BIN
      main/default_course_document/images/mr_chamilo/idea.png
  8. BIN
      main/default_course_document/images/mr_chamilo/navigate_computer.png
  9. BIN
      main/default_course_document/images/mr_chamilo/optimistic.png
  10. BIN
      main/default_course_document/images/mr_chamilo/optimistic_woman.png
  11. BIN
      main/default_course_document/images/mr_chamilo/practicing.png
  12. BIN
      main/default_course_document/images/mr_chamilo/reading.png
  13. BIN
      main/default_course_document/images/mr_chamilo/results.png
  14. 224 0
      main/default_course_document/images/mr_chamilo/svg/assistance.svg
  15. 323 0
      main/default_course_document/images/mr_chamilo/svg/collaborative.svg
  16. 258 0
      main/default_course_document/images/mr_chamilo/svg/doubts.svg
  17. 206 0
      main/default_course_document/images/mr_chamilo/svg/gotowork.svg
  18. 227 0
      main/default_course_document/images/mr_chamilo/svg/idea.svg
  19. 214 0
      main/default_course_document/images/mr_chamilo/svg/navigate_computer.svg
  20. 233 0
      main/default_course_document/images/mr_chamilo/svg/optimistic.svg
  21. 349 0
      main/default_course_document/images/mr_chamilo/svg/optimistic_woman.svg
  22. 396 0
      main/default_course_document/images/mr_chamilo/svg/practicing.svg
  23. 377 0
      main/default_course_document/images/mr_chamilo/svg/reading.svg
  24. 322 0
      main/default_course_document/images/mr_chamilo/svg/results.svg
  25. 439 0
      main/default_course_document/images/mr_chamilo/svg/teaching.svg
  26. 188 0
      main/default_course_document/images/mr_chamilo/svg/writing.svg
  27. BIN
      main/default_course_document/images/mr_chamilo/teaching.png
  28. BIN
      main/default_course_document/images/mr_chamilo/writing.png
  29. 2 2
      main/inc/lib/add_course.lib.inc.php
  30. 11 3
      main/lang/brazilian/trad4all.inc.php
  31. 1 1
      main/lang/bulgarian/trad4all.inc.php
  32. 7 0
      main/lang/english/trad4all.inc.php
  33. 2 0
      main/lang/french/trad4all.inc.php
  34. 1 1
      main/lang/russian/trad4all.inc.php
  35. 2 1
      main/lang/simpl_chinese/trad4all.inc.php
  36. 7 0
      main/lang/spanish/trad4all.inc.php

+ 1 - 0
.scrutinizer.yml

@@ -21,6 +21,7 @@ filter:
         - app/logs/*
         - web/*
         - vendor/*
+        - main/admin/db.php
 checks:
     php:
         code_rating: true

+ 1 - 1
main/admin/course_add.php

@@ -173,7 +173,7 @@ if ($form->validate()) {
     $course['wanted_code'] = $course['visual_code'];
     $course['gradebook_model_id']   = isset($course['gradebook_model_id']) ? $course['gradebook_model_id'] : null;
     // Fixing category code
-    $course['course_category'] = $course['category_code'];
+    $course['course_category'] = isset($course['category_code']) ? $course['category_code'] :  '';
     $course_info = CourseManager::create_course($course);
 
     header('Location: course_list.php'.($course_info===false?'?action=show_msg&warn='.api_get_last_failure():''));

BIN
main/default_course_document/images/mr_chamilo/assistance.png


BIN
main/default_course_document/images/mr_chamilo/collaborative.png


BIN
main/default_course_document/images/mr_chamilo/doubts.png


BIN
main/default_course_document/images/mr_chamilo/gotowork.png


BIN
main/default_course_document/images/mr_chamilo/idea.png


BIN
main/default_course_document/images/mr_chamilo/navigate_computer.png


BIN
main/default_course_document/images/mr_chamilo/optimistic.png


BIN
main/default_course_document/images/mr_chamilo/optimistic_woman.png


BIN
main/default_course_document/images/mr_chamilo/practicing.png


BIN
main/default_course_document/images/mr_chamilo/reading.png


BIN
main/default_course_document/images/mr_chamilo/results.png


File diff suppressed because it is too large
+ 224 - 0
main/default_course_document/images/mr_chamilo/svg/assistance.svg


File diff suppressed because it is too large
+ 323 - 0
main/default_course_document/images/mr_chamilo/svg/collaborative.svg


File diff suppressed because it is too large
+ 258 - 0
main/default_course_document/images/mr_chamilo/svg/doubts.svg


File diff suppressed because it is too large
+ 206 - 0
main/default_course_document/images/mr_chamilo/svg/gotowork.svg


File diff suppressed because it is too large
+ 227 - 0
main/default_course_document/images/mr_chamilo/svg/idea.svg


File diff suppressed because it is too large
+ 214 - 0
main/default_course_document/images/mr_chamilo/svg/navigate_computer.svg


File diff suppressed because it is too large
+ 233 - 0
main/default_course_document/images/mr_chamilo/svg/optimistic.svg


File diff suppressed because it is too large
+ 349 - 0
main/default_course_document/images/mr_chamilo/svg/optimistic_woman.svg


File diff suppressed because it is too large
+ 396 - 0
main/default_course_document/images/mr_chamilo/svg/practicing.svg


File diff suppressed because it is too large
+ 377 - 0
main/default_course_document/images/mr_chamilo/svg/reading.svg


File diff suppressed because it is too large
+ 322 - 0
main/default_course_document/images/mr_chamilo/svg/results.svg


File diff suppressed because it is too large
+ 439 - 0
main/default_course_document/images/mr_chamilo/svg/teaching.svg


File diff suppressed because it is too large
+ 188 - 0
main/default_course_document/images/mr_chamilo/svg/writing.svg


BIN
main/default_course_document/images/mr_chamilo/teaching.png


BIN
main/default_course_document/images/mr_chamilo/writing.png


+ 2 - 2
main/inc/lib/add_course.lib.inc.php

@@ -1031,8 +1031,8 @@ class AddCourse
             $exercise->exercise = get_lang('ExerciceEx');
             $html = '<table width="100%" border="0" cellpadding="0" cellspacing="0">
                         <tr>
-                        <td width="110" valign="top" align="left">
-                            <img src="' . api_get_path(WEB_CODE_PATH) . 'default_course_document/images/mr_dokeos/thinking.jpg">
+                        <td width="220" valign="top" align="left">
+                            <img src="' . api_get_path(WEB_CODE_PATH) . 'default_course_document/images/mr_chamilo/doubts.png">
                         </td>
                         <td valign="top" align="left">' . get_lang('Antique') . '</td></tr>
                     </table>';

+ 11 - 3
main/lang/brazilian/trad4all.inc.php

@@ -796,7 +796,7 @@ $Reject = "Rejeitar";
 $SendingRequestToFollowingUsers = "Envio de requisição aos seguintes usuários";
 $Accepted = "Aceitado";
 $Rejected = "Rejeitado";
-$ChangeModerator = "Change Moderador";
+$ChangeModerator = "Mudança de Moderador";
 $YouAreNotModeratingThisCourse = "Você não é moderador.";
 $Moderator = "Moderador";
 $ThisRoomIsFullPleaseTryAgain = "Esta sala está cheia Desculpe por favor, tente novamente mais tarde..";
@@ -7534,8 +7534,8 @@ $CropYourPicture = "Cortar sua imagem";
 $DownloadBadge = "Baixar emblema";
 $NoXMLFileFoundInTheZip = "Nenhum arquivo XML encontrado no arquivo zip Este é um requisito para este tipo de importação.";
 $BakedBadgeProblem = "Houve um problema ao incorporar a informação afirmação distintivo na imagem emblema, mas você ainda pode usar esta página como uma prova válida.";
-$ConfirmAssociateForumToLPItem = "Confirme item associado mo Fórum ToLP";
-$ConfirmDissociateForumToLPItem = "Confirme item dissociar do Fórum ToLP";
+$ConfirmAssociateForumToLPItem = "Esta ação irá associar um tópico do fórum para este item caminho de aprendizagem. Você quer prosseguir?";
+$ConfirmDissociateForumToLPItem = "Esta ação irá dissociar a discussão no fórum deste item da rota de aprendizagem. Você quer prosseguir?";
 $DissociateForumToLPItem = "Dissociar o item do fórum desta  Rota de aprendizagem";
 $AssociateForumToLPItem = "Associar um item do fórum para esta  Rota de aprendizagem";
 $ForumDissociated = "Fórum dissociado";
@@ -7543,4 +7543,12 @@ $ClickOrDropOneFileHere = "Clique ou soltar um arquivo aqui";
 $ModuloPercentage = "Modulo:\t\t\t%";
 $LastXDays = "Último % dias";
 $ExportBadges = "Exportação de emblemas";
+$LanguagesDisableAllExceptDefault = "Desativar todas as línguas, exceto o padrão da plataforma.";
+$ThereAreUsersUsingThisLanguagesDisableItManually = "Há usuários que atualmente usam a seguinte linguagem. Por favor, desativar manualmente.";
+$MessagingAllowSendPushNotificationTitle = "Permitir enviar notificações push para o aplicativo móvel Chamilo Mensagens";
+$MessagingAllowSendPushNotificationComment = "Enviar Push Notificações pelo Google Cloud Mensagens";
+$MessagingGDCProjectNumberTitle = "Número do projeto de Google Developer Console";
+$MessagingGDCProjectNumberComment = "Você precisa registrar um projeto no Google Developer Console";
+$MessagingGDCApiKeyTitle = "Key API do Google Developer Console para o Google Cloud Mensagens";
+$MessagingGDCApiKeyComment = "Você precisa ativar a API do Google Cloud Mensagens e criar uma credencial para Android";
 ?>

+ 1 - 1
main/lang/bulgarian/trad4all.inc.php

@@ -2494,7 +2494,7 @@ $AddNewQuestionType = "Добавяне на нов тип въпрос";
 $Numbered = "Номериран";
 $iso639_2_code = "bg";
 $iso639_1_code = "bg";
-$charset = "windows-1251";
+$charset = "utf-8";
 $text_dir = "ltr";
 $left_font_family = "verdana, helvetica, arial, geneva, sans-serif";
 $right_font_family = "helvetica, arial, geneva, sans-serif";

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

@@ -7614,4 +7614,11 @@ $LastXDays = "Last % days";
 $ExportBadges = "Export badges";
 $LanguagesDisableAllExceptDefault = "Disable all languages except the platform default";
 $ThereAreUsersUsingThisLanguagesDisableItManually = "There are users currently using the following language. Please disable manually.";
+$MessagingAllowSendPushNotificationTitle = "Allow Push Notifications to the Chamilo Messaging mobile app";
+$MessagingAllowSendPushNotificationComment = "Send Push Notifications by Google Cloud Messaging";
+$MessagingGDCProjectNumberTitle = "Project number of Google Developer Console";
+$MessagingGDCProjectNumberComment = "You need register a project on <a href=\"https://console.developers.google.com/\">Google Developer Console</a>";
+$MessagingGDCApiKeyTitle = "API Key of Google Developer Console for Google Cloud Messaging";
+$MessagingGDCApiKeyComment = "You need enable the Google Cloud Messaging API and create one credential for Android";
+$Overwrite = "Overwrite";
 ?>

+ 2 - 0
main/lang/french/trad4all.inc.php

@@ -7601,4 +7601,6 @@ $LastXDays = "Derniers %s jours";
 $ExportBadges = "Exporter badges";
 $LanguagesDisableAllExceptDefault = "Désactiver toutes les langues execpté celle par défaut de la plateforme";
 $ThereAreUsersUsingThisLanguagesDisableItManually = "Des utilisateurs utilisent encore la langue suivante. Veuillez la désactiver manuellement.";
+$MessagingAllowSendPushNotificationTitle = "Permettre l'envoi de notifications Push à l'application mobile Chamilo Messaging";
+$Overwrite = "Écraser";
 ?>

+ 1 - 1
main/lang/russian/trad4all.inc.php

@@ -1830,7 +1830,7 @@ $AddNewQuestionType = "Добавить новый тип вопроса";
 $Numbered = "Пронумерованный";
 $iso639_2_code = "ru";
 $iso639_1_code = "rus";
-$charset = "iso-8859-5 (стандарт ISO для кодировки русских текстов)";
+$charset = "utf-8";
 $text_dir = "лтр (литера)";
 $left_font_family = "verdana, helvetica, arial, geneva, sans-serif (шрифты)";
 $right_font_family = "helvetica, arial, geneva, sans-serif (шрифты)";

+ 2 - 1
main/lang/simpl_chinese/trad4all.inc.php

@@ -1764,7 +1764,7 @@ $AddNewQuestionType = "添加新的问题类型";
 $Numbered = "数字化的";
 $iso639_2_code = "zh";
 $iso639_1_code = "zho";
-$charset = "字符编码";
+$charset = "utf-8";
 $text_dir = "ltr";
 $left_font_family = "verdana, helvetica, arial, geneva, sans-serif";
 $right_font_family = "helvetica, arial, geneva, sans-serif";
@@ -3583,4 +3583,5 @@ $EditBlocks = "编辑资料块";
 $EndDateMustBeMoreThanStartDate = "结束日期需迟于开始日期";
 $ToolSearch = "搜索";
 $NewImage = "新图片";
+$Administration = "行政";
 ?>

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

@@ -7639,4 +7639,11 @@ $LastXDays = "Últimos %s días";
 $ExportBadges = "Exportar insignias";
 $LanguagesDisableAllExceptDefault = "Desactivar todos los idiomas excepto el por defecto de la plataforma";
 $ThereAreUsersUsingThisLanguagesDisableItManually = "Hay usuarios que usan actualmente el idioma siguiente. Por favor, desactivar manualmente.";
+$MessagingAllowSendPushNotificationTitle = "Permitir enviar notificaciones Push a la aplicación móvil de Chamilo Messaging";
+$MessagingAllowSendPushNotificationComment = "Enviar notificaciones Push a través de Google Cloud Messaging";
+$MessagingGDCProjectNumberTitle = "Número de proyecto de Google Developer Console";
+$MessagingGDCProjectNumberComment = "Necesita registrar un proyecto en <a href=\"https://console.developers.google.com/\">Google Developer Console</a>";
+$MessagingGDCApiKeyTitle = "API key de Google Developer Console para Google Cloud Messaging";
+$MessagingGDCApiKeyComment = "Necesita habilitar la API de Google Cloud Messaging y crear una credencial para Android";
+$Overwrite = "Sobreescribir";
 ?>

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