aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles/prosilver/template
diff options
context:
space:
mode:
authorn-aleha <nick_aleha@myway.com>2014-05-11 20:23:51 +0300
committern-aleha <nick_aleha@myway.com>2014-05-17 04:50:57 +0300
commita1143332098aa2dd99bf16a1eb0b0301d5b0c5d5 (patch)
treeeae2bff3fb563f04451f2aa06286c1c2381aad22 /phpBB/styles/prosilver/template
parentf37ff48e2c1edc643c25db6f213c56de6a27464e (diff)
downloadforums-a1143332098aa2dd99bf16a1eb0b0301d5b0c5d5.tar
forums-a1143332098aa2dd99bf16a1eb0b0301d5b0c5d5.tar.gz
forums-a1143332098aa2dd99bf16a1eb0b0301d5b0c5d5.tar.bz2
forums-a1143332098aa2dd99bf16a1eb0b0301d5b0c5d5.tar.xz
forums-a1143332098aa2dd99bf16a1eb0b0301d5b0c5d5.zip
[ticket/12525] Add string argument to contact and email user language variables
In language/en/common.php: * Introduce a new language variable 'CONTACT' => 'Contact' * Add a string argument to lang var 'CONTACT_USER' to avoid an appended '{USERNAME}' in template. * Add a string argument to lang var 'SEND_EMAIL_USER' to avoid an appended '{USERNAME}' in template. Also fix typos. PHPBB3-12525
Diffstat (limited to 'phpBB/styles/prosilver/template')
-rw-r--r--phpBB/styles/prosilver/template/memberlist_email.html2
-rw-r--r--phpBB/styles/prosilver/template/memberlist_view.html4
-rw-r--r--phpBB/styles/prosilver/template/ucp_pm_viewmessage.html2
-rw-r--r--phpBB/styles/prosilver/template/viewtopic_body.html2
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">