diff --git a/app/controllers/concerns/localized.rb b/app/controllers/concerns/localized.rb
index 8aa5d255ea..fe1142f345 100644
--- a/app/controllers/concerns/localized.rb
+++ b/app/controllers/concerns/localized.rb
@@ -8,10 +8,9 @@ module Localized
   end
 
   def set_locale
-    locale ='zh-CN'
-    #locale   = current_user.locale if respond_to?(:user_signed_in?) && user_signed_in?
-    #locale ||= session[:locale] ||= default_locale
-    #locale   = default_locale unless I18n.available_locales.include?(locale.to_sym)
+    locale   = current_user.locale if respond_to?(:user_signed_in?) && user_signed_in?
+    locale ||= session[:locale] ||= default_locale
+    locale   = default_locale unless I18n.available_locales.include?(locale.to_sym)
 
     I18n.with_locale(locale) do
       yield
diff --git a/app/javascript/styles/closed-social/timeline_comments.scss b/app/javascript/styles/closed-social/timeline_comments.scss
index e82944f161..0a7c2271ed 100644
--- a/app/javascript/styles/closed-social/timeline_comments.scss
+++ b/app/javascript/styles/closed-social/timeline_comments.scss
@@ -1,6 +1,7 @@
 .comments-timeline {
   max-height: 160px;
   min-width: 60%;
+  max-width: 100%;
   overflow: hidden;
   -webkit-mask-image: linear-gradient(#1a1a1a,transparent);
   mask-image: linear-gradient(#1a1a1a,transparent);
diff --git a/config/application.rb b/config/application.rb
index ad6cf82d70..269f36755b 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -119,7 +119,7 @@ module Mastodon
     config.i18n.default_locale = ENV['DEFAULT_LOCALE']&.to_sym
 
     unless config.i18n.available_locales.include?(config.i18n.default_locale)
-      config.i18n.default_locale = :en
+      config.i18n.default_locale = :'zh-CN'
     end
 
     # config.paths.add File.join('app', 'api'), glob: File.join('**', '*.rb')