Download as
Browse Code »

Commit 12fdb928b25e6dd8ecefa5c6bb148c8eb4ee83da

Authored by Rodrigo Souto
1 parent 34268f13
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

noosfero-load: avoid multiple loads of noosfero module

Showing 8 changed files with 10 additions and 9 deletions   Show diff stats
config/environment.rb
  Diff comments   View file @12fdb92
@@ -120,7 +120,8 @@ Noosfero.default_locale = nil @@ -120,7 +120,8 @@ Noosfero.default_locale = nil
120 Tag.hierarchical = true 120 Tag.hierarchical = true
121 121
122 # several local libraries 122 # several local libraries
123 -require 'noosfero' 123 +
  124 +require_dependency 'noosfero'
124 require 'sqlite_extension' 125 require 'sqlite_extension'
125 126
126 # load a local configuration if present, but not under test environment. 127 # load a local configuration if present, but not under test environment.
config/routes.rb
  Diff comments   View file @12fdb92
1 -require 'noosfero' 1 +require_dependency 'noosfero'
2 2
3 ActionController::Routing::Routes.draw do |map| 3 ActionController::Routing::Routes.draw do |map|
4 # The priority is based upon order of creation: first created -> highest priority. 4 # The priority is based upon order of creation: first created -> highest priority.
lib/noosfero/plugin.rb
  Diff comments   View file @12fdb92
1 -require 'noosfero' 1 +require_dependency 'noosfero'
2 include ActionView::Helpers::AssetTagHelper 2 include ActionView::Helpers::AssetTagHelper
3 3
4 class Noosfero::Plugin 4 class Noosfero::Plugin
lib/tasks/doc.rake
  Diff comments   View file @12fdb92
@@ -92,7 +92,7 @@ namespace :noosfero do @@ -92,7 +92,7 @@ namespace :noosfero do
92 92
93 po4a_conf = 'tmp/po4a.conf' 93 po4a_conf = 'tmp/po4a.conf'
94 file po4a_conf => english_xhtml do 94 file po4a_conf => english_xhtml do
95 - require 'noosfero' 95 + require_dependency 'noosfero'
96 begin 96 begin
97 File.open(po4a_conf, 'w') do |file| 97 File.open(po4a_conf, 'w') do |file|
98 file.puts "[po4a_langs] #{(Noosfero.locales.keys - ['en']).join(' ')}" 98 file.puts "[po4a_langs] #{(Noosfero.locales.keys - ['en']).join(' ')}"
@@ -136,7 +136,7 @@ namespace :noosfero do @@ -136,7 +136,7 @@ namespace :noosfero do
136 desc "Translates Noosfero online documentation (does not touch PO files)" 136 desc "Translates Noosfero online documentation (does not touch PO files)"
137 task :translate => [:link_plugins_textiles, :do_translation] 137 task :translate => [:link_plugins_textiles, :do_translation]
138 task :do_translation => english_xhtml do 138 task :do_translation => english_xhtml do
139 - require 'noosfero' 139 + require_dependency 'noosfero'
140 languages = Noosfero.locales.keys - ['en'] 140 languages = Noosfero.locales.keys - ['en']
141 languages.each do |lang| 141 languages.each do |lang|
142 po = "po/#{lang}/noosfero-doc.po" 142 po = "po/#{lang}/noosfero-doc.po"
lib/tasks/gettext.rake
  Diff comments   View file @12fdb92
@@ -39,7 +39,7 @@ end @@ -39,7 +39,7 @@ end
39 desc "Update pot/po files to match new version." 39 desc "Update pot/po files to match new version."
40 task :updatepo do 40 task :updatepo do
41 require 'gettext_rails/tools' 41 require 'gettext_rails/tools'
42 - require 'noosfero' 42 + require_dependency 'noosfero'
43 43
44 GetText::RubyParser::ID << '__' 44 GetText::RubyParser::ID << '__'
45 GetText::RubyParser::PLURAL_ID << 'n__' 45 GetText::RubyParser::PLURAL_ID << 'n__'
lib/tasks/package.rake
  Diff comments   View file @12fdb92
1 1
2 desc "Generate source tarball" 2 desc "Generate source tarball"
3 task :package => 'package:clobber' do 3 task :package => 'package:clobber' do
4 - require 'noosfero' 4 + require_dependency 'noosfero'
5 begin 5 begin
6 sh 'test -d .git' 6 sh 'test -d .git'
7 rescue 7 rescue
lib/tasks/release.rake
  Diff comments   View file @12fdb92
@@ -39,7 +39,7 @@ namespace :noosfero do @@ -39,7 +39,7 @@ namespace :noosfero do
39 end 39 end
40 40
41 def version 41 def version
42 - require 'noosfero' 42 + require_dependency 'noosfero'
43 Noosfero::VERSION 43 Noosfero::VERSION
44 end 44 end
45 45
lib/tasks/version.rake
  Diff comments   View file @12fdb92
1 desc "shows noosfero version" 1 desc "shows noosfero version"
2 task :version do 2 task :version do
3 - require 'noosfero' 3 + require_dependency 'noosfero'
4 puts "noosfero, version #{Noosfero::VERSION}" 4 puts "noosfero, version #{Noosfero::VERSION}"
5 end 5 end