diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-06-20 23:36:26 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-06-20 23:36:26 +0200 |
| commit | 8595fee0401c66511d508fd2d2f0a69609ce5770 (patch) | |
| tree | 87be100e0a750035d8df999e4d457f9f2efb0f81 /phpBB/language/en | |
| parent | a5ca7479b24a1e7ba954f13c80f26d466b80237e (diff) | |
| parent | aeeaf2f6efc79ca407cf8872b1538902b93c2236 (diff) | |
| download | forums-8595fee0401c66511d508fd2d2f0a69609ce5770.tar forums-8595fee0401c66511d508fd2d2f0a69609ce5770.tar.gz forums-8595fee0401c66511d508fd2d2f0a69609ce5770.tar.bz2 forums-8595fee0401c66511d508fd2d2f0a69609ce5770.tar.xz forums-8595fee0401c66511d508fd2d2f0a69609ce5770.zip | |
Merge pull request #2611 from Dragooon/ticket/12729
[ticket/12729] Add Facebook custom profile field
* Dragooon/ticket/12729:
[ticket/12729] Add functional test for Facebook field
[ticket/12730] Values needn't be escaped for schema_data.sql
[ticket/12729] Set field_active as 1 for Facebook profile field
[ticket/12729] Add unit test for ALPHA_DOTS validation
[ticket/12729] Move ALPHA_DOTS to above ALPHA_SPACERS
[ticket/12729] Convert spaces to tabs
[ticket/12729] Fix block header spacing for profilefield_facebook.php
[ticket/12729] Update schema.json
[ticket/12729] Unnecessary whitespace in profilefield_facebook.php
[ticket/12729] Cleanup schema_data.sql for Facebook field
[ticket/12729] Add Facebook custom profile field
Diffstat (limited to 'phpBB/language/en')
| -rw-r--r-- | phpBB/language/en/acp/profile.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/memberlist.php | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php index 7336031218..de0b7dee88 100644 --- a/phpBB/language/en/acp/profile.php +++ b/phpBB/language/en/acp/profile.php @@ -39,6 +39,7 @@ if (empty($lang) || !is_array($lang)) // Custom profile fields $lang = array_merge($lang, array( 'ADDED_PROFILE_FIELD' => 'Successfully added custom profile field.', + 'ALPHA_DOTS' => 'Alphanumeric and dots (periods)', 'ALPHA_ONLY' => 'Alphanumeric only', 'ALPHA_SPACERS' => 'Alphanumeric and spacers', 'ALPHA_UNDERSCORE' => 'Alphanumeric and underscores', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 9a44337294..976feef234 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -226,6 +226,7 @@ $lang = array_merge($lang, array( 'EXTENSION_DISABLED_AFTER_POSTING' => 'The extension <strong>%s</strong> has been deactivated and can no longer be displayed.', 'EXTENSION_DOES_NOT_EXIST' => 'The extension <strong>%s</strong> does not exist.', + 'FACEBOOK' => 'Facebook', 'FAQ' => 'FAQ', 'FAQ_EXPLAIN' => 'Frequently Asked Questions', 'FILENAME' => 'Filename', diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index d900ababd1..341c1620b7 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -144,4 +144,5 @@ $lang = array_merge($lang, array( 'USERS_PER_PAGE' => 'Users per page', 'VIEWING_PROFILE' => 'Viewing profile - %s', + 'VIEW_FACEBOOK_PROFILE' => 'View Facebook Profile', )); |