Changeset 5898 for branches/2.3/expressoMail1_2
- Timestamp:
- 04/09/12 15:21:57 (12 years ago)
- Location:
- branches/2.3/expressoMail1_2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.3/expressoMail1_2/index.php
r5319 r5898 182 182 var sentfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'].'"; 183 183 var spamfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'].'"; 184 var locale = "'.$GLOBALS['phpgw']->translation->userlang.'"; 184 185 var token_param = "'.$var_tokens.'"; 185 var locale = "'.$GLOBALS['phpgw']->common->getPreferredLanguage().'"; 186 186 187 </script>'; 187 188 188 189 // End Set Imap Folder names options 189 190 //User info … … 221 222 echo '<script type="text/javascript">init();</script>'; 222 223 223 // Maybe it's better to put locale in another place.224 $locale = $GLOBALS['phpgw']->translation->userlang;225 echo '<input type="hidden" id="locale" name="locale" value="'.$locale.'" />';226 227 224 if ($GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_shortcuts']) 228 225 { -
branches/2.3/expressoMail1_2/js/main.js
r5319 r5898 137 137 var search_div = Element('search_div'); 138 138 var applet = null; 139 var locale = Element('locale').value;140 139 if (navigator.userAgent.match('MSIE')){ 141 140 applet = document.createElement('<object style="display:yes;width:0;height:0;vertical-align:bottom;" id="cert_applet" ' + … … 158 157 'commons-httpclient-3.1.jar,' + 159 158 'commons-logging-1.1.1.jar' 160 //debug:' true'159 //debug:'false' 161 160 } 162 161
Note: See TracChangeset
for help on using the changeset viewer.