Ticket #2375: patch.diff

functions.inc.php

@@ -2665 +2665 @@
-
-  if ( $dispnum == 'users' || $dispnum == 'extensions' ) {
-    // Setup option list we need
-'On Demand'
-'Always'
-'Never'
+_("On Demand")
+_("Always")
+_("Never")
-    $currentcomponent->setoptlistopts('recordoptions', 'sort', false);
-
-'None'
+_("None")
-    $currentcomponent->addoptlistitem('faxdetecttype', '1', 'Zaptel');
-    $currentcomponent->addoptlistitem('faxdetecttype', '2', 'NVFax');
-    $currentcomponent->setoptlistopts('faxdetecttype', 'sort', false);
-
-'No'
-'Yes'
+_("No")
+_("Yes")
-    $currentcomponent->setoptlistopts('privyn', 'sort', false);
-
-'Enable'
-'Disable'
+_("Enable")
+_("Disable")
-    $currentcomponent->setoptlistopts('callwaiting', 'sort', false);
-
-    $currentcomponent->addoptlistitem('ringtime', '0', 'Default');
@@ -2689 +2689 @@
-    }
-    $currentcomponent->setoptlistopts('ringtime', 'sort', false);
-
-'FreePBX default'
-'disabled'
-'system'
+_("FreePBX default")
+_("disabled")
+_("system")
-    $currentcomponent->setoptlistopts('faxdestoptions', 'sort', false);
-
-    if (function_exists('music_list')) {
@@ -2763 +2763 @@
-      }
-
-    } elseif ( $display != 'extensions' ) {
-'Add User/Extension'
+_("Add User/Extension")
-    }
-    
-    // Setup vars for use in the gui later on             
-    $fc_logon = featurecodes_getFeatureCode('core', 'userlogon');
-    $fc_logoff = featurecodes_getFeatureCode('core', 'userlogoff');
-    
-'Please enter a valid extension number.'
-'Please enter a valid CID Num Alias (must be a valid number).'
-'Please enter valid User Password using numbers only'
-'Please enter a valid Display Name'
-'Please enter a valid Outbound CID'
-'Please enter a valid pause time in seconds, using digits only'
+_("Please enter a valid extension number.")
+_("Please enter a valid CID Num Alias (must be a valid number).")
+_("Please enter valid User Password using numbers only")
+_("Please enter a valid Display Name")
+_("Please enter a valid Outbound CID")
+_("Please enter a valid pause time in seconds, using digits only")
-
-    // This is the actual gui stuff
-    $currentcomponent->addguielem('_top', new gui_hidden('action', ($extdisplay ? 'edit' : 'add')));
-    $currentcomponent->addguielem('_top', new gui_hidden('extdisplay', $extdisplay));
-    
-    if ( $display == 'extensions' ) {
-'Edit Extension' : 'Add Extension'
+_("Edit Extension") : _("Add Extension")
-    } else {
-'Edit User' : 'Add User'
+_("Edit User") : _("Add User")
-    }
-    if ( $extdisplay ) {
-      $currentcomponent->addguielem($section, new gui_hidden('extension', $extdisplay), 2);
@@ -2792 +2792 @@
-      $currentcomponent->addguielem($section, new gui_textbox('extension', $extdisplay, 'User Extension', 'The extension number to dial to reach this user.', '!isInteger()', $msgInvalidExtNum, false), 3);
-    }
-    if ( $display != 'extensions' ) {
-'logs into a device.').' '.$fc_logoff.' '._('logs out of a device.'
+"logs into a device.").' '.$fc_logoff.' '._("logs out of a device."
-      // extra JS function check required for blank password warning -- call last in the onsubmit() function
-      $currentcomponent->addjsfunc('onsubmit()', "\treturn checkBlankUserPwd();\n", 9);
-    }
@@ -2897 +2897 @@
-    $currentcomponent->addgeneralarray('devtechs');
-    
-    // Some errors for the validation bits
-'Please enter the dtmfmode for this device'
-'Please enter the channel for this device'
-'You have not entered a Secret for this device, although this is possible it is generally bad practice to not assign a Secret to a device.\n\nAre you sure you want to leave the Secret empty?'
-'Please enter a Secret for this device'
+_("Please enter the dtmfmode for this device")
+_("Please enter the channel for this device")
+_("You have not entered a Secret for this device, although this is possible it is generally bad practice to not assign a Secret to a device.\n\nAre you sure you want to leave the Secret empty?")
+_("Please enter a Secret for this device")
-    
-    // zap
-    $tmparr = array();
@@ -2965 +2965 @@
-    unset($tmparr);
-    
-    // Devices list
-'Generic SIP Device'
-'Generic IAX2 Device'
-'Generic ZAP Device'
-'Other (Custom) Device'
+_("Generic SIP Device")
+_("Generic IAX2 Device")
+_("Generic ZAP Device")
+_("Other (Custom) Device")
-    $currentcomponent->setoptlistopts('devicelist', 'sort', false);
-
-
-    // Option lists used by the gui
-'Fixed'
-'Adhoc'
+_("Fixed")
+_("Adhoc")
-    $currentcomponent->setoptlistopts('devicetypelist', 'sort', false);
-    
-'none'
-'New User'
+_("none")
+_("New User")
-    $users = core_users_list();
-    if (isset($users)) {
-      foreach ($users as $auser) {
@@ -3010 +3010 @@
-  } elseif ( $extdisplay == '' && $tech_hardware == '' ) { // Adding
-
-    if ( $display != 'extensions') {
-'Add Device'
+_("Add Device")
-    } else {
-'Add an Extension'
+_("Add an Extension")
-    }
-'Please select your Device below then click Submit'
+_("Please select your Device below then click Submit")
-    $currentcomponent->addguielem('Device', new gui_selectbox('tech_hardware', $currentcomponent->getoptlist('devicelist'), '', 'Device', '', false));
-
-  } else {
@@ -3039 +3039 @@
-      unset($tmparr);
-      
-      if ( $display != 'extensions' ) {
-'Add').' '.strtoupper($deviceInfo['tech']).' '._('Device'
+"Add").' '.strtoupper($deviceInfo['tech']).' '._("Device"
-      } else {
-'Add').' '.strtoupper($deviceInfo['tech']).' '._('Extension'
+"Add").' '.strtoupper($deviceInfo['tech']).' '._("Extension"
-      }
-
-    }
@@ -3056 +3056 @@
-    $fc_logon = featurecodes_getFeatureCode('core', 'userlogon');
-    $fc_logoff = featurecodes_getFeatureCode('core', 'userlogoff');
-
-'Please enter a device id.'
-'Please enter a valid Description for this device'
-'Please enter a valid Emergency CID'
-'Please enter a valid extension number.'
+_("Please enter a device id.")
+_("Please enter a valid Description for this device")
+_("Please enter a valid Emergency CID")
+_("Please enter a valid extension number.")
-    
-    // Actual gui
-    $currentcomponent->addguielem('_top', new gui_hidden('action', ($extdisplay ? 'edit' : 'add')));
@@ -3074 +3074 @@
-      }
-      $currentcomponent->addguielem($section, new gui_textbox('description', $devinfo_description, 'Description', 'The caller id name for this device will be set to this description until it is logged into.', '!isAlphanumeric() || isWhitespace()', $msgInvalidDevDesc, false));
-      $currentcomponent->addguielem($section, new gui_textbox('emergency_cid', $devinfo_emergency_cid, 'Emergency CID', 'This caller id will always be set when dialing out an Outbound Route flagged as Emergency.  The Emergency CID overrides all other caller id settings.', '!isCallerID()', $msgInvalidEmergCID));
-'Devices can be fixed or adhoc. Fixed devices are always associated to the same extension/user. Adhoc devices can be logged into and logged out of by users.').' '.$fc_logon.' '._('logs into a device.').' '.$fc_logoff.' '._('logs out of a device.'
+"Devices can be fixed or adhoc. Fixed devices are always associated to the same extension/user. Adhoc devices can be logged into and logged out of by users.").' '.$fc_logon.' '._("logs into a device.").' '.$fc_logoff.' '._("logs out of a device."
-      $currentcomponent->addguielem($section, new gui_selectbox('deviceuser', $currentcomponent->getoptlist('deviceuserlist'), $devinfo_user, 'Default User', 'Fixed devices will always mapped to this user.  Adhoc devices will be mapped to this user by default.<br><br>If selecting "New User", a new User Extension of the same Device ID will be set as the Default User.', false));
-    } else {
-      $section = 'Extension Options';