From: <be...@us...> - 2012-08-29 12:30:17
|
Revision: 10134 http://xoops.svn.sourceforge.net/xoops/?rev=10134&view=rev Author: beckmi Date: 2012-08-29 12:30:05 +0000 (Wed, 29 Aug 2012) Log Message: ----------- fixing English translations Modified Paths: -------------- XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php XoopsModules/contact/branches/voltan/v1.8/contact/language/english/admin.php XoopsModules/contact/branches/voltan/v1.8/contact/language/english/main.php XoopsModules/contact/branches/voltan/v1.8/contact/language/english/modinfo.php XoopsModules/contact/branches/voltan/v1.8/contact/xoops_version.php Modified: XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php =================================================================== --- XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php 2012-08-29 11:06:54 UTC (rev 10133) +++ XoopsModules/contact/branches/voltan/v1.8/contact/admin/contact.php 2012-08-29 12:30:05 UTC (rev 10134) @@ -1,88 +1,88 @@ -<?php -/* - You may not change or alter any portion of this comment or credits - of supporting developers from this source code or any supporting source code - which is considered copyrighted (c) material of the original comment or credit authors. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -*/ - -/** - * Contact module - * - * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ - * @license http://www.fsf.org/copyleft/gpl.html GNU public license - * @author Hossein Azizabadi (AKA Voltan) - * @version $Id$ - */ - -// Call header +<?php +/* + You may not change or alter any portion of this comment or credits + of supporting developers from this source code or any supporting source code + which is considered copyrighted (c) material of the original comment or credit authors. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +*/ + +/** + * Contact module + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @author Hossein Azizabadi (AKA Voltan) + * @version $Id$ + */ + +// Call header require dirname(__FILE__) . '/header.php'; -// Display Admin header +// Display Admin header xoops_cp_header(); // Define default value $op = $contact_handler->Contact_CleanVars($_REQUEST, 'op', 'list', 'string'); $contact_id = $contact_handler->Contact_CleanVars($_REQUEST, 'id', '0', 'int'); -// Define scripts -$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js'); +// Define scripts +$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js'); $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js'); -$xoTheme->addScript(XOOPS_URL . '/modules/contact/js/admin.js'); -// Add module stylesheet -$xoTheme->addStylesheet(XOOPS_URL . '/modules/contact/css/admin.css'); -$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css'); +$xoTheme->addScript(XOOPS_URL . '/modules/contact/js/admin.js'); +// Add module stylesheet +$xoTheme->addStylesheet(XOOPS_URL . '/modules/contact/css/admin.css'); +$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css'); $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css'); -switch ($op) +switch ($op) { case 'list': $contact = array(); - $contact['perpage'] = '10'; - $contact['order'] = 'DESC'; + $contact['perpage'] = '10'; + $contact['order'] = 'DESC'; $contact['sort'] = 'contact_id'; - // get limited information - if (isset($_REQUEST['limit'])) { - $contact['limit'] = $contact_handler->Contact_CleanVars($_REQUEST, 'limit', 0, 'int'); - } else { - $contact['limit'] = $contact['perpage']; - } - - // get start information - if (isset($_REQUEST['start'])) { - $contact['start'] = $contact_handler->Contact_CleanVars($_REQUEST, 'start', 0, 'int'); - } else { - $contact['start'] = 0; + // get limited information + if (isset($_REQUEST['limit'])) { + $contact['limit'] = $contact_handler->Contact_CleanVars($_REQUEST, 'limit', 0, 'int'); + } else { + $contact['limit'] = $contact['perpage']; + } + + // get start information + if (isset($_REQUEST['start'])) { + $contact['start'] = $contact_handler->Contact_CleanVars($_REQUEST, 'start', 0, 'int'); + } else { + $contact['start'] = 0; } $contact_numrows = $contact_handler->Contact_GetCount('contact_cid'); $contacts = $contact_handler->Contact_GetAdminList($contact , 'contact_cid'); - if ($contact_numrows > $contact['limit']) { - $contact_pagenav = new XoopsPageNav($contact_numrows, $contact['limit'], $contact['start'], 'start', 'limit=' . $contact['limit']); - $contact_pagenav = $contact_pagenav->renderNav(4); - } else { - $contact_pagenav = ''; + if ($contact_numrows > $contact['limit']) { + $contact_pagenav = new XoopsPageNav($contact_numrows, $contact['limit'], $contact['start'], 'start', 'limit=' . $contact['limit']); + $contact_pagenav = $contact_pagenav->renderNav(4); + } else { + $contact_pagenav = ''; } - $xoopsTpl->assign('contacts', $contacts); + $xoopsTpl->assign('contacts', $contacts); $xoopsTpl->assign('contact_pagenav', $contact_pagenav); $level = 'list'; break; case 'reply': - if ($contact_id > 0) { + if ($contact_id > 0) { $obj = $contact_handler->get($contact_id); if($obj->getVar('contact_cid') != 0) { redirect_header ( 'contact.php', 3, _AM_CONTACT_CANTREPLY); - } + } $form = $obj->Contact_ReplyForm(); $xoopsTpl->assign('replyform', $form->render()); - $xoopsTpl->assign('replylist', $contact_handler->Contact_GetReply($contact_id)); - } else { - redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST); + $xoopsTpl->assign('replylist', $contact_handler->Contact_GetReply($contact_id)); + } else { + redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST); } $level = 'reply'; break; @@ -163,11 +163,11 @@ case 'delete': if ($contact_id > 0) { - // Prompt message + // Prompt message xoops_confirm(array("id" => $contact_id), 'contact.php?op=dodelete', _AM_CONTACT_MSG_DELETE); - } else { - redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST); - } + } else { + redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST); + } $level = 'delete'; break; @@ -190,7 +190,7 @@ exit (); } - redirect_header ( 'contact.php', 1, _AM_CONTACT_MSG_DELETEDO ); + redirect_header ( 'contact.php', 1, _AM_CONTACT_MSG_DELETED ); xoops_cp_footer (); exit (); break; @@ -199,8 +199,8 @@ $xoopsTpl->assign('navigation', $admin_class->addNavigation('contact.php')); $xoopsTpl->assign('level', $level); -// Call template file -$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_contact.html'); -// Call footer +// Call template file +$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_contact.html'); +// Call footer require dirname(__FILE__) . '/footer.php'; ?> \ No newline at end of file Modified: XoopsModules/contact/branches/voltan/v1.8/contact/language/english/admin.php =================================================================== --- XoopsModules/contact/branches/voltan/v1.8/contact/language/english/admin.php 2012-08-29 11:06:54 UTC (rev 10133) +++ XoopsModules/contact/branches/voltan/v1.8/contact/language/english/admin.php 2012-08-29 12:30:05 UTC (rev 10134) @@ -1,13 +1,13 @@ -<?php +<?php // index -define("_AM_CONTACT_INDEX_ADMENU1","Contacts"); -define("_AM_CONTACT_INDEX_TOTAL","There are <span class='green'>%s</span> Contact in our database"); +define("_AM_CONTACT_INDEX_ADMENU1","Messages"); +define("_AM_CONTACT_INDEX_TOTAL","There are <span class='green'>%s</span> Messages in our database"); // Contact define("_AM_CONTACT_ID","Id"); define("_AM_CONTACT_SUBJECT","Subject"); -define("_AM_CONTACT_DEPARTMENT","Departmant"); +define("_AM_CONTACT_DEPARTMENT","Department"); define("_AM_CONTACT_SUBMITTER","Submitter"); define("_AM_CONTACT_DATE","Date Submitted"); define("_AM_CONTACT_MESSAGE","Message"); @@ -23,8 +23,8 @@ define("_AM_CONTACT_ACTION","Action"); define("_AM_CONTACT_VIEW","View"); define("_AM_CONTACT_REPLY","Reply"); -define("_AM_CONTACT_HAVEREPLY","Replyd"); -define("_AM_CONTACT_HAVENTREPLY","Not Reply"); +define("_AM_CONTACT_HAVEREPLY","Replied"); +define("_AM_CONTACT_HAVENTREPLY","Not Replied"); define("_AM_CONTACT_FROM","From"); define("_AM_CONTACT_NAMEFROM","Name"); @@ -36,13 +36,13 @@ define("_AM_CONTACT_TITLE","Title"); define("_AM_CONTACT_INFO","Information"); -define("_AM_CONTACT_MSG_EXIST","Select Contact not exist"); -define("_AM_CONTACT_MSG_DELETE","Are you sure you want delete this contact and all replys?"); -define("_AM_CONTACT_MSG_DELETEDO","Your selected contact delete"); -define("_AM_CONTACT_MSG_DELETEERROR","Error in delete contact"); -define("_AM_CONTACT_MSG_PRUNE_DELETED","%s contact deleted"); +define("_AM_CONTACT_MSG_EXIST","Selected Message does not exist"); +define("_AM_CONTACT_MSG_DELETE","Are you sure to delete this message and all replies?"); +define("_AM_CONTACT_MSG_DELETED","Your selected message has been deleted"); +define("_AM_CONTACT_MSG_DELETEERROR","Error in deleting message"); +define("_AM_CONTACT_MSG_PRUNE_DELETED","%s messages deleted"); -define("_AM_CONTACT_TOOLS_PRUNE","Prune Contacts"); -define("_AM_CONTACT_TOOLS_PRUNE_BEFORE","Prune contacts that were published before"); -define("_AM_CONTACT_TOOLS_PRUNE_REPLYONLY","Only remove contacts who have reply"); +define("_AM_CONTACT_TOOLS_PRUNE","Delete Messages"); +define("_AM_CONTACT_TOOLS_PRUNE_BEFORE","Delete messages that were published before"); +define("_AM_CONTACT_TOOLS_PRUNE_REPLYONLY","Delete only messages with replies"); ?> \ No newline at end of file Modified: XoopsModules/contact/branches/voltan/v1.8/contact/language/english/main.php =================================================================== --- XoopsModules/contact/branches/voltan/v1.8/contact/language/english/main.php 2012-08-29 11:06:54 UTC (rev 10133) +++ XoopsModules/contact/branches/voltan/v1.8/contact/language/english/main.php 2012-08-29 12:30:05 UTC (rev 10134) @@ -11,12 +11,12 @@ define("_MD_CONTACT_SUBJECT","Subject"); define("_MD_CONTACT_MESSAGE","Comment"); define("_MD_CONTACT_DEPARTMENT","Department"); -define("_MD_CONTACT_DEFULTDEP","Contact"); +define("_MD_CONTACT_DEFULTDEP","Contact Us"); -define("_MD_CONTACT_MES_SEND","Thank you for Contact Us"); -define("_MD_CONTACT_MES_NOVALIDEMAIL","Your Email is not Valida"); -define("_MD_CONTACT_MES_NOTSAVE","Your Message don't save in our DB"); -define("_MD_CONTACT_MES_SAVEINDB","Your Message save in our DB"); -define("_MD_CONTACT_MES_SENDERROR","Error in send Message"); +define("_MD_CONTACT_MES_SEND","Thank you for Contacting Us"); +define("_MD_CONTACT_MES_NOVALIDEMAIL","Your Email is not Valid"); +define("_MD_CONTACT_MES_NOTSAVE","Sorry, your Message was not saved in our DB"); +define("_MD_CONTACT_MES_SAVEINDB","Your Message has been saved in our DB"); +define("_MD_CONTACT_MES_SENDERROR","Error in sending Message"); define("_MD_CONTACT_MES_ERROR","Error"); ?> \ No newline at end of file Modified: XoopsModules/contact/branches/voltan/v1.8/contact/language/english/modinfo.php =================================================================== --- XoopsModules/contact/branches/voltan/v1.8/contact/language/english/modinfo.php 2012-08-29 11:06:54 UTC (rev 10133) +++ XoopsModules/contact/branches/voltan/v1.8/contact/language/english/modinfo.php 2012-08-29 12:30:05 UTC (rev 10134) @@ -1,21 +1,21 @@ -<?php -// $Id$ -// Module Info - -// The name of this module -define("_MI_CONTACT_NAME","Contact"); -define("_MI_CONTACT_DESC","Email contact page"); - -// Admin menu -define('_MI_CONTACT_MENU_HOME',"Home"); +<?php +// $Id$ +// Module Info + +// The name of this module +define("_MI_CONTACT_NAME","Contact Us"); +define("_MI_CONTACT_DESC","Email contact page"); + +// Admin menu +define('_MI_CONTACT_MENU_HOME',"Home"); define("_MI_CONTACT_MENU_HOME_DESC","Go back to Home"); -define('_MI_CONTACT_MENU_CONTACT',"Contact"); -define("_MI_CONTACT_MENU_CONTACT_DESC","list of Contact"); -define('_MI_CONTACT_MENU_TOOLS',"Tools"); -define("_MI_CONTACT_MENU_TOOLS_DESC","Module Tools"); -define("_MI_CONTACT_MENU_ABOUT", "About"); -define("_MI_CONTACT_MENU_ABOUT_DESC" , "About this module"); -define("_MI_CONTACT_MENU_HELP","Help"); +define('_MI_CONTACT_MENU_CONTACT',"Messages"); +define("_MI_CONTACT_MENU_CONTACT_DESC","List of Messages"); +define('_MI_CONTACT_MENU_TOOLS',"Tools"); +define("_MI_CONTACT_MENU_TOOLS_DESC","Module Tools"); +define("_MI_CONTACT_MENU_ABOUT", "About"); +define("_MI_CONTACT_MENU_ABOUT_DESC" , "About this module"); +define("_MI_CONTACT_MENU_HELP","Help"); define("_MI_CONTACT_MENU_HELP_DESC" , "Module help"); // Module Settings @@ -37,20 +37,20 @@ define("_MI_CONTACT_FORM_CAPTCHA_DESC",""); define("_MI_CONTACT_DEPT","Departments"); -define("_MI_CONTACT_DEPT_DESC","Departments allow you to define a department/email combination. Users selecting<br />" -."from a defined department will have their contact information sent to the corresponding<br />" -."email address you define.<br /><br />" -."Define each department/email as follows:<br /><br />" -."dept1,email1|dept2,email2|dept3,email3 etc. - each department and email must be seperated<br />" -."by a comma ',', and each department email combination bust be seperated by a pipe '|'"); +define("_MI_CONTACT_DEPT_DESC","Departments allow you to define a department/email combination. Users selecting<br />" +."from a defined department will have their contact information sent to the corresponding<br />" +."email address you define.<br /><br />" +."Define each department/email as follows:<br /><br />" +."dept1,email1|dept2,email2|dept3,email3 etc. - each department and email must be separated<br />" +."by a comma ',', and each department email combination must be separated by a pipe '|'"); -define("_MI_CONTACT_PERPAGE","Perpage"); +define("_MI_CONTACT_PERPAGE","Per page"); define("_MI_CONTACT_PERPAGE_DESC",""); define("_MI_CONTACT_TOPINFO","Header contact form"); -define("_MI_CONTACT_TOPINFO_DESC","Set HTML codes for show in contact page"); +define("_MI_CONTACT_TOPINFO_DESC","Set HTML codes to show in contact page"); define("_MI_CONTACT_HEAD_OPTIONS","Form Options"); define("_MI_CONTACT_HEAD_ADMIN","Admin setting"); -define("_MI_CONTACT_HEAD_INFO","Information"); +define("_MI_CONTACT_HEAD_INFO","Information"); ?> \ No newline at end of file Modified: XoopsModules/contact/branches/voltan/v1.8/contact/xoops_version.php =================================================================== --- XoopsModules/contact/branches/voltan/v1.8/contact/xoops_version.php 2012-08-29 11:06:54 UTC (rev 10133) +++ XoopsModules/contact/branches/voltan/v1.8/contact/xoops_version.php 2012-08-29 12:30:05 UTC (rev 10134) @@ -1,77 +1,77 @@ -<?php -/* - You may not change or alter any portion of this comment or credits - of supporting developers from this source code or any supporting source code - which is considered copyrighted (c) material of the original comment or credit authors. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -*/ - -/** - * Contact module - * - * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ - * @license http://www.fsf.org/copyleft/gpl.html GNU public license - * @author Hossein Azizabadi (AKA Voltan) - * @version $Id$ +<?php +/* + You may not change or alter any portion of this comment or credits + of supporting developers from this source code or any supporting source code + which is considered copyrighted (c) material of the original comment or credit authors. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +*/ + +/** + * Contact module + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @author Hossein Azizabadi (AKA Voltan) + * @version $Id$ */ - -if (!defined('XOOPS_ROOT_PATH')) { - die('XOOPS root path not defined'); + +if (!defined('XOOPS_ROOT_PATH')) { + die('XOOPS root path not defined'); } - -$moduleDirName = basename( dirname( __FILE__ ) ) ; - -$modversion['name'] = _MI_CONTACT_NAME; -$modversion['version'] = 1.8; -$modversion['description'] = _MI_CONTACT_DESC; -$modversion['credits'] = 'The XOOPS Project, Mohtava Project'; -$modversion['author'] = 'Hossein Azizabadi <hos...@gm...>'; -$modversion['nickname'] = 'Voltan'; -$modversion['help'] = 'page=help'; -$modversion['license'] = 'GNU GPL 2.0'; -$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/"; -$modversion['official'] = 1; -$modversion['image'] = "images/contact_slogo.png"; + +$moduleDirName = basename( dirname( __FILE__ ) ) ; + +$modversion['name'] = _MI_CONTACT_NAME; +$modversion['version'] = 1.8; +$modversion['description'] = _MI_CONTACT_DESC; +$modversion['credits'] = 'The XOOPS Project, Mohtava Project'; +$modversion['author'] = 'Hossein Azizabadi <hos...@gm...>'; +$modversion['nickname'] = 'Voltan'; +$modversion['help'] = 'page=help'; +$modversion['license'] = 'GNU GPL 2.0'; +$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/"; +$modversion['official'] = 1; +$modversion['image'] = "images/contact_slogo.png"; $modversion['dirname'] = "contact"; -$modversion['onUpdate'] = 'include/function_update.php'; -$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin'; -$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16'; -$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32'; +$modversion['onUpdate'] = 'include/functions_update.php'; +$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin'; +$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16'; +$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32'; // DB $modversion['sqlfile']['mysql'] = "sql/mysql.sql"; -$modversion['tables'][0] = "contact"; - -//about -$modversion["module_website_url"] = "http://www.xoops.org/"; -$modversion["module_website_name"] = "XOOPS"; -$modversion["release_date"] = "2012/05/03"; -$modversion["module_status"] = "Beta"; -$modversion["author_website_url"] = "http://www.xoops.org/"; -$modversion["author_website_name"] = "XOOPS"; -$modversion['min_php']='5.2'; -$modversion['min_xoops']='2.5'; -$modversion['min_admin']='1.1'; - -//Admin things -$modversion['hasAdmin'] = 1; - -// Menu -$modversion['hasMain'] = 1; -$modversion['adminindex'] = "admin/index.php"; +$modversion['tables'][0] = "contact"; + +//about +$modversion["module_website_url"] = "http://www.xoops.org/"; +$modversion["module_website_name"] = "XOOPS"; +$modversion["release_date"] = "2012/05/03"; +$modversion["module_status"] = "Beta"; +$modversion["author_website_url"] = "http://www.xoops.org/"; +$modversion["author_website_name"] = "XOOPS"; +$modversion['min_php']='5.2'; +$modversion['min_xoops']='2.5'; +$modversion['min_admin']='1.1'; + +//Admin things +$modversion['hasAdmin'] = 1; + +// Menu +$modversion['hasMain'] = 1; +$modversion['adminindex'] = "admin/index.php"; $modversion['adminmenu'] = "admin/menu.php"; - -// Set to 1 if you want to display menu generated by system module -$modversion['system_menu'] = 1; - -// Templates -$i = 1; -$modversion['templates'][$i]['file'] = 'contact_index.html'; -$modversion['templates'][$i]['description'] = '_MI_CONTACT_TEMPLATES'; +// Set to 1 if you want to display menu generated by system module +$modversion['system_menu'] = 1; + +// Templates +$i = 1; +$modversion['templates'][$i]['file'] = 'contact_index.html'; +$modversion['templates'][$i]['description'] = '_MI_CONTACT_TEMPLATES'; + // Settings $modversion['config'][] = array( 'name' => 'break', @@ -175,5 +175,5 @@ 'description' => '_MI_CONTACT_PERPAGE_DESC', 'formtype' => 'textbox', 'valuetype' => 'int', - 'default' => 10); + 'default' => 10); ?> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |