[Vtigercrm-commits] [vtiger-commits] r5514 - in /vtigercrm/branches/4.2: include/ modules/Activities/ modules/CustomView/ modules/HelpDesk/ modules/Invoice/ modules/Orders/ modules/Potentials/ modules/Quotes/ modules/Users/ modules/Users/language/

vtigercrm-commits at vtiger.fosslabs.com vtigercrm-commits at vtiger.fosslabs.com
Thu Apr 27 18:57:46 EDT 2006 

Author: allanbush
Date: Thu Apr 27 16:57:39 2006
New Revision: 5514

Log:
Added KLeo and Rudig's contributions from http://forums.vtiger.com/viewtopic.php?t=5773.  Refs #750.

I'm sure there's still a lot of work done to remove hard coded strings if someone wants to take it up.

Modified:
    vtigercrm/branches/4.2/include/utils.php
    vtigercrm/branches/4.2/modules/Activities/Forms.php
    vtigercrm/branches/4.2/modules/CustomView/EditView.html
    vtigercrm/branches/4.2/modules/CustomView/EditView.php
    vtigercrm/branches/4.2/modules/HelpDesk/ListView.html
    vtigercrm/branches/4.2/modules/Invoice/DetailView.php
    vtigercrm/branches/4.2/modules/Orders/SalesOrderDetailView.php
    vtigercrm/branches/4.2/modules/Potentials/Forms.php
    vtigercrm/branches/4.2/modules/Quotes/DetailView.php
    vtigercrm/branches/4.2/modules/Users/OrgSharingDetailView.php
    vtigercrm/branches/4.2/modules/Users/language/en_us.lang.php

Modified: vtigercrm/branches/4.2/include/utils.php
==============================================================================
--- vtigercrm/branches/4.2/include/utils.php (original)
+++ vtigercrm/branches/4.2/include/utils.php Thu Apr 27 16:57:39 2006
@@ -3178,7 +3178,7 @@
 				}
 				//Added condition to hide the close symbol in Related Lists
 //				if($relatedlist != '' && $value == "<a href='index.php?return_module=Activities&return_action=index&return_id=".$activityid."&action=Save&module=Activities&record=".$activityid."&change_status=true&status=Completed'>X</a>")
-				if($name == 'Close' && $relatedlist != '')
+				if($name == $app_strings['Close'] && $relatedlist != '')
 				{
 					$list_header .= '';
 				}
@@ -4537,23 +4537,23 @@
 	$output = '';
 	$output .= '<table width="100%" border="0" cellspacing="0" cellpadding="0" class="formOuterBorder">';
 	$output .=  '<tr><td  class="formBorder">';
-	$output .= '<div style="padding:2 0 2 0"><strong>Product Details</strong></div> <div id="productList">';
+	$output .= '<div style="padding:2 0 2 0"><strong>'.$app_strings['LBL_PRODUCT_DETAILS'].'</strong></div> <div id="productList">';
     $output .= '<table width="100%" border="0" cellspacing="0" cellpadding="0" class="formBorder">';
     $output .= '<tr class="moduleListTitle" height="20" id="tablehead">';
-    $output .= '<td width="20%" style="padding:3px;">Product</td>';
+    $output .= '<td width="20%" style="padding:3px;">'.$app_strings['LBL_PRODUCT'].'</td>';
     $output .= '<td WIDTH="1" class="blackLine"><IMG SRC="'.$image_path.'blank.gif"></td>';
     if($module != 'Orders')
     {
-    	$output .= '<td width="12%" style="padding:3px;">Qty In Stock</td>';
+    	$output .= '<td width="12%" style="padding:3px;">'.$app_strings['LBL_QTY_IN_STOCK'].'</td>';
     	$output .= '<td WIDTH="1" class="blackLine"><IMG SRC="'.$image_path.'blank.gif"></td>';
     }	
