aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2014-03-09 17:26:22 -0500
committerNathan Guse <nathaniel.guse@gmail.com>2014-03-09 17:26:22 -0500
commitc169583dc3c551bc08fc217e0d5bb5dd6022ec57 (patch)
treea95483b0952ce55cb615edd8ce9714796c0b3ab6 /phpBB/language
parent20723a9315c7def0ab856888497f411b36916e1c (diff)
parentbc74819cc959ed8400168e97681c895432d2435c (diff)
downloadforums-c169583dc3c551bc08fc217e0d5bb5dd6022ec57.tar
forums-c169583dc3c551bc08fc217e0d5bb5dd6022ec57.tar.gz
forums-c169583dc3c551bc08fc217e0d5bb5dd6022ec57.tar.bz2
forums-c169583dc3c551bc08fc217e0d5bb5dd6022ec57.tar.xz
forums-c169583dc3c551bc08fc217e0d5bb5dd6022ec57.zip
Merge pull request #2089 from nickvergessen/ticket/12251
[ticket/12251] Clean up and Enhancement of Custom Profile Fields
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/profile.php1
-rw-r--r--phpBB/language/en/ucp.php4
2 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php
index 93162daa45..dc42693ca7 100644
--- a/phpBB/language/en/acp/profile.php
+++ b/phpBB/language/en/acp/profile.php
@@ -39,6 +39,7 @@ $lang = array_merge($lang, array(
'ADDED_PROFILE_FIELD' => 'Successfully added custom profile field.',
'ALPHA_ONLY' => 'Alphanumeric only',
'ALPHA_SPACERS' => 'Alphanumeric and spacers',
+ 'ALPHA_UNDERSCORE' => 'Alphanumeric and underscores',
'ALWAYS_TODAY' => 'Always the current date',
'BOOL_ENTRIES_EXPLAIN' => 'Enter your options now',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index a0f7a32116..58bb1d4b3a 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -205,9 +205,11 @@ $lang = array_merge($lang, array(
),
'FIELD_TOO_SMALL' => 'The value of “%2$s” is too small, a minimum value of %1$d is required.',
'FIELD_TOO_LARGE' => 'The value of “%2$s” is too large, a maximum value of %1$d is allowed.',
+ 'FIELD_INVALID_CHARS_INVALID' => 'The field “%s” has invalid characters.',
'FIELD_INVALID_CHARS_NUMBERS_ONLY' => 'The field “%s” has invalid characters, only numbers are allowed.',
'FIELD_INVALID_CHARS_ALPHA_ONLY' => 'The field “%s” has invalid characters, only alphanumeric characters are allowed.',
- 'FIELD_INVALID_CHARS_SPACERS_ONLY' => 'The field “%s” has invalid characters, only alphanumeric, space or -+_[] characters are allowed.',
+ 'FIELD_INVALID_CHARS_ALPHA_SPACERS' => 'The field “%s” has invalid characters, only alphanumeric, space or -+_[] characters are allowed.',
+ 'FIELD_INVALID_CHARS_ALPHA_UNDERSCORE' => 'The field “%s” has invalid characters, only alphanumeric or _ characters are allowed.',
'FIELD_INVALID_DATE' => 'The field “%s” has an invalid date.',
'FIELD_INVALID_URL' => 'The field “%s” has an invalid url.',
'FIELD_INVALID_VALUE' => 'The field “%s” has an invalid value.',