[Git][noosfero/noosfero][master] 2 commits: users: translate export fields

[Rodrigo Souto]

Rodrigo Souto pushed to branch master at Noosfero / noosfero


Commits:
5636febe by Rodrigo Souto at 2018-07-31T19:28:21Z
users: translate export fields

- - - - -
c246a96a by Rodrigo Souto at 2018-07-31T20:28:05Z
Merge branch 'users-export-fields-translation' into 'master'

users: translate export fields

See merge request noosfero/noosfero!1582
- - - - -


4 changed files:

- app/helpers/forms_helper.rb
- app/models/user.rb
- app/services/exporter.rb
- test/functional/users_controller_test.rb


Changes:

=====================================
app/helpers/forms_helper.rb
=====================================
@@ -324,8 +324,7 @@ module FormsHelper
     fields = content_tag('div', { class: 'exportable-fields' }) do
       profile.exportable_fields.map do |field|
         checked = field.in? selected_fields
-        content = check_box_tag(name, field, checked) +
-                  _(field.humanize(capitalize: false)).capitalize
+        content = check_box_tag(name, field, checked) + _(field.humanize)
         content_tag('label', content.html_safe)
       end.join("\n").html_safe
     end


=====================================
app/models/user.rb
=====================================
@@ -22,6 +22,7 @@ class User < ApplicationRecord
   N_('Password')
   N_('Password confirmation')
   N_('Terms accepted')
+  N_('Last login at')
 
   SEARCHABLE_FIELDS = {
     :email => {:label => _('Email'), :weight => 5},


=====================================
app/services/exporter.rb
=====================================
@@ -25,7 +25,7 @@ class Exporter
   private
 
   def csv_columns
-    base_fields + @related_fields.map { |_, cols| cols }.flatten
+    (base_fields + @related_fields.map { |_, cols| cols }.flatten).map { |field| _(field.humanize) }
   end
 
   def csv_line_for(entry)


=====================================
test/functional/users_controller_test.rb
=====================================
@@ -141,7 +141,7 @@ class UsersControllerTest < ActionController::TestCase
 
     get :download, :format => 'csv', :fields => ['email']
     assert_match 'jhondoe at noosfero.org', @response.body
-    assert_match 'last_login_at', @response.body
+    assert_match 'Last login at', @response.body
     assert_no_match 'name', @response.body
   end
 



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/09febf21add5b49d29fc47fb0fd092d6d87d77eb...c246a96a2f32b6ac342872dd146d978ebe52a40b

-- 
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/09febf21add5b49d29fc47fb0fd092d6d87d77eb...c246a96a2f32b6ac342872dd146d978ebe52a40b
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20180731/09562429/attachment-0001.html>