07 Aug, 2014

1 commit

  • 34f8f4d7   Merge remote-tracking branch 'origin/stable' ... Browse File » 
    Hopefully this is the very last time we do this.

Conflicts:
	Rakefile
	app/controllers/my_profile/cms_controller.rb
	app/controllers/public/content_viewer_controller.rb
	app/helpers/application_helper.rb
	app/helpers/content_viewer_helper.rb
	app/models/article.rb
	app/models/enterprise.rb
	app/models/product_categories_block.rb
	app/models/products_block.rb
	app/views/account/_signup_form.rhtml
	app/views/blocks/my_network.rhtml
	app/views/blocks/profile_info.rhtml
	app/views/blocks/profile_info_actions/_community.html.erb
	app/views/blocks/profile_info_actions/_enterprise.html.erb
	app/views/blocks/profile_info_actions/_person.html.erb
	app/views/content_viewer/view_page.rhtml
	app/views/profile/index.rhtml
	app/views/shared/_disabled_enterprise.html.erb
	app/views/shared/articles_list.html.erb
	db/schema.rb
	debian/changelog
	lib/file_presenter.rb
	lib/noosfero.rb
	plugins/custom_forms/controllers/custom_forms_plugin_profile_controller.rb
	plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
	plugins/shopping_cart/test/functional/shopping_cart_plugin_controller_test.rb
	plugins/work_assignment/test/unit/work_assingment_plugin/work_assignment_test.rb
	plugins/work_assignment/test/unit/work_assingment_plugin_test.rb
	public/javascripts/application.js
	script/sample-articles
	script/sample-enterprises
	script/sample-products
	script/sample-profiles
	test/functional/cms_controller_test.rb
	test/functional/comment_controller_test.rb
	test/functional/content_viewer_controller_test.rb
	test/unit/application_helper_test.rb
	test/unit/article_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/folder_helper_test.rb
	test/unit/forum_helper_test.rb
    Antonio Terceiro
     

09 Jul, 2014

1 commit

13 May, 2014

1 commit

  • 23914711   Merge branch 'master' into rails3 ... Browse File » 
    Conflicts:
	app/helpers/application_helper.rb
	app/helpers/layout_helper.rb
	app/models/community.rb
	app/models/enterprise.rb
	app/models/product_category.rb
	app/views/account/change_password.html.erb
	config/boot.rb
	config/environment.rb
	config/routes.rb
	lib/noosfero/plugin.rb
	test/unit/enterprise_activation_test.rb
	test/unit/person_notifier_test.rb
    Rodrigo Souto
     

07 Apr, 2014

1 commit

25 Feb, 2014

1 commit

24 Sep, 2013

1 commit

27 Dec, 2012

1 commit

25 Dec, 2012

1 commit

06 Nov, 2012

5 commits

03 Mar, 2012

1 commit

28 Feb, 2012

1 commit

27 Feb, 2012

1 commit

04 Jan, 2012

1 commit

27 Nov, 2011

1 commit

  • d35779c0   Merge branch 'master' into rails-2.3.5 ... Browse File » 
    Conflicts:
	app/controllers/admin_controller.rb
	app/controllers/application.rb
	app/controllers/public/account_controller.rb
	app/controllers/public/content_viewer_controller.rb
	lib/noosfero/i18n.rb
	test/functional/account_controller_test.rb
	test/functional/admin_controller_test.rb
	test/unit/contact_test.rb
	test/unit/profile_test.rb
    Antonio Terceiro
     

20 Jun, 2011

1 commit

12 Apr, 2011

1 commit

22 Feb, 2011

2 commits

31 Jan, 2011

1 commit

30 Jul, 2010

1 commit

08 Jul, 2010

1 commit

09 Jun, 2010

1 commit

30 Apr, 2010

1 commit

05 Apr, 2010

1 commit

  • ecd3f312   Replacing Ruby-GetText with fast_gettext ... Browse File » 
    Besides being faster, consumming less memory, and being thread-safe,
fast_gettext's approach is cleaner than Ruby-GetText's because it does not
mess with the Rails internals. That's probably due to the fact that
fast_gettext was designed after Rails had proper I18N support, so that's
not exactly Ruby-GetText's fault. Current versions of Ruby-GetText are
claimed to be thread-safe as well, but I decided to go with fast_gettext
regardless.

I am messing with the Rails internals myself by copying some code from
Ruby-Gettext, but that code will be dropped when we upgrade to a more
recent Rails version with proper I18N. Code was copied from Ruby-GetText
to implement:

    * per-language cache
    * validation error messages translation

During initialization, the needed .mo files installed system-wide are
symlinked locally.  By doing this we can take "similar" locales locally
since fast_gettext does not seem to support loading of files from similar
locales (e.g.  loading pt_BR/LC_MESSAGES/domain.mo when
pt/LC_MESSAGES/domain.mo is not available).

This hopefully will fix the long-standing bug with messed up translations
due to high concurrency and non-thread-safety of the version of
Ruby-GetText in Debian Lenny.

(ActionItem1315)
    Antonio Terceiro
     

31 Oct, 2009

1 commit

26 Oct, 2009

1 commit

23 Sep, 2009

1 commit

22 Sep, 2009

2 commits

24 Jul, 2009

1 commit

21 Jul, 2009

1 commit

11 Jul, 2009

1 commit

08 Jul, 2009

1 commit

25 May, 2009

1 commit

29 Apr, 2009

1 commit

27 Apr, 2009

1 commit