Download as
Browse Code »

Commit 86364a8cdee21583cb7472e237f6e352d5306ceb

Authored by Antonio Terceiro
Committed by Antonio Terceiro
1 parent 4e30313c
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

Trying to fix GetText issues

Showing 3 changed files with 8 additions and 12 deletions   Show diff stats
app/controllers/application.rb
  Diff comments   View file @86364a8
@@ -66,9 +66,10 @@ class ApplicationController < ActionController::Base @@ -66,9 +66,10 @@ class ApplicationController < ActionController::Base
66 66
67 before_init_gettext :maybe_save_locale 67 before_init_gettext :maybe_save_locale
68 after_init_gettext :check_locale 68 after_init_gettext :check_locale
69 - if Noosfero.available_locales.size == 1  
70 - GetText.locale = Noosfero.available_locales.first  
71 - end 69 + #if Noosfero.available_locales.size == 1
  70 + #GetText.locale = Noosfero.available_locales.first
  71 + #end
  72 + include GetText
72 init_gettext 'noosfero' 73 init_gettext 'noosfero'
73 74
74 include NeedsProfile 75 include NeedsProfile
@@ -84,12 +85,6 @@ class ApplicationController < ActionController::Base @@ -84,12 +85,6 @@ class ApplicationController < ActionController::Base
84 verify :method => :post, :only => actions, :redirect_to => redirect 85 verify :method => :post, :only => actions, :redirect_to => redirect
85 end 86 end
86 87
87 - # Fix some problems with Single Table Inheritance  
88 - require_dependency 'textile_article'  
89 - require_dependency 'tiny_mce_article'  
90 - require_dependency 'text_article'  
91 - require_dependency 'article'  
92 -  
93 protected 88 protected
94 89
95 # TODO: move this logic somewhere else (Domain class?) 90 # TODO: move this logic somewhere else (Domain class?)
app/helpers/application_helper.rb
  Diff comments   View file @86364a8
@@ -330,9 +330,9 @@ module ApplicationHelper @@ -330,9 +330,9 @@ module ApplicationHelper
330 end 330 end
331 331
332 def theme_include(template) 332 def theme_include(template)
333 - file = ('../../public' + theme_path + '/' + template + '.rhtml')  
334 - if File.exists?(RAILS_ROOT + '/app/views/' + file)  
335 - render :file => file 333 + file = (RAILS_ROOT + '/public' + theme_path + '/' + template + '.rhtml')
  334 + if File.exists?(file)
  335 + render :file => file, :use_full_path => false
336 end 336 end
337 end 337 end
338 338
config/environment.rb
  Diff comments   View file @86364a8
@@ -11,6 +11,7 @@ RAILS_GEM_VERSION = '2.0.2' unless defined? RAILS_GEM_VERSION @@ -11,6 +11,7 @@ RAILS_GEM_VERSION = '2.0.2' unless defined? RAILS_GEM_VERSION
11 require File.join(File.dirname(__FILE__), 'boot') 11 require File.join(File.dirname(__FILE__), 'boot')
12 12
13 # locally-developed modules 13 # locally-developed modules
  14 +require 'locale'
14 require 'gettext/rails' 15 require 'gettext/rails'
15 require 'acts_as_filesystem' 16 require 'acts_as_filesystem'
16 require 'acts_as_having_settings' 17 require 'acts_as_having_settings'