Browse Source

Move dropbox, userInfo and course_info language file to trad4all - refs #4467

Yannick Warnier 10 years ago
parent
commit
b87882c504
60 changed files with 44 additions and 77 deletions
  1. 1 1
      custompages/language.inc.php
  2. 1 1
      custompages/language.php
  3. 0 2
      index.php
  4. 1 1
      main/admin/add_users_to_group.php
  5. 1 1
      main/admin/group_add.php
  6. 1 1
      main/admin/group_edit.php
  7. 1 1
      main/admin/group_list.php
  8. 1 1
      main/auth/profile.php
  9. 1 1
      main/course_info/delete_course.php
  10. 1 1
      main/course_info/infocours.php
  11. 1 1
      main/course_info/legal.php
  12. 1 1
      main/course_info/maintenance.php
  13. 1 1
      main/course_info/maintenance_coach.php
  14. 1 1
      main/course_info/start.php
  15. 1 1
      main/course_progress/index.php
  16. 1 1
      main/coursecopy/recycle_course.php
  17. 1 1
      main/create_course/add_course.php
  18. 2 2
      main/cron/lang/langstats.php
  19. 0 3
      main/cron/lang/langstats_file_builder.php
  20. 3 2
      main/cron/notification.php
  21. 1 1
      main/dashboard/index.php
  22. 0 4
      main/dropbox/dropbox_download.php
  23. 1 1
      main/dropbox/dropbox_init.inc.php
  24. 1 1
      main/inc/ajax/extra_field.ajax.php
  25. 0 2
      main/inc/ajax/message.ajax.php
  26. 0 1
      main/inc/ajax/social.ajax.php
  27. 1 1
      main/inc/ajax/user_manager.ajax.php
  28. 0 1
      main/inc/lib/svg-edit/extensions/imagelib/users.php
  29. 1 1
      main/messages/inbox.php
  30. 1 1
      main/messages/new_message.php
  31. 1 1
      main/messages/outbox.php
  32. 1 1
      main/messages/view_message.php
  33. 0 2
      main/social/friends.php
  34. 0 1
      main/social/group_add.php
  35. 0 2
      main/social/group_edit.php
  36. 0 3
      main/social/group_invitation.php
  37. 0 1
      main/social/group_members.php
  38. 0 2
      main/social/group_topics.php
  39. 0 1
      main/social/group_waiting_list.php
  40. 0 1
      main/social/groups.php
  41. 0 1
      main/social/home.php
  42. 0 2
      main/social/invitations.php
  43. 1 1
      main/social/message_for_group_form.inc.php
  44. 0 2
      main/social/myfiles.php
  45. 0 2
      main/social/profile.php
  46. 1 1
      main/social/profile_friends_and_groups.inc.php
  47. 1 1
      main/social/search.php
  48. 0 1
      main/social/skills_ranking.php
  49. 1 1
      main/user/classes.php
  50. 1 1
      main/user/user.php
  51. 1 1
      main/user/userInfo.php
  52. 1 1
      main/user/user_import.php
  53. 1 1
      plugin/ticket/src/myticket.php
  54. 1 1
      plugin/ticket/src/new_ticket.php
  55. 1 1
      plugin/ticket/src/report.php
  56. 1 1
      plugin/ticket/src/send_ticket.php
  57. 1 1
      plugin/ticket/src/ticket_details.php
  58. 1 1
      user.php
  59. 1 1
      user_portal.php
  60. 1 1
      whoisonline.php

+ 1 - 1
custompages/language.inc.php

