Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

app/models/journal.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 # Redmine - project management software
 # Copyright (C) 2006-2013  Jean-Philippe Lang
 #

config/application.rb

@@ -48,10 +48,8 @@ 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
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"