diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-06-20 23:39:54 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-06-20 23:39:54 +0200 |
| commit | 3c38fcce40b28d7b67f4a9686be88044eda40b9a (patch) | |
| tree | 95a6309b163a12f008d2bb7867152117228e589f /phpBB/language | |
| parent | b9890c6a4c7c30215ce7863825917f9152326081 (diff) | |
| parent | 6b58f406630f7c98e00e2dd1b4db0c55e4e76ba9 (diff) | |
| download | forums-3c38fcce40b28d7b67f4a9686be88044eda40b9a.tar forums-3c38fcce40b28d7b67f4a9686be88044eda40b9a.tar.gz forums-3c38fcce40b28d7b67f4a9686be88044eda40b9a.tar.bz2 forums-3c38fcce40b28d7b67f4a9686be88044eda40b9a.tar.xz forums-3c38fcce40b28d7b67f4a9686be88044eda40b9a.zip | |
Merge pull request #2621 from Dragooon/ticket/12732
[ticket/12732] Add Skype custom profile field
* Dragooon/ticket/12732:
[ticket/12732] Update schema.json for Skype
[ticket/12732] Add functional test for Skype profile field
[ticket/12732] Values shouldn't be escaped for schema_data.sql
[ticket/12732] Set field_active to 1 for Skype's field
[ticket/12732] Add unit tests for ALPHA_PUNCTUATION
[ticket/12732] Missing comma after validation definition
[ticket/12732] Improve ALPHA_PUNCTUATION description
[ticket/12732] Use user info instead of chat as default Skype action
[ticket/12732] Add Skype 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
tests/profilefields/type_string_test.php
Diffstat (limited to 'phpBB/language')
| -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 | 5 |
3 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php index de0b7dee88..fe3ad814cb 100644 --- a/phpBB/language/en/acp/profile.php +++ b/phpBB/language/en/acp/profile.php @@ -43,6 +43,7 @@ $lang = array_merge($lang, array( 'ALPHA_ONLY' => 'Alphanumeric only', 'ALPHA_SPACERS' => 'Alphanumeric and spacers', 'ALPHA_UNDERSCORE' => 'Alphanumeric and underscores', + 'ALPHA_PUNCTUATION' => 'Alphanumeric with comma, dots, underscore and dashes beginning with a letter', 'ALWAYS_TODAY' => 'Always the current date', 'BOOL_ENTRIES_EXPLAIN' => 'Enter your options now', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index e8d02a288f..68a63450bd 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -677,6 +677,7 @@ $lang = array_merge($lang, array( 'SETTINGS' => 'Settings', 'SIGNATURE' => 'Signature', 'SKIP' => 'Skip to content', + 'SKYPE' => 'Skype', 'SMTP_NO_AUTH_SUPPORT' => 'SMTP server does not support authentication.', 'SORRY_AUTH_READ' => 'You are not authorised to read this forum.', 'SORRY_AUTH_VIEW_ATTACH' => 'You are not authorised to download this attachment.', diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index 9e01d396fd..913fab59fc 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -144,6 +144,7 @@ $lang = array_merge($lang, array( 'USERS_PER_PAGE' => 'Users per page', 'VIEWING_PROFILE' => 'Viewing profile - %s', - 'VIEW_FACEBOOK_PROFILE' => 'View Facebook Profile', - 'VIEW_TWITTER_PROFILE' => 'View Twitter Profile', + 'VIEW_FACEBOOK_PROFILE' => 'View Facebook Profile', + 'VIEW_SKYPE_PROFILE' => 'View Skype Profile', + 'VIEW_TWITTER_PROFILE' => 'View Twitter Profile', )); |