Initial conversion to Rails 2.2 I18n

alexwind · Dec 3, 2008 · d82fd5f · d82fd5f
1 parent ace6548
commit d82fd5f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/config/config_schema.yml b/config/config_schema.yml
@@ -117,7 +117,7 @@ general:
   # Localisation
   default_language: 
     handler: StringConfigHandler
-    default: en-US
+    default: en
     comment: ""
     order: 10
 

diff --git a/lang/ui/en-US.yml → config/locales/en.yml b/lang/ui/en-US.yml → config/locales/en.yml
diff --git a/lib/config_system.rb b/lib/config_system.rb
@@ -128,7 +128,7 @@ def self.load_sys
     } : nil
 
     # Globalite
-    Globalite.locale = AppConfig.default_language.nil? ? 'en-US' : AppConfig.default_language
+    I18n.default_locale= AppConfig.default_language.nil? ? 'en' : AppConfig.default_language
   end
 
   def self.try_libs
@@ -138,4 +138,4 @@ def self.try_libs
     @@tried_libs = true
   end
 
-end
+end