Changeset 5033

Show
Ignore:
Timestamp:
09/15/07 10:54:41 (6 years ago)
Author:
p_lindheimer
Message:

#2308 FROM_DID to use , #2381 add iax_genera_custom.conf, #2375 localization fixes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.3/core/etc/iax.conf

    r4110 r5033  
    88mailboxdetail=yes 
    99 
     10#include iax_general_custom.conf 
    1011#include iax_registrations_custom.conf 
    1112#include iax_registrations.conf 

  • modules/branches/2.3/core/functions.inc.php

    r5006 r5033  
    26662666  if ( $dispnum == 'users' || $dispnum == 'extensions' ) { 
    26672667    // Setup option list we need 
    2668     $currentcomponent->addoptlistitem('recordoptions', 'Adhoc', 'On Demand'); 
    2669     $currentcomponent->addoptlistitem('recordoptions', 'Always', 'Always'); 
    2670     $currentcomponent->addoptlistitem('recordoptions', 'Never', 'Never'); 
     2668    $currentcomponent->addoptlistitem('recordoptions', 'Adhoc', _("On Demand")); 
     2669    $currentcomponent->addoptlistitem('recordoptions', 'Always', _("Always")); 
     2670    $currentcomponent->addoptlistitem('recordoptions', 'Never', _("Never")); 
    26712671    $currentcomponent->setoptlistopts('recordoptions', 'sort', false); 
    26722672 
    2673     $currentcomponent->addoptlistitem('faxdetecttype', '0', 'None'); 
     2673    $currentcomponent->addoptlistitem('faxdetecttype', '0', _("None")); 
    26742674    $currentcomponent->addoptlistitem('faxdetecttype', '1', 'Zaptel'); 
    26752675    $currentcomponent->addoptlistitem('faxdetecttype', '2', 'NVFax'); 
    26762676    $currentcomponent->setoptlistopts('faxdetecttype', 'sort', false); 
    26772677 
    2678     $currentcomponent->addoptlistitem('privyn', '0', 'No'); 
    2679     $currentcomponent->addoptlistitem('privyn', '1', 'Yes'); 
     2678    $currentcomponent->addoptlistitem('privyn', '0', _("No")); 
     2679    $currentcomponent->addoptlistitem('privyn', '1', _("Yes")); 
    26802680    $currentcomponent->setoptlistopts('privyn', 'sort', false); 
    26812681 
    2682     $currentcomponent->addoptlistitem('callwaiting', 'enabled', 'Enable'); 
    2683     $currentcomponent->addoptlistitem('callwaiting', 'disabled', 'Disable'); 
     2682    $currentcomponent->addoptlistitem('callwaiting', 'enabled', _("Enable")); 
     2683    $currentcomponent->addoptlistitem('callwaiting', 'disabled', _("Disable")); 
    26842684    $currentcomponent->setoptlistopts('callwaiting', 'sort', false); 
    26852685 
    …… 
    26902690    $currentcomponent->setoptlistopts('ringtime', 'sort', false); 
    26912691 
    2692     $currentcomponent->addoptlistitem('faxdestoptions', 'default', 'FreePBX default'); 
    2693     $currentcomponent->addoptlistitem('faxdestoptions', 'disabled', 'disabled'); 
    2694     $currentcomponent->addoptlistitem('faxdestoptions', 'system', 'system'); 
     2692    $currentcomponent->addoptlistitem('faxdestoptions', 'default', _("FreePBX default")); 
     2693    $currentcomponent->addoptlistitem('faxdestoptions', 'disabled', _("disabled")); 
     2694    $currentcomponent->addoptlistitem('faxdestoptions', 'system', _("system")); 
    26952695    $currentcomponent->setoptlistopts('faxdestoptions', 'sort', false); 
    26962696 
    …… 
    27642764 
    27652765    } elseif ( $display != 'extensions' ) { 
    2766       $currentcomponent->addguielem('_top', new gui_pageheading('title', 'Add User/Extension'), 0); 
     2766      $currentcomponent->addguielem('_top', new gui_pageheading('title', _("Add User/Extension")), 0); 
    27672767    } 
    27682768     
    …… 
    27712771    $fc_logoff = featurecodes_getFeatureCode('core', 'userlogoff'); 
    27722772     
    2773     $msgInvalidExtNum = 'Please enter a valid extension number.'; 
    2774     $msgInvalidCidNum = 'Please enter a valid CID Num Alias (must be a valid number).'; 
    2775     $msgInvalidExtPwd = 'Please enter valid User Password using numbers only'; 
    2776     $msgInvalidDispName = 'Please enter a valid Display Name'; 
    2777     $msgInvalidOutboundCID = 'Please enter a valid Outbound CID'; 
    2778     $msgInvalidPause = 'Please enter a valid pause time in seconds, using digits only'; 
     2773    $msgInvalidExtNum = _("Please enter a valid extension number."); 
     2774    $msgInvalidCidNum = _("Please enter a valid CID Num Alias (must be a valid number)."); 
     2775    $msgInvalidExtPwd = _("Please enter valid User Password using numbers only"); 
     2776    $msgInvalidDispName = _("Please enter a valid Display Name"); 
     2777    $msgInvalidOutboundCID = _("Please enter a valid Outbound CID"); 
     2778    $msgInvalidPause = _("Please enter a valid pause time in seconds, using digits only"); 
    27792779 
    27802780    // This is the actual gui stuff 
    …… 
    27832783     
    27842784    if ( $display == 'extensions' ) { 
    2785       $section = ($extdisplay ? 'Edit Extension' : 'Add Extension');       
     2785      $section = ($extdisplay ? _("Edit Extension") : _("Add Extension"));       
    27862786    } else { 
    2787       $section = ($extdisplay ? 'Edit User' : 'Add User'); 
     2787      $section = ($extdisplay ? _("Edit User") : _("Add User")); 
    27882788    } 
    27892789    if ( $extdisplay ) { 
    …… 
    27932793    } 
    27942794    if ( $display != 'extensions' ) { 
    2795       $currentcomponent->addguielem($section, new gui_password('password', $password, 'User Password', _("A user will enter this password when logging onto a device.").' '.$fc_logon.' '._('logs into a device.').' '.$fc_logoff.' '._('logs out of a device.'), '!isInteger() && !isWhitespace()', $msgInvalidExtPwd, true)); 
     2795      $currentcomponent->addguielem($section, new gui_password('password', $password, 'User Password', _("A user will enter this password when logging onto a device.").' '.$fc_logon.' '._("logs into a device.").' '.$fc_logoff.' '._("logs out of a device."), '!isInteger() && !isWhitespace()', $msgInvalidExtPwd, true)); 
    27962796      // extra JS function check required for blank password warning -- call last in the onsubmit() function 
    27972797      $currentcomponent->addjsfunc('onsubmit()', "\treturn checkBlankUserPwd();\n", 9); 
    …… 
    28982898     
    28992899    // Some errors for the validation bits 
    2900     $msgInvalidDTMFMODE = 'Please enter the dtmfmode for this device'; 
    2901     $msgInvalidChannel = 'Please enter the channel for this device'; 
    2902     $msgConfirmSecret = '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?'; 
    2903     $msgInvalidSecret = 'Please enter a Secret for this device'; 
     2900    $msgInvalidDTMFMODE = _("Please enter the dtmfmode for this device"); 
     2901    $msgInvalidChannel = _("Please enter the channel for this device"); 
     2902    $msgConfirmSecret = _("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?"); 
     2903    $msgInvalidSecret = _("Please enter a Secret for this device"); 
    29042904     
    29052905    // zap 
    …… 
    29662966     
    29672967    // Devices list 
    2968     $currentcomponent->addoptlistitem('devicelist', 'sip_generic', 'Generic SIP Device'); 
    2969     $currentcomponent->addoptlistitem('devicelist', 'iax2_generic', 'Generic IAX2 Device'); 
    2970     $currentcomponent->addoptlistitem('devicelist', 'zap_generic', 'Generic ZAP Device'); 
    2971     $currentcomponent->addoptlistitem('devicelist', 'custom_custom', 'Other (Custom) Device'); 
     2968    $currentcomponent->addoptlistitem('devicelist', 'sip_generic', _("Generic SIP Device")); 
     2969    $currentcomponent->addoptlistitem('devicelist', 'iax2_generic', _("Generic IAX2 Device")); 
     2970    $currentcomponent->addoptlistitem('devicelist', 'zap_generic', _("Generic ZAP Device")); 
     2971    $currentcomponent->addoptlistitem('devicelist', 'custom_custom', _("Other (Custom) Device")); 
    29722972    $currentcomponent->setoptlistopts('devicelist', 'sort', false); 
    29732973 
    29742974 
    29752975    // Option lists used by the gui 
    2976     $currentcomponent->addoptlistitem('devicetypelist', 'fixed', 'Fixed'); 
    2977     $currentcomponent->addoptlistitem('devicetypelist', 'adhoc', 'Adhoc'); 
     2976    $currentcomponent->addoptlistitem('devicetypelist', 'fixed', _("Fixed")); 
     2977    $currentcomponent->addoptlistitem('devicetypelist', 'adhoc', _("Adhoc")); 
    29782978    $currentcomponent->setoptlistopts('devicetypelist', 'sort', false); 
    29792979     
    2980     $currentcomponent->addoptlistitem('deviceuserlist', 'none', 'none'); 
    2981     $currentcomponent->addoptlistitem('deviceuserlist', 'new', 'New User'); 
     2980    $currentcomponent->addoptlistitem('deviceuserlist', 'none', _("none")); 
     2981    $currentcomponent->addoptlistitem('deviceuserlist', 'new', _("New User")); 
    29822982    $users = core_users_list(); 
    29832983    if (isset($users)) { 
    …… 
    30113011 
    30123012    if ( $display != 'extensions') { 
    3013       $currentcomponent->addguielem('_top', new gui_pageheading('title', 'Add Device'), 0); 
     3013      $currentcomponent->addguielem('_top', new gui_pageheading('title', _("Add Device")), 0); 
    30143014    } else { 
    3015       $currentcomponent->addguielem('_top', new gui_pageheading('title', 'Add an Extension'), 0); 
    3016     } 
    3017     $currentcomponent->addguielem('_top', new gui_label('instructions', 'Please select your Device below then click Submit')); 
     3015      $currentcomponent->addguielem('_top', new gui_pageheading('title', _("Add an Extension")), 0); 
     3016    } 
     3017    $currentcomponent->addguielem('_top', new gui_label('instructions', _("Please select your Device below then click Submit"))); 
    30183018    $currentcomponent->addguielem('Device', new gui_selectbox('tech_hardware', $currentcomponent->getoptlist('devicelist'), '', 'Device', '', false)); 
    30193019 
    …… 
    30403040       
    30413041      if ( $display != 'extensions' ) { 
    3042         $currentcomponent->addguielem('_top', new gui_pageheading('title', _('Add').' '.strtoupper($deviceInfo['tech']).' '._('Device')), 0); 
     3042        $currentcomponent->addguielem('_top', new gui_pageheading('title', _("Add").' '.strtoupper($deviceInfo['tech']).' '._("Device")), 0); 
    30433043      } else { 
    3044         $currentcomponent->addguielem('_top', new gui_pageheading('title', _('Add').' '.strtoupper($deviceInfo['tech']).' '._('Extension')), 0); 
     3044        $currentcomponent->addguielem('_top', new gui_pageheading('title', _("Add").' '.strtoupper($deviceInfo['tech']).' '._("Extension")), 0); 
    30453045      } 
    30463046 
    …… 
    30573057    $fc_logoff = featurecodes_getFeatureCode('core', 'userlogoff'); 
    30583058 
    3059     $msgInvalidDevID = 'Please enter a device id.'; 
    3060     $msgInvalidDevDesc = 'Please enter a valid Description for this device'; 
    3061     $msgInvalidEmergCID = 'Please enter a valid Emergency CID'; 
    3062     $msgInvalidExtNum = 'Please enter a valid extension number.'; 
     3059    $msgInvalidDevID = _("Please enter a device id."); 
     3060    $msgInvalidDevDesc = _("Please enter a valid Description for this device"); 
     3061    $msgInvalidEmergCID = _("Please enter a valid Emergency CID"); 
     3062    $msgInvalidExtNum = _("Please enter a valid extension number."); 
    30633063     
    30643064    // Actual gui 
    …… 
    30753075      $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)); 
    30763076      $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)); 
    3077       $currentcomponent->addguielem($section, new gui_selectbox('devicetype', $currentcomponent->getoptlist('devicetypelist'), $devinfo_devicetype, 'Device Type', _('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.'), false)); 
     3077      $currentcomponent->addguielem($section, new gui_selectbox('devicetype', $currentcomponent->getoptlist('devicetypelist'), $devinfo_devicetype, 'Device Type', _("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."), false)); 
    30783078      $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)); 
    30793079    } else { 

  • modules/branches/2.3/core/module.xml

    r4989 r5033  
    44  <category>Basic</category> 
    55  <name>Core</name> 
    6   <version>2.3.0.2</version> 
     6  <version>2.3.0.3</version> 
    77  <candisable>no</candisable> 
    88  <canuninstall>no</canuninstall> 
    99  <changelog> 
     10    *2.3.0.3* #2308 FROM_DID to use ${EXTEN}, #2381 add iax_genera_custom.conf, #2375 localization fixes 
    1011    *2.3.0.2* #2330 allow '_' in route name changes, fix missing global variable. 
    1112    *2.3.0.1* fix support link