Changeset 1240

Timestamp:

09/19/08 21:40:47 (4 months ago)

Author:

piyawat

Message:

fix gettext/rails according to the new style usages recommended on its site.

Files:

• trunk/app/controllers/application.rb (modified) (3 diffs)
• trunk/config/environment.rb (modified) (2 diffs)

trunk/app/controllers/application.rb

@@ -5 +5 @@
-
-require "cgi"
-
-require "gettext/rails"
-
-require "RMagick"
@@ -17 +15 @@
-class ApplicationController < ActionController::Base
-
-# init first; so, site.rb can work
+GetText.locale = $DEFAULT_LOCALE
-  init_gettext "kv"
-
@@ -40 +38 @@
-    # @site initialization
-    @site = Site.current_site
-
-    #GetText.locale = Site.available_locales.include?($DEFAULT_LOCALE) ? $DEFAULT_LOCALE : 'en_US'
-    GetText.locale = Site.available_locales.include?(@site.locale) ? @site.locale : 'en_US'
-
-    # theme

trunk/config/environment.rb

@@ -39 +39 @@
-  
-  # See Rails::Configuration for more options
+  
+  config.gem "gettext", :lib => "gettext/rails"
-end
-
@@ -52 +54 @@
-# Include your application configuration below
-
-$KCODE = 'u'
-
-require 'jcode'
-
-require 'cached_model'
-