diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-06-22 19:40:56 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-06-22 19:40:56 +0200 |
| commit | 7afc13b4db3a1444c5464f4f4f05a72cabede964 (patch) | |
| tree | e4ffd41c5232a5afe80ec74af8278b9b6cce7916 /phpBB/language | |
| parent | afe9d3c3f39ca1c69146778882f2b0250dfa3ed7 (diff) | |
| parent | d4679e6a95b45d839f854493682ebe64651260da (diff) | |
| download | forums-7afc13b4db3a1444c5464f4f4f05a72cabede964.tar forums-7afc13b4db3a1444c5464f4f4f05a72cabede964.tar.gz forums-7afc13b4db3a1444c5464f4f4f05a72cabede964.tar.bz2 forums-7afc13b4db3a1444c5464f4f4f05a72cabede964.tar.xz forums-7afc13b4db3a1444c5464f4f4f05a72cabede964.zip | |
Merge pull request #2615 from Dragooon/ticket/12730
[ticket/12730] Add Google+ profile field
* Dragooon/ticket/12730:
[ticket/12730] Update Google+ button class to use proper identification
[ticket/12730] Update maxlen for type_googleplus to 255
[ticket/12730] Fix type_googleplus_test to use same validation rule as the field
[ticket/12730] Update field_length to be 20 by default for Google+
[ticket/12730] Google+ field_order should be 13
[ticket/12730] Switch service name to googleplus for type_googleplus
[ticket/12730] Restore field_length to 10 for type_googleplus
[ticket/12730] Add functional test for Google+ field
[ticket/12730] Value shouldn't be escaped for schema_data.sql
[ticket/12730] Missing newline at type_googleplus_test.php
[ticket/12730] Set field_active to 1 for Google+ field
[ticket/12730] Add unit test for type_googleplus
[ticket/12730] Add missing brackets to type_googleplus.php
[ticket/12730] Update field_order for Google+ CPF
[ticket/12730] Use string template for Google+ CPF instead of a new one
[ticket/12730] Minor formatting fixes
[ticket/12730] Incorrect indentation for type_googleplus
[ticket/12730] Spaces in block header
[ticket/12730] Add a Google+ field by default
[ticket/12730] Add Google+ profile field type
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 | 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 fe3ad814cb..67813bcba4 100644 --- a/phpBB/language/en/acp/profile.php +++ b/phpBB/language/en/acp/profile.php @@ -93,6 +93,7 @@ $lang = array_merge($lang, array( 'FIELD_DESCRIPTION' => 'Field description', 'FIELD_DESCRIPTION_EXPLAIN' => 'The explanation for this field presented to the user.', 'FIELD_DROPDOWN' => 'Dropdown box', + 'FIELD_GOOGLEPLUS' => 'Google+', 'FIELD_IDENT' => 'Field identification', 'FIELD_IDENT_ALREADY_EXIST' => 'The chosen field identification already exist. Please choose another name.', 'FIELD_IDENT_EXPLAIN' => 'The field identification is a name to identify the profile field within the database and the templates.', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 46f19359cd..757b9d7251 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -284,6 +284,7 @@ $lang = array_merge($lang, array( 'GB' => 'GB', 'GIB' => 'GiB', 'GO' => 'Go', + 'GOOGLEPLUS' => 'Google+', 'GOTO_FIRST_POST' => 'Go to first post', 'GOTO_LAST_POST' => 'Go to last post', 'GOTO_PAGE' => 'Go to page', diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index b5fd21e5e3..e02f9ff525 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -148,4 +148,5 @@ $lang = array_merge($lang, array( 'VIEW_SKYPE_PROFILE' => 'View Skype Profile', 'VIEW_TWITTER_PROFILE' => 'View Twitter Profile', 'VIEW_YOUTUBE_CHANNEL' => 'View YouTube Channel', + 'VIEW_GOOGLEPLUS_PROFILE' => 'View Google+ Profile', )); |