diff --git a/src/controllers/selection.js b/src/controllers/selection.js
index ea779c8..af835bc 100644
--- a/src/controllers/selection.js
+++ b/src/controllers/selection.js
@@ -628,12 +628,16 @@ const selection = {
if(Store.allowEdit===false){
return;
}
+
+ const _locale = locale()
+ const locale_paste = _locale.paste;
+
if(Store.luckysheet_select_save.length > 1){
if(isEditMode()){
- alert("不能对多重选择区域执行此操作，请选择单个区域，然后再试");
+ alert(locale_paste.errorNotAllowMulti);
}
else{
- tooltip.info('提示', "不能对多重选择区域执行此操作，请选择单个区域，然后再试");
+ tooltip.info(`${locale_paste.warning}`, locale_paste.errorNotAllowMulti);
}
}
@@ -664,10 +668,10 @@ const selection = {
if(has_PartMC){
if(isEditMode()){
- alert("不能对合并单元格做部分更改");
+ alert(locale_paste.errorNotAllowMerged);
}
else{
- tooltip.info('提示', "不能对合并单元格做部分更改");
+ tooltip.info(`${locale_paste.warning}`, locale_paste.errorNotAllowMerged);
}
return;
@@ -805,10 +809,10 @@ const selection = {
if(has_PartMC){
if(isEditMode()){
- alert("不能对合并单元格做部分更改");
+ alert(locale_paste.errorNotAllowMerged);
}
else{
- tooltip.info('提示',"不能对合并单元格做部分更改");
+ tooltip.info(`${locale_paste.warning}`,locale_paste.errorNotAllowMerged);
}
return;
}
@@ -882,6 +886,9 @@ const selection = {
return;
}
+ const _locale = locale()
+ const locale_paste = _locale.paste;
+
let cfg = $.extend(true, {}, Store.config);
if(cfg["merge"] == null){
cfg["merge"] = {};
@@ -914,10 +921,10 @@ const selection = {
if(has_PartMC){
if(isEditMode()){
- alert("不能对合并单元格做部分更改");
+ alert(locale_paste.errorNotAllowMerged);
}
else{
- tooltip.info('提示',"不能对合并单元格做部分更改");
+ tooltip.info(`${locale_paste.warning}`,locale_paste.errorNotAllowMerged);
}
return;
}
@@ -1308,6 +1315,10 @@ const selection = {
if(!checkProtectionLockedRangeList(Store.luckysheet_select_save, Store.currentSheetIndex)){
return;
}
+
+ const _locale = locale()
+ const locale_paste = _locale.paste;
+
let cfg = $.extend(true, {}, Store.config);
if(cfg["merge"] == null){
cfg["merge"] = {};
@@ -1392,10 +1403,10 @@ const selection = {
if(has_PartMC){
if(isEditMode()){
- alert("不能对合并单元格做部分更改");
+ alert(locale_paste.errorNotAllowMerged);
}
else{
- tooltip.info('提示',"不能对合并单元格做部分更改");
+ tooltip.info(`${locale_paste.warning}`,locale_paste.errorNotAllowMerged);
}
return;
}
@@ -1627,6 +1638,10 @@ const selection = {
if(!checkProtectionLockedRangeList(Store.luckysheet_select_save, Store.currentSheetIndex)){
return;
}
+
+ const _locale = locale()
+ const locale_paste = _locale.paste;
+
let cfg = $.extend(true, {}, Store.config);
if(cfg["merge"] == null){
cfg["merge"] = {};
@@ -1660,10 +1675,10 @@ const selection = {
if(has_PartMC){
if(isEditMode()){
- alert("不能对合并单元格做部分更改");
+ alert(locale_paste.errorNotAllowMerged);
}
else{
- tooltip.info('提示',"不能对合并单元格做部分更改");
+ tooltip.info(`${locale_paste.warning}`,locale_paste.errorNotAllowMerged);
}
return;
}
diff --git a/src/locale/en.js b/src/locale/en.js
index 6770889..b6aecb7 100644
--- a/src/locale/en.js
+++ b/src/locale/en.js
@@ -9886,9 +9886,14 @@ export default {
notLessOne:"The number of rows and columns cannot be less than 1",
offsetColumnLessZero:"The offset column cannot be negative!",
- pasteMustKeybordAlert:"在表格中进行复制粘贴: Ctrl + C 进行复制, Ctrl + V 进行粘贴, Ctrl + X 进行剪切",
- pasteMustKeybordAlertHTMLTitle:"在表格中进行复制粘贴",
- pasteMustKeybordAlertHTML:"Ctrl + C 进行复制
Ctrl + V 进行粘贴
Ctrl + X 进行剪切",
+ pasteMustKeybordAlert:"Copy and paste in the Sheet: Ctrl + C to copy, Ctrl + V to paste, Ctrl + X to cut",
+ pasteMustKeybordAlertHTMLTitle:"Copy and paste in the Sheet",
+ pasteMustKeybordAlertHTML:"Ctrl + C to copy
Ctrl + V to paste
Ctrl + X to cut",
+ },
+ paste: {
+ warning:"Warning",
+ errorNotAllowMulti:"Cannot perform this operation on multiple selection areas, please select a single range and try again",
+ errorNotAllowMerged:"Cannot make partial changes to merged cells",
},
pivotTable:{
title:"Pivot Table",
diff --git a/src/locale/es.js b/src/locale/es.js
index 93149fd..20f2d80 100644
--- a/src/locale/es.js
+++ b/src/locale/es.js
@@ -9859,6 +9859,11 @@ export default {
pasteMustKeybordAlertHTMLTitle:"在表格中进行复制粘贴",
pasteMustKeybordAlertHTML:"Ctrl + C 进行复制
Ctrl + V 进行粘贴
Ctrl + X 进行剪切",
},
+ paste: {
+ warning:"Advertencia",
+ errorNotAllowMulti:"No se puede realizar esta operación en varias áreas de selección, selecciona un solo rango y vuelve a intentarlo",
+ errorNotAllowMerged: "No se pueden realizar cambios parciales en las celdas fusionadas",
+ },
pivotTable:{
title:"Tabla Dinámica",
closePannel:"Cerrar",
diff --git a/src/locale/zh.js b/src/locale/zh.js
index 11bb434..41abd46 100644
--- a/src/locale/zh.js
+++ b/src/locale/zh.js
@@ -10119,6 +10119,11 @@ export default {
pasteMustKeybordAlertHTMLTitle:"Copy and paste in the Sheet",
pasteMustKeybordAlertHTML:"Ctrl + C to copy
Ctrl + V to paste
Ctrl + X to cut",
},
+ paste: {
+ warning:"提示",
+ errorNotAllowMulti:"不能对多重选择区域执行此操作，请选择单个区域，然后再试",
+ errorNotAllowMerged:"不能对合并单元格做部分更改",
+ },
pivotTable:{
title:"数据透视表",
closePannel:"关闭",
diff --git a/src/locale/zh_tw.js b/src/locale/zh_tw.js
index bca42d5..a26a1ed 100644
--- a/src/locale/zh_tw.js
+++ b/src/locale/zh_tw.js
@@ -10112,6 +10112,11 @@ export default {
pasteMustKeybordAlertHTMLTitle: "Copy and paste in the Sheet",
pasteMustKeybordAlertHTML : "Ctrl + C to copy
Ctrl + V to paste
Ctrl + X to cut",
},
+ paste: {
+ warning : "提示",
+ errorNotAllowMulti : "不能對多重選擇區域執行此操作,請選擇單個區域,然後再試",
+ errorNotAllowMerged: "不能对合并单元格做部分更改",
+ },
pivotTable: {
title : "數據透視錶",
closePannel : "關閉",