-    $output .= '<td width="12%" style="padding:3px;">Qty</td>';
+    $output .= '<td width="12%" style="padding:3px;">'.$app_strings['LBL_QTY'].'</td>';
     $output .= '<td WIDTH="1" class="blackLine"><IMG SRC="'.$image_path.'blank.gif"></td>';
-    $output .= '<td width="15%" style="padding:3px;">Unit Price</td>';
+    $output .= '<td width="15%" style="padding:3px;">'.$app_strings['LBL_UNIT_PRICE'].'</td>';
     $output .= '<td WIDTH="1" class="blackLine"><IMG SRC="'.$image_path.'blank.gif"></td>';
-    $output .= '<td width="16%" style="padding:3px;">List Price</td>';
+    $output .= '<td width="16%" style="padding:3px;">'.$app_strings['LBL_LIST_PRICE'].'</td>';
     $output .= '<td WIDTH="1" class="blackLine"><IMG SRC="'.$image_path.'blank.gif"></td>';
-    $output .= '<td style="padding:3px;"><div align="center">Total</div></td>';
+    $output .= '<td style="padding:3px;"><div align="center">'.$app_strings['LBL_TOTAL'].'</div></td>';
     $output .=  '</tr>';
     $output .=  '<tr id="tableheadline">';
     $output .=  '<td colspan="11" height="1" class="blackLine"><IMG SRC="'.$image_path.'blank.gif"></td>';
@@ -4640,22 +4640,22 @@
 	$output .= '<table width="100%" border="0" cellspacing="2" cellpadding="2" bgcolor="#FFFFFF">';
         $output .= '<tr>'; 
 	$output .= '<td width="150"></td>';
-      	$output .= '<td><div align="right"><b>Sub Total:</b></div></td>';
+      	$output .= '<td><div align="right"><b>'.$app_strings['LBL_SUB_TOTAL'].':</b></div></td>';
         $output .= '<td width="150"><div align="right" style="border:1px solid #000;padding:2px">&nbsp;'.$focus->column_fields['hdnSubTotal'].'</div></td>';
         $output .= '</tr>';
         $output .= '<tr>'; 
 	$output .=  '<td>&nbsp;</td>';
-        $output .= '<td><div align="right"><b>Tax:</b></div></td>';
+        $output .= '<td><div align="right"><b>'.$app_strings['LBL_TAX'].':</b></div></td>';
         $output .= '<td width="150"><div align="right" style="border:1px solid #000;padding:2px">&nbsp;'.$focus->column_fields['txtTax'].'</div></td>';
       $output .= '</tr>';
       $output .= '<tr>'; 
       $output .= '<td>&nbsp;</td>';
-      $output .= '<td><div align="right"><b>Adjustment:</b></div></td>';
+      $output .= '<td><div align="right"><b>'.$app_strings['LBL_ADJUSTMENT'].':</b></div></td>';
       $output .= '<td width="150"><div align="right"><div align="right" style="border:1px solid #000;padding:2px">&nbsp;'.$focus->column_fields['txtAdjustment'].'</div></td>';
       $output .= '</tr>';
       $output .= '<tr>'; 
       $output .= '<td>&nbsp;</td>';
-      $output .= '<td><div align="right"><b>Grand Total:</b></div></td>';
+      $output .= '<td><div align="right"><b>'.$app_strings['LBL_GRAND_TOTAL'].':</b></div></td>';
       $output .= '<td width="150"><div id="grandTotal" align="right" style="border:1px solid #000;padding:2px">&nbsp;'.$focus->column_fields['hdnGrandTotal'].'</div></td>';
     $output .= '</tr>';
     $output .= '</table>';

Modified: vtigercrm/branches/4.2/modules/Activities/Forms.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Activities/Forms.php (original)
+++ vtigercrm/branches/4.2/modules/Activities/Forms.php Thu Apr 27 16:57:39 2006
@@ -129,9 +129,9 @@
 
 			<input type="hidden" name="due_date" value="">
 
