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

#220- forum_icons_template.php LAN update, minor LAN fixes to post_shortcodes (#6)

Browse Source
This commit is contained in:
Moc
2013-06-14 16:46:11 +02:00
parent 5873a80978
commit b3693632de
3 changed files with 74 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
e107_plugins/forum/languages/English/English_front.php
View File

@@ -115,7 +115,6 @@ define("LAN_FORUM_0073", "Tracked topics"); // LAN_397
define("LAN_FORUM_0074", "Posted by"); // LAN_423
define("LAN_FORUM_0075", "New topics"); // LAN_424
// starting at LAN_FORUM_1xxx => forum_viewforum.php
define("LAN_FORUM_1001", "Forums"); // LAN_01
@@ -130,15 +129,14 @@ define("LAN_FORUM_1008", "There are no topics in this forum yet."); // LAN_58
define("LAN_FORUM_1009", "This forum is moderated by"); // LAN_404
define("LAN_FORUM_1010", "[popular]"); // LAN_395 (vf)
define("LAN_FORUM_1011", "Sticky"); // LAN_202
define("LAN_FORUM_1012", "Sticky/Closed"); // LAN_203
define("LAN_FORUM_1013", "Announcement"); // LAN_396
define("LAN_FORUM_1014", "Closed thread"); // LAN_81
define("LAN_FORUM_1012", "Sticky/Closed"); // LAN_203 /
define("LAN_FORUM_1013", "Announcement"); // LAN_396 // FORLAN_17
define("LAN_FORUM_1014", "Closed topic"); // LAN_81 / FORLAN_18
define("LAN_FORUM_1015", "[user deleted]"); // FORLAN_19 (vf)
define("LAN_FORUM_1016", "Poll"); // FORLAN_23
define("LAN_FORUM_1017", "Go to"); // LAN_401 (p?)
define("LAN_FORUM_1018", "New topic");
define("LAN_FORUM_1019", "Are you sure?"); // new
// starting at LAN_FORUM_2xxx => forum_viewtopic.php
@@ -152,7 +150,6 @@ define("LAN_FORUM_2006", "Post a reply"); // new
define("LAN_FORUM_2007", "Post a quick reply"); // new
define("LAN_FORUM_2008", "HIDDEN - LOGIN AND REPLY TO REVEAL"); // FORLAN_HIDDEN - used in [hide] bbcode?
define("LAN_FORUM_2009", "Are you sure you want to delete this topic and any replies?"); // LAN_409
define("LAN_FORUM_2010", "Are you sure you want to delete this reply?"); // LAN_410
//define("LAN_FORUM_2011", "posted by"); // LAN_410 // LAN_FORUM_0074
@@ -202,7 +199,6 @@ define("LAN_FORUM_2044", "Email"); // FORLAN_101
define("LAN_FORUM_2045", "Print"); // FORLAN_102
define("LAN_FORUM_2046", "Report"); // LAN_413
// starting at LAN_FORUM_3xxx => forum_post.php
define("LAN_FORUM_3001", "You are not authorized to post to this forum."); // LAN_399 (p)
define("LAN_FORUM_3002", "This topic is locked."); // LAN_397
@@ -234,7 +230,7 @@ define("LAN_FORUM_3023", "Update topic"); // LAN_77
define("LAN_FORUM_3024", "Update reply"); // LAN_78
define("LAN_FORUM_3025", "Type"); // new
define("LAN_FORUM_3026", "Post topic as"); // LAN_400 (p)
//define("LAN_FORUM_3027", "Type"); // new
//define("LAN_FORUM_3027", "Type"); // new -
// poll - partly in e107_plugins/poll/poll_class.php
define("LAN_FORUM_3028", "Add Poll"); // new
@@ -249,11 +245,9 @@ define("LAN_FORUM_3036", "IP address"); // POLLAN_18
define("LAN_FORUM_3037", "User ID (only members can vote)"); // POLLAN_19
define("LAN_FORUM_3038", "Normal"); // LAN_1
define("LAN_FORUM_3039", "Sticky"); // LAN_2
define("LAN_FORUM_3040", "Announcement"); // LAN_3
define("LAN_FORUM_3041", "Deactivate emoticons for this post"); // LAN_FORUMPOST_EMOTES
define("LAN_FORUM_3042", "Enable email tracking (email sent when reply is posted)"); // LAN_380
define("LAN_FORUM_3039", "Deactivate emoticons for this post"); // LAN_FORUMPOST_EMOTES
define("LAN_FORUM_3040", "Enable email tracking (email sent when reply is posted)"); // LAN_380
// missing 41-21
// forum_posted_template
define("LAN_FORUM_3043", "Thank you"); // LAN_133 (p)
@@ -265,6 +259,26 @@ define("LAN_FORUM_3047", "Your message has been successfully posted."); // LAN_3
define("LAN_FORUM_3048", "Click here to view your message"); // LAN_325
define("LAN_FORUM_3049", "Your reply has been successfully posted."); // LAN_415
// forum_icons_template
define("LAN_FORUM_4001", "Unread post exists"); // LAN_199 (vf)
define("LAN_FORUM_4002", "No unread posts"); // new
define("LAN_FORUM_4003", "New posts on popular topic"); // FORLAN_13
define("LAN_FORUM_4004", "No new posts on popular topic"); // FORLAN_14
define("LAN_FORUM_4005", "Website"); // LAN_396
define("LAN_FORUM_4006", "Email"); // LAN_397
define("LAN_FORUM_4007", "Profile"); // LAN_398
define("LAN_FORUM_4008", "Private Message"); // LAN_399
define("LAN_FORUM_4009", "Track topic"); // LAN_391 (vt)
define("LAN_FORUM_4010", "Untrack topic"); // LAN_392 (vt) / new
define("LAN_FORUM_4011", "Stick thread"); // LAN_401
define("LAN_FORUM_4012", "Unstick thread"); // LAN_398
define("LAN_FORUM_4013", "Lock thread"); // LAN_399
define("LAN_FORUM_4014", "Unlock thread"); // LAN_400
/* THIS WILL BE DELETED ONCE THE REWRITE IS DONE
==================================================
@@ -280,7 +294,6 @@ define("LAN_09", "Visits to site since registration");
define("LAN_10", "Back to top");
define("LAN_65", "Jump");
define("LAN_53", "Thread");
define("LAN_54", "Starter");
define("LAN_55", "Replies");
@@ -291,8 +304,6 @@ define("LAN_59", "You must be a registered member and logged in to post on this
define("LAN_202", "Sticky");
define("LAN_203", "Sticky/Closed");
define("LAN_66", "This thread is now closed");
define("LAN_67", "Posts");
define("LAN_194", "Guest");

6
e107_plugins/forum/shortcodes/batch/post_shortcodes.php
View File

@@ -257,7 +257,7 @@ class plugin_forum_post_shortcodes extends e_shortcode
{
$thread_sticky = (isset($_POST['threadtype']) ? $_POST['threadtype'] : vartrue($threadInfo['thread_sticky'],0)); // no reference of 'head' $threadInfo['head']['thread_sticky']
$opts = array(0 => LAN_FORUM_3038, 1 => LAN_FORUM_3039, 2 => LAN_FORUM_3038);
$opts = array(0 => LAN_FORUM_3038, 1 => LAN_FORUM_1011, 2 => LAN_FORUM_1013);
return e107::getForm()->radio('threadtype',$opts, $thread_sticky);
@@ -279,7 +279,7 @@ class plugin_forum_post_shortcodes extends e_shortcode
function sc_noemotes()
{
if(vartrue($eaction) == true) { return ; }
return "<input type='checkbox' name='no_emote' value='1' />&nbsp;<span class='defaulttext'>".LAN_FORUM_3041.'</span>';
return "<input type='checkbox' name='no_emote' value='1' />&nbsp;<span class='defaulttext'>".LAN_FORUM_3039.'</span>';
}
function sc_emailnotify()
@@ -309,7 +309,7 @@ class plugin_forum_post_shortcodes extends e_shortcode
$chk = ($pref['notify_on'] ? "checked='checked'" : '');
}
}
return "<br /><input type='checkbox' name='notify' value='1' {$chk} />&nbsp;<span class='defaulttext'>".LAN_FORUM_3042."</span>";
return "<br /><input type='checkbox' name='notify' value='1' {$chk} />&nbsp;<span class='defaulttext'>".LAN_FORUM_3040."</span>";
}
return '';
}

96
e107_plugins/forum/templates/forum_icons_template.php
View File

@@ -10,67 +10,59 @@
*
*/
if ( ! defined('e107_INIT')) { exit(); }
// include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum_viewforum.php'); // now uses English_front.php
if (!defined('e107_INIT')) { exit(); }
// Thread info
define('IMAGE_e', '<img src="'.img_path('e.png').'" alt="" title="" />');
define('IMAGE_new', '<img src="'.img_path('new.png').'" alt="'.LAN_199.'" title="'.LAN_199.'" />');
define('IMAGE_nonew', '<img src="'.img_path('nonew.png').'" alt="" title="" />');
define('IMAGE_new_small', '<img src="'.img_path('new_small.png').'" alt="'.FORLAN_11.'" title="'.FORLAN_11.'" />');
define('IMAGE_nonew_small', '<img src="'.img_path('nonew_small.png').'" alt="'.FORLAN_12.'" title="'.FORLAN_12.'" />');
define('IMAGE_new_popular', '<img src="'.img_path('new_popular.png').'" alt="'.FORLAN_13.'" title="'.FORLAN_13.'" />');
define('IMAGE_nonew_popular', '<img src="'.img_path('nonew_popular.png').'" alt="'.FORLAN_14.'" title="'.FORLAN_14.'" />');
define('IMAGE_new_popular_small', '<img src="'.img_path('new_popular_small.png').'" alt="'.FORLAN_13.'" title="'.FORLAN_13.'" />');
define('IMAGE_nonew_popular_small', '<img src="'.img_path('nonew_popular_small.png').'" alt="'.FORLAN_14.'" title="'.FORLAN_14.'" />');
define('IMAGE_sticky', '<img src="'.img_path('sticky.png').'" alt="'.FORLAN_15.'" title="'.FORLAN_15.'" />');
define('IMAGE_stickyclosed', '<img src="'.img_path('sticky_closed.png').'" alt="'.FORLAN_16.'" title="'.FORLAN_16.'" />');
define('IMAGE_sticky_small', '<img src="'.img_path('sticky_small.png').'" alt="'.FORLAN_15.'" title="'.FORLAN_15.'" />');
define('IMAGE_stickyclosed_small', '<img src="'.img_path('sticky_closed_small.png').'" alt="'.FORLAN_16.'" title="'.FORLAN_16.'" />');
define('IMAGE_announce', '<img src="'.img_path('announce.png').'" alt="'.FORLAN_17.'" title="'.FORLAN_17.'" />');
define('IMAGE_announce_small', '<img src="'.img_path('announce_small.png').'" alt="'.FORLAN_17.'" title="'.FORLAN_17.'" />');
define('IMAGE_closed_small', '<img src="'.img_path('closed_small.png').'" alt="'.FORLAN_18.'" title="'.FORLAN_18.'" />');
define('IMAGE_closed', '<img src="'.img_path('closed.png').'" alt="'.FORLAN_18.'" title="'.FORLAN_18.'" />');
define('IMAGE_e', '<img src="'.img_path('e.png').'" alt="" title="" />');
define('IMAGE_new', '<img src="'.img_path('new.png').'" alt="'.LAN_FORUM_4001.'" title="'.LAN_FORUM_4001.'" />');
define('IMAGE_nonew', '<img src="'.img_path('nonew.png').'" alt="'.LAN_FORUM_4002.' title="'.LAN_FORUM_4002.'" />');
define('IMAGE_new_small', '<img src="'.img_path('new_small.png').'" alt="'.LAN_FORUM_4001.'" title="'.LAN_FORUM_4001.'" />');
define('IMAGE_nonew_small', '<img src="'.img_path('nonew_small.png').'" alt="'.LAN_FORUM_4002.'" title="'.LAN_FORUM_4002.'" />');
define('IMAGE_new_popular', '<img src="'.img_path('new_popular.png').'" alt="'.LAN_FORUM_4003.'" title="'.LAN_FORUM_4003.'" />');
define('IMAGE_nonew_popular', '<img src="'.img_path('nonew_popular.png').'" alt="'.LAN_FORUM_4004.'" title="'.LAN_FORUM_4004.'" />');
define('IMAGE_new_popular_small', '<img src="'.img_path('new_popular_small.png').'" alt="'.LAN_FORUM_4003.'" title="'.LAN_FORUM_4003.'" />');
define('IMAGE_nonew_popular_small', '<img src="'.img_path('nonew_popular_small.png').'" alt="'.LAN_FORUM_4004.'" title="'.LAN_FORUM_4004.'" />');
define('IMAGE_sticky', '<img src="'.img_path('sticky.png').'" alt="'.LAN_FORUM_1011.'" title="'.LAN_FORUM_1011.'" />');
define('IMAGE_sticky_small', '<img src="'.img_path('sticky_small.png').'" alt="'.LAN_FORUM_1011.'" title="'.LAN_FORUM_1011.'" />');
define('IMAGE_stickyclosed', '<img src="'.img_path('sticky_closed.png').'" alt="'.LAN_FORUM_1012.'" title="'.LAN_FORUM_1012.'" />');
define('IMAGE_stickyclosed_small', '<img src="'.img_path('sticky_closed_small.png').'" alt="'.LAN_FORUM_1012.'" title="'.LAN_FORUM_1012.'" />');
define('IMAGE_announce', '<img src="'.img_path('announce.png').'" alt="'.LAN_FORUM_1013.'" title="'.LAN_FORUM_1013.'" />');
define('IMAGE_announce_small', '<img src="'.img_path('announce_small.png').'" alt="'.LAN_FORUM_1013.'" title="'.LAN_FORUM_1013.'" />');
define('IMAGE_closed_small', '<img src="'.img_path('closed_small.png').'" alt="'.LAN_FORUM_1014.'" title="'.LAN_FORUM_1014.'" />');
define('IMAGE_closed', '<img src="'.img_path('closed.png').'" alt="'.LAN_FORUM_1014.'" title="'.LAN_FORUM_1014.'" />');
// User info
define('IMAGE_profile', '<img src="'.img_path('profile.png').'" alt="'.LAN_398.'" title="'.LAN_398.'" />');
define('IMAGE_email', '<img src="'.img_path('email.png').'" alt="'.LAN_397.'" title="'.LAN_397.'" />');
define('IMAGE_website', '<img src="'.img_path('website.png').'" alt="'.LAN_396.'" title="'.LAN_396.'" />');
define('IMAGE_website', '<img src="'.img_path('website.png').'" alt="'.LAN_FORUM_4005.'" title="'.LAN_FORUM_4005.'" />');
define('IMAGE_email', '<img src="'.img_path('email.png').'" alt="'.LAN_FORUM_4006.'" title="'.LAN_FORUM_4006.'" />');
define('IMAGE_profile', '<img src="'.img_path('profile.png').'" alt="'.LAN_FORUM_4007.'" title="'.LAN_FORUM_4007.'" />');
// action
define('IMAGE_pm', '<img src="'.img_path('pm.png').'" alt="'.LAN_399.'" title="'.LAN_399.'" class="icon S16 action" />');
define('IMAGE_edit', '<img src="'.img_path('edit.png').'" alt="'.LAN_400.'" title="'.LAN_400.'" class="icon S16 action" />');
define('IMAGE_quote', '<img src="'.img_path('quote.png').'" alt="'.LAN_401.'" title="'.LAN_401.'" class="icon S16 action" />');
define('IMAGE_track', '<img src="'.img_path('track.png').'" alt="'.LAN_392.'" title="'.LAN_392.'" class="icon S16 action" />');
define('IMAGE_untrack', '<img src="'.img_path('untrack.png').'" alt="'.LAN_391.'" title="'.LAN_391.'" class="icon S16 action" />');
define('IMAGE_admin_edit', '<img src="'.img_path('admin_edit.png').'" alt="'.LAN_406.'" title="'.LAN_406.'" class="icon S16 action" />');
define('IMAGE_admin_move', '<img src="'.img_path('admin_move.png').'" alt="'.LAN_402.'" title="'.LAN_402.'" class="icon S16 action" />');
define('IMAGE_admin_split', '<img src="'.img_path('admin_split.png').'" alt="'.FORLAN_105.'" title="'.FORLAN_105.'" class="icon S16 action" />');
define('IMAGE_admin_move2', '<img src="'.img_path('admin_move.png').'" alt="'.LAN_408.'" title="'.LAN_408.'" class="icon S16 action" />');
define('IMAGE_report', '<img src="'.img_path('report.png').'" alt="'.LAN_413.'" title="'.LAN_413.'" class="icon S16 action" />');
define('IMAGE_attachment', '<img src="'.img_path('attach.png').'" alt="" title="" class="icon S16 action" />');
define('IMAGE_post', '<img src="'.img_path('post.png').'" alt="" title="" />');
define('IMAGE_post2', '<img src="'.img_path('post2.png').'" alt="" title="" class="icon S16 action" />');
define('IMAGE_pm', '<img src="'.img_path('pm.png').'" alt="'.LAN_FORUM_4008.'" title="'.LAN_FORUM_4008.'" class="icon S16 action" />');
define('IMAGE_edit', '<img src="'.img_path('edit.png').'" alt="'.LAN_FORUM_2039.'" title="'.LAN_FORUM_2039.'" class="icon S16 action" />');
define('IMAGE_quote', '<img src="'.img_path('quote.png').'" alt="'.LAN_FORUM_2041.'" title="'.LAN_FORUM_2041.'" class="icon S16 action" />');
define('IMAGE_track', '<img src="'.img_path('track.png').'" alt="'.LAN_FORUM_4009.'" title="'.LAN_FORUM_4009.'" class="icon S16 action" />');
define('IMAGE_untrack', '<img src="'.img_path('untrack.png').'" alt="'.LAN_FORUM_4010.'" title="'.LAN_FORUM_4010.'" class="icon S16 action" />');
define('IMAGE_admin_edit', '<img src="'.img_path('admin_edit.png').'" alt="'.LAN_FORUM_2039.'" title="'.LAN_FORUM_2039.'" class="icon S16 action" />');
define('IMAGE_admin_move', '<img src="'.img_path('admin_move.png').'" alt="'.LAN_FORUM_2042.'" title="'.LAN_FORUM_2042.'" class="icon S16 action" />');
define('IMAGE_admin_split', '<img src="'.img_path('admin_split.png').'" alt="'.LAN_FORUM_2043.'" title="'.LAN_FORUM_2043.'" class="icon S16 action" />');
define('IMAGE_admin_move2', '<img src="'.img_path('admin_move.png').'" alt="'.LAN_FORUM_2042.'" title="'.LAN_FORUM_2042.'" class="icon S16 action" />');
define('IMAGE_report', '<img src="'.img_path('report.png').'" alt="'.LAN_FORUM_2046.'" title="'.LAN_FORUM_2046.'" class="icon S16 action" />');
define('IMAGE_attachment', '<img src="'.img_path('attach.png').'" alt="'.LAN_FORUM_3013.'" title="'.LAN_FORUM_3013.'" class="icon S16 action" />');
define('IMAGE_post', '<img src="'.img_path('post.png').'" alt="" title="" />');
define('IMAGE_post2', '<img src="'.img_path('post2.png').'" alt="" title="" class="icon S16 action" />');
// Admin <input> Icons
define('IMAGE_admin_delete', 'src="'.img_path('admin_delete.png').'" alt="'.LAN_435.'" title="'.LAN_435.'" ');
define('IMAGE_admin_unstick', 'src="'.img_path('admin_unstick.png').'" alt="'.LAN_398.'" title="'.LAN_398.'" ');
define('IMAGE_admin_stick', 'src="'.img_path('admin_stick.png').'" alt="'.LAN_401.'" title="'.LAN_401.'" ');
define('IMAGE_admin_lock', 'src="'.img_path('admin_lock.png').'" alt="'.LAN_399.'" title="'.LAN_399.'" ');
define('IMAGE_admin_unlock', 'src="'.img_path('admin_unlock.png').'" alt="'.LAN_400.'" title="'.LAN_400.'" ');
define('IMAGE_admin_delete', 'src="'.img_path('admin_delete.png').'" alt="'.LAN_FORUM_2040.'" title="'.LAN_FORUM_2040.'" ');
define('IMAGE_admin_stick', 'src="'.img_path('admin_stick.png').'" alt="'.LAN_FORUM_4011.'" title="'.LAN_FORUM_4011.'" ');
define('IMAGE_admin_unstick', 'src="'.img_path('admin_unstick.png').'" alt="'.LAN_FORUM_4012.'" title="'.LAN_FORUM_4012.'" ');
define('IMAGE_admin_lock', 'src="'.img_path('admin_lock.png').'" alt="'.LAN_FORUM_4013.'" title="'.LAN_FORUM_4013.'" ');
define('IMAGE_admin_unlock', 'src="'.img_path('admin_unlock.png').'" alt="'.LAN_FORUM_4014.'" title="'.LAN_FORUM_4014.'" ');
// Multi Language Images
define('IMAGE_newthread', '<img src="'.img_path('newthread.png').'" alt="'.FORLAN_10.'" title="'.FORLAN_10.'" />');
define('IMAGE_reply', '<img src="'.img_path('reply.png').'" alt="" title="" />');
define('IMAGE_rank_moderator_image', '<img src="'.img_path('moderator.png', '', 'rank_moderator_image').'" alt="" />');
define('IMAGE_rank_main_admin_image', '<img src="'.img_path('main_admin.png', '', 'rank_main_admin_image').'" alt="" />');
define('IMAGE_rank_admin_image', '<img src="'.img_path('admin.png', '', 'rank_admin_image').'" alt="" />');
define('IMAGE_newthread', '<img src="'.img_path('newthread.png').'" alt="'.LAN_FORUM_2005.'" title="'.LAN_FORUM_2005.'" />');
define('IMAGE_reply', '<img src="'.img_path('reply.png').'" alt="'.LAN_FORUM_2006.'" title="'.LAN_FORUM_2006.'" />');
define('IMAGE_rank_moderator_image', '<img src="'.img_path('moderator.png', '', 'rank_moderator_image').'" alt="" />');
define('IMAGE_rank_main_admin_image', '<img src="'.img_path('main_admin.png', '', 'rank_main_admin_image').'" alt="" />');
define('IMAGE_rank_admin_image', '<img src="'.img_path('admin.png', '', 'rank_admin_image').'" alt="" />');
?>