Skip to content

Commit

Permalink
#546 Replace "e-mail" with "email"
Browse files Browse the repository at this point in the history
  • Loading branch information
@daris
daris committed Dec 5, 2011
1 parent 9e7269f commit e778ec3
Show file tree
Hide file tree
Showing 11 changed files with 69 additions and 74 deletions.
12 changes: 6 additions & 6 deletions admin_bans.php
View file
Expand Up @@ -188,10 +188,10 @@
</td>
</tr>
<tr>
<th scope="row"><?php echo $lang->t('E-mail label') ?></th>
<th scope="row"><?php echo $lang->t('Email label') ?></th>
<td>
<input type="text" name="ban_email" size="40" maxlength="80" value="<?php if (isset($ban_email)) echo $ban_email; ?>" tabindex="3" />
<span><?php echo $lang->t('E-mail help') ?></span>
<span><?php echo $lang->t('Email help') ?></span>
</td>
</tr>
</table>
Expand Down Expand Up @@ -321,7 +321,7 @@
if ($ban_email != '' && !is_valid_email($ban_email))
{
if (!preg_match('%^[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$%', $ban_email))
message($lang->t('Invalid e-mail message'));
message($lang->t('Invalid email message'));
}

if ($ban_expire != '' && $ban_expire != 'Never')
Expand Down Expand Up @@ -497,7 +497,7 @@
<thead>
<tr>
<th class="tcl" scope="col"><?php echo $lang->t('Results username head') ?></th>
<th class="tc2" scope="col"><?php echo $lang->t('Results e-mail head') ?></th>
<th class="tc2" scope="col"><?php echo $lang->t('Results email head') ?></th>
<th class="tc3" scope="col"><?php echo $lang->t('Results IP address head') ?></th>
<th class="tc4" scope="col"><?php echo $lang->t('Results expire head') ?></th>
<th class="tc5" scope="col"><?php echo $lang->t('Results message head') ?></th>
Expand Down Expand Up @@ -619,7 +619,7 @@
<td><input type="text" name="form[ip]" size="30" maxlength="255" tabindex="5" /></td>
</tr>
<tr>
<th scope="row"><?php echo $lang->t('E-mail label') ?></th>
<th scope="row"><?php echo $lang->t('Email label') ?></th>
<td><input type="text" name="form[email]" size="30" maxlength="80" tabindex="6" /></td>
</tr>
<tr>
Expand All @@ -642,7 +642,7 @@
<select name="order_by" tabindex="10">
<option value="username" selected="selected"><?php echo $lang->t('Order by username') ?></option>
<option value="ip"><?php echo $lang->t('Order by ip') ?></option>
<option value="email"><?php echo $lang->t('Order by e-mail') ?></option>
<option value="email"><?php echo $lang->t('Order by email') ?></option>
<option value="expire"><?php echo $lang->t('Order by expire') ?></option>
</select>&#160;&#160;&#160;<select name="direction" tabindex="11">
<option value="ASC" selected="selected"><?php echo $lang->t('Ascending') ?></option>
Expand Down
8 changes: 4 additions & 4 deletions admin_groups.php
View file
Expand Up @@ -207,10 +207,10 @@
</td>
</tr>
<?php if ($group['g_id'] != PUN_GUEST): ?> <tr>
<th scope="row"><?php echo $lang->t('Send e-mails label') ?></th>
<th scope="row"><?php echo $lang->t('Send emails label') ?></th>
<td>
<input type="radio" name="send_email" value="1"<?php if ($group['g_send_email'] == '1') echo ' checked="checked"' ?> tabindex="33" />&#160;<strong><?php echo $lang->t('Yes') ?></strong>&#160;&#160;&#160;<input type="radio" name="send_email" value="0"<?php if ($group['g_send_email'] == '0') echo ' checked="checked"' ?> tabindex="34" />&#160;<strong><?php echo $lang->t('No') ?></strong>
<span><?php echo $lang->t('Send e-mails help') ?></span>
<span><?php echo $lang->t('Send emails help') ?></span>
</td>
</tr>
<?php endif; ?> <tr>
Expand All @@ -228,10 +228,10 @@
</td>
</tr>
<?php if ($group['g_id'] != PUN_GUEST): ?> <tr>
<th scope="row"><?php echo $lang->t('E-mail flood label') ?></th>
<th scope="row"><?php echo $lang->t('Email flood label') ?></th>
<td>
<input type="text" name="email_flood" size="5" maxlength="4" value="<?php echo $group['g_email_flood'] ?>" tabindex="37" />
<span><?php echo $lang->t('E-mail flood help') ?></span>
<span><?php echo $lang->t('Email flood help') ?></span>
</td>
</tr>
<tr>
Expand Down
22 changes: 11 additions & 11 deletions admin_options.php
View file
Expand Up @@ -106,10 +106,10 @@
require PUN_ROOT.'include/email.php';