-		<FONT class="required">${app_strings['LBL_REQUIRED_SYMBOL']}</FONT>Subject<br>
+		<FONT class="required">${app_strings['LBL_REQUIRED_SYMBOL']}</FONT>{$mod_strings['LBL_LIST_SUBJECT']}:<br>
 		<input name='subject' id='task_subject' type="text" value=""><br>
-		<FONT class="required">${app_strings['LBL_REQUIRED_SYMBOL']}</FONT>Start Date & Time&nbsp;<br>
+		<FONT class="required">${app_strings['LBL_REQUIRED_SYMBOL']}</FONT>{$mod_strings['LBL_LIST_DUE_DATE']}:<br>
 		<input name="date_start" id="jscal_field_date_start" type="text" tabindex="2" size="11" maxlength="10" value="{$dis_value}"> <img src="themes/{$theme}/images/calendar.gif" id="jscal_trigger_date_start">&nbsp; 
 		<input name="time_start" id='task_time_start' tabindex="1" size="5" maxlength="5" type="text" value="{$curr_time}"><br>
 		<font size=1><em old="(yyyy-mm-dd 24:00)">($current_user->date_format 24:00)</em></font><br><br>
@@ -164,27 +164,27 @@
 
 			
 		<script type="text/javascript" src="jscalendar/calendar-setup.js"></script>
-		<FONT class="required">${app_strings['LBL_REQUIRED_SYMBOL']}</FONT>Subject<br>
+		<FONT class="required">${app_strings['LBL_REQUIRED_SYMBOL']}</FONT>{$mod_strings['LBL_LIST_SUBJECT']}:<br>
 		<input name='subject' id='event_subject' type="text" value=""><br>
-		<FONT class="required">${app_strings['LBL_REQUIRED_SYMBOL']}</FONT>Start Date & Time&nbsp;<br>
+		<FONT class="required">${app_strings['LBL_REQUIRED_SYMBOL']}</FONT>{$mod_strings['LBL_LIST_DUE_DATE']}:<br>
 		<input name="date_start" id="jscal_field_event_date_start" type="text" tabindex="2" size="11" maxlength="10" value="{$dis_value}"> <img src="themes/{$theme}/images/calendar.gif" id="jscal_trigger_event_date_start">&nbsp; 
 		<input name="time_start" id='event_time_start' tabindex="1" size="5" maxlength="5" type="text" value="{$curr_time}"><br>
 		<font size=1><em old="(yyyy-mm-dd 24:00)">($current_user->date_format 24:00)</em></font><br>
-		Activity Type<br>
+		{$mod_strings['Activity Type']}:<br>
 		<select name='activitytype'>
 EOQ;
 
 $the_form .= get_select_options_with_id($comboFieldArray['activitytype_dom'], "");
 $the_form .= <<<EOQ
                 </select><br>
-		Duration<br>
+		{$mod_strings['Duration']}:<br>
 		<input name="duration_hours" type="text" size="2" value="1">&nbsp;
 		<select name='duration_minutes'>
 EOQ;
 
 $the_form .= get_select_options_with_id($comboFieldArray['duration_minutes_dom'], "");
 $the_form .= <<<EOQ
-                </select>(hours/minutes)<br>	
+                </select>({$mod_strings['LBL_HOURS']}/{$mod_strings['LBL_MINUTES']})<br>	
 		<br>
 		<input title="${app_strings['LBL_SAVE_BUTTON_TITLE']}" accessKey="${app_strings['LBL_SAVE_BUTTON_KEY']}" class="button" type="submit" name="button" value="${app_strings['LBL_SAVE_BUTTON_LABEL']}" >
 		</form>

Modified: vtigercrm/branches/4.2/modules/CustomView/EditView.html
==============================================================================
--- vtigercrm/branches/4.2/modules/CustomView/EditView.html (original)
+++ vtigercrm/branches/4.2/modules/CustomView/EditView.html Thu Apr 27 16:57:39 2006
@@ -188,7 +188,7 @@
 <table width="100%" cellpadding="2" cellspacing="0" border="0">
   <tr>
     <td vAlign="middle" align="left"><IMG src="{IMAGE_PATH}{MODULE}.gif" border="0"></td>
