ActionItem68: s/virtual community/environment/

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@515 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem68: s/virtual community/environment/
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@515 3f533792-8f58-4932-b0fe-aaf55b0a4547
AntonioTerceiro
1 parent bee6e16e
Showing 11 changed files with 28 additions and 28 deletions Show diff stats
app/models/environment.rb
app/views/account/index.rhtml
app/views/account/index_anonymous.rhtml
app/views/admin_panel/index.rhtml
app/views/features/index.rhtml
config/routes.rb
po/noosfero.pot
po/pt_BR/noosfero.po
test/fixtures/design_boxes.yml
test/integration/routing_test.rb
test/unit/environment_test.rb
@@ -63,13 +63,13 @@ class Environment &lt; ActiveRecord::Base
     end
   end
-  # the virtual community's terms of use: every user must accept them before
+  # the environment's terms of use: every user must accept them before
   # registering.
   def terms_of_use
     self.settings['terms_of_use']
   end
-  # sets the virtual community's terms of use.
+  # sets the environment's terms of use.
   def terms_of_use=(value)
     self.settings['terms_of_use'] = value
   end
@@ -117,7 +117,7 @@ class Environment &lt; ActiveRecord::Base
   # <tt>name</tt> is mandatory
   validates_presence_of :name
-  # only one virtual community can be the default one
+  # only one environment can be the default one
   validates_uniqueness_of :is_default, :if => (lambda do |environment| environment.is_default? end), :message => _('Only one Virtual Community can be the default one')
   # #################################################
@@ -23,5 +23,5 @@
 <p>
 <%= link_to _('Logout.'), :action => 'logout' %>
-<%= _('It is always a good idea to make a logout when you finish using the virtual community.')%>
+<%= _('It is always a good idea to make a logout when you finish using the environment.')%>
 </p>
@@ -2,10 +2,10 @@
 <p>
 <%= link_to _('Login.'), :action => 'login' %>
-<%= _('You need to login to be able to use all the features in this virtual community.') %>
+<%= _('You need to login to be able to use all the features in this environment.') %>
 </p>
 <p>
 <%= link_to _('Sign up.'), :action => 'signup' %>
-<%= _('If you are not an user already, you can register now to become a member of this virtual community.') %>
+<%= _('If you are not an user already, you can register now to become a member of this environment.') %>
 </p>
 <h1><%= _('Administrator Panel') %></h1>
-<p><%= _('You, as an virtual community administrator, has the following options:')%></p>
+<p><%= _('You, as an environment administrator, has the following options:')%></p>
 <ul>
   <li><%= link_to _('Enable/disable features'), :controller => 'features' %></li>
@@ -2,6 +2,6 @@
 <%= render :partial => 'features_table' %>
-<%= help_textile _('Here you can enable or disable several features of your virtual community. Each feature represents some funcionality that your virtual community can use if you enable it.
+<%= help_textile _('Here you can enable or disable several features of your environment. Each feature represents some funcionality that your environment can use if you enable it.
-Check all the features you want to enable for your virtual community, uncheck all the ones you don\t want, and use the \'Save changes\' button to confirm your changes.') %>
+Check all the features you want to enable for your environment, uncheck all the ones you don\t want, and use the \'Save changes\' button to confirm your changes.') %>
@@ -32,14 +32,14 @@ ActionController::Routing::Routes.draw do |map|
   ######################################################
   ## Controllers that are used by environment admin
   ######################################################
-  # administrative tasks for a virtual community
+  # administrative tasks for a environment
   map.admin 'admin', :controller => 'admin_panel'
   map.admin 'admin/:controller/:action/:id', :controller => Noosfero.pattern_for_controllers_in_directory('environment_admin')
   ######################################################
   ## Controllers that are used by system admin
   ######################################################
-  # administrative tasks for a virtual community
+  # administrative tasks for a environment
   map.system 'system', :controller => 'system'
   map.system 'system/:controller/:action/:id', :controller => Noosfero.pattern_for_controllers_in_directory('system_admin')
