Spelling mistakes, general clean up, few extra tidbits

This commit is contained in:
Ice
2008-08-09 14:47:40 +00:00
parent 618d0cca19
commit 205fe3ccaf
17 changed files with 110 additions and 104 deletions

View File

@@ -60,9 +60,9 @@ class acp_portal
'portal_friends' => array('lang' => 'PORTAL_FRIENDS' , 'validate' => 'bool' , 'type' => 'radio:yes_no' , 'explain' => true),
'portal_max_online_friends' => array('lang' => 'PORTAL_MAX_ONLINE_FRIENDS' , 'validate' => 'int' , 'type' => 'text:3:3' , 'explain' => true),
'legend2' => 'ACP_PORTAL_COLLUMN_WIDTH_SETTINGS',
'portal_left_collumn_width' => array('lang' => 'PORTAL_LEFT_COLLUMN_WIDTH' , 'validate' => 'int' , 'type' => 'text:3:3', 'explain' => true),
'portal_right_collumn_width' => array('lang' => 'PORTAL_RIGHT_COLLUMN_WIDTH' , 'validate' => 'int' , 'type' => 'text:3:3', 'explain' => true),
'legend2' => 'ACP_PORTAL_column_WIDTH_SETTINGS',
'portal_left_column_width' => array('lang' => 'PORTAL_LEFT_column_WIDTH' , 'validate' => 'int' , 'type' => 'text:3:3', 'explain' => true),
'portal_right_column_width' => array('lang' => 'PORTAL_RIGHT_column_WIDTH' , 'validate' => 'int' , 'type' => 'text:3:3', 'explain' => true),
)
);
break;

View File

@@ -1,6 +1,6 @@
<?php
$current_version = '1.0.0';
$current_version = '1.0.0RC2';
// If only checking version, exit.
if( defined('IN_PHPBB') )

View File

@@ -26,8 +26,8 @@ INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_whoi
INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_change_style', '0');
INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_main_menu', '1');
INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_user_menu', '1');
INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_right_collumn_width', '180');
INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_left_collumn_width', '180');
INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_right_column_width', '180');
INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_left_column_width', '180');
INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_poll_topic', '1');
INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_poll_topic_id', '');
INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_last_visited_bots_number', '1');

View File

@@ -52,4 +52,10 @@ $mod_update['0.3.0'] = array(
),
);
$sql_update['1.0.0RC1'] = array(
"UPDATE phpbb_portal_config SET config_name = 'portal_right_column_width' WHERE config_name = 'portal_right_collumn_width'",
"UPDATE phpbb_portal_config SET config_name = 'portal_left_column_width' WHERE config_name = 'portal_left_collumn_width'"
);
?>

View File