-    <td class="moduleTitle" vAlign="middle" align="left" noWrap width="100%" height="20">{MODULE}: {MOD.LBL_MODULE_NAME}</td>
+    <td class="moduleTitle" vAlign="middle" align="left" noWrap width="100%" height="20">{MODULENAME}: {MOD.LBL_MODULE_NAME}</td>
     <!--<td nowrap class='bodySmall' align='right'>[ <A href='http://www.vtiger.com/products/crm/document.html' target='_blank'>{APP.LNK_HELP}</A> 
       ]</td>-->
   </tr>

Modified: vtigercrm/branches/4.2/modules/CustomView/EditView.php
==============================================================================
--- vtigercrm/branches/4.2/modules/CustomView/EditView.php (original)
+++ vtigercrm/branches/4.2/modules/CustomView/EditView.php Thu Apr 27 16:57:39 2006
@@ -48,6 +48,7 @@
 $xtpl->assign("APP", $app_strings);
 $xtpl->assign("IMAGE_PATH", $image_path);
 $xtpl->assign("MODULE",$cv_module);
+$xtpl->assign("MODULENAME",$app_strings[$cv_module]);
 $xtpl->assign("CVMODULE", $cv_module);
 $xtpl->assign("CUSTOMVIEWID",$recordid);
 $xtpl->assign("DATAFORMAT",$current_user->date_format);

Modified: vtigercrm/branches/4.2/modules/HelpDesk/ListView.html
==============================================================================
--- vtigercrm/branches/4.2/modules/HelpDesk/ListView.html (original)
+++ vtigercrm/branches/4.2/modules/HelpDesk/ListView.html Thu Apr 27 16:57:39 2006
@@ -104,7 +104,7 @@
           <td  class="formSecHeader">{MOD.LBL_STATISTICS}{MOD.LBL_COLON}</td>
           </tr>
           <tr>
-          <TD  class="dataLabel" width="50%" noWrap ><div align="left"><a href="index.php?module=HelpDesk&action=CumulStatistics">Cumulative Statistics</a></div></TD>
+          <TD  class="dataLabel" width="50%" noWrap ><div align="left"><a href="index.php?module=HelpDesk&action=CumulStatistics">{MOD.LBL_TICKET_CUMULATIVE_STATISTICS}</a></div></TD>
            </tr>
           </TABLE>
 

Modified: vtigercrm/branches/4.2/modules/Invoice/DetailView.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Invoice/DetailView.php (original)
+++ vtigercrm/branches/4.2/modules/Invoice/DetailView.php Thu Apr 27 16:57:39 2006
@@ -116,7 +116,7 @@
 
 	$xtpl->assign("DUPLICATEBUTTON","<td><input title=\"$app_strings[LBL_DUPLICATE_BUTTON_TITLE]\" accessKey=\"$app_strings[LBL_DUPLICATE_BUTTON_KEY]\" class=\"button\" onclick=\"this.form.return_module.value='Invoice'; this.form.return_action.value='DetailView'; this.form.isDuplicate.value='true'; this.form.action.value='EditView'\" type=\"submit\" name=\"Duplicate\" value=\"$app_strings[LBL_DUPLICATE_BUTTON_LABEL]\"></td>");
 }
