diff --git a/app/models/journal.rb b/app/models/journal.rb
index ed76c65a7..c40175dca 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 # Redmine - project management software
 # Copyright (C) 2006-2013  Jean-Philippe Lang
 #
diff --git a/config/application.rb b/config/application.rb
index f2dbae78c..a1e14e0d9 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -48,10 +48,10 @@ module RedmineApp
 
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    config.i18n.default_locale = :zh
+    # config.i18n.default_locale = :zh
 
-    # config.i18n.enforce_available_locales = false
-    # I18n.config.enforce_available_locales = false
+    config.i18n.enforce_available_locales = false
+    I18n.config.enforce_available_locales = false
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"