mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 20:57:26 +02:00
Code Issues Releases Wiki Activity

Private Messenger: Language file duplicate cleanup.

Browse Source
This commit is contained in:
Cameron
2016-04-03 15:02:25 -07:00
parent 2c18d90b9c
commit a496b9a665
10 changed files with 45 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
e107_plugins/pm/admin_config.php
View File

@@ -273,7 +273,7 @@ class private_msg_ui extends e_admin_ui
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>
<th>".ADLAN_PM_36."</th> <th>".LAN_USERCLASS."</th>
<th>".ADLAN_PM_37."</th> <th>".ADLAN_PM_37."</th>
<th>".ADLAN_PM_38."</th> <th>".ADLAN_PM_38."</th>
</tr> </tr>
@@ -311,14 +311,14 @@ class private_msg_ui extends e_admin_ui
<td>".e107::getUserClass()->uc_get_classname($row['limit_classnum'])."</td> <td>".e107::getUserClass()->uc_get_classname($row['limit_classnum'])."</td>
<td> <td>
<div class='row'> <div class='row'>
<div class='col-md-2'>".ADLAN_PM_39.":</div><div class='col-md-10'><input type='text' class='tbox' size='5' name='inbox_count[{$row['limit_id']}]' value='{$row['inbox_count']}' /></div> <div class='col-md-2'>".LAN_PLUGIN_PM_INBOX.":</div><div class='col-md-10'><input type='text' class='tbox' size='5' name='inbox_count[{$row['limit_id']}]' value='{$row['inbox_count']}' /></div>
<div class='col-md-2'>".ADLAN_PM_40.":</div><div class='col-md-10'><input type='text' class='tbox' size='5' name='outbox_count[{$row['limit_id']}]' value='{$row['outbox_count']}' /></div> <div class='col-md-2'>".LAN_PLUGIN_PM_OUTBOX.":</div><div class='col-md-10'><input type='text' class='tbox' size='5' name='outbox_count[{$row['limit_id']}]' value='{$row['outbox_count']}' /></div>
</div> </div>
</td> </td>
<td> <td>
<div class='row'> <div class='row'>
<div class='col-md-2'>".ADLAN_PM_39.":</div><div class='col-md-10'><input type='text' class='tbox' size='5' name='inbox_size[{$row['limit_id']}]' value='{$row['inbox_size']}' /></div> <div class='col-md-2'>".LAN_PLUGIN_PM_INBOX.":</div><div class='col-md-10'><input type='text' class='tbox' size='5' name='inbox_size[{$row['limit_id']}]' value='{$row['inbox_size']}' /></div>
<div class='col-md-2'>".ADLAN_PM_40.":</div><div class='col-md-10'><input type='text' class='tbox' size='5' name='outbox_size[{$row['limit_id']}]' value='{$row['outbox_size']}' /></div> <div class='col-md-2'>".LAN_PLUGIN_PM_OUTBOX.":</div><div class='col-md-10'><input type='text' class='tbox' size='5' name='outbox_size[{$row['limit_id']}]' value='{$row['outbox_size']}' /></div>
</div> </div>
</td> </td>
</tr> </tr>
@@ -377,7 +377,7 @@ class private_msg_ui extends e_admin_ui
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>
<th>".ADLAN_PM_36."</th> <th>".LAN_USERCLASS."</th>
<th>".ADLAN_PM_37."</th> <th>".ADLAN_PM_37."</th>
<th>".ADLAN_PM_38."</th> <th>".ADLAN_PM_38."</th>
</tr> </tr>
@@ -390,14 +390,14 @@ class private_msg_ui extends e_admin_ui
<td>".e107::getUserClass()->uc_dropdown('newlimit_class', 0, 'guest,member,admin,classes')."</td> <td>".e107::getUserClass()->uc_dropdown('newlimit_class', 0, 'guest,member,admin,classes')."</td>
<td> <td>
<div class='row'> <div class='row'>
<div class='col-md-2'>".ADLAN_PM_39.":</div><div class='col-md-10'><input type='text' class='tbox' size='5' name='new_inbox_count' value='' /></div> <div class='col-md-2'>".LAN_PLUGIN_PM_INBOX.":</div><div class='col-md-10'><input type='text' class='tbox' size='5' name='new_inbox_count' value='' /></div>
<div class='col-md-2'>".ADLAN_PM_40.":</div><div class='col-md-10'><input type='text' class='tbox' size='5' name='new_outbox_count' value='' /></div> <div class='col-md-2'>".LAN_PLUGIN_PM_OUTBOX.":</div><div class='col-md-10'><input type='text' class='tbox' size='5' name='new_outbox_count' value='' /></div>
</div> </div>
</td> </td>
<td> <td>
<div class='row'> <div class='row'>
<div class='col-md-2'>".ADLAN_PM_39.":</div><div class='col-md-10'><input type='text' class='tbox' size='5' name='new_inbox_size' value='' /></div> <div class='col-md-2'>".LAN_PLUGIN_PM_INBOX.":</div><div class='col-md-10'><input type='text' class='tbox' size='5' name='new_inbox_size' value='' /></div>
<div class='col-md-2'>".ADLAN_PM_40.":</div><div class='col-md-10'><input type='text' class='tbox' size='5' name='new_outbox_size' value='' /></div> <div class='col-md-2'>".LAN_PLUGIN_PM_OUTBOX.":</div><div class='col-md-10'><input type='text' class='tbox' size='5' name='new_outbox_size' value='' /></div>
</div> </div>
</td> </td>
</tr> </tr>

