From d9c9c7f86535e17619bf8ba827fe685a97dd91ad Mon Sep 17 00:00:00 2001
From: zhongjin <zhongjin@onenetcom.cn>
Date: Sun, 26 May 2024 10:20:00 +0800
Subject: [PATCH] new

---
 app/views/admin/visualizations/embed_map_error.html.erb     | 2 +-
 .../javascripts/builder/data/default-form-styles.json       | 2 +-
 .../edit-feature-content-views/edit-feature-header.tpl      | 2 +-
 .../dialogs/add_custom_basemap/add_custom_basemap.jst.ejs   | 2 +-
 .../cartodb/common/dialogs/delete_column/template.jst.ejs   | 2 +-
 .../cartodb/common/views/pages_subheader.jst.ejs            | 6 +++---
 .../views/dashboard/dialogs/create-dialog/dialog-view.tpl   | 4 ++--
 .../new-dashboard/components/NavigationBar/UserDropdown.vue | 2 ++
 vendor/assets/stylesheets/cartodb.css                       | 1 +
 9 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/views/admin/visualizations/embed_map_error.html.erb b/app/views/admin/visualizations/embed_map_error.html.erb
index a5a23a9..54aa0df 100644
--- a/app/views/admin/visualizations/embed_map_error.html.erb
+++ b/app/views/admin/visualizations/embed_map_error.html.erb
@@ -29,7 +29,7 @@
         </div>
 
         <p class='CDB-Text CDB-Size-large'>
-          未找到地图或数据表, 也许是没有登录权限. 请重新 <%= link_to "登录", login_url(after: request.original_url) %> 
+          Map or dataset not found, or with restricted access. Please <%= link_to "login", login_url(after: request.original_url), target: "_blank" %> to your account and try again
         </p>
       </div>
     </div>