-	$xtpl->assign("CREATEPDF","<td><input title=\"Export To PDF\" accessKey=\"Alt+e\" class=\"button\" onclick=\"this.form.return_module.value='Invoice'; this.form.return_action.value='DetailView'; this.form.return_id.value='".$_REQUEST['record']."'; this.form.action.value='CreatePDF'\" type=\"submit\" name=\"Export To PDF\" value=\"Export To PDF\"></td>");
+	$xtpl->assign("CREATEPDF","<td><input title=\"Export To PDF\" accessKey=\"Alt+e\" class=\"button\" onclick=\"this.form.return_module.value='Invoice'; this.form.return_action.value='DetailView'; this.form.return_id.value='".$_REQUEST['record']."'; this.form.action.value='CreatePDF'\" type=\"submit\" name=\"Export To PDF\" value=\"$app_strings[LBL_EXPORT_TO_PDF]\"></td>");
 
 if(isPermitted("Invoice",2,$_REQUEST['record']) == 'yes')
 {

Modified: vtigercrm/branches/4.2/modules/Orders/SalesOrderDetailView.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Orders/SalesOrderDetailView.php (original)
+++ vtigercrm/branches/4.2/modules/Orders/SalesOrderDetailView.php Thu Apr 27 16:57:39 2006
@@ -119,7 +119,7 @@
 	$xtpl->assign("DUPLICATEBUTTON","<td><input title=\"$app_strings[LBL_DUPLICATE_BUTTON_TITLE]\" accessKey=\"$app_strings[LBL_DUPLICATE_BUTTON_KEY]\" class=\"button\" onclick=\"this.form.return_module.value='Orders'; this.form.return_action.value='SalesOrderDetailView'; this.form.module.value='Orders';this.form.isDuplicate.value='true'; this.form.action.value='SalesOrderEditView'\" type=\"submit\" name=\"Duplicate\" value=\"$app_strings[LBL_DUPLICATE_BUTTON_LABEL]\"></td>");
 }
 
-	$xtpl->assign("CREATEPDF","<td><input title=\"Export To PDF\" accessKey=\"Alt+e\" class=\"button\" onclick=\"this.form.return_module.value='Orders'; this.form.return_action.value='SalesOrderDetailView'; this.form.return_id.value='".$_REQUEST['record']."'; this.form.module.value='Orders';this.form.action.value='CreateSOPDF'\" type=\"submit\" name=\"$app_strings[LBL_EXPORT_TO_PDF]\" value=\"Export To PDF\"></td>");
+	$xtpl->assign("CREATEPDF","<td><input title=\"Export To PDF\" accessKey=\"Alt+e\" class=\"button\" onclick=\"this.form.return_module.value='Orders'; this.form.return_action.value='SalesOrderDetailView'; this.form.return_id.value='".$_REQUEST['record']."'; this.form.module.value='Orders';this.form.action.value='CreateSOPDF'\" type=\"submit\" name=\"Export To PDF\" value=\"$app_strings[LBL_EXPORT_TO_PDF]\"></td>");
 
 
 if(isPermitted("Invoice",1,$_REQUEST['record']) == 'yes')

Modified: vtigercrm/branches/4.2/modules/Potentials/Forms.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Potentials/Forms.php (original)
+++ vtigercrm/branches/4.2/modules/Potentials/Forms.php Thu Apr 27 16:57:39 2006
@@ -243,7 +243,7 @@
 		<input name='potentialname' id="quick_potentialname" type="text" value=""><br>
 		<FONT class="required">$lbl_required_symbol</FONT>$lbl_account_name<br>
 		<input name='account_name' type="text" id="account_name"  value="" readonly>
-		<input name="account_id" id="quick_account_id"  type="hidden" value="">&nbsp;<input title="Change" accessKey="Change" type="button" tabindex="3" class="button" value="Change" name="btn1" LANGUAGE=javascript onclick='return window.open("index.php?module=Accounts&action=Popup&popuptype=specific&form=EditView&form_submit=false","test","width=600,height=400,resizable=1,scrollbars=1");'>
+		<input name="account_id" id="quick_account_id"  type="hidden" value="">&nbsp;<input title="Change" accessKey="Change" type="button" tabindex="3" class="button" value="$app_strings[LBL_CHANGE_BUTTON_LABEL]" name="btn1" LANGUAGE=javascript onclick='return window.open("index.php?module=Accounts&action=Popup&popuptype=specific&form=EditView&form_submit=false","test","width=600,height=400,resizable=1,scrollbars=1");'>
 		<br>
 
 		<FONT class="required">$lbl_required_symbol</FONT>$lbl_date_closed <br><font size="1"><em old='ntc_date_format'>($current_user->date_format)</em></font><br>