4
e107_plugins/pm/e_shortcode.php
View File

@@ -65,8 +65,8 @@ class pm_shortcodes extends e_shortcode
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li> <li>
<a href="'.$urlInbox.'">'.LAN_PM_25.'</a> <a href="'.$urlInbox.'">'.LAN_PLUGIN_PM_INBOX.'</a>
<a href="'.$urlOutbox.'">'.LAN_PM_26.'</a> <a href="'.$urlOutbox.'">'.LAN_PLUGIN_PM_OUTBOX.'</a>
<a href="'.$urlCompose.'">'.LAN_PM_35.'</a> <a href="'.$urlCompose.'">'.LAN_PM_35.'</a>
</li> </li>

4
e107_plugins/pm/languages/English.php
View File

@@ -24,8 +24,8 @@ define("LAN_PM_21", "Adding this PM will exceed your maximum outbox size, PM not
define("LAN_PM_22", "File upload failed"); define("LAN_PM_22", "File upload failed");
define("LAN_PM_23", "You are not allowed to send attachments"); define("LAN_PM_23", "You are not allowed to send attachments");
define("LAN_PM_24", "Deleting PM"); define("LAN_PM_24", "Deleting PM");
define("LAN_PM_25", "Inbox"); // define("LAN_PM_25", "Inbox");
define("LAN_PM_26", "Outbox"); // define("LAN_PM_26", "Outbox");
define("LAN_PM_27", "Unread"); define("LAN_PM_27", "Unread");
define("LAN_PM_28", "N/A"); define("LAN_PM_28", "N/A");
define("LAN_PM_29", "Message Sent"); define("LAN_PM_29", "Message Sent");

6
e107_plugins/pm/languages/English_admin.php
View File

@@ -35,11 +35,11 @@ define("ADLAN_PM_31", "Userclass which may to send to entire userclasses");
define("ADLAN_PM_33", "Inactive (no limits)"); define("ADLAN_PM_33", "Inactive (no limits)");
define("ADLAN_PM_34", "PM counts"); define("ADLAN_PM_34", "PM counts");
define("ADLAN_PM_35", "PM box sizes"); define("ADLAN_PM_35", "PM box sizes");
define("ADLAN_PM_36", "Userclass"); // define("ADLAN_PM_36", "Userclass");
define("ADLAN_PM_37", "Count limits"); define("ADLAN_PM_37", "Count limits");
define("ADLAN_PM_38", "Size limits (in KB)"); define("ADLAN_PM_38", "Size limits (in KB)");
define("ADLAN_PM_39", "Inbox"); // define("ADLAN_PM_39", "Inbox");
define("ADLAN_PM_40", "Outbox"); // define("ADLAN_PM_40", "Outbox");
define("ADLAN_PM_41", "There are currently no limits set."); define("ADLAN_PM_41", "There are currently no limits set.");
//define("ADLAN_PM_42", "Update Limits"); //define("ADLAN_PM_42", "Update Limits");
//define("ADLAN_PM_43", "Add New Limit"); //define("ADLAN_PM_43", "Add New Limit");

2
e107_plugins/pm/languages/English_global.php
View File

@@ -4,4 +4,6 @@ define("LAN_PLUGIN_PM_NAME", "Private Messenger");
define("LAN_PLUGIN_PM_DESCRIPTION", "This plugin is a fully featured Private Messaging system."); define("LAN_PLUGIN_PM_DESCRIPTION", "This plugin is a fully featured Private Messaging system.");
define("LAN_PLUGIN_PM_URL_DEFAULT_LABEL", "Default"); define("LAN_PLUGIN_PM_URL_DEFAULT_LABEL", "Default");
define("LAN_PLUGIN_PM_URL_DEFAULT_DESCR", "Default"); define("LAN_PLUGIN_PM_URL_DEFAULT_DESCR", "Default");
define("LAN_PLUGIN_PM_INBOX", "Inbox");
define("LAN_PLUGIN_PM_OUTBOX", "Outbox");
?> ?>

2
e107_plugins/pm/plugin.xml
View File

@@ -4,7 +4,7 @@
<description lan="LAN_PLUGIN_PM_DESCRIPTION">This plugin is a fully featured Private Messaging system.</description> <description lan="LAN_PLUGIN_PM_DESCRIPTION">This plugin is a fully featured Private Messaging system.</description>
<category>users</category> <category>users</category>
<adminLinks> <adminLinks>
<link url='admin_config.php' description='ADLAN_PM_2' icon='images/pvt_message_32.png' iconSmall='images/pvt_message_16.png' primary='true' /> <link url='admin_config.php' description='LAN_CONFIGURE' icon='images/pvt_message_32.png' iconSmall='images/pvt_message_16.png' primary='true' />
</adminLinks> </adminLinks>
<pluginPrefs> <pluginPrefs>
<pref name="title">PMLAN_PM</pref> <pref name="title">PMLAN_PM</pref>

16
e107_plugins/pm/pm.php
View File

@@ -318,11 +318,11 @@ class pm_extended extends private_message
if($comeFrom == 'outbox') if($comeFrom == 'outbox')
{ {
$bread = array('text'=> LAN_PM_26, 'url'=>e107::url('pm','index').'?mode=outbox'); $bread = array('text'=> LAN_PLUGIN_PM_OUTBOX, 'url'=>e107::url('pm','index').'?mode=outbox');
} }
else else
{ {
$bread = array('text'=> LAN_PM_25, 'url'=>e107::url('pm','index').'?mode=inbox'); $bread = array('text'=> LAN_PLUGIN_PM_INBOX, 'url'=>e107::url('pm','index').'?mode=inbox');
} }
$ns->tablerender(LAN_PM, $this->breadcrumb($bread ,'#'.$pmid).$txt); $ns->tablerender(LAN_PM, $this->breadcrumb($bread ,'#'.$pmid).$txt);
@@ -337,13 +337,13 @@ class pm_extended extends private_message
{ // Show Outbox { // Show Outbox
$caption = ''; $caption = '';
if(!deftrue('BOOTSTRAP')){ $caption .= LAN_PM." - ".LAN_PM_26; } if(!deftrue('BOOTSTRAP')){ $caption .= LAN_PM." - ".LAN_PLUGIN_PM_OUTBOX; }
$ns->tablerender($caption, $this->show_outbox(), 'PM'); $ns->tablerender($caption, $this->show_outbox(), 'PM');
} }
else else
{ // Show Inbox { // Show Inbox
$caption = ''; $caption = '';
if(!deftrue('BOOTSTRAP')){ $caption .= LAN_PM." - ".LAN_PM_25; } if(!deftrue('BOOTSTRAP')){ $caption .= LAN_PM." - ".LAN_PLUGIN_PM_INBOX; }
$ns->tablerender($caption, $this->show_inbox(), 'PM'); $ns->tablerender($caption, $this->show_inbox(), 'PM');
} }
} }
@@ -784,15 +784,15 @@ switch ($action)
case 'inbox' : case 'inbox' :
$caption = LAN_PM; $caption = LAN_PM;
if(!deftrue('BOOTSTRAP')){ $caption .= ' - '.LAN_PM_25; } if(!deftrue('BOOTSTRAP')){ $caption .= ' - '.LAN_PLUGIN_PM_INBOX; }
$ns->tablerender($caption, $pm->breadcrumb(LAN_PM_25). $mes->render() . $pm->show_inbox($pm_proc_id), 'PM'); $ns->tablerender($caption, $pm->breadcrumb(LAN_PLUGIN_PM_INBOX). $mes->render() . $pm->show_inbox($pm_proc_id), 'PM');
break; break;
case 'outbox' : case 'outbox' :
$caption = LAN_PM; $caption = LAN_PM;
if(!deftrue('BOOTSTRAP')){ $caption .= ' - '.LAN_PM_26; } if(!deftrue('BOOTSTRAP')){ $caption .= ' - '.LAN_PLUGIN_PM_OUTBOX; }
$ns->tablerender($caption, $pm->breadcrumb(LAN_PM_26).$mes->render() . $pm->show_outbox($pm_proc_id), 'PM'); $ns->tablerender($caption, $pm->breadcrumb(LAN_PLUGIN_PM_OUTBOX).$mes->render() . $pm->show_outbox($pm_proc_id), 'PM');
break; break;
case 'show' : case 'show' :

