Browse Source

localize message displayed when column sorting fails due to merged cells

master
takeuchi kazuto 3 years ago
parent
commit
a246578d79
  1. 7
      src/global/sort.js
  2. 2
      src/locale/en.js
  3. 2
      src/locale/es.js
  4. 2
      src/locale/zh.js
  5. 2
      src/locale/zh_tw.js

7
src/global/sort.js

@ -300,6 +300,9 @@ function sortColumnSeletion(colIndex, isAsc) {
isAsc = true; isAsc = true;
} }
const _locale = locale();
const locale_sort = _locale.sort;
let d = editor.deepCopyFlowData(Store.flowdata); let d = editor.deepCopyFlowData(Store.flowdata);
let r1 = 0, r2 = d.length - 1; let r1 = 0, r2 = d.length - 1;
@ -351,10 +354,10 @@ function sortColumnSeletion(colIndex, isAsc) {
if(hasMc){ if(hasMc){
if(isEditMode()){ if(isEditMode()){
alert("列排序会扩展至整个表格选区,选区有合并单元格,无法执行此操作,请选择功能栏排序功能!"); alert(locale_sort.columnSortMergeError);
} }
else{ else{
tooltip.info("列排序会扩展至整个表格选区,选区有合并单元格,无法执行此操作,请选择功能栏排序功能!", ""); tooltip.info(locale_sort.columnSortMergeError, "");
} }
return; return;

2
src/locale/en.js

@ -9290,7 +9290,7 @@ export default {
"noRangeError":"Cannot perform this operation on multiple selection areas, please select a single range and try again", "noRangeError":"Cannot perform this operation on multiple selection areas, please select a single range and try again",
"mergeError":"There are merged cells in the selection, this operation cannot be performed!", "mergeError":"There are merged cells in the selection, this operation cannot be performed!",
"columnSortMergeError":"Column sorting will extend to the entire table selection. There are merged cells, this operation cannot be performed. Please use the sort feature in the toolbar.",
}, },
filter:{ filter:{
filter:"create filter", filter:"create filter",

2
src/locale/es.js

@ -9275,7 +9275,7 @@ export default {
"noRangeError":"No se puede realizar esta operación en múltiples áreas de selección, selecciona un solo rango e intenta nuevamente", "noRangeError":"No se puede realizar esta operación en múltiples áreas de selección, selecciona un solo rango e intenta nuevamente",
"mergeError":"Hay celdas combinadas en la selección, ¡esta operación no se puede realizar!", "mergeError":"Hay celdas combinadas en la selección, ¡esta operación no se puede realizar!",
"columnSortMergeError":"La ordenación de las columnas se extiende a toda la selección de la tabla. Esta operación no puede realizarse si hay celdas fusionadas. Utilice la función de clasificación de la barra de herramientas.",
}, },
filter:{ filter:{
filter:"crear filtro", filter:"crear filtro",

2
src/locale/zh.js

@ -9518,7 +9518,7 @@ export default {
"noRangeError":"不能对多重选择区域执行此操作,请选择单个区域,然后再试", "noRangeError":"不能对多重选择区域执行此操作,请选择单个区域,然后再试",
"mergeError":"选区有合并单元格,无法执行此操作!", "mergeError":"选区有合并单元格,无法执行此操作!",
"columnSortMergeError":"列排序会扩展至整个表格选区,选区有合并单元格,无法执行此操作,请选择功能栏排序功能!",
}, },
filter:{ filter:{
"filter":"筛选", "filter":"筛选",

2
src/locale/zh_tw.js

@ -9511,7 +9511,7 @@ export default {
"noRangeError": "不能對多重選擇區域執行此操作,請選擇單個區域,然後再試", "noRangeError": "不能對多重選擇區域執行此操作,請選擇單個區域,然後再試",
"mergeError" : "選區有合併儲存格,無法執行此操作!", "mergeError" : "選區有合併儲存格,無法執行此操作!",
"columnSortMergeError": "列排序會擴展至整個表格選區,選區有合並單元格,無法執行此操作,請選擇功能欄排序功能!",
}, },
filter: { filter: {
"filter" : "篩選", "filter" : "篩選",

Loading…
Cancel
Save