@@ -227,7 +227,7 @@ msgid &quot;PersonInfo|Contact information&quot;
 msgstr ""
 #: app/models/environment.rb:-
-msgid "virtual community"
+msgid "environment"
 msgstr ""
 #: app/models/environment.rb:-
@@ -979,7 +979,7 @@ msgid &quot;Administrator Panel&quot;
 msgstr ""
 #: app/views/admin_panel/index.rhtml:3
-msgid "You, as an virtual community administrator, has the following options:"
+msgid "You, as an environment administrator, has the following options:"
 msgstr ""
 #: app/views/admin_panel/index.rhtml:6
@@ -1023,7 +1023,7 @@ msgstr &quot;&quot;
 #: app/views/account/index_anonymous.rhtml:10
 msgid ""
 "If you are not an user already, you can register now to become a member of "
-"this virtual community."
+"this environment."
 msgstr ""
 #: app/views/account/change_password.rhtml:1
@@ -1087,11 +1087,11 @@ msgstr &quot;&quot;
 #: app/views/features/index.rhtml:5
 msgid ""
-"Here you can enable or disable several features of your virtual community. "
-"Each feature represents some funcionality that your virtual community can "
+"Here you can enable or disable several features of your environment. "
+"Each feature represents some funcionality that your environment can "
 "use if you enable it.\n"
 "\n"
-"Check all the features you want to enable for your virtual community, "
+"Check all the features you want to enable for your environment, "
 "uncheck all the ones you don\t want, and use the 'Save changes' button to "
 "confirm your changes."
 msgstr ""
@@ -229,7 +229,7 @@ msgid &quot;PersonInfo|Contact information&quot;
 msgstr "Informação de contato"
 #: app/models/environment.rb:-
-msgid "virtual community"
+msgid "environment"
 msgstr "comunidade virtual"
 #: app/models/environment.rb:-
@@ -985,7 +985,7 @@ msgid &quot;Administrator Panel&quot;
 msgstr "Painel do Administrador"
 #: app/views/admin_panel/index.rhtml:3
-msgid "You, as an virtual community administrator, has the following options:"
+msgid "You, as an environment administrator, has the following options:"
 msgstr ""
 "Você, como administrador de comunidade virtual, tem as seguintes opções:"
@@ -1032,7 +1032,7 @@ msgstr &quot;Registre-se.&quot;
 #: app/views/account/index_anonymous.rhtml:10
 msgid ""
 "If you are not an user already, you can register now to become a member of "
-"this virtual community."
+"this environment."
 msgstr ""
 "Se você ainda não é um usuário, você pode se registrar agora e se tornar um "
 "membro desse comunidade virtual."
@@ -1100,11 +1100,11 @@ msgstr &quot;Habilitar/Desabilitar funcionalidades&quot;
 #: app/views/features/index.rhtml:5
 msgid ""
-"Here you can enable or disable several features of your virtual community. "
-"Each feature represents some funcionality that your virtual community can "
+"Here you can enable or disable several features of your environment. "
+"Each feature represents some funcionality that your environment can "
 "use if you enable it.\n"
 "\n"
-"Check all the features you want to enable for your virtual community, "
+"Check all the features you want to enable for your environment, "
 "uncheck all the ones you don\t want, and use the 'Save changes' button to "
 "confirm your changes."
 msgstr ""
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-# none: creating a virtual community alerady creates its boxes. Thanks to
+# none: creating a environment alerady creates its boxes. Thanks to
 # acts_as_design
@@ -34,7 +34,7 @@ class RoutingTest &lt; ActionController::IntegrationTest
     assert_routing('/myprofile/ze', :profile => 'ze', :controller => 'profile_editor', :action => 'index')
   end
-  # virtual community administrative controllers (admin/*)
+  # environment administrative controllers (admin/*)
   ################################################################
   def test_admin_panel_controller
@@ -63,12 +63,12 @@ class EnvironmentTest &lt; Test::Unit::TestCase
   end
   def test_terms_of_use
