Changeset 5658

Timestamp:

02/09/08 10:46:02 (1 year ago)

Author:

p_lindheimer

Message:

#2591 - fix/insert proper gettext formatting for i18n localization

Files:

• modules/branches/2.4/core/functions.inc.php (modified) (4 diffs)
• modules/branches/2.4/daynight/page.daynight.php (modified) (1 diff)
• modules/branches/2.4/ivr/page.ivr.php (modified) (2 diffs)
• modules/branches/2.4/music/page.music.php (modified) (1 diff)
• modules/branches/2.4/recordings/page.recordings.php (modified) (3 diffs)
• modules/branches/2.4/voicemail/functions.inc.php (modified) (1 diff)

modules/branches/2.4/core/functions.inc.php

@@ -3951 +3951 @@
-                        $currentcomponent->addguielem($section, new gui_hidden('extension', $extdisplay), 2);
-                } else {
-'The extension number to dial to reach this user.'
+_("The extension number to dial to reach this user.")
-                }
-                if ( $display != 'extensions' ) {
@@ -3958 +3958 @@
-                        $currentcomponent->addjsfunc('onsubmit()', "\treturn checkBlankUserPwd();\n", 9);
-                }
-'The caller id name for calls from this user will be set to this name. Only enter the name, NOT the number.'
+_("The caller id name for calls from this user will be set to this name. Only enter the name, NOT the number.")
-                $cid_masquerade = (trim($cid_masquerade) == $extdisplay)?"":$cid_masquerade;
-'The CID Number to use for internal calls, if different from the extension number. This is used to masquerade as a different user. A common example is a team of support people who would like their internal callerid to display the general support number (a ringgroup or queue). There will be no effect on external calls.'
-"If you want to support direct sip dialing of users internally or through anonymous sip calls, you can supply a friendly name that can be used in addition to the users extension to call them."
+_("The CID Number to use for internal calls, if different from the extension number. This is used to masquerade as a different user. A common example is a team of support people who would like their internal callerid to display the general support number (a ringgroup or queue). There will be no effect on external calls.")
+_("If you want to support direct sip dialing of users internally or through anonymous sip calls, you can supply a friendly name that can be used in addition to the users extension to call them.")
-                
-                $section = 'Extension Options';
-"The direct DID that is associated with this extension. The DID should be in the same format as provided by the provider (e.g. full number, 4 digits for 10x4, etc).<br><br>Format should be: <b>XXXXXXXXXX</b><br><br>Leave this field blank to disable the direct DID feature for this extension. All non-numeric characters will be stripped."
-"Alert Info can be used for distinctive ring on SIP phones. Set this value to the desired Alert Info to be sent to the phone when this DID is called. Leave blank to use default values. Will have no effect if no Direct DID is set"
+_("The direct DID that is associated with this extension. The DID should be in the same format as provided by the provider (e.g. full number, 4 digits for 10x4, etc).<br><br>Format should be: <b>XXXXXXXXXX</b><br><br>Leave this field blank to disable the direct DID feature for this extension. All non-numeric characters will be stripped.")
+_("Alert Info can be used for distinctive ring on SIP phones. Set this value to the desired Alert Info to be sent to the phone when this DID is called. Leave blank to use default values. Will have no effect if no Direct DID is set")
-                if (function_exists('music_list')) {
-"Set the MoH class that will be used for calls that come in on this Direct DID. For example, choose a type appropriate for a originating country which may have announcements in their language. Only effects MoH class when the call came in from the Direct DID."
-
-"Overrides the caller id when dialing out a trunk. Any setting here will override the common outbound caller id set in the Trunks admin.<br><br>Format: <b>\"caller name\" &lt;#######&gt;</b><br><br>Leave this field blank to disable the outbound callerid feature for this user."
+_("Set the MoH class that will be used for calls that come in on this Direct DID. For example, choose a type appropriate for a originating country which may have announcements in their language. Only effects MoH class when the call came in from the Direct DID.")
+
+_("Overrides the caller id when dialing out a trunk. Any setting here will override the common outbound caller id set in the Trunks admin.<br><br>Format: <b>\"caller name\" &lt;#######&gt;</b><br><br>Leave this field blank to disable the outbound callerid feature for this user.")
-                $ringtimer = (isset($ringtimer) ? $ringtimer : '0');
-"Number of seconds to ring prior to going to voicemail. Default will use the value set in the General Tab. If no voicemail is configured this will be ignored."
+_("Number of seconds to ring prior to going to voicemail. Default will use the value set in the General Tab. If no voicemail is configured this will be ignored.")
-                if (!isset($callwaiting)) {
-                        if ($amp_conf['ENABLECW']) {
@@ -3979 +3979 @@
-                        }
-                }
-"Set the initial/current Call Waiting state for this user's extension"
+_("Set the initial/current Call Waiting state for this user's extension")
-
-                $section = 'Recording Options';
-"Record all inbound calls received at this extension."
-"Record all outbound calls received at this extension."
+_("Record all inbound calls received at this extension.")
+_("Record all outbound calls received at this extension.")
-
-                $section = 'Fax Handling';
-                $wait = (isset($wait) ? $wait : '0');
-"Select 'system' to have the system receive and email faxes.<br><br>The FreePBX default is defined in General Settings."
-"Email address is used if 'system' has been chosen for the fax extension above.<br><br>Leave this blank to use the FreePBX default in General Settings"
-"Selecting Zaptel or NVFax will immediately answer the call and play ringing tones to the caller for the number of seconds in Pause below. Use NVFax on SIP or IAX trunks."
-'The number of seconds we should wait after performing an Immediate Answer. The primary purpose of this is to pause and listen for a fax tone before allowing the call to proceed.'
+_("Select 'system' to have the system receive and email faxes.<br><br>The FreePBX default is defined in General Settings.")
+_("Email address is used if 'system' has been chosen for the fax extension above.<br><br>Leave this blank to use the FreePBX default in General Settings")
+_("Selecting Zaptel or NVFax will immediately answer the call and play ringing tones to the caller for the number of seconds in Pause below. Use NVFax on SIP or IAX trunks.")
+_("The number of seconds we should wait after performing an Immediate Answer. The primary purpose of this is to pause and listen for a fax tone before allowing the call to proceed.")
-
-                $section = 'Privacy';
-                $privacyman = (isset($privacyman) ? $privacyman : '0');
-"If no Caller ID is sent, Privacy Manager will asks the caller to enter their 10 digit phone number. The caller is given 3 attempts."
+_("If no Caller ID is sent, Privacy Manager will asks the caller to enter their 10 digit phone number. The caller is given 3 attempts.")
-
-        }
@@ -4248 +4248 @@
-                                $currentcomponent->addguielem($section, new gui_textbox('deviceid', $extdisplay, 'Device ID', 'Give your device a unique integer ID.  The device will use this ID to authenicate to the system.', '!isInteger()', $msgInvalidDevID, false));
-                        }
-'The caller id name for this device will be set to this description until it is logged into.'
-'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.'
+_("The caller id name for this device will be set to this description until it is logged into.")
+_("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.")
-                        $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));
-'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.'
+_("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.")
-                } else {
-                        $section = 'Extension Options';
-'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.'
+_("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.")
-                }
-                $currentcomponent->addguielem($section, new gui_hidden('tech', $devinfo_tech));