if (!is_valid_email($form['admin_email']))
message($lang->t('Invalid admin e-mail message'));
message($lang->t('Invalid admin email message'));

if (!is_valid_email($form['webmaster_email']))
message($lang->t('Invalid webmaster e-mail message'));
message($lang->t('Invalid webmaster email message'));

if ($form['mailing_list'] != '')
$form['mailing_list'] = strtolower(preg_replace('%\s%S', '', $form['mailing_list']));
Expand Down Expand Up @@ -602,7 +602,7 @@
<tr>
<th scope="row"><?php echo $lang->t('Reporting method label') ?></th>
<td>
<input type="radio" name="form[report_method]" value="0"<?php if ($pun_config['o_report_method'] == '0') echo ' checked="checked"' ?> />&#160;<strong><?php echo $lang->t('Internal') ?></strong>&#160;&#160;&#160;<input type="radio" name="form[report_method]" value="1"<?php if ($pun_config['o_report_method'] == '1') echo ' checked="checked"' ?> />&#160;<strong><?php echo $lang->t('By e-mail') ?></strong>&#160;&#160;&#160;<input type="radio" name="form[report_method]" value="2"<?php if ($pun_config['o_report_method'] == '2') echo ' checked="checked"' ?> />&#160;<strong><?php echo $lang->t('Both') ?></strong>
<input type="radio" name="form[report_method]" value="0"<?php if ($pun_config['o_report_method'] == '0') echo ' checked="checked"' ?> />&#160;<strong><?php echo $lang->t('Internal') ?></strong>&#160;&#160;&#160;<input type="radio" name="form[report_method]" value="1"<?php if ($pun_config['o_report_method'] == '1') echo ' checked="checked"' ?> />&#160;<strong><?php echo $lang->t('By email') ?></strong>&#160;&#160;&#160;<input type="radio" name="form[report_method]" value="2"<?php if ($pun_config['o_report_method'] == '2') echo ' checked="checked"' ?> />&#160;<strong><?php echo $lang->t('Both') ?></strong>
<span><?php echo $lang->t('Reporting method help') ?></span>
</td>
</tr>
Expand Down Expand Up @@ -663,21 +663,21 @@
</div>
<div class="inform">
<fieldset>
<legend><?php echo $lang->t('E-mail subhead') ?></legend>
<legend><?php echo $lang->t('Email subhead') ?></legend>
<div class="infldset">
<table class="aligntop" cellspacing="0">
<tr>
<th scope="row"><?php echo $lang->t('Admin e-mail label') ?></th>
<th scope="row"><?php echo $lang->t('Admin email label') ?></th>
<td>
<input type="text" name="form[admin_email]" size="50" maxlength="80" value="<?php echo $pun_config['o_admin_email'] ?>" />
<span><?php echo $lang->t('Admin e-mail help') ?></span>
<span><?php echo $lang->t('Admin email help') ?></span>
</td>
</tr>
<tr>
<th scope="row"><?php echo $lang->t('Webmaster e-mail label') ?></th>
<th scope="row"><?php echo $lang->t('Webmaster email label') ?></th>
<td>
<input type="text" name="form[webmaster_email]" size="50" maxlength="80" value="<?php echo $pun_config['o_webmaster_email'] ?>" />
<span><?php echo $lang->t('Webmaster e-mail help') ?></span>
<span><?php echo $lang->t('Webmaster email help') ?></span>
</td>
</tr>
<tr>
Expand Down Expand Up @@ -770,10 +770,10 @@
</td>
</tr>
<tr>
<th scope="row"><?php echo $lang->t('E-mail default label') ?></th>
<th scope="row"><?php echo $lang->t('Email default label') ?></th>
<td>
<span><?php echo $lang->t('E-mail default help') ?></span>
<input type="radio" name="form[default_email_setting]" value="0"<?php if ($pun_config['o_default_email_setting'] == '0') echo ' checked="checked"' ?> />&#160;<?php echo $lang->t('Display e-mail label') ?><br />
<span><?php echo $lang->t('Email default help') ?></span>
<input type="radio" name="form[default_email_setting]" value="0"<?php if ($pun_config['o_default_email_setting'] == '0') echo ' checked="checked"' ?> />&#160;<?php echo $lang->t('Display email label') ?><br />
<input type="radio" name="form[default_email_setting]" value="1"<?php if ($pun_config['o_default_email_setting'] == '1') echo ' checked="checked"' ?> />&#160;<?php echo $lang->t('Hide allow form label') ?><br />
<input type="radio" name="form[default_email_setting]" value="2"<?php if ($pun_config['o_default_email_setting'] == '2') echo ' checked="checked"' ?> />&#160;<?php echo $lang->t('Hide both label') ?><br />
</td>
Expand Down
12 changes: 6 additions & 6 deletions admin_permissions.php
View file
Expand Up @@ -96,10 +96,10 @@
</td>
</tr>
<tr>
<th scope="row"><?php echo $lang->t('Require e-mail label') ?></th>
<th scope="row"><?php echo $lang->t('Require email label') ?></th>
<td>
<input type="radio" name="form[force_guest_email]" value="1"<?php if ($pun_config['p_force_guest_email'] == '1') echo ' checked="checked"' ?> />&#160;<strong><?php echo $lang->t('Yes') ?></strong>&#160;&#160;&#160;<input type="radio" name="form[force_guest_email]" value="0"<?php if ($pun_config['p_force_guest_email'] == '0') echo ' checked="checked"' ?> />&#160;<strong><?php echo $lang->t('No') ?></strong>
<span><?php echo $lang->t('Require e-mail help') ?></span>
<span><?php echo $lang->t('Require email help') ?></span>
</td>
</tr>
</table>
Expand Down Expand Up @@ -156,17 +156,17 @@
<div class="infldset">
<table class="aligntop" cellspacing="0">
<tr>
<th scope="row"><?php echo $lang->t('Banned e-mail label') ?></th>
<th scope="row"><?php echo $lang->t('Banned email label') ?></th>
<td>
<input type="radio" name="form[allow_banned_email]" value="1"<?php if ($pun_config['p_allow_banned_email'] == '1') echo ' checked="checked"' ?> />&#160;<strong><?php echo $lang->t('Yes') ?></strong>&#160;&#160;&#160;<input type="radio" name="form[allow_banned_email]" value="0"<?php if ($pun_config['p_allow_banned_email'] == '0') echo ' checked="checked"' ?> />&#160;<strong><?php echo $lang->t('No') ?></strong>
<span><?php echo $lang->t('Banned e-mail help') ?></span>
<span><?php echo $lang->t('Banned email help') ?></span>
</td>
</tr>
<tr>
<th scope="row"><?php echo $lang->t('Duplicate e-mail label') ?></th>
<th scope="row"><?php echo $lang->t('Duplicate email label') ?></th>
<td>
<input type="radio" name="form[allow_dupe_email]" value="1"<?php if ($pun_config['p_allow_dupe_email'] == '1') echo ' checked="checked"' ?> />&#160;<strong><?php echo $lang->t('Yes') ?></strong>&#160;&#160;&#160;<input type="radio" name="form[allow_dupe_email]" value="0"<?php if ($pun_config['p_allow_dupe_email'] == '0') echo ' checked="checked"' ?> />&#160;<strong><?php echo $lang->t('No') ?></strong>
<span><?php echo $lang->t('Duplicate e-mail help') ?></span>
<span><?php echo $lang->t('Duplicate email help') ?></span>
</td>
</tr>
</table>
Expand Down
8 changes: 4 additions & 4 deletions admin_users.php
View file
Expand Up @@ -193,7 +193,7 @@
<thead>
<tr>
<th class="tcl" scope="col"><?php echo $lang->t('Results username head') ?></th>
<th class="tc2" scope="col"><?php echo $lang->t('Results e-mail head') ?></th>
<th class="tc2" scope="col"><?php echo $lang->t('Results email head') ?></th>
<th class="tc3" scope="col"><?php echo $lang->t('Results title head') ?></th>
<th class="tc4" scope="col"><?php echo $lang->t('Results posts head') ?></th>
<th class="tc5" scope="col"><?php echo $lang->t('Results admin note head') ?></th>
Expand Down Expand Up @@ -1049,7 +1049,7 @@
<thead>
<tr>
<th class="tcl" scope="col"><?php echo $lang->t('Results username head') ?></th>
<th class="tc2" scope="col"><?php echo $lang->t('Results e-mail head') ?></th>
<th class="tc2" scope="col"><?php echo $lang->t('Results email head') ?></th>
<th class="tc3" scope="col"><?php echo $lang->t('Results title head') ?></th>
<th class="tc4" scope="col"><?php echo $lang->t('Results posts head') ?></th>
<th class="tc5" scope="col"><?php echo $lang->t('Results admin note head') ?></th>
Expand Down Expand Up @@ -1157,7 +1157,7 @@
<td><input type="text" name="form[username]" size="25" maxlength="25" tabindex="2" /></td>
</tr>
<tr>
<th scope="row"><?php echo $lang->t('E-mail address label') ?></th>
<th scope="row"><?php echo $lang->t('Email address label') ?></th>
<td><input type="text" name="form[email]" size="30" maxlength="80" tabindex="3" /></td>
</tr>
<tr>
Expand Down Expand Up @@ -1247,7 +1247,7 @@
<td>
<select name="order_by" tabindex="21">
<option value="username" selected="selected"><?php echo $lang->t('Order by username') ?></option>
<option value="email"><?php echo $lang->t('Order by e-mail') ?></option>
<option value="email"><?php echo $lang->t('Order by email') ?></option>
<option value="num_posts"><?php echo $lang->t('Order by posts') ?></option>
<option value="last_post"><?php echo $lang->t('Order by last post') ?></option>
<option value="last_visit"><?php echo $lang->t('Order by last visit') ?></option>
Expand Down
13 changes: 6 additions & 7 deletions lang/English/admin_bans.po
View file
Expand Up @@ -32,7 +32,7 @@ msgstr "The guest user cannot be banned."
msgid "Invalid IP message"
msgstr "You entered an invalid IP/IP-range."

