SD-SimpleDesk

@@ -44,7 +44,7 @@

 			<add><![CDATA[	// SimpleDesk sections. Added here after the initial cleaning is done, so that we can do our own permission checks without arguing with SMF's system (so much)

 	if (!empty($modSettings['helpdesk_active']))

 	{

-		shd_load_language('SimpleDeskProfile');

+		shd_load_language('sd_language/SimpleDeskProfile');

 		// Put it here so we can reuse it for the left menu a bit

 		$context['helpdesk_menu'] = array(

@@ -206,7 +206,7 @@

 	<file name="$sourcedir/Who.php"><!-- load the who's online strings... we don't use it much now, but maybe later... -->

 		<operation>

 			<search position="after"><![CDATA[// Actions that require a specific permission level.]]></search>

-			<add><![CDATA[	shd_load_language('SimpleDeskWho');

+			<add><![CDATA[	shd_load_language('sd_language/SimpleDeskWho');

 	shd_load_plugin_langfiles('who');

 	]]></add>

@@ -21,13 +21,7 @@

 		<modification format="xml" type="file">install-xml/install-packages.xml</modification>

 		<!-- language files -->

-		<require-file name="language-php/SimpleDesk.english.php" destination="$languagedir" />

-		<require-file name="language-php/SimpleDeskPermissions.english.php" destination="$languagedir" />

-		<require-file name="language-php/SimpleDeskLogAction.english.php" destination="$languagedir" />

-		<require-file name="language-php/SimpleDeskAdmin.english.php" destination="$languagedir" />

-		<require-file name="language-php/SimpleDeskWho.english.php" destination="$languagedir" />

-		<require-file name="language-php/SimpleDeskNotifications.english.php" destination="$languagedir" />

-		<require-file name="language-php/SimpleDeskProfile.english.php" destination="$languagedir" />

+		<require-dir name="sd_language" destination="$themes_dir/default/languages" />

 		<!-- sources -->

 		<require-dir name="sd_source" destination="$sourcedir" />

@@ -73,13 +67,7 @@

 		<modification format="xml" type="file" reverse="true">install-xml/install-packages.xml</modification>

 		<!-- language files, removed -->

-		<remove-file name="$languagedir/SimpleDesk.english.php" />

-		<remove-file name="$languagedir/SimpleDeskPermissions.english.php" />

-		<remove-file name="$languagedir/SimpleDeskLogAction.english.php" />

-		<remove-file name="$languagedir/SimpleDeskAdmin.english.php" />

-		<remove-file name="$languagedir/SimpleDeskWho.english.php" />

-		<remove-file name="$languagedir/SimpleDeskNotifications.english.php" />

-		<remove-file name="$languagedir/SimpleDeskProfile.english.php" />

+		<remove-dir name="$themes_dir/default/languages/sd_language" />

 		<!-- source files, removed -->

 		<remove-dir name="$sourcedir/sd_source" />

@@ -39,7 +39,7 @@ function shd_admin_main()

 	global $context, $scripturl, $sourcedir, $settings, $txt, $modSettings, $scripturl;

 	shd_init();

-	shd_load_language('SimpleDeskAdmin');

+	shd_load_language('sd_language/SimpleDeskAdmin');

 	// Kick them in the kneecaps!

 	if (!shd_allowed_to('admin_helpdesk', 0))

@@ -704,7 +704,7 @@ function shd_admin_action_log()

 {

 	global $context, $settings, $scripturl, $txt, $sourcedir, $smcFunc, $sort_types;

-	shd_load_language('SimpleDeskLogAction');

+	shd_load_language('sd_language/SimpleDeskLogAction');

 	$context['can_delete'] = allowedTo('admin_forum');

@@ -233,7 +233,7 @@ function shd_admin_edit_dept()

 {

 	global $context, $txt, $smcFunc, $scripturl;

-	shd_load_language('SimpleDeskPermissions');

+	shd_load_language('sd_language/SimpleDeskPermissions');

 	$_REQUEST['dept'] = isset($_REQUEST['dept']) ? (int) $_REQUEST['dept'] : 0;

@@ -37,7 +37,7 @@ function shd_admin_permissions()

 	shd_load_all_permission_sets();

 	loadTemplate('sd_template/SimpleDesk-AdminPermissions');

-	shd_load_language('SimpleDeskPermissions');

+	shd_load_language('sd_language/SimpleDeskPermissions');

 	$subactions = array(

 		'main' => 'shd_admin_role_list',

@@ -344,7 +344,7 @@ function shd_notify_users($notify_data)

 	);

 	foreach ($notify_lang as $this_lang => $lang_members)

 	{

-		shd_load_language('SimpleDeskNotifications', $this_lang);

+		shd_load_language('sd_language/SimpleDeskNotifications', $this_lang);

 		foreach ($lang_members as $member)

 		{

@@ -448,9 +448,9 @@ function shd_notify_popup()

 	// We're reusing the Help template, need its language file.

 	loadLanguage('Help');

-	shd_load_language('SimpleDeskAdmin');

-	shd_load_language('SimpleDeskLogAction');

-	shd_load_language('SimpleDeskNotifications');

+	shd_load_language('sd_language/SimpleDeskAdmin');

+	shd_load_language('sd_language/SimpleDeskLogAction');

+	shd_load_language('sd_language/SimpleDeskNotifications');

 	// Set the page up

 	loadTemplate('Help');

@@ -34,7 +34,7 @@ function shd_profile_main($memID)

 	// Load the profile details

 	loadTemplate('sd_template/SimpleDesk-Profile', array('helpdesk', 'helpdesk_admin'));

-	shd_load_language('SimpleDeskProfile');

+	shd_load_language('sd_language/SimpleDeskProfile');

 	$context['shd_preferences'] = shd_load_user_prefs();

 	shd_load_plugin_files('hdprofile');

 	shd_load_plugin_langfiles('hdprofile');

@@ -540,7 +540,7 @@ function shd_profile_permissions($memID)

 {

 	global $context, $txt, $scripturl, $sourcedir, $user_info, $smcFunc, $user_profile, $settings;

-	shd_load_language('SimpleDeskPermissions');

+	shd_load_language('sd_language/SimpleDeskPermissions');

 	$context['page_title'] = $txt['shd_profile_area'] . ' - ' . $txt['shd_profile_permissions'];

 	$context['sub_template'] = 'shd_profile_permissions';

@@ -686,7 +686,7 @@ function shd_profile_actionlog($memID)

 	global $context, $txt, $scripturl, $sourcedir, $user_info, $settings;

 	loadTemplate('sd_template/SimpleDesk-Profile');

-	shd_load_language('SimpleDeskProfile');

+	shd_load_language('sd_language/SimpleDeskProfile');

 	require_once($sourcedir . '/sd_source/Subs-SimpleDeskAdmin.php');

 	$context['action_log'] = shd_load_action_log_entries(0, 10, '', '', 'la.id_member = ' . $memID);

@@ -142,7 +142,7 @@ function shd_tickettotopic()

 		fatal_lang_error('shd_moveticket_noboards', false);

 	// OK, now we got to check for custom fields. In any case, we need to fetch the list of fields that might be applicable to this ticket.

-	shd_load_language('SimpleDeskAdmin');

+	shd_load_language('sd_language/SimpleDeskAdmin');

 	$context['field_types'] = array(

 		CFIELD_TYPE_TEXT => array($txt['shd_admin_custom_fields_ui_text'], 'text'),

 		CFIELD_TYPE_LARGETEXT => array($txt['shd_admin_custom_fields_ui_largetext'], 'largetext'),

@@ -104,7 +104,7 @@ function shd_init()

 	define('ROLEPERM_DENY', 2);

 	// Load some stuff

-	shd_load_language('SimpleDesk');

+	shd_load_language('sd_language/SimpleDesk');

 	require($sourcedir . '/sd_source/Subs-SimpleDeskPermissions.php');

 	// Set up defaults

@@ -1562,7 +1562,7 @@ function shd_init_actions(&$actionArray)

 	// If we're going to a help page (for admin), make sure to load the relevant text.

 	if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'helpadmin')

-		shd_load_language('SimpleDeskAdmin');

+		shd_load_language('sd_language/SimpleDeskAdmin');

 	// Now engage any SD specific hooks.

 	call_integration_hook('shd_hook_actions', array(&$actionArray));

@@ -69,9 +69,9 @@ function shd_load_action_log_entries($start = 0, $items_per_page = 10, $sort = '

 	global $smcFunc, $txt, $scripturl, $context, $user_info, $user_profile;

 	// Load languages incase they aren't there (Read: ticket-specific logs)

-	shd_load_language('SimpleDeskAdmin');

-	shd_load_language('SimpleDeskLogAction');

-	shd_load_language('SimpleDeskNotifications');

+	shd_load_language('sd_language/SimpleDeskAdmin');

+	shd_load_language('sd_language/SimpleDeskLogAction');

+	shd_load_language('sd_language/SimpleDeskNotifications');

 	$loaded_users = array();

@@ -362,7 +362,7 @@ function shd_admin_bootstrap(&$admin_areas)

 	// Load the main admin language files and any needed for SD plugins in the admin panel.

 	require_once($sourcedir . '/sd_source/SimpleDesk-Admin.php');

-	shd_load_language('SimpleDeskAdmin');

+	shd_load_language('sd_language/SimpleDeskAdmin');

 	shd_load_plugin_files('hdadmin');

 	shd_load_plugin_langfiles('hdadmin');