modules/branches/2.4/daynight/page.daynight.php

@@ -144 +144 @@
-        </tr>
-        <tr>
-'Description for this Day/Night Control'
+"Description for this Day/Night Control"
-                <td><input size="40" type="text" name="fc_description" value="<?php  echo $fc_description ?>">
-                </td>

modules/branches/2.4/ivr/page.ivr.php

@@ -127 +127 @@
-                <tr><td colspan=2><hr /></td></tr>
-                <tr>
-Change Name<span>This changes the short name, visible on the right, of this IVR
+<?php echo _("Change Name"); ?><span><?php echo _("This changes the short name, visible on the right, of this IVR");?>
-                        <td><input type="text" name="displayname" value="<?php echo $ivr_details['displayname'] ?>"></td>
-                </tr>
-                <tr>
-Timeout<span>The amount of time (in seconds) before the 't' option, if specified, is used
+<?php echo _("Timeout");?><span><?php echo _("The amount of time (in seconds) before the 't' option, if specified, is used");?>
-                        <td><input type="text" name="timeout" value="<?php echo $ivr_details['timeout'] ?>"></td>
-                </tr>
-                <?php if ( function_exists('voicemail_getVoicemail') ) { ?>
-                <tr>
-Enable Directory<span>Let callers into the IVR dial '#' to access the directory
+<?php echo _("Enable Directory");?><span><?php echo _("Let callers into the IVR dial '#' to access the directory");?>
-                        <td><input type="checkbox" name="ena_directory" <?php echo $ivr_details['enable_directory'] ?>></td>
-                </tr>
-                <tr>
-Directory Context<span>When # is selected, this is the voicemail directory context that is used
+<?php echo _("Directory Context");?><span><?php echo _("When # is selected, this is the voicemail directory context that is used");?>
-                        <td>
-                                <select name="dircontext"/>
@@ -156 +156 @@
-                <?php } ?>
-                <tr>
-Enable Direct Dial<span>Let callers into the IVR dial an extension directly
+<?php echo _("Enable Direct Dial");?><span><?php echo _("Let callers into the IVR dial an extension directly");?>
-                        <td><input type="checkbox" name="ena_directdial" <?php echo $ivr_details['enable_directdial'] ?>></td>
-                </tr>