msgid "Invalid e-mail message"
msgid "Invalid email message"
msgstr "The email address (e.g. user@domain.com) or partial email address domain (e.g. domain.com) you entered is invalid."

msgid "Invalid date message"
Expand Down Expand Up @@ -95,7 +95,7 @@ msgstr "Username"
msgid "Order by ip"
msgstr "IP"

msgid "Order by e-mail"
msgid "Order by email"
msgstr "Email"

msgid "Order by expire"
Expand All @@ -110,10 +110,10 @@ msgstr "Descending"
msgid "Submit search"
msgstr "Submit search"

msgid "E-mail label"
msgid "Email label"
msgstr "Email"

msgid "E-mail help"
msgid "Email help"
msgstr "The email or email domain you wish to ban (e.g. someone@somewhere.com or somewhere.com). See \"Allow banned email addresses\" in Permissions for more info."

msgid "IP label"
Expand Down Expand Up @@ -155,7 +155,7 @@ msgstr "Search Results"
msgid "Results username head"
msgstr "Username"

msgid "Results e-mail head"
msgid "Results email head"
msgstr "Email"

msgid "Results IP address head"
Expand All @@ -177,5 +177,4 @@ msgid "No match"
msgstr "No match"

msgid "Unknown"
msgstr "Unknown"