-    v = Environment.new(:name => 'My test virtual community')
+    v = Environment.new(:name => 'My test environment')
     assert_nil v.terms_of_use
-    v.terms_of_use = 'To be part of this virtual community, you must accept the following terms: ...'
+    v.terms_of_use = 'To be part of this environment, you must accept the following terms: ...'
     assert v.save
     id = v.id
-    assert_equal 'To be part of this virtual community, you must accept the following terms: ...', Environment.find(id).terms_of_use
+    assert_equal 'To be part of this environment, you must accept the following terms: ...', Environment.find(id).terms_of_use
   end
   def test_has_terms_of_use
	@@ -63,13 +63,13 @@ class Environment < ActiveRecord::Base		@@ -63,13 +63,13 @@ class Environment < ActiveRecord::Base
63	end	63	end
64	end	64	end
65		65
66	- # the virtual community's terms of use: every user must accept them before	66	+ # the environment's terms of use: every user must accept them before
67	# registering.	67	# registering.
68	def terms_of_use	68	def terms_of_use
69	self.settings['terms_of_use']	69	self.settings['terms_of_use']
70	end	70	end
71		71
72	- # sets the virtual community's terms of use.	72	+ # sets the environment's terms of use.
73	def terms_of_use=(value)	73	def terms_of_use=(value)
74	self.settings['terms_of_use'] = value	74	self.settings['terms_of_use'] = value
75	end	75	end
	@@ -117,7 +117,7 @@ class Environment < ActiveRecord::Base		@@ -117,7 +117,7 @@ class Environment < ActiveRecord::Base
117	# <tt>name</tt> is mandatory	117	# <tt>name</tt> is mandatory
118	validates_presence_of :name	118	validates_presence_of :name
119		119
120	- # only one virtual community can be the default one	120	+ # only one environment can be the default one
121	validates_uniqueness_of :is_default, :if => (lambda do \|environment\| environment.is_default? end), :message => _('Only one Virtual Community can be the default one')	121	validates_uniqueness_of :is_default, :if => (lambda do \|environment\| environment.is_default? end), :message => _('Only one Virtual Community can be the default one')
122		122
123	# #################################################	123	# #################################################
	@@ -23,5 +23,5 @@		@@ -23,5 +23,5 @@
23		23
24	<p>	24	<p>
25	<%= link_to _('Logout.'), :action => 'logout' %>	25	<%= link_to _('Logout.'), :action => 'logout' %>
26	-<%= _('It is always a good idea to make a logout when you finish using the virtual community.')%>	26	+<%= _('It is always a good idea to make a logout when you finish using the environment.')%>
27	</p>	27	</p>
	@@ -2,10 +2,10 @@		@@ -2,10 +2,10 @@
2		2
3	<p>	3	<p>
4	<%= link_to _('Login.'), :action => 'login' %>	4	<%= link_to _('Login.'), :action => 'login' %>
5	-<%= _('You need to login to be able to use all the features in this virtual community.') %>	5	+<%= _('You need to login to be able to use all the features in this environment.') %>
6	</p>	6	</p>
7		7
8	<p>	8	<p>
9	<%= link_to _('Sign up.'), :action => 'signup' %>	9	<%= link_to _('Sign up.'), :action => 'signup' %>
10	-<%= _('If you are not an user already, you can register now to become a member of this virtual community.') %>	10	+<%= _('If you are not an user already, you can register now to become a member of this environment.') %>
11	</p>	11	</p>
1	<h1><%= _('Administrator Panel') %></h1>	1	<h1><%= _('Administrator Panel') %></h1>
2		2
3	-<p><%= _('You, as an virtual community administrator, has the following options:')%></p>	3	+<p><%= _('You, as an environment administrator, has the following options:')%></p>
4		4
5	<ul>	5	<ul>
6	<li><%= link_to _('Enable/disable features'), :controller => 'features' %></li>	6	<li><%= link_to _('Enable/disable features'), :controller => 'features' %></li>
	@@ -2,6 +2,6 @@		@@ -2,6 +2,6 @@
