[Vtigercrm-commits] [vtiger-commits] r10411 - in /vtigercrm/branches/5.0.3: include/language/ install/ modules/Emails/ modules/Emails/language/ modules/Migration/DBChanges/ modules/Settings/ modules/Users/
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Mon Mar 12 11:05:54 EDT 2007
Author: saraj
Date: Mon Mar 12 09:05:35 2007
New Revision: 10411
Log:
changes made for language support in js alert. --Minnie
Modified:
vtigercrm/branches/5.0.3/include/language/en_us.lang.php
vtigercrm/branches/5.0.3/install/2setConfig.php
vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php
vtigercrm/branches/5.0.3/modules/Emails/mailbox.php
vtigercrm/branches/5.0.3/modules/Migration/DBChanges/42P2_to_50.php
vtigercrm/branches/5.0.3/modules/Settings/ListMailAccount.php
vtigercrm/branches/5.0.3/modules/Settings/listemailtemplates.php
vtigercrm/branches/5.0.3/modules/Settings/savewordtemplate.php
vtigercrm/branches/5.0.3/modules/Users/Forms.php
Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Mon Mar 12 09:05:35 2007
@@ -692,6 +692,125 @@
'Dear_Admin_tasks_not_been_completed' => 'Dear Admin,<br><br> Please note that there are certain tasks in the system which have not been completed even after 24hours of their existence<br> Thank You<br>HelpDesk Team<br>',
'Too_many_pending_tickets' => 'Too many pending tickets',
'Dear_Admin_too_ many_tickets_pending' => 'Dear Admin,<br> This is to bring to your notice that there are too many tickets pending. Kindly take the necessary action required for addressing the same<br><br> Thanks and Regards,<br> HelpDesk Team<br>',
+
+//Added for java script alerts
+'DELETE_CONFIRMATION' => 'Are you sure you want to delete the selected ',
+'SELECT_ATLEAST_ONE' => 'Please select at least one entity',
+'DELETING_ACCOUNT' => 'Deleting this account(s) will remove its related Potentials,Quotes,Sales Orders & Invoice. Are you sure you want to delete the selected ',
+'DELETING_VENDOR' => 'Deleting this vendor(s) will remove its related Purchase Orders. Are you sure you want to delete the selected ',
+'PLEASE_SELECT_MAILID' => 'Please Select a mailid',
+'OVERWRITE_EXISTING_ACCOUNT1' => 'Overwrite the existing address with this selected account(',
+'OVERWRITE_EXISTING_ACCOUNT2' => ') address details?',
+'MISSING_FIELDS' => 'Missing required fields:',
+'NOT_ALLOWED_TO_EDIT' => 'you are not allowed to edit this field',
+'COLUMNS_CANNOT_BE_EMPTY' => 'Selected Columns cannot be empty',
+'CANNOT_BE_EMPTY' => ' cannot be empty',
+'CANNOT_BE_NONE' => ' cannot be none',
+'SERVERNAME_CANNOT_BE_EMPTY' => 'Server Name cannot be empty',
+'ENTER_VALID' => 'Please enter a valid ',
+'SHOULDBE_LESS' => ' should be less than ',
+'SHOULDBE_LESS_EQUAL' => ' should be less than or equal to ',
+'SHOULDBE_EQUAL' => ' should be equal to ',
+'SHOULDBE_GREATER' => ' should be greater than ',
+'SHOULDBE_GREATER_EQUAL' => ' should be greater than or equal to ',
+'INVALID' => 'Invalid ',
+'EXCEEDS_MAX' => ' exceeds the maximum limit ',
+'OUT_OF_RANGE' => ' is out of range',
+'SHOULDNOTBE_EQUAL' => ' should not be equal to ',
+'PORTAL_PROVIDE_EMAILID' => 'Portal user should provide email Id for portal login',
+'ADD_CONFIRMATION' => 'Are you sure you want to add the selected ',
+'ACCOUNTNAME_CANNOT_EMPTY' => 'AccountName Cannot be Empty',
+'CANT_SELECT_CONTACTS' => "You can\'t select related contacts from Lead",
+'LBL_THIS' => 'This ',
+'DOESNOT_HAVE_MAILIDS' => " doesn\'t have any mail ids",
+'DOESNOT_HAVE_AN_MAILID' => '" '."doesn\'t have an Email Id",
+'ARE_YOU_SURE' => 'Are you sure?',
+'MISSING_REPORT_NAME' => 'Missing Report Name',
+'REPORT_NAME_EXISTS' => 'Report name already exists, try again...',
+'WANT_TO_CHANGE_CONTACT_ADDR' => 'Do you want to change the addresses of the Contacts related to this Account?',
+'SURE_TO_DELETE' => 'Are you sure you want to delete ?',
+'RECORDS' => ' records ?',
+'NO_PRODUCT_SELECTED' => 'No product is selected. Select at least one Product',
+'VALID_FINAL_PERCENT' => 'Enter valid Final Discount Percentage',
+'VALID_FINAL_AMOUNT' => 'Enter valid Final Discount Amount',
+'VALID_SHIPPING_CHARGE' => 'Enter a valid Shipping & Handling charge',
+'VALID_ADJUSTMENT' => 'Enter a valid Adjustment',
+'SELECTED_MORE_THAN_ONCE' => 'You have selected the following product(s) more than once.',
+'WANT_TO_CONTINUE' => 'Do you want to Continue?',
+'ENTER_VALID_TAX' => 'Please enter Valid TAX value',
+'VALID_TAX_NAME' => 'Enter valid Tax Name',
+'CORRECT_TAX_VALUE' => 'Enter Correct Tax Value',
+'ENTER_POSITIVE_VALUE' => 'Please enter positive value',
+'LABEL_SHOULDNOT_EMPTY' => 'The tax label name should not be empty',
+'NOT_VALID_ENTRY' => 'is not a valid entry. Please enter correct value',
+'VALID_DISCOUNT_PERCENT' => 'Enter a valid Discount percentage',
+'VALID_DISCOUNT_AMOUNT' => 'Enter a valid Discount Amount',
+'SELECT_TEMPLATE_TO_MERGE' => 'Please select a template to merge',
+'MISSING_REQUIRED_FIELDS' => 'Missing required fields: ',
+'READONLY' => "it\'s readonly",
+'SELECT_ATLEAST_ONE_USER' => 'Please select at least one user',
+'DISABLE_SHARING_CONFIRMATION' => 'Are you sure you want to disable sharing for selected ',
+'USERS' => ' user(s) ?',
+'ENDTIME_GREATER_THAN_STARTTIME' => 'End Time should be greater than Start Time ',
+'FOLLOWUPTIME_GREATER_THAN_STARTTIME' => 'Followup Time should be greater than End Time ',
+'MISSING_EVENT_NAME' => 'Missing Event Name',
+'EVENT_TYPE_NOT_SELECTED' => 'Event Type is not selected',
+'OPPORTUNITYNAME_CANNOT_BE_EMPTY' => 'Opportunity Name field cannot be empty',
+'CLOSEDATE_CANNOT_BE_EMPTY' => 'Close Date field cannot be empty',
+'SITEURL_CANNOT_BE_EMPTY' => 'Site Url cannot be empty',
+'SITENAME_CANNOT_BE_EMPTY' => 'Site Name cannot be empty',
+'LISTPRICE_CANNOT_BE_EMPTY' => 'List Price cannot be empty',
+'INVALID_LIST_PRICE' => 'Invalid List Price',
+'PROBLEM_ACCESSSING_URL' => 'Problem accessing url: ',
+'CODE' => ' Code: ',
+'WISH_TO_QUALIFY_MAIL_AS_CONTACT' => 'Are you sure you wish to Qualify this Mail as Contact?',
+'SELECT_ATLEAST_ONEMSG_TO_DEL' => 'Please select at least one message to delete',
+'ERROR' => 'Error',
+'FIELD_TYPE_NOT_SELECTED' => 'Field Type is not selected',
+'SPECIAL_CHARACTERS_NOT_ALLOWED' => 'Special characters are not allowed in Label field',
+'PICKLIST_CANNOT_BE_EMPTY' => 'Picklist value cannot be empty',
+'DUPLICATE_VALUES_FOUND' => 'Duplicate Values found',
+'DUPLICATE_MAPPING_ACCOUNTS' => 'Duplicate mapping for accounts!!',
+'DUPLICATE_MAPPING_CONTACTS' => 'Duplicate mapping for Contacts!!',
+'DUPLICATE_MAPPING_POTENTIAL' => 'Duplicate mapping for Potential!!',
+'ERROR_WHILE_EDITING' => 'Error while Editing',
+'PLEASE_ENTER_TAG' => 'Please enter a tag',
+'PLEASE_SELECT_PRODUCT' => 'Please select a Product',
+'DUPLICATE_ENTRIES_FOUND' => "Duplicate entries found for the value \'",
+'ROLE_SHOULDHAVE_INFO' => 'Role should have at least one profile',
+'ENTER_VALID_CONVERSION_RATE' => 'Enter valid Conversion Rate',
+'GROUPNAME_CANNNOT_BE_NONE' => 'Group Name cannot be none',
+'GROUP_SHOULDHAVE_ONEMEMBER_INFO' => 'Group should have at least one member. Select a member to the group',
+'MAP_DELETED_INFO' => 'This map has been deleted. You cannot use this map again',
+'MUSTHAVE_ONE_REQUIREDFIELD' => 'Must have one Required field to be selected\n',
+'COLUMNS_CANNOT_BE_DUPLICATED' => 'Columns cannot be duplicated',
+'SPECIFY_ROLE_INFO' => 'Specfiy the Role to Transfer Existing Roles Users',
+'FOLDERNAME_CANNOT_BE_EMPTY' => 'The Folder name cannot be empty',
+'FOLDER_NAME_ALREADY_EXISTS' => 'Folder name already exists, try again...',
+'SELECT_ATLEAST_ONE_REPORT' => 'Please select at least one Report',
+'DELETE_FOLDER_CONFIRMATION' => "Are you sure you want to delete the folder \'",
+'DELETE_REPORT_CONFIRMATION' => 'Are you sure you want to delete this report ?',
+'MOVE_REPORT_CONFIRMATION' => 'Are you sure you want to move this report to ',
+'FOLDER' => ' folder ?',
+'ACCOUNT_ACCESS_INFO' => 'Potentials, HelpDesk, Quotes, SalesOrder & Invoice Access must be set to Private when the Account Access is set to Private',
+'PROFILENAME_CANNOT_BE_EMPTY' => 'Profile Name Cannot be empty',
+'PROFILE_DETAILS_UPDATED' => 'Profile Details are updated',
+'CURRENCY_CHANGE_INFO' => 'Currency Changes has been made Successfully',
+'CURRENCY_CONVERSION_INFO' => 'Are you using Dollar $ as Currency? \n Click OK to remain as $, Cancel to change the currency conversion rate.',
+'THE_EMAILID' => "The email id \'",
+'EMAIL_FIELD_INVALID' => "\' in the email field is invalid",
+'SELECT_VALID_IMAGE' => 'Please Select a Valid Image',
+'EMAIL_FILED_IS' => "\' in the email field is ",
+'OTHER_EMAIL_FILED_IS' => "\' in other email field is ",
+'YAHOO_EMAIL_FILED_IS' => "\' in yahoo email field is ",
+'INVALID_ADD_IN_EMAILFIELD' => '\" not a valid email address in Email field',
+'INVALID_ADD_IN_OTHER_EMAILFIELD' => '\" not a valid email address in Other Email field',
+'ENTER_VALID_4DIGIT_YEAR' => 'Please enter a valid 4 digit year between ',
+'AND' => ' and ',
+'DATABASE_CHANGE_CONFIRMATION' => 'Are you sure to apply the Database Changes from ',
+'TO' => ' to ',
+'DELETE_RSSFEED_CONFIRMATION' => 'Are you sure to delete the rss feed?',
+
);
$app_list_strings = array (
Modified: vtigercrm/branches/5.0.3/install/2setConfig.php
==============================================================================
--- vtigercrm/branches/5.0.3/install/2setConfig.php (original)
+++ vtigercrm/branches/5.0.3/install/2setConfig.php Mon Mar 12 09:05:35 2007
@@ -281,11 +281,11 @@
// Here we decide whether to submit the form.
if (isError == true) {
- alert("Missing required fields: " + errorMessage);
+ alert(alert_arr.MISSING_REQUIRED_FIELDS + errorMessage);
return false;
}
if (trim(form.admin_email.value) != "" && !/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/.test(form.admin_email.value)) {
- alert("The email id '"+form.admin_email.value+"' in the email field is invalid");
+ alert(alert_arr.THE_EMAILID+form.admin_email.value+alert_arr.EMAIL_FIELD_INVALID);
form.admin_email.focus();
exit();
}
Modified: vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php Mon Mar 12 09:05:35 2007
@@ -164,6 +164,11 @@
'LBL_CONF_MAILSERVER_ERROR'=>'Please configure your outgoing mailserver under Settings ---> Outgoing Server link',
'LBL_VTIGER_EMAIL_CLIENT'=>'vtiger Email Client',
'LBL_MAILSELECT_INFO3'=>'You don\'t have permission to view email id(s) of the selected Record(s).',
+//Added for script alerts
+'FEATURE_AVAILABLE_INFO' => 'This feature is currently only available for Microsoft Internet Explorer 5.5+ users\n\nWait f
+or an update!',
+'DOWNLOAD_CONFIRAMATION' => 'Do you want to download the file ?',
+
);
?>
Modified: vtigercrm/branches/5.0.3/modules/Emails/mailbox.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Emails/mailbox.php (original)
+++ vtigercrm/branches/5.0.3/modules/Emails/mailbox.php Mon Mar 12 09:05:35 2007
@@ -73,9 +73,9 @@
function handleFile(nr) {
if (b != "ie") {
- alert("This feature is currently only available for Microsoft Internet Explorer 5.5+ users\n\nWait for an update!");
+ alert('.$mod_strings['FEATURE_AVAILABLE_INFO'].');
} else {
- check = confirm("Do you want to download the file ?");
+ check = confirm('.$mod_strings['DOWNLOAD_CONFIRAMATION'].');
if (check) {
setTimeout("this.location.reload()",8000);
location.href="index.php?action=gotodownload&module=Emails&download=1&file="+ nr +"&msgno='.$msg.'"; } else {
Modified: vtigercrm/branches/5.0.3/modules/Migration/DBChanges/42P2_to_50.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Migration/DBChanges/42P2_to_50.php (original)
+++ vtigercrm/branches/5.0.3/modules/Migration/DBChanges/42P2_to_50.php Mon Mar 12 09:05:35 2007
@@ -4060,10 +4060,10 @@
function ajaxSaveResponse(response)
{
//alert(response.responseText);
- alert("Currency Changes has been made Successfully");
+ alert(alert_arr.CURRENCY_CHANGE_INFO);
}
- if(!confirm("Are you using Dollar $ as Currency? \n Click OK to remain as $, Cancel to change the currency conversion rate."))
+ if(!confirm(alert_arr.CURRENCY_CONVERSION_INFO))
{
getConversionRate('');
}
Modified: vtigercrm/branches/5.0.3/modules/Settings/ListMailAccount.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/ListMailAccount.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/ListMailAccount.php Mon Mar 12 09:05:35 2007
@@ -131,7 +131,7 @@
}
else
{
- alert("Please select at least one entity");
+ alert(alert_arr.SELECT);
return false;
}
}
@@ -153,7 +153,7 @@
}
else
{
- alert("Please select at least one entity");
+ alert(alert_arr.SELECT);
return false;
}
}
Modified: vtigercrm/branches/5.0.3/modules/Settings/listemailtemplates.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/listemailtemplates.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/listemailtemplates.php Mon Mar 12 09:05:35 2007
@@ -39,6 +39,7 @@
$smarty->assign("UMOD", $mod_strings);
global $current_language;
$smod_strings = return_module_language($current_language,'Settings');
+$smarty->assign("APP", $app_strings);
$smarty->assign("MOD", $smod_strings);
$smarty->assign("MODULE", 'Settings');
$smarty->assign("IMAGE_PATH", $image_path);
Modified: vtigercrm/branches/5.0.3/modules/Settings/savewordtemplate.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/savewordtemplate.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/savewordtemplate.php Mon Mar 12 09:05:35 2007
@@ -135,14 +135,14 @@
include('themes/'.$theme.'/header.php');
include "upload.php";
// $errormessage = "<B><font color='red'>Kindly give a valid file for upload!</font></B> <br>" ;
- echo "<script>alert('Please Specify a File to Merge')</script>";
+ echo "<script>alert('".$mod_strings['SPECIFY_FILE_TO_MERGE']."')</script>";
}
else if($errorCode == 2)
{
include('themes/'.$theme.'/header.php');
include "upload.php";
//$errormessage = "<B><font color='red'>Sorry, the uploaded file exceeds the maximum filesize limit. Please try a smaller file</font></B> <br>";
- echo "<script>alert('Sorry, the uploaded file exceeds the maximum filesize limit. Please try a smaller file')</script>";
+ echo "<script>alert('".$mod_strings['FILESIZE_EXCEEDS_INFO']."')</script>";
//echo $errormessage;
//echo $errorCode;
}
@@ -150,7 +150,7 @@
{
include('themes/'.$theme.'/header.php');
include "upload.php";
- echo "<script>alert('Problems in file upload. Please try again!')</script>";
+ echo "<script>alert('".$mod_strings['PROBLEMS_IN_FILEUPLOAD']."')</script>";
}
Modified: vtigercrm/branches/5.0.3/modules/Users/Forms.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/Forms.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/Forms.php Mon Mar 12 09:05:35 2007
@@ -41,6 +41,11 @@
$err_missing_required_fields = $app_strings['ERR_MISSING_REQUIRED_FIELDS'];
$err_invalid_email_address = $app_strings['ERR_INVALID_EMAIL_ADDRESS'];
$lbl_user_image=$mod_strings['User Image'];
+$err_select_valid_image = $app_strings['SELECT_VALID_IMAGE'];
+$the_emailid = $app_strings['THE_EMAILID'];
+$email_field_is = $app_strings['EMAIL_FILED_IS'].$err_invalid_email_address;
+$other_email_field_is = $app_strings['OTHER_EMAIL_FILED_IS'].$err_invalid_email_address;
+$yahoo_email_field_is = $app_strings['YAHOO_EMAIL_FILED_IS'].$err_invalid_email_address;
$the_script = <<<EOQ
@@ -96,17 +101,17 @@
set_fieldfocus(errorMessage,oField_miss);
}
if (trim(form.email1.value) != "" && !/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/.test(form.email1.value)) {
- alert("The email id '"+form.email1.value+"' in the email field is $err_invalid_email_address");
+ alert("$the_emailid"+form.email1.value+"$email_field_is");
form.email1.focus();
exit();
}
if (trim(form.email2.value) != "" && !/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/.test(form.email2.value)) {
- alert("The email id '"+form.email2.value+"' in other email field is $err_invalid_email_address");
+ alert("$the_emailid"+form.email1.value+"$other_email_field_is");
form.email2.focus();
exit();
}
if (trim(form.yahoo_id.value) != "" && !/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/.test(form.yahoo_id.value)) {
- alert("The email id '"+form.yahoo_id.value+"' in yahoo email field is $err_invalid_email_address");
+ alert("$the_emailid"+form.yahoo_id.value+"$yahoo_email_field_is");
form.yahoo_id.focus();
exit();
}
@@ -120,7 +125,7 @@
if((aUpload[aUpload.length-1]!="jpg") && (aUpload[aUpload.length-1]!="gif") && (aUpload[aUpload.length-1]!="bmp") && (aUpload[aUpload.length-1]!="png"))
{
- alert("Please Select a Valid Image");
+ alert("$err_select_valid_image");
form.imagename.focus(); exit();
}
More information about the vtigercrm-commits
mailing list