Add locales files into noosfero plugins

- plugins: gov_user, software_communities - Update translation on errors of create institution - Update translation on error of create software Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com> Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>

Add locales files into noosfero plugins
- plugins: gov_user, software_communities - Update translation on errors of create institution - Update translation on error of create software Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com> Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
Luciano Prestes · Daniela Feitosa
1 parent 523171af
Showing 7 changed files with 36 additions and 21 deletions Show diff stats
src/noosfero-spb/gov_user/controllers/gov_user_plugin_controller.rb
src/noosfero-spb/gov_user/locales/pt-BR.yml
src/noosfero-spb/gov_user/public/views/create-institution.js
src/noosfero-spb/software_communities/locales/pt-BR.yml
src/noosfero-spb/software_communities/po/pt/software_communities.po
src/noosfero-spb/software_communities/po/software_communities.pot
src/noosfero-spb/software_communities/views/software_communities_plugin_myprofile/new_software.html.erb
@@ -217,8 +217,8 @@ class GovUserPluginController &lt; ApplicationController
   end
   def save_institution institution
-    inst_errors = institution.errors.messages
-    com_errors = institution.community.errors.messages
+    inst_errors = institution.errors.full_messages
+    com_errors = institution.community.errors.full_messages
     set_errors institution
@@ -230,7 +230,7 @@ class GovUserPluginController &lt; ApplicationController
     else
       { :success => false,
         :message => _("Institution could not be created!"),
-        :errors => inst_errors.merge(com_errors)
+        :errors => inst_errors + com_errors
       }
     end
   end
@@ -0,0 +1 @@
+../../software_communities/locales/pt-BR.yml
 \ No newline at end of file
@@ -113,12 +113,8 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
     var errors = "<ul>";
     var field_name;
-    for(var error_key in response.errors) {
-      field_name = adjust_error_key(error_key);
-
-      if(response.errors[error_key].length > 0){
-        errors += "<li><b>"+field_name+"</b>: "+response.errors[error_key]+"</li>";
-      }
+    for(var error in response.errors) {
+        errors += "<li>"+response.errors[error]+"</li>";
     }
     errors += "</ul>";
@@ -147,14 +143,6 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
   }
-  function adjust_error_key(error_key) {
-    var text = error_key.replace(/_/, " ");
-    text = text.charAt(0).toUpperCase() + text.slice(1);
-
-    return text;
-  }
-
-
   function save_institution(evt) {
     evt.preventDefault();
@@ -0,0 +1,26 @@
+# encoding: UTF-8
+
+"pt-BR": &pt-BR
+
+  activerecord:
+    attributes:
+      community:
+        name: 'Nome'
+        state: 'Estado'
+        city: 'Cidade'
+      software_info:
+        finality: 'Finalidade'
+      license_info:
+        version: 'Versão'
+      institution:
+        name: 'Nome'
+        state: 'Estado'
+        city: 'Cidade'
+        governmental_power: 'Poder Governamental'
+        governmental_sphere: 'Esfera Governamental'
+        juridical_nature: 'Natureza Jurídica'
+
+'pt_BR':
+  <<: *pt-BR
+'pt':
+  <<: *pt-BR
@@ -860,8 +860,8 @@ msgstr &quot;&quot;
 "e critérios"
 #: plugins/software_communities/views/software_communities_plugin_myprofile/new_software.html.erb:22
-msgid "\"Can`t create new software: #{@errors.length} errors\""
-msgstr "\"Não foi possível criar o software: #{@errors.length} errors\""
+msgid "Can`t create new software: %s errors"
+msgstr "Não foi possível criar o software: %s erros"
 #: plugins/software_communities/views/software_communities_plugin_myprofile/new_software.html.erb:45
 msgid "Domain"
@@ -825,7 +825,7 @@ msgid &quot;&quot;
 msgstr ""
 #: plugins/software_communities/views/software_communities_plugin_myprofile/new_software.html.erb:22
-msgid "\"Can`t create new software: #{@errors.length} errors\""
+msgid "Can`t create new software: %s errors"
 msgstr ""
 #: plugins/software_communities/views/software_communities_plugin_myprofile/new_software.html.erb:45
@@ -19,7 +19,7 @@
 <% unless @errors.blank? %>
 <div class="errorExplanation" id="errorExplanation">
-  <h2> <%= _("Can`t create new software: #{@errors.length} errors") %> </h2>
+  <h2> <%= _("Can`t create new software: %s errors") % @errors.length %> </h2>
   <ul>
   <% @errors.each do |error| %>
     <li> <%= error %> </li>
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+../../software_communities/locales/pt-BR.yml
0	\ No newline at end of file	2	\ No newline at end of file
	@@ -113,12 +113,8 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement']		@@ -113,12 +113,8 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement']
113	var errors = "<ul>";	113	var errors = "<ul>";
114	var field_name;	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	errors += "</ul>";	120	errors += "</ul>";
	@@ -147,14 +143,6 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement']		@@ -147,14 +143,6 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement']
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	function save_institution(evt) {	146	function save_institution(evt) {
159	evt.preventDefault();	147	evt.preventDefault();
160		148
@@ -0,0 +1,26 @@		@@ -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
	@@ -825,7 +825,7 @@ msgid ""		@@ -825,7 +825,7 @@ msgid ""
825	msgstr ""	825	msgstr ""
826		826
827	#: plugins/software_communities/views/software_communities_plugin_myprofile/new_software.html.erb:22	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	msgstr ""	829	msgstr ""
830		830
831	#: plugins/software_communities/views/software_communities_plugin_myprofile/new_software.html.erb:45	831	#: plugins/software_communities/views/software_communities_plugin_myprofile/new_software.html.erb:45
	@@ -19,7 +19,7 @@		@@ -19,7 +19,7 @@
19		19
20	<% unless @errors.blank? %>	20	<% unless @errors.blank? %>
21	<div class="errorExplanation" id="errorExplanation">	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	<ul>	23	<ul>
24	<% @errors.each do \|error\| %>	24	<% @errors.each do \|error\| %>
25	<li> <%= error %> </li>	25	<li> <%= error %> </li>