diff --git a/lib/assets/javascripts/builder/data/default-form-styles.json b/lib/assets/javascripts/builder/data/default-form-styles.json
index 45d15da..262eb7e 100755
--- a/lib/assets/javascripts/builder/data/default-form-styles.json
+++ b/lib/assets/javascripts/builder/data/default-form-styles.json
@@ -10,7 +10,7 @@
   },
   "stroke": {
     "size": {
-      "fixed": 0
+      "fixed": 1
     },
     "color": {
       "fixed": "#FFFFFF",
diff --git a/lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-header.tpl b/lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-header.tpl
index 216f7a1..2d89fcb 100755
--- a/lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-header.tpl
+++ b/lib/assets/javascripts/builder/editor/layers/edit-feature-content-views/edit-feature-header.tpl
@@ -33,6 +33,6 @@
       </p>
     </div>
   </div>
-  
+
   <div class="u-flex u-tSpace-xl js-context-menu"></div>
 </div>
diff --git a/lib/assets/javascripts/cartodb/common/dialogs/add_custom_basemap/add_custom_basemap.jst.ejs b/lib/assets/javascripts/cartodb/common/dialogs/add_custom_basemap/add_custom_basemap.jst.ejs
index 32a49c8..f0f8cf1 100644
--- a/lib/assets/javascripts/cartodb/common/dialogs/add_custom_basemap/add_custom_basemap.jst.ejs
+++ b/lib/assets/javascripts/cartodb/common/dialogs/add_custom_basemap/add_custom_basemap.jst.ejs
@@ -6,7 +6,7 @@
           <i class="CDB-IconFont CDB-IconFont-layerStack"></i>
         </div>
         <p class="Dialog-headerTitle">添加自定义底图</p>
-        <p class="Dialog-headerText">Select from these great resources.</p>
+        <p class="Dialog-headerText">从这些优质资源中进行选择</p>
       </li>
     </ul>
   </div>
diff --git a/lib/assets/javascripts/cartodb/common/dialogs/delete_column/template.jst.ejs b/lib/assets/javascripts/cartodb/common/dialogs/delete_column/template.jst.ejs
index 523cac6..7f10093 100644
--- a/lib/assets/javascripts/cartodb/common/dialogs/delete_column/template.jst.ejs
+++ b/lib/assets/javascripts/cartodb/common/dialogs/delete_column/template.jst.ejs
@@ -3,7 +3,7 @@
     <i class="CDB-IconFont CDB-IconFont-trash"></i>
   </div>
   <p class="Dialog-headerTitle">确定删除 '<%- column %>' 吗？</p>
-  <p class="Dialog-headerText">Are you sure you want to delete it?</p>
+  <p class="Dialog-headerText">你确定要删除吗?</p>
 </div>
 <div class="Dialog-footer Dialog-footer--simple u-inner">
   <button class="Button Button--secondary Dialog-footerBtn cancel">
diff --git a/lib/assets/javascripts/cartodb/common/views/pages_subheader.jst.ejs b/lib/assets/javascripts/cartodb/common/views/pages_subheader.jst.ejs
index c3b0dc9..5e87460 100644
--- a/lib/assets/javascripts/cartodb/common/views/pages_subheader.jst.ejs
+++ b/lib/assets/javascripts/cartodb/common/views/pages_subheader.jst.ejs
@@ -1,13 +1,13 @@
 <div class="SideMenu-type">
   <ul class="SideMenu-list">
     <li class="SideMenu-typeItem"><a href="<%= profileUrl %>" class="SideMenu-typeLink <% if (path === profileUrl) { %>is-selected<% } %>">Profile</a></li>
-    <li class="SideMenu-typeItem"><a href="<%= accountUrl %>" class="SideMenu-typeLink <% if (path === accountUrl) { %>is-selected<% } %>">Account</a></li>
+    <li class="SideMenu-typeItem"><a href="<%= accountUrl %>" class="SideMenu-typeLink <% if (path === accountUrl) { %>is-selected<% } %>">账号</a></li>
     <li class="SideMenu-typeItem"><a href="<%= apiKeysUrl %>" class="SideMenu-typeLink <% if (path === apiKeysUrl) { %>is-selected<% } %>">API keys</a></li>
     <% if (!cdb.config.get("cartodb_com_hosted") && !isInsideOrg) { %>
-      <li class="SideMenu-typeItem"><a href="<%= planUrl %>" class="SideMenu-typeLink">Billing</a></li>
+      <li class="SideMenu-typeItem"><a href="<%= planUrl %>" class="SideMenu-typeLink">计费</a></li>
     <% } %>
     <% if (isOrgAdmin) { %>
-      <li class="SideMenu-typeItem"><a href="<%= organizationUrl %>" class="SideMenu-typeLink <% if (path === organizationUrl) { %>is-selected<% } %>">Organization settings</a></li>
+      <li class="SideMenu-typeItem"><a href="<%= organizationUrl %>" class="SideMenu-typeLink <% if (path === organizationUrl) { %>is-selected<% } %>">团队设置</a></li>
     <% } %>
   </ul>
 </div>
diff --git a/lib/assets/javascripts/dashboard/views/dashboard/dialogs/create-dialog/dialog-view.tpl b/lib/assets/javascripts/dashboard/views/dashboard/dialogs/create-dialog/dialog-view.tpl
index ab06f0e..71fefb9 100644
--- a/lib/assets/javascripts/dashboard/views/dashboard/dialogs/create-dialog/dialog-view.tpl
+++ b/lib/assets/javascripts/dashboard/views/dashboard/dialogs/create-dialog/dialog-view.tpl
@@ -2,8 +2,8 @@
   <div class="Dialog-headerIcon Dialog-headerIcon--neutral">
     <i class="CDB-IconFont CDB-IconFont-add"></i>
   </div>
-  <h2 class="CDB-Text CDB-Size-large u-mainTextColor u-bSpace">新建数据集</h2>
-  <h3 class="CDB-Text CDB-Size-medium u-altTextColor">选择合适的数据集或新建</h3>
+  <h2 class="CDB-Text CDB-Size-large u-mainTextColor u-bSpace">选择数据</h2>
+  <h3 class="CDB-Text CDB-Size-medium u-altTextColor">选择合适的数据集或新建一个数据表</h3>
 </div>
 <div class="Filters Filters--navListing Filters--static js-navigation"></div>
 <div class="js-content-container Dialog-body Dialog-body--expanded Dialog-body--create Dialog-body--noPaddingTop Dialog-body--withoutBorder"></div>
diff --git a/lib/assets/javascripts/new-dashboard/components/NavigationBar/UserDropdown.vue b/lib/assets/javascripts/new-dashboard/components/NavigationBar/UserDropdown.vue
index 28c14ed..ef9b94a 100644
--- a/lib/assets/javascripts/new-dashboard/components/NavigationBar/UserDropdown.vue
+++ b/lib/assets/javascripts/new-dashboard/components/NavigationBar/UserDropdown.vue
@@ -43,6 +43,7 @@
         </router-link>
         <span v-if="notificationsCount > 0" class="notification-number text is-semibold is-small is-txtGrey">{{notificationsCount}}</span>
       </li>
+<!--
       <li class="navbar-dropdown-iconLink">
         <div class="icon-container">
           <img svg-inline src="../../assets/icons/navbar/dropdown/feedback.svg"/>
@@ -51,6 +52,7 @@
           {{ $t('UserDropdown.feedback') }}
         </a>
       </li>
+-->
     </ul>
     <a :href="`${ baseUrl }/logout`" class="navbar-dropdown-bottom" @click="linkClicked">
       <div class="arrow"><img src="../../assets/icons/navbar/dropdown/arrow-right.svg" /></div>
diff --git a/vendor/assets/stylesheets/cartodb.css b/vendor/assets/stylesheets/cartodb.css
index eb3c7c0..b334c30 100644
--- a/vendor/assets/stylesheets/cartodb.css
+++ b/vendor/assets/stylesheets/cartodb.css
@@ -1,3 +1,4 @@
+
   /**
    *  CartoDB infowindow dark styles
    */