Merge branch '#2285-Made-some-fields-translatable' of https://github.…

…com/benjaminlaot/ckan into benjaminlaot-#2285-Made-some-fields-translatable
ckan · Feb 24, 2015 · e1f202c · e1f202c
2 parents 44f027e + e5b7461
commit e1f202c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ckan/templates/organization/member_new.html b/ckan/templates/organization/member_new.html
@@ -29,7 +29,7 @@ <h1 class="page-heading">
             <input id="username" name="username" type="text" value="{{ user.name }}"
             disabled="True" class="control-medium">
           {% else %}
-            <input id="username" type="text" name="username" placeholder="Username"
+             <input id="username" type="text" name="username" placeholder="{{ _('Username') }}"
             value="" class="control-medium" data-module="autocomplete"
             data-module-source="/api/2/util/user/autocomplete?q=?">
           {% endif %}
@@ -47,7 +47,7 @@ <h1 class="page-heading">
             {{ _('If you wish to invite a new user, enter their email address.') }}
           </span>
           <div class="controls">
-            <input id="email" type="text" name="email" placeholder="Email address">
+            <input id="email" type="email" name="email" placeholder="{{ _('Email address') }}" >
           </div>
         </div>
       {% endif %}

diff --git a/ckan/templates/user/read_base.html b/ckan/templates/user/read_base.html
@@ -89,7 +89,7 @@ <h1 class="heading">{{ user.display_name }}</h1>
         </dl>
         <dl>
           <dt>{{ _('State') }}</dt>
-          <dd>{{ user.state }}</dd>
+          <dd>{{ _(user.state) }}</dd>
         </dl>
         {% if c.is_myself %}
           <dl>