msgstr "Unknown"
15 changes: 7 additions & 8 deletions lang/English/admin_groups.po
View file
Expand Up @@ -203,11 +203,11 @@ msgstr "Search user list"
msgid "User list search help"
msgstr "Allow users in this group to freetext search for users in the user list."

msgid "Send e-mails label"
msgstr "Send e-mails"
msgid "Send emails label"
msgstr "Send emails"

msgid "Send e-mails help"
msgstr "Allow users in this group to send e-mails to other users."
msgid "Send emails help"
msgstr "Allow users in this group to send emails to other users."

msgid "Post flood label"
msgstr "Post flood interval"
Expand All @@ -221,10 +221,10 @@ msgstr "Search flood interval"
msgid "Search flood help"
msgstr "Number of seconds that users in this group have to wait between searches. Set to 0 to disable."

msgid "E-mail flood label"
msgid "Email flood label"
msgstr "Email flood interval"

msgid "E-mail flood help"
msgid "Email flood help"
msgstr "Number of seconds that users in this group have to wait between emails. Set to 0 to disable."

msgid "Report flood label"
Expand All @@ -234,5 +234,4 @@ msgid "Report flood help"
msgstr "Number of seconds that users in this group have to wait between reports. Set to 0 to disable."

msgid "Moderator info"
msgstr "Please note that in order for a user in this group to have moderator abilities, he/she must be assigned to moderate one or more forums. This is done via the user administration page of the user's profile."

