diff options
| author | Cesar G <prototech91@gmail.com> | 2014-05-16 20:04:34 -0700 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-05-16 20:04:34 -0700 |
| commit | 747eb198efdf30063e74f656c56a3b047a81766a (patch) | |
| tree | e818335e17941956ae114d2d7b339803ecbed7dc /phpBB/styles/prosilver/template | |
| parent | 5dc0605b6bebee0621311e9e1479e35c8e3e7cfe (diff) | |
| parent | a1143332098aa2dd99bf16a1eb0b0301d5b0c5d5 (diff) | |
| download | forums-747eb198efdf30063e74f656c56a3b047a81766a.tar forums-747eb198efdf30063e74f656c56a3b047a81766a.tar.gz forums-747eb198efdf30063e74f656c56a3b047a81766a.tar.bz2 forums-747eb198efdf30063e74f656c56a3b047a81766a.tar.xz forums-747eb198efdf30063e74f656c56a3b047a81766a.zip | |
Merge remote-tracking branch 'n-aleha/ticket/12525' into develop-ascraeus
* n-aleha/ticket/12525:
[ticket/12525] Add string argument to contact and email user language variables
Diffstat (limited to 'phpBB/styles/prosilver/template')
4 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/styles/prosilver/template/memberlist_email.html b/phpBB/styles/prosilver/template/memberlist_email.html index 218402a9e9..78d0eba5a8 100644 --- a/phpBB/styles/prosilver/template/memberlist_email.html +++ b/phpBB/styles/prosilver/template/memberlist_email.html @@ -1,6 +1,6 @@ <!-- INCLUDE overall_header.html --> -<h2 class="titlespace">{L_SEND_EMAIL_USER} {USERNAME}</h2> +<h2 class="titlespace">{L_SEND_EMAIL_USER}</h2> <form method="post" action="{S_POST_ACTION}" id="post"> diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html index a8b1e972fe..ffa57f9cc8 100644 --- a/phpBB/styles/prosilver/template/memberlist_view.html +++ b/phpBB/styles/prosilver/template/memberlist_view.html @@ -60,10 +60,10 @@ <div class="inner"> <div class="column1"> - <h3>{L_CONTACT_USER} {USERNAME}</h3> + <h3>{L_CONTACT_USER}</h3> <dl class="details"> - <!-- IF U_EMAIL --><dt>{L_EMAIL_ADDRESS}{L_COLON}</dt> <dd><a href="{U_EMAIL}">{L_SEND_EMAIL_USER} {USERNAME}</a></dd><!-- ENDIF --> + <!-- IF U_EMAIL --><dt>{L_EMAIL_ADDRESS}{L_COLON}</dt> <dd><a href="{U_EMAIL}">{L_SEND_EMAIL_USER}</a></dd><!-- ENDIF --> <!-- IF U_PM --><dt>{L_PM}{L_COLON}</dt> <dd><a href="{U_PM}">{L_SEND_PRIVATE_MESSAGE}</a></dd><!-- ENDIF --> <!-- IF U_JABBER and S_JABBER_ENABLED --><dt>{L_JABBER}{L_COLON}</dt> <dd><a href="{U_JABBER}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_JABBER_MESSAGE}</a></dd><!-- ELSEIF USER_JABBER --><dt>{L_JABBER}{L_COLON}</dt> <dd>{USER_JABBER}</dd><!-- ENDIF --> <!-- BEGIN custom_fields --> diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html index 81171e97b2..f58b334a60 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html @@ -36,7 +36,7 @@ <!-- EVENT ucp_pm_viewmessage_contact_fields_before --> <!-- IF .contact --> <dd class="profile-contact"> - <strong>{L_CONTACT_USER}{L_COLON}</strong> + <strong>{L_CONTACT}{L_COLON}</strong> <div class="dropdown-container dropdown-left"> <a href="#" class="dropdown-trigger"><span class="imageset icon_contact"></span></a> <div class="dropdown hidden"> diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index 17c73b82f4..18fa7ce783 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -149,7 +149,7 @@ <!-- EVENT viewtopic_body_contact_fields_before --> <!-- IF not S_IS_BOT and .postrow.contact --> <dd class="profile-contact"> - <strong>{L_CONTACT_USER}{L_COLON}</strong> + <strong>{L_CONTACT}{L_COLON}</strong> <div class="dropdown-container dropdown-left"> <a href="#" class="dropdown-trigger"><span class="imageset icon_contact"></span></a> <div class="dropdown hidden"> |