[Easymod-cvs] easymod2/mods/easymod/includes admin_easymod.php.txt,1.10,1.11 mod_complete.tpl,1.2,1.
Status: Beta
Brought to you by:
wgeric
Menu
▾
▴
[Easymod-cvs] easymod2/mods/easymod/includes admin_easymod.php.txt,1.10,1.11 mod_complete.tpl,1.2,1.3 mod_settings.tpl,1.3,1.4 mod_sql_body.tpl,1.1,1.2
|
From: Brendan K. <bk...@us...> - 2005-06-03 22:59:22
|
Update of /cvsroot/easymod/easymod2/mods/easymod/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10447/mods/easymod/includes Modified Files: admin_easymod.php.txt mod_complete.tpl mod_settings.tpl mod_sql_body.tpl Log Message: Working through the hardcoded langauge vars. Hope everythings ok ;) Index: mod_complete.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/mod_complete.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mod_complete.tpl 8 May 2005 03:04:19 -0000 1.2 --- mod_complete.tpl 3 Jun 2005 22:59:12 -0000 1.3 *************** *** 92,97 **** </tr> <tr> ! <td class="row1" align="left" width="25%"><span class="gen">Database Alterations:</span></td> ! <td class="row2" align="left" width="75%"><span class="gen">Tables Added: N/A Tables Altered: N/A Rows Added: N/A</span></td> </tr> </table> --- 92,98 ---- </tr> <tr> ! <td class="row1" align="left" width="25%"><span class="gen">{L_DB_ALTERATIONS}:</span></td> ! <!-- Need info for db alterations below! --> ! <td class="row2" align="left" width="75%"><span class="gen">{L_TABLES_ADDED}: N/A {L_TABLES_ALTERED}: N/A {L_ROWS_ADDED}: N/A</span></td> </tr> </table> *************** *** 119,123 **** <br /> <table width="100%"> ! <tr><td><span class="gen">THIS TEXT WILL DEPEND ON MOVE METHOD:</span></td></tr> <tr><td> <form action="{S_ACTION}" method="post"> --- 120,124 ---- <br /> <table width="100%"> ! <tr><td><span class="gen">{L_DEPENDS_ON_MOVE}:</span></td></tr> <tr><td> <form action="{S_ACTION}" method="post"> Index: mod_sql_body.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/mod_sql_body.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mod_sql_body.tpl 24 Apr 2005 14:59:53 -0000 1.1 --- mod_sql_body.tpl 3 Jun 2005 22:59:12 -0000 1.2 *************** *** 7,11 **** <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" align="center"> <tr> ! <th height="25" class="thHead" nowrap="nowrap">URGENT WARNING</th> </tr> <tr> --- 7,11 ---- <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" align="center"> <tr> ! <th height="25" class="thHead" nowrap="nowrap">{L_URGENT_WARNING}</th> </tr> <tr> *************** *** 15,22 **** </tr> <tr> ! <td width="100%" align="center"><span class="gen">SQL commands for dropping either a column or an entire ! table have been detected. Although these commands may be legitamate, you should double check that you want this. Dropping ! a table or column is irreversable. You are strongly urged to backup your database before proceeding even if the commands ! are legitamate!</span></td> </tr> <tr> --- 15,19 ---- </tr> <tr> ! <td width="100%" align="center"><span class="gen">{L_SQL_DROP_WARN}</span></td> </tr> <tr> *************** *** 33,37 **** <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" align="center"> <tr> ! <th height="25" class="thHead" nowrap="nowrap">Notice</th> </tr> <tr> --- 30,34 ---- <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" align="center"> <tr> ! <th height="25" class="thHead" nowrap="nowrap">{L_NOTICE}</th> </tr> <tr> *************** *** 41,48 **** </tr> <tr> ! <td width="100%" align="center"><span class="gen">You have a MS Access database. EM should perform most ! SQL properly for Access. However, when creating tables or adding columns there is no way to assign default values. You ! will have to do this manually in Access. Without default values, the MOD may not function as intended and the consequences ! could be severe. If you know how to automate this, be sure to contact me (Nuttzy)!</span></td> </tr> <tr> --- 38,42 ---- </tr> <tr> ! <td width="100%" align="center"><span class="gen">{L_SQL_MSACCESS_WARN}</span></td> </tr> <tr> *************** *** 59,63 **** <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" align="center"> <tr> ! <th height="25" class="thHead" nowrap="nowrap">SQL ERROR</th> </tr> <tr> --- 53,57 ---- <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" align="center"> <tr> ! <th height="25" class="thHead" nowrap="nowrap">{L_SQL_ERROR}</th> </tr> <tr> *************** *** 67,81 **** </tr> <tr> ! <td width="100%" align="center"><span class="gen"><b>SQL PROCESSING HALTED</b><br> ! <br> ! An error was encountered while processing the SQL commands. Further SQL processing has been halted. You ! may choose to complete the MOD installation anyway and perform the SQL commands manually yourself. However, at this point ! EM cannot guarantee the MOD will work correctly so you are best off seeking support from the Author before continuing ! further.<br> <br> ! The failed line was:<br> {sql_error.LINE}<br> <br> ! SQL Error: {sql_error.ERROR_CODE}<br> {sql_error.ERROR_MSG}</span></td> </tr> --- 61,71 ---- </tr> <tr> ! <td width="100%" align="center"><span class="gen"><b>{L_SQL_HALTED}</b><br> ! <br>{L_SQL_ERROR_EXPLAIN}<br> <br> ! {L_FAILED_LINE}:<br> {sql_error.LINE}<br> <br> ! {L_SQL_ERROR}: {sql_error.ERROR_CODE}<br> {sql_error.ERROR_MSG}</span></td> </tr> *************** *** 93,97 **** <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" align="center"> <tr> ! <th height="25" class="thHead" nowrap="nowrap">Notice</th> </tr> <tr> --- 83,87 ---- <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" align="center"> <tr> ! <th height="25" class="thHead" nowrap="nowrap">{L_NOTICE}</th> </tr> <tr> *************** *** 101,108 **** </tr> <tr> ! <td width="100%" align="center"><span class="gen">You have a {experimental.DB_TYPE} database. Most ! likely EM isn't generating the SQL properly. The reason is simply because I (Nuttzy) don't know what it is supposed to ! look like. If you know what the SQL should look like, please let me know on <a href="{experimental.DB_LINK}" ! target="_sql">this topic</a>. Otherwise just expect that maybe this won't work so well ;-)</span></td> </tr> <tr> --- 91,95 ---- </tr> <tr> ! <td width="100%" align="center"><span class="gen">{L_EXPERIMENTAL_EXPLAIN}</span></td> </tr> <tr> *************** *** 131,139 **** <tr> <td width="100%" align="center"><span class="gen"> ! <b>SQL PROCESSING ERROR:</b><br> ! <b>No SQL alterations will be performed.</b> However, you may skip SQL processing, continue ! installing the MOD, and deal with the SQL manually.<br> <br> ! The following error occured:<br> <br> {error.ERROR_MSG} --- 118,125 ---- <tr> <td width="100%" align="center"><span class="gen"> ! <b>{L_SQL_PROCESS_ERROR}:</b><br> ! <b>{L_NO_SQL_PREFORMED}<br> <br> ! {L_FOLLOWING_ERROR}:<br> <br> {error.ERROR_MSG} *************** *** 157,161 **** <tr> <td width="100%" align="center"><span class="gen"> ! No SQL to process. Click 'Complete Installation' to proceed. </span></td> </tr> --- 143,147 ---- <tr> <td width="100%" align="center"><span class="gen"> ! {L_NO_SQL} </span></td> </tr> Index: admin_easymod.php.txt =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/admin_easymod.php.txt,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** admin_easymod.php.txt 27 May 2005 08:10:50 -0000 1.10 --- admin_easymod.php.txt 3 Jun 2005 22:59:12 -0000 1.11 *************** *** 165,168 **** --- 165,174 ---- } + $template->assign_vars(array( + 'L_SQL_PROCESS_ERROR' => $lang['EM_sql_process_error'], + 'L_NO_SQL_PREFORMED' => $lang['EM_no_sql_preformed'], + 'L_FOLLOWING_ERROR' => $lang['EM_following_error'], + )); + $template->assign_block_vars('error', array( 'L_TITLE' => $lang['EM_error_detail'], *************** *** 875,881 **** 'L_PW_SET' => $lang['EM_password_set'], 'L_PW_CONFIRM' => $lang['EM_password_confirm'], ! // hard coded lang ! 'L_EM_VERSION' => 'EasyMOD Version', ! 'L_EMV_DESC' => 'If you need to reinstall EM, then you might need to change the version. You can do so here.', 'L_FILE_TITLE' => $lang['EM_file_title'], --- 881,886 ---- 'L_PW_SET' => $lang['EM_password_set'], 'L_PW_CONFIRM' => $lang['EM_password_confirm'], ! 'L_EM_VERSION' => $lang['EM_easymod_version'], ! 'L_EMV_DESC' => $lang['EM_emv_description'], 'L_FILE_TITLE' => $lang['EM_file_title'], *************** *** 895,898 **** --- 900,904 ---- 'L_FTP_EXT_WARN' => $lang['EM_ftp_ext_not'], 'L_FTP_CACHE' => $lang['EM_ftp_cache'], + 'L_SUPPLY_CHANGE' => $lang['EM_supply_on_change'], 'L_YES' => $lang['EM_yes'], 'L_NO' => $lang['EM_no'], *************** *** 2488,2491 **** --- 2494,2498 ---- { $template->assign_block_vars( 'no_sql', array()); + $template->assign_vars(array('L_NO_SQL' => $lang['EM_no_sql'])); $error = 'none' ; } *************** *** 2525,2528 **** --- 2532,2539 ---- { $template->assign_block_vars( 'drop_warning', array()); + $template->assign_vars(array( + 'L_SQL_DROP_WARN' => $lang['EM_sql_drop_warning'], + 'L_URGENT_WARNING' => $lang['EM_urgent_warning'], + )); $drop_warning = true ; } *************** *** 2544,2551 **** $link .= (SQL_LAYER == 'postgresql') ? '15388' : '15389' ; ! $template->assign_block_vars( 'experimental', array( ! 'DB_LINK' => $link, ! 'DB_TYPE' => SQL_LAYER) ! ); } --- 2555,2562 ---- $link .= (SQL_LAYER == 'postgresql') ? '15388' : '15389' ; ! $template->assign_block_vars('experimental', array()); ! $template->assign_vars(array( ! 'L_EXPERIMENTAL_EXPLAIN' => sprintf($lang['EM_experimental_explain'], SQL_LAYER, $link) ! )); } *************** *** 2554,2557 **** --- 2565,2569 ---- { $template->assign_block_vars( 'msaccess', array()); + $template->assign_vars(array('L_SQL_MSACCESS_WARN' => $lang['EM_sql_msaccess_warning'])); } *************** *** 2563,2584 **** 'L_STEP' => $lang['EM_sql_step2'], 'L_SQL_ALPHA2' => $lang['EM_SQL_Alpha2'], ! //remove lang ! // 'L_SQL_INTRO' => $lang['EM_SQL_Intro'], ! 'L_SQL_INTRO' => "EasyMOD will now make changes to your database if you command it to. Any SQL with a check next to it will be performed ! by EM. If you are reinstalling a MOD, you probably <b>do not</b> want to run the SQL a second time, <b>so be careful!</b><br> ! <br> ! <b>Official Warning:</b> This is a DUMB process. Commands you check off will be executed but EM does NOT check to see ! if these changes will negatively impact your database. You are STRONGLY advised to <b>backup your database</b> before making ! any changes. Prior to executing, you are advised to examine each command thoroughly or ask for feedback from experienced ! MOD installers. Again, if you are reinstalling a MOD, multiple executions of the same SQL lines could adversely effect ! your database.", ! 'L_ALTERATIONS' => $lang['EM_Alterations'], ! //remove lang ! // 'L_PSEUDO' => $lang['EM_Pseudo'], ! 'L_PSEUDO' => 'Proposed Database Alterations for your ' . SQL_LAYER . ' Database', 'L_ALLOW' => $lang['EM_Allow'], 'L_PERFORM' => $lang['EM_Perform'], 'L_COMPLETE' => $lang['EM_complete_install'], 'THEMES' => $themes, --- 2575,2585 ---- 'L_STEP' => $lang['EM_sql_step2'], 'L_SQL_ALPHA2' => $lang['EM_SQL_Alpha2'], ! 'L_SQL_INTRO' => $lang['EM_sql_intro_explain'], 'L_ALTERATIONS' => $lang['EM_Alterations'], ! 'L_PSEUDO' => sprintf($lang['EM_proposed_alerations'], SQL_LAYER), 'L_ALLOW' => $lang['EM_Allow'], 'L_PERFORM' => $lang['EM_Perform'], 'L_COMPLETE' => $lang['EM_complete_install'], + 'L_NOTICE' => $lang['EM_notice'], 'THEMES' => $themes, *************** *** 2638,2642 **** if ($failure) { ! $sql[] = array('command' => $sql_line, 'status' => '<b>Not Attempted</b>') ; } else if ($sql_allow) --- 2639,2643 ---- if ($failure) { ! $sql[] = array('command' => $sql_line, 'status' => '<b>' . $lang['EM_not_attempted'] . '</b>') ; } else if ($sql_allow) *************** *** 2646,2650 **** { // set the status ! $sql[] = array('command' => $sql_line, 'status' => '<b>FAILED</b>') ; $failure = true ; --- 2647,2651 ---- { // set the status ! $sql[] = array('command' => $sql_line, 'status' => '<b>' . $lang['EM_failed'] . '</b>') ; $failure = true ; *************** *** 2659,2671 **** 'ERROR_MSG' => $error['message']) ); } else { ! $sql[] = array('command' => $sql_line, 'status' => 'Success') ; } } else { ! $sql[] = array('command' => $sql_line, 'status' => '<b>Skipped</b>') ; } } --- 2660,2678 ---- 'ERROR_MSG' => $error['message']) ); + $template->assign_vars(array( + 'L_SQL_ERROR' => $lang['EM_sql_msaccess_warning'], + 'L_SQL_ERROR_EXPLAIN' => $lang['EM_sql_error_explain'], + 'L_FAILED_LINE' => $lang['EM_failed_line'], + 'L_SQL_HALTED' => $lang['EM_sql_halted'], + )); } else { ! $sql[] = array('command' => $sql_line, 'status' => $lang['EM_success']) ; } } else { ! $sql[] = array('command' => $sql_line, 'status' => '<b>' . $lang['EM_skipped'] . '</b>') ; } } *************** *** 2690,2695 **** ); } ! $sql_intro = 'The following is the result for each line of SQL executed.' ; ! $sql_intro .= (!$failure) ? ' - <b>ALL LINES EXECUTED SUCCESSFULLY</b>' : ' - <b>ERRORS DETECTED</b>' ; // fill the template --- 2697,2702 ---- ); } ! $sql_intro = $lang['EM_line_results']; ! $sql_intro .= (!$failure) ? ' - <b>' . $lang['EM_all_lines_successfull'] . '</b>' : ' - <b>' . $lang['EM_errors_detected'] . '</b>' ; // fill the template *************** *** 2698,2705 **** 'L_SQL_ALPHA2' => $lang['EM_SQL_Alpha2'], 'L_SQL_INTRO' => $sql_intro, ! // 'L_ALTERATIONS' => $lang['EM_Alterations'], ! 'L_ALTERATIONS' => 'SQL Processing Results', ! // 'L_PSEUDO' => $lang['EM_Pseudo'], ! 'L_PSEUDO' => 'The following SQL was attempted:', 'L_ALLOW' => $lang['EM_Allow'], 'L_PERFORM' => $lang['EM_Perform'], --- 2705,2710 ---- 'L_SQL_ALPHA2' => $lang['EM_SQL_Alpha2'], 'L_SQL_INTRO' => $sql_intro, ! 'L_ALTERATIONS' => $lang['EM_processing_results'], ! 'L_PSEUDO' => $lang['EM_sql_attempted'], 'L_ALLOW' => $lang['EM_Allow'], 'L_PERFORM' => $lang['EM_Perform'], *************** *** 2924,2927 **** --- 2929,2937 ---- 'L_PROCESSED' => $lang['EM_processed_commands'], 'L_UNPROCESSED' => $lang['EM_unprocessed_commands'], + 'L_DB_ALTERATIONS' => $lang['EM_database_alterations'], + 'L_TABLES_ADDED' => $lang['EM_tables_added'], + 'L_TABLES_ALTERED' => $lang['EM_tables_altered'], + 'L_ROWS_ADDED' => $lang['EM_rows_added'], + 'L_DEPENDS_ON_MOVE' => $lang['EM_text_depend_move'], 'L_DIY_INSTRUCTIONS' => $lang['DIY_Instructions'], Index: mod_settings.tpl =================================================================== RCS file: /cvsroot/easymod/easymod2/mods/easymod/includes/mod_settings.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mod_settings.tpl 25 May 2005 01:10:51 -0000 1.3 --- mod_settings.tpl 3 Jun 2005 22:59:12 -0000 1.4 *************** *** 54,58 **** <tr> <td class="row1" align="right"><span class="gen">{L_FTP_PASS}</span></td> ! <td class="row2"><input type="password" name="ftp_pass" value="{FTP_PASS}" /> Only supply if you want to change it</td> </tr> <tr> --- 54,58 ---- <tr> <td class="row1" align="right"><span class="gen">{L_FTP_PASS}</span></td> ! <td class="row2"><input type="password" name="ftp_pass" value="{FTP_PASS}" /> {L_SUPPLY_CHANGE}</td> </tr> <tr> |
