Download as
Browse Code »

Commit 7233d84ea21f3135d88c81518dc31fd048c8e23a

Authored by Daniela Feitosa
2 parents 2dffabc4 dd6919c5
Exists in master and in 36 other branches add_sisp_to_chef, add_super_archives_plugin, automates_core_packing, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_merge_request_url, fix_no_license, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, lxc_settings, mezuro_cookbook, refactor_download_block, remove_broken_theme, remove_sisp_buttons, sisp_catalog_header, software_communities_html_refactor, software_infos_api, spb_to_rails4, stable-4.1, stable-4.2, theme_header, theme_javascript_refactory, update_search_by_categories

Merge branch 'fix_models_translations' into 'master' 

Fix models translations

Atualizado a tradução das mensagens de erro na criação de software e de comunidade

See merge request !126
Showing 7 changed files with 36 additions and 21 deletions   Show diff stats
src/noosfero-spb/gov_user/controllers/gov_user_plugin_controller.rb
  Diff comments   View file @7233d84
... ... @@ -217,8 +217,8 @@ class GovUserPluginController < ApplicationController
217 217 end
218 218  
219 219 def save_institution institution
220   - inst_errors = institution.errors.messages
221   - com_errors = institution.community.errors.messages
  220 + inst_errors = institution.errors.full_messages
  221 + com_errors = institution.community.errors.full_messages
222 222  
223 223 set_errors institution
224 224  
... ... @@ -230,7 +230,7 @@ class GovUserPluginController < ApplicationController
230 230 else
231 231 { :success => false,
232 232 :message => _("Institution could not be created!"),
233   - :errors => inst_errors.merge(com_errors)
  233 + :errors => inst_errors + com_errors
234 234 }
235 235 end
236 236 end
... ...
src/noosfero-spb/gov_user/locales/pt-BR.yml 0 → 120000
  Diff comments   View file @7233d84
... ... @@ -0,0 +1 @@
  1 +../../software_communities/locales/pt-BR.yml
0 2 \ No newline at end of file
... ...
src/noosfero-spb/gov_user/public/views/create-institution.js
  Diff comments   View file @7233d84
... ... @@ -113,12 +113,8 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement']
113 113 var errors = "<ul>";
114 114 var field_name;
115 115  
116   - for(var error_key in response.errors) {
117   - field_name = adjust_error_key(error_key);
118   -
119   - if(response.errors[error_key].length > 0){
120   - errors += "<li><b>"+field_name+"</b>: "+response.errors[error_key]+"</li>";
121   - }
  116 + for(var error in response.errors) {
  117 + errors += "<li>"+response.errors[error]+"</li>";
122 118 }
123 119  
124 120 errors += "</ul>";
... ... @@ -147,14 +143,6 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
147 143 }
148 144  
149 145  
150   - function adjust_error_key(error_key) {
151   - var text = error_key.replace(/_/, " ");
152   - text = text.charAt(0).toUpperCase() + text.slice(1);
153   -
154   - return text;
155   - }
156   -
157   -
158 146 function save_institution(evt) {
159 147 evt.preventDefault();
160 148  
... ...
src/noosfero-spb/software_communities/locales/pt-BR.yml 0 → 100644
  Diff comments   View file @7233d84
... ... @@ -0,0 +1,26 @@
  1 +# encoding: UTF-8
  2 +
  3 +"pt-BR": &pt-BR
  4 +
  5 + activerecord:
  6 + attributes:
  7 + community:
  8 + name: 'Nome'
  9 + state: 'Estado'
  10 + city: 'Cidade'
  11 + software_info:
  12 + finality: 'Finalidade'
  13 + license_info:
  14 + version: 'Versão'
  15 + institution:
  16 + name: 'Nome'
  17 + state: 'Estado'
  18 + city: 'Cidade'
  19 + governmental_power: 'Poder Governamental'
  20 + governmental_sphere: 'Esfera Governamental'
  21 + juridical_nature: 'Natureza Jurídica'
  22 +
  23 +'pt_BR':
  24 + <<: *pt-BR
  25 +'pt':
  26 + <<: *pt-BR
... ...
src/noosfero-spb/software_communities/po/pt/software_communities.po
  Diff comments   View file @7233d84
... ... @@ -860,8 +860,8 @@ msgstr &quot;&quot;
860 860 "e critérios"
861 861  
862 862 #: plugins/software_communities/views/software_communities_plugin_myprofile/new_software.html.erb:22
863   -msgid "\"Can`t create new software: #{@errors.length} errors\""
864   -msgstr "\"Não foi possível criar o software: #{@errors.length} errors\""
  863 +msgid "Can`t create new software: %s errors"
  864 +msgstr "Não foi possível criar o software: %s erros"
865 865  
866 866 #: plugins/software_communities/views/software_communities_plugin_myprofile/new_software.html.erb:45
867 867 msgid "Domain"
... ...
src/noosfero-spb/software_communities/po/software_communities.pot
  Diff comments   View file @7233d84
... ... @@ -825,7 +825,7 @@ msgid &quot;&quot;
825 825 msgstr ""
826 826  
827 827 #: plugins/software_communities/views/software_communities_plugin_myprofile/new_software.html.erb:22
828   -msgid "\"Can`t create new software: #{@errors.length} errors\""
  828 +msgid "Can`t create new software: %s errors"
829 829 msgstr ""
830 830  
831 831 #: plugins/software_communities/views/software_communities_plugin_myprofile/new_software.html.erb:45
... ...
src/noosfero-spb/software_communities/views/software_communities_plugin_myprofile/new_software.html.erb
  Diff comments   View file @7233d84
... ... @@ -19,7 +19,7 @@
19 19  
20 20 <% unless @errors.blank? %>
21 21 <div class="errorExplanation" id="errorExplanation">
22   - <h2> <%= _("Can`t create new software: #{@errors.length} errors") %> </h2>
  22 + <h2> <%= _("Can`t create new software: %s errors") % @errors.length %> </h2>
23 23 <ul>
24 24 <% @errors.each do |error| %>
25 25 <li> <%= error %> </li>
... ...