@@ -59,7 +59,7 @@ $chamilo_langs = array(null => 'english', 'en' => 'english', 'fr' => 'french', '
 $available_langs = array('en','fr');
 
 // Which language files will we need ?
-$language_file = array('registration', 'admin','userInfo');
+$language_file = array('registration', 'admin');
 
 // Let's find out which language to serve to this particular browser
 $lang_match = $chamilo_langs[get_preferred_language($available_langs)];

+ 1 - 1
custompages/language.php

@@ -35,7 +35,7 @@ function custompages_get_lang($variable) {
 	return get_lang($variable, null, $_SESSION['user_language_choice']);
 }
 
-$language_file = array('registration', 'admin', 'userInfo');
+$language_file = array('registration', 'admin');
 $available_langs = array('en', 'fr', 'es');
 $chamilo_langs = array(null => 'english', 'en' => 'english', 'fr' => 'french', 'nl' => 'dutch', 'de' => 'german', 'es' => 'spanish');
 $lang_match = $chamilo_langs[get_preferred_language($available_langs)];

+ 0 - 2
index.php

@@ -8,8 +8,6 @@
 use \ChamiloSession as Session;
 define('CHAMILO_HOMEPAGE', true);
 
-$language_file = array('userInfo');
-
 /* Flag forcing the 'current course' reset, as we're not inside a course anymore. */
 // Maybe we should change this into an api function? an example: CourseManager::unset();
 $cidReset = true;

+ 1 - 1
main/admin/add_users_to_group.php

@@ -5,7 +5,7 @@
 */
 
 // name of the language file that needs to be included
-$language_file = array('admin','registration','userInfo');
+$language_file = array('admin', 'registration');
 
 // resetting the course id
 $cidReset = true;

+ 1 - 1
main/admin/group_add.php

@@ -5,7 +5,7 @@
 */
 
 // Language files that should be included
-$language_file = array('admin', 'registration', 'userInfo');
+$language_file = array('admin', 'registration');
 
 $cidReset = true;
 

+ 1 - 1
main/admin/group_edit.php

@@ -5,7 +5,7 @@
 
 */
 // Language files that should be included
-$language_file = array('admin','userInfo');
+$language_file = array('admin');
 $cidReset = true;
 require_once '../inc/global.inc.php';
 $this_section = SECTION_PLATFORM_ADMIN;

+ 1 - 1
main/admin/group_list.php

@@ -7,7 +7,7 @@
 
  */
 // name of the language file that needs to be included
-$language_file = array('registration', 'admin', 'userInfo');
+$language_file = array('registration', 'admin');
 $cidReset = true;
 require_once '../inc/global.inc.php';
 

+ 1 - 1
main/auth/profile.php

@@ -10,7 +10,7 @@
 */
 
 // Language files that should be included.
-$language_file = array('registration', 'userInfo');
+$language_file = array('registration');
 $cidReset = true;
 require_once '../inc/global.inc.php';
 

+ 1 - 1
main/course_info/delete_course.php

@@ -13,7 +13,7 @@
 use \ChamiloSession as Session;
 
 // Language files that need to be included
-$language_file = array('admin', 'course_info');
+$language_file = array('admin');
 
 require_once '../inc/global.inc.php';
 $this_section = SECTION_COURSES;

+ 1 - 1
main/course_info/infocours.php

@@ -15,7 +15,7 @@
  */
 
 // Language files that need to be included
-$language_file = array('create_course', 'course_info', 'admin', 'gradebook', 'document');
+$language_file = array('create_course', 'admin', 'gradebook', 'document');
 require_once '../inc/global.inc.php';
 $current_course_tool  = TOOL_COURSE_SETTING;
 $this_section = SECTION_COURSES;

+ 1 - 1
main/course_info/legal.php

@@ -4,7 +4,7 @@
 use \ChamiloSession as Session;
 
 // Language files that need to be included
-$language_file = array('create_course', 'course_info', 'admin');
+$language_file = array('create_course', 'admin');
 
 $cidReset = true;
 

+ 1 - 1
main/course_info/maintenance.php

@@ -9,7 +9,7 @@
  */
 
 // Language files that need to be included
-$language_file = array('admin','create_course', 'course_info');
+$language_file = array('admin','create_course');
 require_once '../inc/global.inc.php';
 $current_course_tool  = TOOL_COURSE_MAINTENANCE;
 $this_section = SECTION_COURSES;

+ 1 - 1
main/course_info/maintenance_coach.php

@@ -10,7 +10,7 @@
  * Code
  */
 // Language files that need to be included
-$language_file = array('admin', 'create_course', 'course_info');
+$language_file = array('admin', 'create_course');
 
 require_once '../inc/global.inc.php';
 

+ 1 - 1
main/course_info/start.php

@@ -3,7 +3,7 @@
 
 use \ChamiloSession as Session;
 
-$language_file = array('create_course', 'registration','admin','exercice', 'course_info');
+$language_file = array('create_course', 'registration', 'admin', 'exercice');
 
 require_once '../inc/global.inc.php';
 

+ 1 - 1
main/course_progress/index.php

@@ -8,7 +8,7 @@
  */
 
 // name of the language file that needs to be included
-$language_file = array('userInfo', 'admin');
+$language_file = array('admin');
 
 // including files
 require_once '../inc/global.inc.php';

+ 1 - 1
main/coursecopy/recycle_course.php

@@ -10,7 +10,7 @@
  * Code
  */
 // Language files that need to be included
-$language_file = array ('exercice', 'admin', 'course_info');
+$language_file = array ('exercice', 'admin');
 
 // Including the global initialization file
 require_once '../inc/global.inc.php';

+ 1 - 1
main/create_course/add_course.php

@@ -14,7 +14,7 @@
 use \ChamiloSession as Session;
 
 // Name of the language file that needs to be included.
-$language_file = array('create_course', 'registration','admin','exercice', 'course_info');
+$language_file = array('create_course', 'registration', 'admin', 'exercice');
 
 // Flag forcing the "current course" reset.
 $cidReset = true;

+ 2 - 2
main/cron/lang/langstats.php

@@ -17,9 +17,9 @@ $language_file = array(
 'help', 'reservation', 'hotspot',
 'scormdocument',
 'install', 'shibboleth',
-'learnpath', 'course_info', 'survey',
+'learnpath', 'survey',
 'tracking', 'create_course',
-'trad4all', 'document', 'userInfo', 'dropbox',
+'trad4all', 'document',
 'exercice', 'wiki',
 );
 require_once '../../inc/global.inc.php';

+ 0 - 3
main/cron/lang/langstats_file_builder.php

@@ -14,10 +14,8 @@
  */
 $language_file = array(
 'admin',
-'course_info',
 'create_course',
 'document',
-'dropbox',
 'exercice',
 'gradebook',
 'help',
@@ -31,7 +29,6 @@ $language_file = array(
 'survey',
 'tracking',
 'trad4all',
-'userInfo',
 'wiki',
 );
 require_once '../../inc/global.inc.php';

+ 3 - 2
main/cron/notification.php

@@ -7,8 +7,9 @@
 /**
  * Initialization
  */
-if (PHP_SAPI!='cli') { die('Run this script through the command line or comment this line in the code'); }
-$language_file = array('userInfo');
+if (PHP_SAPI!='cli') {
+    die('Run this script through the command line or comment this line in the code');
+}
 
 require_once '../inc/global.inc.php';
 /**

+ 1 - 1
main/dashboard/index.php

@@ -6,7 +6,7 @@
 * @package chamilo.dashboard
 */
 // name of the language file that needs to be included
-$language_file = array('tracking', 'userInfo', 'admin', 'gradebook');
+$language_file = array('tracking', 'admin', 'gradebook');
 $cidReset = true;
 
 // including files

+ 0 - 4
main/dropbox/dropbox_download.php

@@ -6,10 +6,6 @@
 /**
  * Code
  */
-
-// We cannot use dropbox_init.inc.php because this one already outputs data.
-$language_file = 'dropbox';
-
 // including the basic Chamilo initialisation file
 require_once '../inc/global.inc.php';
 

+ 1 - 1
main/dropbox/dropbox_init.inc.php

@@ -121,7 +121,7 @@ Version 1.4 (Yannick Warnier)
 
 use \ChamiloSession as Session;
 
-$language_file = array('dropbox', 'document');
+$language_file = array('document');
 
 // including the basic Chamilo initialisation file
 require_once '../inc/global.inc.php';

+ 1 - 1
main/inc/ajax/extra_field.ajax.php

@@ -1,7 +1,7 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-$language_file = array('admin', 'registration', 'userInfo');
+$language_file = array('admin', 'registration');
 require_once '../global.inc.php';
 $action = $_GET['a'];
 

+ 0 - 2
main/inc/ajax/message.ajax.php

@@ -4,8 +4,6 @@
  * Responses to AJAX calls
  */
 
-$language_file = array('userInfo');
-
 require_once '../global.inc.php';
 
 $action = $_GET['a'];

+ 0 - 1
main/inc/ajax/social.ajax.php

@@ -3,7 +3,6 @@
 /**
  * Responses to AJAX calls
  */
-$language_file = array('userInfo');
 require_once '../global.inc.php';
 
 $action = isset($_GET['a']) ? $_GET['a'] : null;

+ 1 - 1
main/inc/ajax/user_manager.ajax.php

@@ -3,7 +3,7 @@
 /**
  * Responses to AJAX calls
  */
-$language_file = array('admin', 'registration', 'userInfo');
+$language_file = array('admin', 'registration';
 require_once '../global.inc.php';
 $action = $_GET['a'];
 

+ 0 - 1
main/inc/lib/svg-edit/extensions/imagelib/users.php

@@ -3,7 +3,6 @@
  * @author Juan Carlos Raña Trabado
  * @since 25/september/2010
 */
-$language_file = array('userInfo');
 //Chamilo load libraries
 require_once '../../../../../inc/global.inc.php';
 

+ 1 - 1
main/messages/inbox.php

@@ -5,7 +5,7 @@
  */
 
 // name of the language file that needs to be included
-$language_file = array('registration', 'userInfo');
+$language_file = array('registration');
 $cidReset = true;
 
 require_once '../inc/global.inc.php';

+ 1 - 1
main/messages/new_message.php

@@ -13,7 +13,7 @@
 * - send to specific user (when pressing send message in the who is online list)
 */
 // name of the language file that needs to be included
-$language_file = array('userInfo', 'admin');
+$language_file = array('admin');
 $cidReset	= true;
 require_once '../inc/global.inc.php';
 

+ 1 - 1
main/messages/outbox.php

@@ -5,7 +5,7 @@
 */
 
 // name of the language file that needs to be included
-$language_file = array('registration', 'userInfo');
+$language_file = array('registration');
 $cidReset = true;
 require_once '../inc/global.inc.php';
 

+ 1 - 1
main/messages/view_message.php

@@ -3,7 +3,7 @@
 /**
 *	@package chamilo.messages
 */
-$language_file = array('registration', 'userInfo');
+$language_file = array('registration');
 $cidReset= true;
 require_once '../inc/global.inc.php';
 api_block_anonymous_users();

+ 0 - 2
main/social/friends.php

@@ -5,8 +5,6 @@
  * @package chamilo.social
  * @author Julio Montoya <gugli100@gmail.com>
  */
-
-$language_file = array('userInfo');
 $cidReset = true;
 require_once '../inc/global.inc.php';
 

+ 0 - 1
main/social/group_add.php

@@ -4,7 +4,6 @@
  * @package chamilo.social
  * @author Julio Montoya <gugli100@gmail.com>
  */
-$language_file= 'userInfo';
 $cidReset = true;
 require_once '../inc/global.inc.php';
 

+ 0 - 2
main/social/group_edit.php

@@ -4,8 +4,6 @@
  * @package chamilo.social
  * @author Julio Montoya <gugli100@gmail.com>
  */
-// Language files that should be included
-$language_file = array('userInfo');
 $cidReset = true;
 require_once '../inc/global.inc.php';
 

+ 0 - 3
main/social/group_invitation.php

@@ -7,9 +7,6 @@
 /**
  * Initialization
  */
-// name of the language file that needs to be included
-$language_file = array('userInfo');
-
 // resetting the course id
 $cidReset = true;
 

+ 0 - 1
main/social/group_members.php

@@ -7,7 +7,6 @@
 /**
  * Initialization
  */
-$language_file = array('userInfo');
 $cidReset = true;
 require_once '../inc/global.inc.php';
 

+ 0 - 2
main/social/group_topics.php

@@ -5,8 +5,6 @@
  * @package chamilo.social
  * @author Julio Montoya <gugli100@gmail.com>
  */
-
-$language_file = array('userInfo');
 $cidReset = true;
 require_once '../inc/global.inc.php';
 

+ 0 - 1
main/social/group_waiting_list.php

@@ -8,7 +8,6 @@
  * Initialization
  */
 $cidReset = true;
-$language_file = array('userInfo');
 require_once '../inc/global.inc.php';
 
 api_block_anonymous_users();

+ 0 - 1
main/social/groups.php

@@ -7,7 +7,6 @@
  */
 
 $cidReset = true;
-$language_file = array('userInfo');
 require_once '../inc/global.inc.php';
 
 api_block_anonymous_users();

+ 0 - 1
main/social/home.php

@@ -8,7 +8,6 @@
 /**
  * Initialization
  */
-$language_file = array('userInfo');
 $cidReset = true;
 
 require_once '../inc/global.inc.php';

+ 0 - 2
main/social/invitations.php

@@ -4,8 +4,6 @@
  * @package chamilo.social
  * @author Julio Montoya <gugli100@gmail.com>
  */
-
-$language_file = array('userInfo');
 $cidReset=true;
 require_once '../inc/global.inc.php';
 

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

@@ -6,7 +6,7 @@
  * @package chamilo.social
  */
 
-$language_file = array('registration', 'userInfo', 'admin');
+$language_file = array('registration', 'admin');
 $cidReset = true;
 require_once '../inc/global.inc.php';
 

+ 0 - 2
main/social/myfiles.php

@@ -4,8 +4,6 @@
  * @author Juan Carlos Trabado herodoto@telefonica.net
  * @package chamilo.social
  */
-
-$language_file = array('userInfo');
 $cidReset = true;
 require_once '../inc/global.inc.php';
 

+ 0 - 2
main/social/profile.php

@@ -6,8 +6,6 @@
 * @author Isaac Flores Paz <florespaz_isaac@hotmail.com>
 * @package chamilo.social
 */
-
-$language_file = array('userInfo');
 $cidReset = true;
 require_once '../inc/global.inc.php';
 // Include OpenGraph NOT AVAILABLE

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

@@ -8,7 +8,7 @@
 /**
  * Initialization
  */
-$language_file = array('registration', 'userInfo', 'admin');
+$language_file = array('registration', 'admin');
 $cidReset = true;
 require_once '../inc/global.inc.php';
 

+ 1 - 1
main/social/search.php

@@ -6,7 +6,7 @@
  */
 
 // name of the language file that needs to be included
-$language_file = array('registration', 'admin', 'userInfo');
+$language_file = array('registration', 'admin');
 $cidReset = true;
 
 require_once '../inc/global.inc.php';

+ 0 - 1
main/social/skills_ranking.php

@@ -7,7 +7,6 @@
 /**
  * Initialization
  */
-$language_file = array('userInfo');
 $cidReset = true;
 
 require_once '../inc/global.inc.php';

+ 1 - 1
main/user/classes.php

@@ -8,7 +8,7 @@
  * Init
  */
 
-$language_file = array('userInfo','admin');
+$language_file = array('admin');
 $cidReset=true;
 require_once '../inc/global.inc.php';
 

+ 1 - 1
main/user/user.php

@@ -24,7 +24,7 @@
  * Code
  */
 // name of the language file that needs to be included
-$language_file = array('registration', 'admin', 'userInfo', 'registration');
+$language_file = array('registration', 'admin');
 $use_anonymous = true;
 require_once '../inc/global.inc.php';
 $current_course_tool  = TOOL_USER;

+ 1 - 1
main/user/userInfo.php

@@ -17,7 +17,7 @@
  */
 
 // name of the language file that needs to be included
-$language_file = array ('registration', 'userInfo');
+$language_file = array ('registration');
 
 require_once '../inc/global.inc.php';
 

+ 1 - 1
main/user/user_import.php

@@ -1,7 +1,7 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-$language_file = array('registration', 'admin', 'userInfo');
+$language_file = array('registration', 'admin');
 
 require_once '../inc/global.inc.php';
 require_once api_get_path(LIBRARY_PATH).'import.lib.php';

+ 1 - 1
plugin/ticket/src/myticket.php

@@ -6,7 +6,7 @@
  * @package chamilo.plugin.ticket
  */
 
-$language_file = array('userInfo', 'admin');
+$language_file = array('admin');
 $cidReset = true;
 //needed in order to load the plugin lang variables
 $course_plugin = 'ticket';

+ 1 - 1
plugin/ticket/src/new_ticket.php

@@ -4,7 +4,7 @@
 /**
  * @package chamilo.plugin.ticket
  */
-$language_file = array('userInfo', 'admin');
+$language_file = array('admin');
 $cidReset = true;
 require_once '../config.php';
 $plugin = TicketPlugin::create();

+ 1 - 1
plugin/ticket/src/report.php

@@ -4,7 +4,7 @@
 /**
  * @package chamilo.plugin.ticket
  */
-$language_file = array('userInfo', 'admin', 'trad4all');
+$language_file = array('admin', 'trad4all');
 $cidReset = true;
 require_once '../config.php';
 $plugin = TicketPlugin::create();

+ 1 - 1
plugin/ticket/src/send_ticket.php

@@ -8,7 +8,7 @@
 /**
  * INIT SECTION
  */
-$language_file = array('userInfo', 'admin');
+$language_file = array('admin');
 $cidReset = true;
 require_once '../config.php';
 $plugin = TicketPlugin::create();

+ 1 - 1
plugin/ticket/src/ticket_details.php

@@ -5,7 +5,7 @@
  * @package chamilo.plugin.ticket
  */
 
-$language_file = array('userInfo', 'admin');
+$language_file = array('admin');
 $cidReset = true;
 require_once '../config.php';
 $plugin = TicketPlugin::create();

+ 1 - 1
user.php

@@ -16,7 +16,7 @@
  * Variables definitions and inclusions
  */
 // name of the language file that needs to be included
-$language_file = array('registration', 'userInfo');
+$language_file = array('registration');
 
 $cidReset = true;
 require_once 'main/inc/global.inc.php';

+ 1 - 1
user_portal.php

@@ -16,7 +16,7 @@
  */
 
 use \ChamiloSession as Session;
-$language_file = array('admin', 'userInfo');
+$language_file = array('admin');
 /* Flag forcing the 'current course' reset, as we're not inside a course anymore */
 $cidReset = true;
 

+ 1 - 1
whoisonline.php

@@ -6,7 +6,7 @@
 */
 
 // language files that should be included
-$language_file = array('registration', 'userInfo');
+$language_file = array('registration');
 
 if (!isset($_GET['cidReq'])) {
 	$cidReset = true;