msgstr "Please note that in order for a user in this group to have moderator abilities, he/she must be assigned to moderate one or more forums. This is done via the user administration page of the user's profile."
29 changes: 14 additions & 15 deletions lang/English/admin_options.po
View file
Expand Up @@ -17,10 +17,10 @@ msgstr "Bad HTTP_REFERER. If you have moved these forums from one location to an
msgid "Must enter title message"
msgstr "You must enter a board title."

msgid "Invalid admin e-mail message"
msgid "Invalid admin email message"
msgstr "The admin email address you entered is invalid."

msgid "Invalid webmaster e-mail message"
msgid "Invalid webmaster email message"
msgstr "The webmaster email address you entered is invalid."

msgid "SMTP passwords did not match"
Expand Down Expand Up @@ -423,7 +423,7 @@ msgstr "Reporting method"
msgid "Internal"
msgstr "Internal"

msgid "By e-mail"
msgid "By email"
msgstr "Email"

msgid "Both"
Expand Down Expand Up @@ -472,20 +472,20 @@ msgstr "Max size"
msgid "Max size help"
msgstr "The maximum allowed size of avatars in bytes (10240 is recommended)."

# E-mail section
msgid "E-mail subhead"
# Email section
msgid "Email subhead"
msgstr "Email"

msgid "Admin e-mail label"
msgid "Admin email label"
msgstr "Admin email"

msgid "Admin e-mail help"
msgid "Admin email help"
msgstr "The email address of the board administrator."

msgid "Webmaster e-mail label"
msgid "Webmaster email label"
msgstr "Webmaster email"

msgid "Webmaster e-mail help"
msgid "Webmaster email help"
msgstr "This is the address that all emails sent by the board will be addressed from."

msgid "Forum subscriptions label"
Expand Down Expand Up @@ -561,17 +561,17 @@ msgstr "Enter your rules here"
msgid "Rules help"
msgstr "Here you can enter any rules or other information that the user must review and accept when registering. If you enabled rules above you have to enter something here, otherwise it will be disabled. This text will not be parsed like regular posts and thus may contain HTML."

msgid "E-mail default label"
msgid "Email default label"
msgstr "Default email setting"

msgid "E-mail default help"
msgid "Email default help"
msgstr "Choose the default privacy setting for new user registrations."

msgid "Display e-mail label"
msgid "Display email label"
msgstr "Display email address to other users."

msgid "Hide allow form label"
msgstr "Hide email address but allow form e-mail."
msgstr "Hide email address but allow form email."

msgid "Hide both label"
msgstr "Hide email address and disallow form email."
Expand Down Expand Up @@ -606,5 +606,4 @@ msgid "Maintenance message label"
msgstr "Maintenance message"

msgid "Maintenance message help"
msgstr "The message that will be displayed to users when the board is in maintenance mode. If left blank, a default message will be used. This text will not be parsed like regular posts and thus may contain HTML."

msgstr "The message that will be displayed to users when the board is in maintenance mode. If left blank, a default message will be used. This text will not be parsed like regular posts and thus may contain HTML."

0 comments on commit e778ec3

Please sign in to comment.