Changeset 1206

Show
Ignore:
Timestamp:
07/12/08 09:20:35 (6 months ago)
Author:
piyawat
Message:

use the locale setting from Site.current_site

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/app/controllers/application.rb

    r1195 r1206  
    3838  def initialize 
    3939 
    40     GetText.locale = Site.available_locales.include?($DEFAULT_LOCALE) ? $DEFAULT_LOCALE : 'en_US' 
    41  
    4240    # @site initialization 
    4341    @site = Site.current_site 
     42 
     43    #GetText.locale = Site.available_locales.include?($DEFAULT_LOCALE) ? $DEFAULT_LOCALE : 'en_US' 
     44    GetText.locale = Site.available_locales.include?(@site.locale) ? @site.locale : 'en_US' 
    4445 
    4546    # theme