modules/branches/2.4/music/page.music.php

@@ -286 +286 @@
-        <?php 
-                if (file_exists("{$path_to_dir}/.random")) {
-Disable Random Play
-
-Enable Random Play
+<?php echo _("Disable Random Play");?>
+
+<?php echo _("Enable Random Play");?>
-                }
-        ?>

modules/branches/2.4/recordings/page.recordings.php

@@ -171 +171 @@
-        <p>
-        <form enctype="multipart/form-data" name="upload" action="<?php echo $_SERVER['PHP_SELF'] ?>" method="POST"/>
-'Alternatively, upload a recording in'
+"Alternatively, upload a recording in"
-                <input type="hidden" name="display" value="recordings">
-                <input type="hidden" name="action" value="recordings_start">
@@ -237 +237 @@
-        <?php 
-        echo "<a href=config.php?display=recordings&amp;action=delete&amp;usersnum=".urlencode($num);
-
+
+
+
+
+
-        ?>
-        <form name="prompt"  action="<?php $_SERVER['PHP_SELF'] ?>" method="post" onsubmit="return rec_onsubmit();">
@@ -247 +251 @@
-        <tr><td colspan=2><hr></td></tr>
-        <tr>
-Change Name<span>This changes the short name, visible on the right, of this recording
+<?php echo _("Change Name");?><span><?php echo _("This changes the short name, visible on the right, of this recording");?>
-                <td><input type="text" name="rname" value="<?php echo $this_recording['displayname'] ?>"></td>
-        </tr>
-        <tr>
-Descriptive Name<span>This is displayed, as a hint, when selecting this recording in Queues, Digital Receptionist, etc
+<?php echo _("Descriptive Name");?><span><?php echo _("This is displayed, as a hint, when selecting this recording in Queues, Digital Receptionist, etc");?>
-                <td>&nbsp;<textarea name="notes" rows="3" cols="40"><?php echo $this_recording['description'] ?></textarea></td>
-        </tr>
-        </table>
-        <hr />
-Files
+<?php echo _("Files");?>
-        <table>
-        <?php 

modules/branches/2.4/voicemail/functions.inc.php

@@ -221 +221 @@
-                $currentcomponent->addguielem($section, new gui_radio('envelope', $currentcomponent->getoptlist('vmyn'), $vmops_envelope, _('Play Envelope'), _("Envelope controls whether or not the voicemail system will play the message envelope (date/time) before playing the voicemail message. This settng does not affect the operation of the envelope option in the advanced voicemail menu.")));
-                $currentcomponent->addguielem($section, new gui_radio('delete', $currentcomponent->getoptlist('vmyn'), $vmops_delete, _('Delete Vmail'), _("If set to \"yes\" the message will be deleted from the voicemailbox (after having been emailed). Provides functionality that allows a user to receive their voicemail via email alone, rather than having the voicemail able to be retrieved from the Webinterface or the Extension handset.  CAUTION: MUST HAVE attach voicemail to email SET TO YES OTHERWISE YOUR MESSAGES WILL BE LOST FOREVER.")));
-'Separate options with pipe ( | )%sie: review=yes|maxmessage=60'
-'This is the Voicemail Context which is normally set to default. Do not change unless you understand the implications.'
-'Enable/Disable the VmX Locater feature for this user. When enabled all settings are controlled by the user in the User Portal (ARI). Disabling will not delete any existing user settings but will disable access to the feature'
+"Separate options with pipe ( | )%sie: review=yes|maxmessage=60"
+"This is the Voicemail Context which is normally set to default. Do not change unless you understand the implications."
+"Enable/Disable the VmX Locater feature for this user. When enabled all settings are controlled by the user in the User Portal (ARI). Disabling will not delete any existing user settings but will disable access to the feature"
-        }
-}