From 8265d4bec446096e90459545b02e262427baefeb Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Mon, 23 Mar 2015 22:39:58 -0500 Subject: [PATCH] Move group and forum language file to trad4all - refs #4467 --- main/announcements/announcements.php | 2 +- main/calendar/agenda.php | 3 --- main/calendar/agenda_js.php | 3 --- main/calendar/agenda_list.php | 3 --- main/cron/lang/langstats.php | 4 ++-- main/cron/lang/langstats_file_builder.php | 2 -- main/forum/editpost.php | 2 +- main/forum/forumqualify.php | 2 +- main/forum/forumsearch.php | 3 --- main/forum/iframe_thread.php | 4 ---- main/forum/index.php | 2 -- main/forum/newthread.php | 2 +- main/forum/reply.php | 2 +- main/forum/viewforum.php | 3 --- main/forum/viewforumcategory.php | 3 --- main/forum/viewpost.php | 2 -- main/forum/viewthread.php | 3 --- main/group/group.php | 2 +- main/group/group_category.php | 3 --- main/group/group_creation.php | 4 ---- main/group/group_edit.php | 3 --- main/group/group_overview.php | 2 +- main/group/group_space.php | 3 --- main/group/import.php | 2 +- main/group/member_settings.php | 3 --- main/group/settings.php | 4 ---- main/group/tutor_settings.php | 3 --- main/social/group_topics.php | 2 +- news_list.php | 2 +- 29 files changed, 12 insertions(+), 66 deletions(-) diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php index 3d35cc9deb..c0fa657d26 100755 --- a/main/announcements/announcements.php +++ b/main/announcements/announcements.php @@ -15,7 +15,7 @@ // name of the language file that needs to be included use \ChamiloSession as Session; -$language_file = array('group', 'survey', 'document'); +$language_file = array('survey', 'document'); // use anonymous mode when accessing this course tool $use_anonymous = true; diff --git a/main/calendar/agenda.php b/main/calendar/agenda.php index 8ead4cf148..1acfb60291 100755 --- a/main/calendar/agenda.php +++ b/main/calendar/agenda.php @@ -7,9 +7,6 @@ use \ChamiloSession as Session; -// name of the language file that needs to be included -$language_file = array('group'); - // use anonymous mode when accessing this course tool $use_anonymous = true; require_once '../inc/global.inc.php'; diff --git a/main/calendar/agenda_js.php b/main/calendar/agenda_js.php index d5a7ab8ee0..92c9fbf81e 100755 --- a/main/calendar/agenda_js.php +++ b/main/calendar/agenda_js.php @@ -7,9 +7,6 @@ use \ChamiloSession as Session; -// name of the language file that needs to be included -$language_file = array('group'); - // use anonymous mode when accessing this course tool $use_anonymous = true; diff --git a/main/calendar/agenda_list.php b/main/calendar/agenda_list.php index cfa47445d7..0f6bffc2b2 100755 --- a/main/calendar/agenda_list.php +++ b/main/calendar/agenda_list.php @@ -4,9 +4,6 @@ * @package chamilo.calendar */ -// name of the language file that needs to be included -$language_file = array('group'); - require_once '../inc/global.inc.php'; require_once 'agenda.inc.php'; diff --git a/main/cron/lang/langstats.php b/main/cron/lang/langstats.php index 5ebaef3d47..e208e79a17 100755 --- a/main/cron/lang/langstats.php +++ b/main/cron/lang/langstats.php @@ -13,14 +13,14 @@ */ die(); $language_file = array( -'gradebook', 'registration', 'admin', 'group', +'gradebook', 'registration', 'admin', 'help', 'reservation', 'hotspot', 'scormdocument', 'install', 'shibboleth', 'learnpath', 'course_info', 'survey', 'tracking', 'create_course', 'trad4all', 'document', 'userInfo', 'dropbox', -'exercice', 'wiki', 'forum' +'exercice', 'wiki', ); require_once '../../inc/global.inc.php'; require_once 'langstats.class.php'; diff --git a/main/cron/lang/langstats_file_builder.php b/main/cron/lang/langstats_file_builder.php index b3d6c239d1..789ba76752 100755 --- a/main/cron/lang/langstats_file_builder.php +++ b/main/cron/lang/langstats_file_builder.php @@ -19,9 +19,7 @@ $language_file = array( 'document', 'dropbox', 'exercice', -'forum', 'gradebook', -'group', 'help', 'hotspot', 'install', diff --git a/main/forum/editpost.php b/main/forum/editpost.php index 18b8604c00..c1d628ff78 100755 --- a/main/forum/editpost.php +++ b/main/forum/editpost.php @@ -23,7 +23,7 @@ */ // Language files that need to be included. -$language_file = array('forum', 'group', 'gradebook'); +$language_file = array('gradebook'); // Including the global initialization file. require_once '../inc/global.inc.php'; diff --git a/main/forum/forumqualify.php b/main/forum/forumqualify.php index 1d457d7552..8dbb8aae0d 100755 --- a/main/forum/forumqualify.php +++ b/main/forum/forumqualify.php @@ -7,7 +7,7 @@ */ // name of the language file that needs to be included -$language_file = array('admin', 'forum'); +$language_file = array('admin'); require_once '../inc/global.inc.php'; require_once 'forumconfig.inc.php'; require_once 'forumfunction.inc.php'; diff --git a/main/forum/forumsearch.php b/main/forum/forumsearch.php index 76fa6ed529..0b34106d1e 100755 --- a/main/forum/forumsearch.php +++ b/main/forum/forumsearch.php @@ -24,9 +24,6 @@ use \ChamiloSession as Session; -// Language files that need to be included. -$language_file = array ('forum', 'group'); - // Including the global initialiation file. require_once '../inc/global.inc.php'; diff --git a/main/forum/iframe_thread.php b/main/forum/iframe_thread.php index 34be026deb..c6d0fe6932 100755 --- a/main/forum/iframe_thread.php +++ b/main/forum/iframe_thread.php @@ -20,10 +20,6 @@ * * @package chamilo.forum */ - -// Name of the language file that needs to be included -$language_file = 'forum'; - require_once '../inc/global.inc.php'; /* ACCESS RIGHTS */ diff --git a/main/forum/index.php b/main/forum/index.php index 358b634510..e15ae9d405 100755 --- a/main/forum/index.php +++ b/main/forum/index.php @@ -23,8 +23,6 @@ */ use \ChamiloSession as Session; -// Name of the language file that needs to be included. -$language_file = array('forum'); // Including the global initialization file. require_once '../inc/global.inc.php'; diff --git a/main/forum/newthread.php b/main/forum/newthread.php index a4a902db56..c8087b6c7f 100755 --- a/main/forum/newthread.php +++ b/main/forum/newthread.php @@ -26,7 +26,7 @@ use \ChamiloSession as Session; // Language file that need to be included. -$language_file = array('forum', 'document', 'gradebook'); +$language_file = array('document', 'gradebook'); // Including the global initialization file. require_once '../inc/global.inc.php'; diff --git a/main/forum/reply.php b/main/forum/reply.php index 1393cfcc1b..9b2fff6026 100755 --- a/main/forum/reply.php +++ b/main/forum/reply.php @@ -19,7 +19,7 @@ */ // Language files that need to be included. -$language_file = array('forum', 'document'); +$language_file = array('document'); // Including the global initialization file. require_once '../inc/global.inc.php'; diff --git a/main/forum/viewforum.php b/main/forum/viewforum.php index b4011b42b7..4d39f048d1 100755 --- a/main/forum/viewforum.php +++ b/main/forum/viewforum.php @@ -24,9 +24,6 @@ use \ChamiloSession as Session; -// Language files that need to be included. -$language_file = array('forum', 'group'); - // Including the global initialization file. require_once '../inc/global.inc.php'; $current_course_tool = TOOL_FORUM; diff --git a/main/forum/viewforumcategory.php b/main/forum/viewforumcategory.php index bff410c948..67b92b2b33 100755 --- a/main/forum/viewforumcategory.php +++ b/main/forum/viewforumcategory.php @@ -22,9 +22,6 @@ * @package chamilo.forum */ -// Language file that needs to be included. -$language_file = 'forum'; - // Including the global initialization file. require_once '../inc/global.inc.php'; diff --git a/main/forum/viewpost.php b/main/forum/viewpost.php index d267a6f561..d29d1acd99 100755 --- a/main/forum/viewpost.php +++ b/main/forum/viewpost.php @@ -3,8 +3,6 @@ /** * @package chamilo.forum */ -// Language file that needs to be included. -$language_file = 'forum'; // Including the global initialization file. require_once '../inc/global.inc.php'; diff --git a/main/forum/viewthread.php b/main/forum/viewthread.php index 109964863d..ef2eae88af 100755 --- a/main/forum/viewthread.php +++ b/main/forum/viewthread.php @@ -6,9 +6,6 @@ * @package chamilo.forum */ -// Language file that needs to be included. -$language_file = array ('forum', 'group'); - // Including the global initialization file. require_once '../inc/global.inc.php'; $current_course_tool = TOOL_FORUM; diff --git a/main/group/group.php b/main/group/group.php index 2071105e5f..b4e350721e 100755 --- a/main/group/group.php +++ b/main/group/group.php @@ -16,7 +16,7 @@ */ // Name of the language file that needs to be included -$language_file = array('group', 'document'); +$language_file = array('document'); require_once '../inc/global.inc.php'; diff --git a/main/group/group_category.php b/main/group/group_category.php index 69cb8366a1..c1f2926f15 100755 --- a/main/group/group_category.php +++ b/main/group/group_category.php @@ -5,9 +5,6 @@ * @package chamilo.group */ -// Name of the language file that needs to be included -$language_file = 'group'; - require_once '../inc/global.inc.php'; $this_section = SECTION_COURSES; $current_course_tool = TOOL_GROUP; diff --git a/main/group/group_creation.php b/main/group/group_creation.php index 97b9221ff6..d4dca90f5f 100755 --- a/main/group/group_creation.php +++ b/main/group/group_creation.php @@ -4,10 +4,6 @@ /** * @package chamilo.group */ - -// Name of the language file that needs to be included -$language_file = 'group'; - require_once '../inc/global.inc.php'; $this_section = SECTION_COURSES; $current_course_tool = TOOL_GROUP; diff --git a/main/group/group_edit.php b/main/group/group_edit.php index 80cde59fe5..1ba6703e03 100755 --- a/main/group/group_edit.php +++ b/main/group/group_edit.php @@ -13,9 +13,6 @@ /* INIT SECTION */ -// Name of the language file that needs to be included -$language_file = 'group'; - require '../inc/global.inc.php'; $this_section = SECTION_COURSES; $current_course_tool = TOOL_GROUP; diff --git a/main/group/group_overview.php b/main/group/group_overview.php index bcb4058d9c..0e4f31852f 100755 --- a/main/group/group_overview.php +++ b/main/group/group_overview.php @@ -15,7 +15,7 @@ */ // Name of the language file that needs to be included -$language_file = array('group', 'admin'); +$language_file = array('admin'); require_once '../inc/global.inc.php'; $this_section = SECTION_COURSES; diff --git a/main/group/group_space.php b/main/group/group_space.php index 155e204876..7524a62259 100755 --- a/main/group/group_space.php +++ b/main/group/group_space.php @@ -9,9 +9,6 @@ * @todo Display error message if no group ID specified */ -// Name of the language file that needs to be included -$language_file = 'group'; - require_once '../inc/global.inc.php'; $current_course_tool = TOOL_GROUP; diff --git a/main/group/import.php b/main/group/import.php index c08ef2cb99..4600d58039 100755 --- a/main/group/import.php +++ b/main/group/import.php @@ -2,7 +2,7 @@ /* For licensing terms, see /license.txt */ // Name of the language file that needs to be included -$language_file = array('group', 'admin', 'registration'); +$language_file = array('admin', 'registration'); require_once '../inc/global.inc.php'; $this_section = SECTION_COURSES; diff --git a/main/group/member_settings.php b/main/group/member_settings.php index 48adfb3747..f392496957 100755 --- a/main/group/member_settings.php +++ b/main/group/member_settings.php @@ -13,9 +13,6 @@ /* INIT SECTION */ -// Name of the language file that needs to be included -$language_file = 'group'; - require_once '../inc/global.inc.php'; $this_section = SECTION_COURSES; $current_course_tool = TOOL_GROUP; diff --git a/main/group/settings.php b/main/group/settings.php index 2aca6c9e2b..1d1f7b1dc2 100755 --- a/main/group/settings.php +++ b/main/group/settings.php @@ -10,10 +10,6 @@ * @package chamilo.group * @todo course admin functionality to create groups based on who is in which course (or class). */ - -// Name of the language file that needs to be included -$language_file = 'group'; - require_once '../inc/global.inc.php'; $this_section = SECTION_COURSES; $current_course_tool = TOOL_GROUP; diff --git a/main/group/tutor_settings.php b/main/group/tutor_settings.php index 2c9935cf0a..6c39f3e162 100755 --- a/main/group/tutor_settings.php +++ b/main/group/tutor_settings.php @@ -11,9 +11,6 @@ * @todo course admin functionality to create groups based on who is in which course (or class). */ -// Name of the language file that needs to be included -$language_file = 'group'; - require_once '../inc/global.inc.php'; $this_section = SECTION_COURSES; $current_course_tool = TOOL_GROUP; diff --git a/main/social/group_topics.php b/main/social/group_topics.php index d570811334..34afc9c056 100755 --- a/main/social/group_topics.php +++ b/main/social/group_topics.php @@ -6,7 +6,7 @@ * @author Julio Montoya */ -$language_file = array('userInfo', 'forum'); +$language_file = array('userInfo'); $cidReset = true; require_once '../inc/global.inc.php'; diff --git a/news_list.php b/news_list.php index 1853167c20..88c08f469b 100755 --- a/news_list.php +++ b/news_list.php @@ -2,7 +2,7 @@ /* For licensing terms, see /license.txt */ // name of the language file that needs to be included -$language_file = array ('admin', 'group'); +$language_file = array ('admin'); // including necessary files require_once 'main/inc/global.inc.php';