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

10 years ago · b87882c504
parent 5c7ad62b16
commit b87882c504
60 changed files with 44 additions and 77 deletions
--- a/custompages/language.inc.php
+++ b/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)];
--- a/custompages/language.php
+++ b/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)];
--- a/index.php
+++ b/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;
--- a/main/admin/add_users_to_group.php
+++ b/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;
--- a/main/admin/group_add.php
+++ b/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;

--- a/main/admin/group_edit.php
+++ b/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;
--- a/main/admin/group_list.php
+++ b/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';

--- a/main/auth/profile.php
+++ b/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';

--- a/main/course_info/delete_course.php
+++ b/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;
--- a/main/course_info/infocours.php
+++ b/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;
--- a/main/course_info/legal.php
+++ b/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;

--- a/main/course_info/maintenance.php
+++ b/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;
--- a/main/course_info/maintenance_coach.php
+++ b/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';

--- a/main/course_info/start.php
+++ b/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';

--- a/main/course_progress/index.php
+++ b/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';
--- a/main/coursecopy/recycle_course.php
+++ b/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';
--- a/main/create_course/add_course.php
+++ b/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;
--- a/main/cron/lang/langstats.php
+++ b/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';
--- a/main/cron/lang/langstats_file_builder.php
+++ b/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';
--- a/main/cron/notification.php
+++ b/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';
 /**
--- a/main/dashboard/index.php
+++ b/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
--- a/main/dropbox/dropbox_download.php
+++ b/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';

--- a/main/dropbox/dropbox_init.inc.php
+++ b/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';
--- a/main/inc/ajax/extra_field.ajax.php
+++ b/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'];

--- a/main/inc/ajax/message.ajax.php
+++ b/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'];
--- a/main/inc/ajax/social.ajax.php
+++ b/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;
--- a/main/inc/ajax/user_manager.ajax.php
+++ b/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'];

--- a/main/inc/lib/svg-edit/extensions/imagelib/users.php
+++ b/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';

--- a/main/messages/inbox.php
+++ b/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';
--- a/main/messages/new_message.php
+++ b/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';

--- a/main/messages/outbox.php
+++ b/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';

--- a/main/messages/view_message.php
+++ b/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();
--- a/main/social/friends.php
+++ b/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';

--- a/main/social/group_add.php
+++ b/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';

--- a/main/social/group_edit.php
+++ b/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';

--- a/main/social/group_invitation.php
+++ b/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;

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

--- a/main/social/group_topics.php
+++ b/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';

--- a/main/social/group_waiting_list.php
+++ b/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();
--- a/main/social/groups.php
+++ b/main/social/groups.php
@ -7,7 +7,6 @@
 */

 $cidReset = true;
-$language_file = array('userInfo');
 require_once '../inc/global.inc.php';

 api_block_anonymous_users();
--- a/main/social/home.php
+++ b/main/social/home.php
@ -8,7 +8,6 @@
 /**
 * Initialization
 */
-$language_file = array('userInfo');
 $cidReset = true;

 require_once '../inc/global.inc.php';
--- a/main/social/invitations.php
+++ b/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';

--- a/main/social/message_for_group_form.inc.php
+++ b/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';

--- a/main/social/myfiles.php
+++ b/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';

--- a/main/social/profile.php
+++ b/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
--- a/main/social/profile_friends_and_groups.inc.php
+++ b/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';

--- a/main/social/search.php
+++ b/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';
--- a/main/social/skills_ranking.php
+++ b/main/social/skills_ranking.php
@ -7,7 +7,6 @@
 /**
 * Initialization
 */
-$language_file = array('userInfo');
 $cidReset = true;

 require_once '../inc/global.inc.php';
--- a/main/user/classes.php
+++ b/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';

--- a/main/user/user.php
+++ b/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;
--- a/main/user/userInfo.php
+++ b/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';

--- a/main/user/user_import.php
+++ b/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';
--- a/plugin/ticket/src/myticket.php
+++ b/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';
--- a/plugin/ticket/src/new_ticket.php
+++ b/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();
--- a/plugin/ticket/src/report.php
+++ b/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();
--- a/plugin/ticket/src/send_ticket.php
+++ b/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();
--- a/plugin/ticket/src/ticket_details.php
+++ b/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();
--- a/user.php
+++ b/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';
--- a/user_portal.php
+++ b/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;

--- a/whoisonline.php
+++ b/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;