diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-06-20 23:37:51 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-06-20 23:37:51 +0200 |
| commit | b9890c6a4c7c30215ce7863825917f9152326081 (patch) | |
| tree | e7b03ee965ceecfe2bb61f3b07997059f448cb7f /phpBB/language/en | |
| parent | 8595fee0401c66511d508fd2d2f0a69609ce5770 (diff) | |
| parent | cdfcbfc6d0c7c1ea7f1b5c802eaa85887934f829 (diff) | |
| download | forums-b9890c6a4c7c30215ce7863825917f9152326081.tar forums-b9890c6a4c7c30215ce7863825917f9152326081.tar.gz forums-b9890c6a4c7c30215ce7863825917f9152326081.tar.bz2 forums-b9890c6a4c7c30215ce7863825917f9152326081.tar.xz forums-b9890c6a4c7c30215ce7863825917f9152326081.zip | |
Merge pull request #2612 from Dragooon/ticket/12733
[ticket/12733] Add Twitter custom profile field
* Dragooon/ticket/12733:
[ticket/12733] Add functional test for twitter profile field
[ticket/12733] Values needn't be escaped for schema_data.sql
[ticket/12733] Set field_active to 1 for Twitter
[ticket/12733] Convert spaces to tabs
[ticket/12733] Fix spacing for block header in profilefield_twitter.php
[ticket/12733] Update schema.json
[ticket/12733] Add Twitter custom profile field
Conflicts:
phpBB/install/schemas/schema.json
phpBB/install/schemas/schema_data.sql
phpBB/language/en/memberlist.php
tests/functional/ucp_profile_test.php
Diffstat (limited to 'phpBB/language/en')
| -rw-r--r-- | phpBB/language/en/common.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/memberlist.php | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 976feef234..e8d02a288f 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -772,6 +772,7 @@ $lang = array_merge($lang, array( 2 => 'Total members <strong>%d</strong>', ), 'TRACKED_PHP_ERROR' => 'Tracked PHP errors: %s', + 'TWITTER' => 'Twitter', 'UNABLE_GET_IMAGE_SIZE' => 'It was not possible to determine the dimensions of the image. Please verify that the URL you entered is correct.', 'UNABLE_TO_DELIVER_FILE'=> 'Unable to deliver file.', diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index 341c1620b7..9e01d396fd 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -145,4 +145,5 @@ $lang = array_merge($lang, array( 'VIEWING_PROFILE' => 'Viewing profile - %s', 'VIEW_FACEBOOK_PROFILE' => 'View Facebook Profile', + 'VIEW_TWITTER_PROFILE' => 'View Twitter Profile', )); |