BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/101442
Change subject: Fix i18n template errors
......................................................................
Fix i18n template errors
Fix a few small Twig errors and html issues introduced by the i18n
changes.
Change-Id: I701b632e132438c072aeaaf2f320da11556161c5
---
M data/templates/admin/user.html
M data/templates/admin/users.html
M data/templates/user/changePassword.html
3 files changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/wikimania-scholarships
refs/changes/42/101442/1
diff --git a/data/templates/admin/user.html b/data/templates/admin/user.html
index e7fa65e..0d50256 100644
--- a/data/templates/admin/user.html
+++ b/data/templates/admin/user.html
@@ -10,7 +10,7 @@
<form method="post" action="{{ urlFor( 'admin_user_post' ) }}">
<input type="hidden" name="id" value="{{ id }}"/>
<fieldset>
- <legend>{{ wgLang.message( 'admin-user-id', [ id ] ) }}
+ <legend>{{ wgLang.message( 'admin-user-id', [ id ] ) }}</legend>
<ul>
<li {{ 'username' in errors ? 'class="fieldWithErrors"' }}><label
for"username">{{ wgLang.message( 'username' ) }}</label>
<input type="text" name="username" id="username" value="{{ u.username
}}" required="required"/>
diff --git a/data/templates/admin/users.html b/data/templates/admin/users.html
index e932354..7a5686e 100644
--- a/data/templates/admin/users.html
+++ b/data/templates/admin/users.html
@@ -15,12 +15,12 @@
{% for row in records %}
<tr class="{{ cycle( [ 'oddrow', 'evenrow' ], loop.index ) }}">
<td>{{ row.id }}</td>
- <td><a href="{{ urlFor( 'admin_user', { 'id':row.id} ) }}">{{ row.username
}}</a></td>
+ <td><a href="{{ urlFor( 'admin_user', { 'id':row.id } ) }}">{{
row.username }}</a></td>
<td><a href="mailto:{{ row.email|url_encode }}">{{ row.email }}</a></td>
- <td>{{ row.reviewer ? {{ wgLang.message( 'admin-users-yes' ) }} : {{
wgLang.message( 'admin-users-no' ) }} }}</td>
- <td>{{ row.isvalid ? {{ wgLang.message( 'admin-users-yes' ) }} : {{
wgLang.message( 'admin-users-no' ) }} }}</td>
- <td>{{ row.isadmin ? {{ wgLang.message( 'admin-users-yes' ) }} : {{
wgLang.message( 'admin-users-no' ) }} }}</td>
- <td>{{ row.blocked ? {{ wgLang.message( 'admin-users-yes' ) }} : {{
wgLang.message( 'admin-users-no' ) }} }}</td>
+ <td>{{ row.reviewer ? wgLang.message( 'admin-users-yes' ) :
wgLang.message( 'admin-users-no' ) }}</td>
+ <td>{{ row.isvalid ? wgLang.message( 'admin-users-yes' ) : wgLang.message(
'admin-users-no' ) }}</td>
+ <td>{{ row.isadmin ? wgLang.message( 'admin-users-yes' ) : wgLang.message(
'admin-users-no' ) }}</td>
+ <td>{{ row.blocked ? wgLang.message( 'admin-users-yes' ) : wgLang.message(
'admin-users-no' ) }}</td>
</tr>
{% endfor %}
</table>
diff --git a/data/templates/user/changePassword.html
b/data/templates/user/changePassword.html
index cf01647..e0c6b69 100644
--- a/data/templates/user/changePassword.html
+++ b/data/templates/user/changePassword.html
@@ -6,7 +6,7 @@
<input type="hidden" name="id" value="{{ user.id }}" />
<fieldset>
<legend>{{ wgLang.message( 'change-password' ) }}</legend>
- <p>{{ wgLang.message( 'password-username', [ user.username ] ) }}</p>
+ <p>{{ wgLang.message( 'password-username', [ user.username ] )|raw }}</p>
<ul>
<li><label for="oldpw">{{ wgLang.message( 'old-password' ) }}</label>
<input type="password" name="oldpw" id="oldpw" value=""
required="required"/>
--
To view, visit https://gerrit.wikimedia.org/r/101442
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I701b632e132438c072aeaaf2f320da11556161c5
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/wikimania-scholarships
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