20
e107_plugins/pm/pm_conf.php
View File

@@ -406,7 +406,7 @@ function show_limits($pm_prefs)
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>
<th>".ADLAN_PM_36."</th> <th>".LAN_USERCLASS."</th>
<th>".ADLAN_PM_37."</th> <th>".ADLAN_PM_37."</th>
<th>".ADLAN_PM_38."</th> <th>".ADLAN_PM_38."</th>
</tr> </tr>
@@ -441,12 +441,12 @@ function show_limits($pm_prefs)
<tr> <tr>
<td>".e107::getUserClass()->uc_get_classname($row['limit_classnum'])."</td> <td>".e107::getUserClass()->uc_get_classname($row['limit_classnum'])."</td>
<td> <td>
".ADLAN_PM_39.": <input type='text' class='tbox' size='5' name='inbox_count[{$row['limit_id']}]' value='{$row['inbox_count']}' /> <br /> ".LAN_PLUGIN_PM_INBOX.": <input type='text' class='tbox' size='5' name='inbox_count[{$row['limit_id']}]' value='{$row['inbox_count']}' /> <br />
".ADLAN_PM_40.": <input type='text' class='tbox' size='5' name='outbox_count[{$row['limit_id']}]' value='{$row['outbox_count']}' /> ".LAN_PLUGIN_PM_OUTBOX.": <input type='text' class='tbox' size='5' name='outbox_count[{$row['limit_id']}]' value='{$row['outbox_count']}' />
</td> </td>
<td> <td>
".ADLAN_PM_39.": <input type='text' class='tbox' size='5' name='inbox_size[{$row['limit_id']}]' value='{$row['inbox_size']}' /> <br /> ".LAN_PLUGIN_PM_INBOX.": <input type='text' class='tbox' size='5' name='inbox_size[{$row['limit_id']}]' value='{$row['inbox_size']}' /> <br />
".ADLAN_PM_40.": <input type='text' class='tbox' size='5' name='outbox_size[{$row['limit_id']}]' value='{$row['outbox_size']}' /> ".LAN_PLUGIN_PM_OUTBOX.": <input type='text' class='tbox' size='5' name='outbox_size[{$row['limit_id']}]' value='{$row['outbox_size']}' />
</td> </td>
</tr> </tr>
"; ";
@@ -498,7 +498,7 @@ function add_limit($pm_prefs)
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>
<th>".ADLAN_PM_36."</th> <th>".LAN_USERCLASS."</th>
<th>".ADLAN_PM_37."</th> <th>".ADLAN_PM_37."</th>
<th>".ADLAN_PM_38."</th> <th>".ADLAN_PM_38."</th>
</tr> </tr>
@@ -510,12 +510,12 @@ function add_limit($pm_prefs)
<tr> <tr>
<td>".e107::getUserClass()->uc_dropdown('newlimit_class', 0, 'guest,member,admin,classes')."</td> <td>".e107::getUserClass()->uc_dropdown('newlimit_class', 0, 'guest,member,admin,classes')."</td>
<td> <td>
".ADLAN_PM_39.": <input type='text' class='tbox' size='5' name='new_inbox_count' value='' /> <br /> ".LAN_PLUGIN_PM_INBOX.": <input type='text' class='tbox' size='5' name='new_inbox_count' value='' /> <br />
".ADLAN_PM_40.": <input type='text' class='tbox' size='5' name='new_outbox_count' value='' /> ".LAN_PLUGIN_PM_OUTBOX.": <input type='text' class='tbox' size='5' name='new_outbox_count' value='' />
</td> </td>
<td> <td>
".ADLAN_PM_39.": <input type='text' class='tbox' size='5' name='new_inbox_size' value='' /> <br /> ".LAN_PLUGIN_PM_INBOX.": <input type='text' class='tbox' size='5' name='new_inbox_size' value='' /> <br />
".ADLAN_PM_40.": <input type='text' class='tbox' size='5' name='new_outbox_size' value='' /> ".LAN_PLUGIN_PM_OUTBOX.": <input type='text' class='tbox' size='5' name='new_outbox_size' value='' />
</td> </td>
</tr> </tr>

