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 | |
| 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')
6 files changed, 17 insertions, 17 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"> diff --git a/phpBB/styles/subsilver2/template/memberlist_email.html b/phpBB/styles/subsilver2/template/memberlist_email.html index 88289e53bf..7693a4167f 100644 --- a/phpBB/styles/subsilver2/template/memberlist_email.html +++ b/phpBB/styles/subsilver2/template/memberlist_email.html @@ -3,10 +3,10 @@ <div id="pagecontent"> <form action="{S_POST_ACTION}" method="post" name="postform"> - + <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th colspan="2">{L_SEND_EMAIL_USER} {USERNAME}</th> + <tr> + <th colspan="2">{L_SEND_EMAIL_USER}</th> </tr> <!-- IF ERROR_MESSAGE --> <tr> @@ -14,11 +14,11 @@ </tr> <!-- ENDIF --> <!-- IF S_SEND_USER --> - <tr> + <tr> <td class="row1" width="35%"><b class="genmed">{L_RECIPIENT}</b></td> <td class="row2" width="65%"><b class="genmed">{USERNAME}</b></td> </tr> - <tr> + <tr> <td class="row1" width="35%"><b class="genmed">{L_SUBJECT}</b></td> <td class="row2"><input class="post" type="text" name="subject" size="50" tabindex="2" value="{SUBJECT}" /></td> </tr> @@ -27,24 +27,24 @@ <td class="row1" width="35%"><b class="genmed">{L_EMAIL_ADDRESS}</b></td> <td class="row2"><input class="post" type="email" name="email" size="50" maxlength="100" value="{EMAIL}" /></td> </tr> - <tr> + <tr> <td class="row1" width="35%"><b class="genmed">{L_REAL_NAME}</b></td> <td class="row2"><input class="post" type="text" name="name" size="50" value="{NAME}" /></td> </tr> - <tr> + <tr> <td class="row1" width="35%"><b class="genmed">{L_DEST_LANG}</b><br /><span class="gensmall">{L_DEST_LANG_EXPLAIN}</span></td> <td class="row2"><select name="lang">{S_LANG_OPTIONS}</select></td> </tr> <!-- ENDIF --> - <tr> + <tr> <td class="row1" valign="top"><b class="genmed">{L_MESSAGE_BODY}</b><br /><span class="gensmall">{L_EMAIL_BODY_EXPLAIN}</span></td> <td class="row2"><textarea class="post" name="message" rows="15" cols="76" tabindex="3">{MESSAGE}</textarea></td> </tr> - <tr> + <tr> <td class="row1" valign="top"><span class="gen"><b>{L_OPTIONS}</b></span></td> <td class="row2"> <table cellspacing="0" cellpadding="1" border="0"> - <tr> + <tr> <td><input type="checkbox" class="radio" name="cc_email" value="1" checked="checked" /></td> <td class="gen">{L_CC_EMAIL}</td> </tr> @@ -57,7 +57,7 @@ </table> {S_FORM_TOKEN} - + </form> </div> diff --git a/phpBB/styles/subsilver2/template/memberlist_view.html b/phpBB/styles/subsilver2/template/memberlist_view.html index 4c8014a370..550643ff03 100644 --- a/phpBB/styles/subsilver2/template/memberlist_view.html +++ b/phpBB/styles/subsilver2/template/memberlist_view.html @@ -104,7 +104,7 @@ </td> </tr> <tr> - <td class="cat" align="center"><h4>{L_CONTACT_USER}</h4></td> + <td class="cat" align="center"><h4>{L_CONTACT}</h4></td> <td class="cat" align="center"><h4>{L_ABOUT_USER}</h4></td> </tr> <!-- EVENT memberlist_view_contact_before --> |