aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-01-19 14:52:51 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-01-19 14:52:51 +0100
commit0ce98d7eac4724154650e2be357fceec02c44174 (patch)
treedf36693ed1bfb299dc603e46e9eaa60c74e215b6
parentf40f774b2e9b862e9dafa110db07ffe3ffaaccdf (diff)
downloadforums-0ce98d7eac4724154650e2be357fceec02c44174.tar
forums-0ce98d7eac4724154650e2be357fceec02c44174.tar.gz
forums-0ce98d7eac4724154650e2be357fceec02c44174.tar.bz2
forums-0ce98d7eac4724154650e2be357fceec02c44174.tar.xz
forums-0ce98d7eac4724154650e2be357fceec02c44174.zip
[ticket/11201] Allow translation of profile field name and explanation
PHPBB3-11201
-rw-r--r--phpBB/phpbb/profilefields/profilefields.php8
-rw-r--r--phpBB/styles/prosilver/template/custom_profile_fields.html2
2 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/phpbb/profilefields/profilefields.php b/phpBB/phpbb/profilefields/profilefields.php
index f63064bd56..772c178c89 100644
--- a/phpBB/phpbb/profilefields/profilefields.php
+++ b/phpBB/phpbb/profilefields/profilefields.php
@@ -282,8 +282,8 @@ class profilefields
$tpl_fields['row'] += array(
'PROFILE_' . strtoupper($ident) . '_VALUE' => $value,
'PROFILE_' . strtoupper($ident) . '_TYPE' => $ident_ary['data']['field_type'],
- 'PROFILE_' . strtoupper($ident) . '_NAME' => $ident_ary['data']['lang_name'],
- 'PROFILE_' . strtoupper($ident) . '_EXPLAIN'=> $ident_ary['data']['lang_explain'],
+ 'PROFILE_' . strtoupper($ident) . '_NAME' => $this->user->lang($ident_ary['data']['lang_name']),
+ 'PROFILE_' . strtoupper($ident) . '_EXPLAIN'=> $this->user->lang($ident_ary['data']['lang_explain']),
'S_PROFILE_' . strtoupper($ident) => true
);
@@ -291,8 +291,8 @@ class profilefields
$tpl_fields['blockrow'][] = array(
'PROFILE_FIELD_VALUE' => $value,
'PROFILE_FIELD_TYPE' => $ident_ary['data']['field_type'],
- 'PROFILE_FIELD_NAME' => $ident_ary['data']['lang_name'],
- 'PROFILE_FIELD_EXPLAIN' => $ident_ary['data']['lang_explain'],
+ 'PROFILE_FIELD_NAME' => $this->user->lang($ident_ary['data']['lang_name']),
+ 'PROFILE_FIELD_EXPLAIN' => $this->user->lang($ident_ary['data']['lang_explain']),
'S_PROFILE_' . strtoupper($ident) => true
);
diff --git a/phpBB/styles/prosilver/template/custom_profile_fields.html b/phpBB/styles/prosilver/template/custom_profile_fields.html
index 7de97f64cb..764cac7b3a 100644
--- a/phpBB/styles/prosilver/template/custom_profile_fields.html
+++ b/phpBB/styles/prosilver/template/custom_profile_fields.html
@@ -5,7 +5,7 @@
<!-- END dropdown -->
<!-- BEGIN text -->
-<textarea name="{text.FIELD_IDENT}" id="{text.FIELD_IDENT}" rows="{text.FIELD_ROWS}" cols="{text.FIELD_COLS}" class="inputbox autowidth">{text.FIELD_VALUE}</textarea>
+<textarea name="{text.FIELD_IDENT}" id="{text.FIELD_IDENT}" rows="{text.FIELD_ROWS}" cols="{text.FIELD_COLS}" class="inputbox">{text.FIELD_VALUE}</textarea>
<!-- END text -->
<!-- BEGIN string -->