2		2
3	<%= render :partial => 'features_table' %>	3	<%= render :partial => 'features_table' %>
4		4
5	-<%= help_textile _('Here you can enable or disable several features of your virtual community. Each feature represents some funcionality that your virtual community can use if you enable it.	5	+<%= help_textile _('Here you can enable or disable several features of your environment. Each feature represents some funcionality that your environment can use if you enable it.
6		6
7	-Check all the features you want to enable for your virtual community, uncheck all the ones you don\t want, and use the \'Save changes\' button to confirm your changes.') %>	7	+Check all the features you want to enable for your environment, uncheck all the ones you don\t want, and use the \'Save changes\' button to confirm your changes.') %>
	@@ -32,14 +32,14 @@ ActionController::Routing::Routes.draw do \|map\|		@@ -32,14 +32,14 @@ ActionController::Routing::Routes.draw do \|map\|
32	######################################################	32	######################################################
33	## Controllers that are used by environment admin	33	## Controllers that are used by environment admin
34	######################################################	34	######################################################
35	- # administrative tasks for a virtual community	35	+ # administrative tasks for a environment
36	map.admin 'admin', :controller => 'admin_panel'	36	map.admin 'admin', :controller => 'admin_panel'
37	map.admin 'admin/:controller/:action/:id', :controller => Noosfero.pattern_for_controllers_in_directory('environment_admin')	37	map.admin 'admin/:controller/:action/:id', :controller => Noosfero.pattern_for_controllers_in_directory('environment_admin')
38		38
39	######################################################	39	######################################################
40	## Controllers that are used by system admin	40	## Controllers that are used by system admin
41	######################################################	41	######################################################
42	- # administrative tasks for a virtual community	42	+ # administrative tasks for a environment
43	map.system 'system', :controller => 'system'	43	map.system 'system', :controller => 'system'
44	map.system 'system/:controller/:action/:id', :controller => Noosfero.pattern_for_controllers_in_directory('system_admin')	44	map.system 'system/:controller/:action/:id', :controller => Noosfero.pattern_for_controllers_in_directory('system_admin')
45		45
1	# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html	1	# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
2	-# none: creating a virtual community alerady creates its boxes. Thanks to	2	+# none: creating a environment alerady creates its boxes. Thanks to
3	# acts_as_design	3	# acts_as_design
	@@ -34,7 +34,7 @@ class RoutingTest < ActionController::IntegrationTest		@@ -34,7 +34,7 @@ class RoutingTest < ActionController::IntegrationTest
34	assert_routing('/myprofile/ze', :profile => 'ze', :controller => 'profile_editor', :action => 'index')	34	assert_routing('/myprofile/ze', :profile => 'ze', :controller => 'profile_editor', :action => 'index')
35	end	35	end
36		36
37	- # virtual community administrative controllers (admin/*)	37	+ # environment administrative controllers (admin/*)
38	################################################################	38	################################################################
39		39
40	def test_admin_panel_controller	40	def test_admin_panel_controller
	@@ -63,12 +63,12 @@ class EnvironmentTest < Test::Unit::TestCase		@@ -63,12 +63,12 @@ class EnvironmentTest < Test::Unit::TestCase
63	end	63	end
64		64
65	def test_terms_of_use	65	def test_terms_of_use
66	- v = Environment.new(:name => 'My test virtual community')	66	+ v = Environment.new(:name => 'My test environment')
67	assert_nil v.terms_of_use	67	assert_nil v.terms_of_use
68	- v.terms_of_use = 'To be part of this virtual community, you must accept the following terms: ...'	68	+ v.terms_of_use = 'To be part of this environment, you must accept the following terms: ...'
69	assert v.save	69	assert v.save
70	id = v.id	70	id = v.id
71	- assert_equal 'To be part of this virtual community, you must accept the following terms: ...', Environment.find(id).terms_of_use	71	+ assert_equal 'To be part of this environment, you must accept the following terms: ...', Environment.find(id).terms_of_use
72	end	72	end
73		73
74	def test_has_terms_of_use	74	def test_has_terms_of_use