@@ -183,13 +183,13 @@ $lang = array_merge($lang, array(
'PORTAL_MAX_MOST_POSTER' => 'Anzahl der anzuzeigenden Vielschreiber',
'PORTAL_MAX_MOST_POSTER_EXPLAIN' => '0 bedeutet unbegrenzt',
// left and right collumn width
'ACP_PORTAL_COLLUMN_WIDTH_INFO' => 'Spaltenbreite',
'ACP_PORTAL_COLLUMN_WIDTH_SETTINGS' => 'Breiteneinstellung der rechten und linken Spalte',
'PORTAL_LEFT_COLLUMN_WIDTH' => 'Breite der linken Spalte',
'PORTAL_LEFT_COLLUMN_WIDTH_EXPLAIN' => 'Ändere hier die Breite der linken Spalte in Pixel, empfohlener Wert 180',
'PORTAL_RIGHT_COLLUMN_WIDTH' => 'Breite der rechten Spalte',
'PORTAL_RIGHT_COLLUMN_WIDTH_EXPLAIN' => 'Ändere hier die Breite der rechten Spalte in Pixel, empfohlener Wert 180',
// left and right column width
'ACP_PORTAL_column_WIDTH_INFO' => 'Spaltenbreite',
'ACP_PORTAL_column_WIDTH_SETTINGS' => 'Breiteneinstellung der rechten und linken Spalte',
'PORTAL_LEFT_column_WIDTH' => 'Breite der linken Spalte',
'PORTAL_LEFT_column_WIDTH_EXPLAIN' => 'Ändere hier die Breite der linken Spalte in Pixel, empfohlener Wert 180',
'PORTAL_RIGHT_column_WIDTH' => 'Breite der rechten Spalte',
'PORTAL_RIGHT_column_WIDTH_EXPLAIN' => 'Ändere hier die Breite der rechten Spalte in Pixel, empfohlener Wert 180',
// attachments
'ACP_PORTAL_ATTACHMENTS_NUMBER_INFO' => 'Dateianhänge',

View File

@@ -23,20 +23,20 @@ if (empty($lang) || !is_array($lang))
$lang = array_merge($lang, array(
'ACP_PORTAL_INFO' => 'Portal',
'ACP_PORTAL_GENERAL_INFO' => 'General',
'ACP_PORTAL_ANNOUNCE_INFO' => 'Global announcements',
'ACP_PORTAL_ANNOUNCE_INFO' => 'Global Announcements',
'ACP_PORTAL_NEWS_INFO' => 'News',
'ACP_PORTAL_RECENT_INFO' => 'Recent topics',
'ACP_PORTAL_RECENT_INFO' => 'Recent Topics',
'ACP_PORTAL_WORDGRAPH_INFO' => 'Wordgraph',
'ACP_PORTAL_GENERAL_INFO' => 'General settings',
'ACP_PORTAL_PAYPAL_INFO' => 'Paypal donations',
'ACP_PORTAL_GENERAL_INFO' => 'General Settings',
'ACP_PORTAL_PAYPAL_INFO' => 'Paypal Sonations',
'ACP_PORTAL_ATTACHMENTS_NUMBER_INFO' => 'Attachments',
'ACP_PORTAL_MEMBERS_INFO' => 'Latest members',
'ACP_PORTAL_MEMBERS_INFO' => 'Latest Members',
'ACP_PORTAL_POLLS_INFO' => 'Poll',
'ACP_PORTAL_BOTS_INFO' => 'Last visited bots',
'ACP_PORTAL_MOST_POSTER_INFO' => 'Most posters',
'ACP_PORTAL_WELCOME_INFO' => 'Welcome message',
'ACP_PORTAL_CUSTOM_INFO' => 'Custom block',
'ACP_PORTAL_MINICALENDAR_INFO' => 'Mini calendar',
'ACP_PORTAL_BOTS_INFO' => 'Last Visited Bots',
'ACP_PORTAL_MOST_POSTER_INFO' => 'Most Posters',
'ACP_PORTAL_WELCOME_INFO' => 'Welcome Message',
'ACP_PORTAL_CUSTOM_INFO' => 'Custom Block',
'ACP_PORTAL_MINICALENDAR_INFO' => 'Mini Calendar',
'ACP_PORTAL_LINKS_INFO' => 'Links',
));

View File

@@ -42,10 +42,10 @@ $lang = array_merge($lang, array(
'PORTAL_UPDATE_TEXT' => 'There\'s an update for portal waiting to be installed! Install <a href="%1$s">%2$s</a>!',
// news & global announcements
'LATEST_ANNOUNCEMENTS' => 'Latest global announcements',
'GLOBAL_ANNOUNCEMENT' => 'Global announcement',
'VIEW_LATEST_ANNOUNCEMENT' => '1 announcement',
'VIEW_LATEST_ANNOUNCEMENTS' => '%d announcements',
'LATEST_ANNOUNCEMENTS' => 'Latest global announcements',
'GLOBAL_ANNOUNCEMENT' => 'Global announcement',
'VIEW_LATEST_ANNOUNCEMENT' => '1 announcement',
'VIEW_LATEST_ANNOUNCEMENTS' => '%d announcements',
'LATEST_NEWS' => 'Latest news',
'READ_FULL' => 'Read all',
'NO_NEWS' => 'No news',
@@ -58,7 +58,7 @@ $lang = array_merge($lang, array(
'JUMP_NEWEST' => 'Jump to newest post',
'JUMP_FIRST' => 'Jump to first post',
'JUMP_TO_POST' => 'Jump to post',
'BACK' => 'Back',
'BACK' => 'Back',
// who is online
'WIO_TOTAL' => 'Total',
@@ -73,8 +73,8 @@ $lang = array_merge($lang, array(
// user menu
'USER_MENU' => 'User menu',
'UM_LOG_ME_IN' => 'remember me',
'UM_HIDE_ME' => 'hide me',
'UM_LOG_ME_IN' => 'Remember me',
'UM_HIDE_ME' => 'Hide me',
'UM_MAIN_SUBSCRIBED'=> 'Subscribed',
'UM_BOOKMARKS' => 'Bookmarks',
@@ -87,17 +87,17 @@ $lang = array_merge($lang, array(
'ST_NEW_STICKYS'=> 'New sticky',
*/
'ST_TOP' => 'Total',
'ST_TOP_ANNS' => 'Total announcment:',
'ST_TOP_STICKYS'=> 'Total sticky:',
'ST_TOT_ATTACH' => 'Total attachments:',
'ST_TOP_ANNS' => 'Total Announcements:',
'ST_TOP_STICKYS'=> 'Total Stickies:',
'ST_TOT_ATTACH' => 'Total Attachments:',
// search
'SH' => 'go',
'SH_SITE' => 'forums',
'SH_POSTS' => 'posts',
'SH_AUTHOR' => 'author',
'SH_ENGINE' => 'search engines',
'SH_ADV' => 'advanced search',
'SH' => 'Go',
'SH_SITE' => 'Forums',
'SH_POSTS' => 'Posts',
'SH_AUTHOR' => 'Author',
'SH_ENGINE' => 'Search engines',
'SH_ADV' => 'Advanced search',
// recent
'RECENT_NEWS' => 'Recent',
@@ -129,7 +129,7 @@ $lang = array_merge($lang, array(
// make donation
'DONATION' => 'Make a donation',
'DONATION_TEXT' => 'is a formation suplying services with no intention of any revenue. Anyone who wants to support this formation can do it by donating so that the cost of server, the domain and etc. could be paid of.',
'DONATION_TEXT' => 'is a group suplying services with no intention of any revenue. Anyone who wants to support this group can do so by donating so that the cost of server, the domain etc. could be taken care of.',
'PAY_MSG' => 'After selecting the amount which you want to donate from the menu, you can go on by clicking on the picture of PayPal.',
'PAY_ITEM' => 'Make a donation', // paypal item
@@ -209,8 +209,8 @@ $lang = array_merge($lang, array(
'Mini_Cal_events' => 'Upcoming Events',
'Mini_Cal_no_events' => 'None',
'Mini_cal_this_event' => 'This month holiday events',
'View_next_month' => 'next month',
'View_previous_month' => 'previous month',
'View_next_month' => 'Next month',
'View_previous_month' => 'Previous month',
// uses MySQL DATE_FORMAT - %c long_month, numeric (1..12) - %e Day of the long_month, numeric (0..31)
// see http://www.mysql.com/doc/D/a/Date_and_time_functions.html for more details

View File

@@ -188,13 +188,13 @@ $lang = array_merge($lang, array(
'PORTAL_MAX_MOST_POSTER' => 'How many most posters to display',
'PORTAL_MAX_MOST_POSTER_EXPLAIN' => '0 means infinite',
// left and right collumn width
'ACP_PORTAL_COLLUMN_WIDTH_INFO' => 'Collumn width',
'ACP_PORTAL_COLLUMN_WIDTH_SETTINGS' => 'Left and right collumn width settings',
'PORTAL_LEFT_COLLUMN_WIDTH' => 'Width value of the left collumn',
'PORTAL_LEFT_COLLUMN_WIDTH_EXPLAIN' => 'Change the width of left collumn in pixel, recommended value 180',
'PORTAL_RIGHT_COLLUMN_WIDTH' => 'Width value of the right collumn',
'PORTAL_RIGHT_COLLUMN_WIDTH_EXPLAIN' => 'Change the width of right collumn in pixel, recommended value 180',
// left and right column width
'ACP_PORTAL_column_WIDTH_INFO' => 'column width',
'ACP_PORTAL_column_WIDTH_SETTINGS' => 'Left and right column width settings',
'PORTAL_LEFT_column_WIDTH' => 'Width value of the left column',
'PORTAL_LEFT_column_WIDTH_EXPLAIN' => 'Change the width of left column in pixel, recommended value 180',
'PORTAL_RIGHT_column_WIDTH' => 'Width value of the right column',
'PORTAL_RIGHT_column_WIDTH_EXPLAIN' => 'Change the width of right column in pixel, recommended value 180',
// attachments
'ACP_PORTAL_ATTACHMENTS_NUMBER_INFO' => 'Attachments',
@@ -279,9 +279,9 @@ $lang = array_merge($lang, array(
'PORTAL_MINICALENDAR' => 'Display mini calendar block',
'PORTAL_MINICALENDAR_EXPLAIN' => 'Display this block on portal.',
'PORTAL_MINICALENDAR_TODAY_COLOR' => 'Active day color',
'PORTAL_MINICALENDAR_TODAY_COLOR_EXPLAIN' => 'HEX or named colors are allowed such as #FFFFFF for white, or color names like vilolet.',
'PORTAL_MINICALENDAR_TODAY_COLOR_EXPLAIN' => 'HEX or named colors are allowed such as #FFFFFF for white, or color names like violet.',
'PORTAL_MINICALENDAR_DAY_LINK_COLOR' => 'Day link color',
'PORTAL_MINICALENDAR_DAY_LINK_COLOR_EXPLAIN'=> 'HEX or named colors are allowed such as #FFFFFF for white, or color names like vilolet.',
'PORTAL_MINICALENDAR_DAY_LINK_COLOR_EXPLAIN'=> 'HEX or named colors are allowed such as #FFFFFF for white, or color names like violet.',
));

View File

@@ -237,8 +237,8 @@ if ($portal_config['portal_pay_s_block'] or ( $portal_config['portal_pay_c_block
}
$template->assign_vars(array(
'PORTAL_LEFT_COLLUMN' => $portal_config['portal_left_collumn_width'],
'PORTAL_RIGHT_COLLUMN' => $portal_config['portal_right_collumn_width'],
'PORTAL_LEFT_column' => $portal_config['portal_left_column_width'],
'PORTAL_RIGHT_column' => $portal_config['portal_right_column_width'],
));
// output page

View File

@@ -5,7 +5,7 @@
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<tr>
<!-- [+] left block area -->
<td valign="top" style="width: {PORTAL_LEFT_COLLUMN}px; padding-right:6px;">
<td valign="top" style="width: {PORTAL_LEFT_column}px; padding-right:6px;">
<br style="clear:both" />
<!-- IF S_DISPLAY_MAINMENU -->
@@ -141,7 +141,7 @@
<td style="width:4px;" valign="top"> </td>
<!-- [+] right block area -->
<td valign="top" style="width: {PORTAL_RIGHT_COLLUMN}px; padding-left:6px;">
<td valign="top" style="width: {PORTAL_RIGHT_column}px; padding-left:6px;">
<br style="clear:both" />
<!-- IF S_DISPLAY_USERMENU -->

View File

@@ -38,7 +38,7 @@ small, .small {
<table cellpadding="0" cellspacing="0" border="0" width="100%" align="center">
<tr>
<!-- [+] left block area -->
<td width="{PORTAL_LEFT_COLLUMN}px" valign="top" style="padding-right:6px;">
<td width="{PORTAL_LEFT_column}px" valign="top" style="padding-right:6px;">
<!-- IF S_DISPLAY_MAINMENU -->
<!-- INCLUDE portal/block/main_menu.html -->
@@ -179,7 +179,7 @@ small, .small {
<td style="width:4px;" valign="top"> </td>
<!-- [+] right block area -->
<td width="{PORTAL_RIGHT_COLLUMN}px" valign="top" style="padding-left:6px;">
<td width="{PORTAL_RIGHT_column}px" valign="top" style="padding-left:6px;">
<!-- IF S_DISPLAY_USERMENU -->