Modified: vtigercrm/branches/4.2/modules/Quotes/DetailView.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Quotes/DetailView.php (original)
+++ vtigercrm/branches/4.2/modules/Quotes/DetailView.php Thu Apr 27 16:57:39 2006
@@ -125,7 +125,7 @@
 }
 
 	
-	$xtpl->assign("CREATEPDF","<td><input title=\"Export To PDF\" accessKey=\"Alt+e\" class=\"button\" onclick=\"this.form.return_module.value='Quotes'; this.form.return_action.value='DetailView'; this.form.return_id.value='".$_REQUEST['record']."';this.form.module.value='Quotes'; this.form.action.value='CreatePDF'\" type=\"submit\" name=\"Export To PDF\" value=\"Export To PDF\"></td>");
+	$xtpl->assign("CREATEPDF","<td><input title=\"Export To PDF\" accessKey=\"Alt+e\" class=\"button\" onclick=\"this.form.return_module.value='Quotes'; this.form.return_action.value='DetailView'; this.form.return_id.value='".$_REQUEST['record']."';this.form.module.value='Quotes'; this.form.action.value='CreatePDF'\" type=\"submit\" name=\"Export To PDF\" value=\"$app_strings[LBL_EXPORT_TO_PDF]\"></td>");
 
 	if(isPermitted("SalesOrder",1,$_REQUEST['record']) == 'yes')
 	{

Modified: vtigercrm/branches/4.2/modules/Users/OrgSharingDetailView.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Users/OrgSharingDetailView.php (original)
+++ vtigercrm/branches/4.2/modules/Users/OrgSharingDetailView.php Thu Apr 27 16:57:39 2006
@@ -15,7 +15,7 @@
 global $app_list_strings;
 
 echo '<form action="index.php" method="post" name="new" id="form">';
-echo get_module_title("Security", "Default Organisation Sharing Privileges", true);
+echo get_module_title("Security", $mod_strings['LBL_ORG_SHARING_PRIVILEGES_HEADER'], true);
 
 global $theme;
 $theme_path="themes/".$theme."/";
@@ -31,7 +31,7 @@
 $output .= '<TABLE width="60%" border=0 cellPadding=5 cellSpacing=1 class="FormBorder">';
 $output .= '<tr>';
 $output .= '<td class="moduleListTitle" height="20" style="padding:0px 3px 0px 3px;"><b>'.$mod_strings['LBL_ORG_SHARING_PRIVILEGES'].'</b></td>';
-$output .= '<td class="moduleListTitle" height="20" style="padding:0px 3px 0px 3px;"><b>Access Privilege</b></td>';
+$output .= '<td class="moduleListTitle" height="20" style="padding:0px 3px 0px 3px;"><b>'.$mod_strings['LBL_ACCESS_PRIVILEGE'].'</b></td>';
 $output .=  '</tr>';
 
 $row=1;

Modified: vtigercrm/branches/4.2/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/branches/4.2/modules/Users/language/en_us.lang.php Thu Apr 27 16:57:39 2006
@@ -211,6 +211,8 @@
 
 //Added fields in OrgSharingDetailsView.php
 'LBL_ORG_SHARING_PRIVILEGES'=>'Organisation Sharing  Privileges',
+'LBL_ORG_SHARING_PRIVILEGES_HEADER' => 'Setup: Organisation Sharing Privileges',
+'LBL_ACCESS_PRIVILEGE' =>'Access Privilege',
 'LBL_EDIT_PERMISSIONS'=>'Edit Permissions',
 'LBL_SAVE_PERMISSIONS'=>'Save Permissions',
 'LBL_READ_ONLY'=>'Public: Read Only',

More information about the vtigercrm-commits mailing list