lang

@rbv

@@ -1 +1 @@
-Subproject commit 12a3acaa05bebfc5c38ed4e08d3b4b7693f9208a
+Subproject commit 0372ed35e4e460fb6ead54b9d70ac9b8d8f26296

src/main/java/com/rebuild/web/feeds/FeedsListController.java

@@ -25,6 +25,7 @@ import com.rebuild.core.service.feeds.FeedsType;
 import com.rebuild.core.service.query.AdvFilterParser;
 import com.rebuild.core.support.general.FieldValueHelper;
 import com.rebuild.core.support.i18n.I18nUtils;
+import com.rebuild.core.support.i18n.Language;
 import com.rebuild.utils.JSONUtils;
 import com.rebuild.web.BaseController;
 import com.rebuild.web.IdParam;
@@ -184,7 +185,7 @@ public class FeedsListController extends BaseController {
             Team team = Application.getUserStore().getTeam(ID.valueOf((String) o[7]));
             item.put("scope", new Object[]{team.getIdentity(), team.getName()});
         } else {
-            item.put("scope", scope.getName());
+            item.put("scope", Language.L(scope.getName()));
         }
         item.put("type", o[8]);
         item.put("numComments", FeedsHelper.getNumOfComment((ID) o[0]));

src/main/resources/web/_include/nav-left-admin.html

@@ -5,7 +5,7 @@
       <div class="left-sidebar-spacer">
         <div class="left-sidebar-scroll rb-scroller">
           <div class="left-sidebar-content">
-            <ul class="sidebar-elements text-capitalize-s">
+            <ul class="sidebar-elements">
               <li class="divider">[[${bundle.L('系统')}]]</li>
               <li th:class="${active == 'systems'} ? 'active'">
                 <a th:href="@{/admin/systems}"><i class="icon zmdi zmdi-settings"></i><span>[[${bundle.L('通用配置')}]]</span></a>

src/main/resources/web/admin/metadata/auto-fillin.html

@@ -43,7 +43,7 @@
                   <p class="description">[[${comments}]]</p>
                 </div>
               </div>
-              <div class="aside-nav collapse text-capitalize-s">
+              <div class="aside-nav collapse">
                 <ul class="nav">
                   <li><a href="../../base">[[${bundle.L('基本信息')}]]</a></li>
                   <li><a href="../../form-design">[[${bundle.L('表单设计')}]]</a></li>

src/main/resources/web/admin/metadata/entity-advanced.html

@@ -38,7 +38,7 @@
                   <p class="description">[[${comments}]]</p>
                 </div>
               </div>
-              <div class="aside-nav collapse text-capitalize-s">
+              <div class="aside-nav collapse">
                 <ul class="nav">
                   <li><a href="base">[[${bundle.L('基本信息')}]]</a></li>
                   <li><a href="form-design">[[${bundle.L('表单设计')}]]</a></li>

src/main/resources/web/admin/metadata/entity-edit.html

@@ -20,7 +20,7 @@
                   <p class="description">[[${comments}]]</p>
                 </div>
               </div>
-              <div class="aside-nav collapse text-capitalize-s">
+              <div class="aside-nav collapse">
                 <ul class="nav">
                   <li class="active"><a href="base">[[${bundle.L('基本信息')}]]</a></li>
                   <li><a href="form-design">[[${bundle.L('表单设计')}]]</a></li>

src/main/resources/web/admin/metadata/field-edit.html

@@ -21,7 +21,7 @@
                   <p class="description">[[${comments}]]</p>
                 </div>
               </div>
-              <div class="aside-nav collapse text-capitalize-s">
+              <div class="aside-nav collapse">
                 <ul class="nav">
                   <li><a href="../base">[[${bundle.L('基本信息')}]]</a></li>
                   <li><a href="../form-design">[[${bundle.L('表单设计')}]]</a></li>

src/main/resources/web/admin/metadata/fields.html

@@ -20,7 +20,7 @@
                   <p class="description">[[${comments}]]</p>
                 </div>
               </div>
-              <div class="aside-nav collapse text-capitalize-s">
+              <div class="aside-nav collapse">
                 <ul class="nav">
                   <li><a href="base">[[${bundle.L('基本信息')}]]</a></li>
                   <li><a href="form-design">[[${bundle.L('表单设计')}]]</a></li>

src/main/resources/web/admin/metadata/form-design.html

@@ -21,7 +21,7 @@
                   <p class="description">[[${comments}]]</p>
                 </div>
               </div>
-              <div class="aside-nav collapse text-capitalize-s">
+              <div class="aside-nav collapse">
                 <ul class="nav">
                   <li><a href="base">[[${bundle.L('基本信息')}]]</a></li>
                   <li class="active"><a href="form-design">[[${bundle.L('表单设计')}]]</a></li>

src/main/resources/web/assets/css/rb-page.css

@@ -3678,10 +3678,7 @@ a.avatar.x26 img {
 .btn,
 .dropdown-item,
 .page-head-title,
-.card-header,
+.text-capitalize {
-.text-capitalize,
-.text-capitalize-s *,
-h1, h2, h3, h4, h5, h6 {
   text-transform: capitalize;
 }
 

src/main/resources/web/assets/js/feeds/feeds-list.js

@@ -299,7 +299,7 @@ class FeedsComments extends React.Component {
           <span className={`${!this.state.openComment && 'hide'}`}>
             <FeedsEditor placeholder={$L('添加评论')} ref={(c) => (this._FeedsEditor = c)} />
             <div className="mt-2 text-right">
-              <button onClick={() => this._commentState(false)} className="btn btn-sm btn-link">
+              <button onClick={() => this._commentState(false)} className="btn btn-sm btn-link mr-1">
                 {$L('取消')}
               </button>
               <button className="btn btn-sm btn-primary" ref={(c) => (this._$btn = c)} onClick={() => this._post()}>

src/main/resources/web/assets/js/project/task-view.js

@@ -1019,7 +1019,7 @@ class TaskComment extends React.Component {
           <span className={`${!this.state.openComment && 'hide'}`}>
             <TextEditor placeholder={$L('添加评论')} ref={(c) => (this._editor = c)} />
             <div className="mt-2 text-right" ref={(c) => (this._btns = c)}>
-              <button onClick={() => this.commentState(false)} className="btn btn-sm btn-link">
+              <button onClick={() => this.commentState(false)} className="btn btn-sm btn-link mr-1">
                 {$L('取消')}
               </button>
               <button className="btn btn-sm btn-primary" ref={(c) => (this._btn = c)} onClick={() => this._post()}>

src/main/resources/web/settings/user-settings.html

@@ -76,7 +76,7 @@
           <div class="card">
             <div class="card-body">
               <div class="tab-container">
-                <ul class="nav nav-tabs text-capitalize-s">
+                <ul class="nav nav-tabs">
                   <li class="nav-item"><a class="nav-link active" href="#base" data-toggle="tab">[[${bundle.L('个人信息')}]]</a></li>
                   <li class="nav-item"><a class="nav-link" href="#secure" data-toggle="tab">[[${bundle.L('安全设置')}]]</a></li>
                   <li class="nav-item"><a class="nav-link" href="#logs" data-toggle="tab">[[${bundle.L('登录日志')}]]</a></li>