Download as
Browse Code »

Commit 52b357dca934dbf3712005f7f9c9ea660b6b63f4

Authored by Antonio Terceiro
Committed by Daniela Feitosa
1 parent ed28f199
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

English review 

Thanks to professor Fabio Kon from USP for the heads up.

Note that this patch changes only the labels used for the fields, but
does not touch the actual field names.
Showing 3 changed files with 3 additions and 3 deletions   Show diff stats
app/helpers/profile_editor_helper.rb
  Diff comments   View file @52b357d
@@ -18,7 +18,7 @@ module ProfileEditorHelper @@ -18,7 +18,7 @@ module ProfileEditorHelper
18 N_('Science Politics'), 18 N_('Science Politics'),
19 N_('Accounting and Actuarial Science'), 19 N_('Accounting and Actuarial Science'),
20 N_('Morphologic Sciences'), 20 N_('Morphologic Sciences'),
21 - N_('Computation'), 21 + N_('Computer Science'),
22 N_('Rural Development'), 22 N_('Rural Development'),
23 N_('Law'), 23 N_('Law'),
24 N_('Ecology'), 24 N_('Ecology'),
app/models/person.rb
  Diff comments   View file @52b357d
@@ -156,7 +156,7 @@ class Person < Profile @@ -156,7 +156,7 @@ class Person < Profile
156 N_('Schooling status') 156 N_('Schooling status')
157 settings_items :schooling_status 157 settings_items :schooling_status
158 158
159 - N_('Formation'); N_('Custom formation'); N_('Custom area of study'); 159 + N_('Education'); N_('Custom education'); N_('Custom area of study');
160 settings_items :formation, :custom_formation, :custom_area_of_study 160 settings_items :formation, :custom_formation, :custom_area_of_study
161 161
162 N_('Contact information'); N_('City'); N_('State'); N_('Country'); N_('Sex'); N_('Zip code') 162 N_('Contact information'); N_('City'); N_('State'); N_('Country'); N_('Sex'); N_('Zip code')
app/views/profile_editor/_person_form.rhtml
  Diff comments   View file @52b357d
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 } 44 }
45 </script> 45 </script>
46 46
47 -<%= optional_field(@person, 'formation', select_area(_('Formation'), 'profile_data', 'formation', {:class => 'type-select-full-line'})) %> 47 +<%= optional_field(@person, 'formation', select_area(_('Education'), 'profile_data', 'formation', {:class => 'type-select-full-line'})) %>
48 48
49 <span id='profile_data_custom_formation_span' <%= "style='display:none'" if ! ['Others', nil].include?(@person.formation) %> > 49 <span id='profile_data_custom_formation_span' <%= "style='display:none'" if ! ['Others', nil].include?(@person.formation) %> >
50 <%= optional_field(@person, 'custom_formation', f.text_field(:custom_formation)) %> 50 <%= optional_field(@person, 'custom_formation', f.text_field(:custom_formation)) %>