12
e107_plugins/pm/private_msg_menu.php
View File

@@ -97,8 +97,8 @@ $pmManager = new pmbox_manager($pm_prefs);
//setScVar('pm_handler_shortcodes','pmManager', $pmManager); //setScVar('pm_handler_shortcodes','pmManager', $pmManager);
define('PM_INBOX_ICON', "<img src='".e_PLUGIN_ABS."pm/images/mail_get.png' class='icon S16' alt='".LAN_PM_25."' title='".LAN_PM_25."' />"); define('PM_INBOX_ICON', "<img src='".e_PLUGIN_ABS."pm/images/mail_get.png' class='icon S16' alt='".LAN_PLUGIN_PM_INBOX."' title='".LAN_PLUGIN_PM_INBOX."' />");
define('PM_OUTBOX_ICON', "<img src='".e_PLUGIN_ABS."pm/images/mail_send.png' class='icon S16' alt='".LAN_PM_26."' title='".LAN_PM_26."' />"); define('PM_OUTBOX_ICON', "<img src='".e_PLUGIN_ABS."pm/images/mail_send.png' class='icon S16' alt='".LAN_PLUGIN_PM_OUTBOX."' title='".LAN_PLUGIN_PM_OUTBOX."' />");
define('PM_SEND_LINK', LAN_PM_35); define('PM_SEND_LINK', LAN_PM_35);
define('NEWPM_ANIMATION', "<img src='".e_PLUGIN_ABS."pm/images/newpm.gif' alt='' />"); define('NEWPM_ANIMATION', "<img src='".e_PLUGIN_ABS."pm/images/newpm.gif' alt='' />");
@@ -125,13 +125,13 @@ if(!isset($pm_menu_template))
/* /*
$pm_menu_template = " $pm_menu_template = "
<a href='{URL=pm|main|f=box&box=inbox}'>".PM_INBOX_ICON."</a> <a href='{URL=pm|main|f=box&box=inbox}'>".PM_INBOX_ICON."</a>
<a href='{URL=pm|main|f=box&box=inbox}'>".LAN_PM_25."</a> <a href='{URL=pm|main|f=box&box=inbox}'>".LAN_PLUGIN_PM_INBOX."</a>
{PM_NEWPM_ANIMATE} {PM_NEWPM_ANIMATE}
<br /> <br />
{PM_INBOX_TOTAL} ".LAN_PM_36.", {PM_INBOX_UNREAD} ".LAN_PM_37." {PM_INBOX_FILLED} {PM_INBOX_TOTAL} ".LAN_PM_36.", {PM_INBOX_UNREAD} ".LAN_PM_37." {PM_INBOX_FILLED}
<br /> <br />
<a href='{URL=pm|main|f=box&box=outbox}'>".PM_OUTBOX_ICON."</a> <a href='{URL=pm|main|f=box&box=outbox}'>".PM_OUTBOX_ICON."</a>
<a href='{URL=pm|main|f=box&box=outbox}'>".LAN_PM_26."</a><br /> <a href='{URL=pm|main|f=box&box=outbox}'>".LAN_PLUGIN_PM_OUTBOX."</a><br />
{PM_OUTBOX_TOTAL} ".LAN_PM_36.", {PM_OUTBOX_UNREAD} ".LAN_PM_37." {PM_OUTBOX_FILLED} {PM_OUTBOX_TOTAL} ".LAN_PM_36.", {PM_OUTBOX_UNREAD} ".LAN_PM_37." {PM_OUTBOX_FILLED}
{PM_SEND_PM_LINK} {PM_SEND_PM_LINK}
{PM_BLOCKED_SENDERS_MANAGE} {PM_BLOCKED_SENDERS_MANAGE}
@@ -140,13 +140,13 @@ if(!isset($pm_menu_template))
$pm_menu_template = " $pm_menu_template = "
<a href='".e_PLUGIN_ABS."pm/pm.php?inbox'>".PM_INBOX_ICON."</a> <a href='".e_PLUGIN_ABS."pm/pm.php?inbox'>".PM_INBOX_ICON."</a>
<a href='".e_PLUGIN_ABS."pm/pm.php?inbox'>".LAN_PM_25."</a> <a href='".e_PLUGIN_ABS."pm/pm.php?inbox'>".LAN_PLUGIN_PM_INBOX."</a>
{PM_NEWPM_ANIMATE} {PM_NEWPM_ANIMATE}
<br /> <br />
{PM_INBOX_TOTAL} ".LAN_PM_36.", {PM_INBOX_UNREAD} ".LAN_PM_37." {PM_INBOX_FILLED} {PM_INBOX_TOTAL} ".LAN_PM_36.", {PM_INBOX_UNREAD} ".LAN_PM_37." {PM_INBOX_FILLED}
<br /> <br />
<a href='".e_PLUGIN_ABS."pm/pm.php?outbox'>".PM_OUTBOX_ICON."</a> <a href='".e_PLUGIN_ABS."pm/pm.php?outbox'>".PM_OUTBOX_ICON."</a>
<a href='".e_PLUGIN_ABS."pm/pm.php?outbox'>".LAN_PM_26."</a><br /> <a href='".e_PLUGIN_ABS."pm/pm.php?outbox'>".LAN_PLUGIN_PM_OUTBOX."</a><br />
{PM_OUTBOX_TOTAL} ".LAN_PM_36.", {PM_OUTBOX_UNREAD} ".LAN_PM_37." {PM_OUTBOX_FILLED} {PM_OUTBOX_TOTAL} ".LAN_PM_36.", {PM_OUTBOX_UNREAD} ".LAN_PM_37." {PM_OUTBOX_FILLED}
{PM_SEND_PM_LINK} {PM_SEND_PM_LINK}
{PM_BLOCKED_SENDERS_MANAGE} {PM_BLOCKED_SENDERS_MANAGE}

2
e107_plugins/pm/shortcodes/batch/pm_shortcodes.php
View File

@@ -229,7 +229,7 @@ if(!class_exists('plugin_pm_pm_shortcodes'))
} }
} }
return e107::getForm()->text('pm_subject',$value,255, array('size'=>80)); return e107::getForm()->text('pm_subject',$value,255, array('size'=>80, 'required'=>1));
// return "<input class='tbox' type='text' name='pm_subject' value='{$value}' size='63' maxlength='255' />"; // return "<input class='tbox' type='text' name='pm_subject' value='{$value}' size='63' maxlength='255' />";
} }