Merge branch 'standalone_develop' into pre_trustie_server

config/initializers/doorkeeper.rb

@@ -361,7 +361,7 @@ Doorkeeper.configure do
   #   https://datatracker.ietf.org/doc/html/rfc6819#section-4.4.3
   #
   #
-  grant_flows %w[authorization_code client_credentials password]
+  grant_flows %w[authorization_code client_credentials password refresh_token]
 
   # Allows to customize OAuth grant flows that +each+ application support.
   # You can configure a custom block (or use a class respond to `#call`) that must

config/locales/zh-CN.yml

@@ -223,6 +223,14 @@ zh-CN:
         platform: '直播平台'
         live_time: '开播时间'
         duration: '直播时长'
+      project_language:
+        name: '项目语言'
+      license: 
+        name: '许可证名称'
+        content: '许可证内容'
+      ignore:
+        name: 'git忽略文件名称'
+        content: 'git忽略文件内容'
     close_pr: 合并请求
   roles: 
     Developer: 开发者