Download as
Browse Code »

Commit 09b9a114d29a9c48790bc2b70786c2cf13f61fb3

Authored by Antonio Terceiro
1 parent 606ef8eb
Exists in master and in 23 other branches activate_plugin, api_fixies, api_tasks, article_blog_visualization_format, article_layout_refactoring, article_layout_temp, blog_page_bug, clone_article, communities_ratings, design_template, event_layout, fix_forum, fix_optional_fields, fix_suggest_article, folder_improvments, manage_organization, merge_deactive_and_ban, news_page, script_to_update, stable, template_mirror_block, tests, tests_fixies

ActionItem862: removing dependency on deprecated library

Showing 2 changed files with 0 additions and 11 deletions   Show diff stats
app/controllers/application.rb
  Diff comments   View file @09b9a11
@@ -128,16 +128,6 @@ class ApplicationController < ActionController::Base @@ -128,16 +128,6 @@ class ApplicationController < ActionController::Base
128 end 128 end
129 RAILS_DEFAULT_LOGGER.info('Locale reverted from %s to %s' % [old_locale, locale]) 129 RAILS_DEFAULT_LOGGER.info('Locale reverted from %s to %s' % [old_locale, locale])
130 end 130 end
131 -  
132 - # now set the system locale  
133 - system_locale = '%s.utf8' % locale  
134 - begin  
135 - Locale.setlocale(Locale::LC_TIME, system_locale)  
136 - rescue Exception => e  
137 - # fallback to C  
138 - RAILS_DEFAULT_LOGGER.info("Locale #{system_locale} not available, falling back to the portable \"C\" locale (consider installing the #{system_locale} locale in your system)")  
139 - Locale.setlocale(Locale::LC_TIME, 'C')  
140 - end  
141 end 131 end
142 132
143 def load_category 133 def load_category
config/environment.rb
  Diff comments   View file @09b9a11
@@ -88,7 +88,6 @@ Noosfero.locales = { @@ -88,7 +88,6 @@ Noosfero.locales = {
88 } 88 }
89 # if you want to override this, do it in config/local.rb ! 89 # if you want to override this, do it in config/local.rb !
90 Noosfero.default_locale = 'en' 90 Noosfero.default_locale = 'en'
91 -require 'locale.so'  
92 91
93 Tag.hierarchical = true 92 Tag.hierarchical = true
94 93