From 9e48347652015f2539f4238e5fcc583def6a6da4 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Sat, 27 Mar 2021 00:36:57 +0300 Subject: [PATCH] Fix translations --- .../main/app/controller/FormsTab.js | 2 +- apps/documenteditor/main/app/controller/Main.js | 16 +++++++++------- .../main/app/controller/Toolbar.js | 5 +++-- apps/documenteditor/main/locale/en.json | 2 ++ 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/apps/documenteditor/main/app/controller/FormsTab.js b/apps/documenteditor/main/app/controller/FormsTab.js index f8eaad23f..41bd29531 100644 --- a/apps/documenteditor/main/app/controller/FormsTab.js +++ b/apps/documenteditor/main/app/controller/FormsTab.js @@ -179,7 +179,7 @@ define([ this.api.asc_AddContentControlPicture(oFormPr); else if (type == 'checkbox' || type == 'radiobox') { oPr = new AscCommon.CSdtCheckBoxPr(); - (type == 'radiobox') && oPr.put_GroupKey('Group 1'); + (type == 'radiobox') && oPr.put_GroupKey(this.toolbar.textGroup + ' 1'); this.api.asc_AddContentControlCheckBox(oPr, oFormPr); } else if (type == 'combobox' || type == 'dropdown') this.api.asc_AddContentControlList(type == 'combobox', oPr, oFormPr); diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 41ba35615..535dfe7d4 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -138,9 +138,10 @@ define([ "Error! Main Document Only.": this.txtMainDocOnly, "Error! Not a valid bookmark self-reference.": this.txtNotValidBookmark, "Error! No text of specified style in document.": this.txtNoText, - "Choose an item.": this.txtChoose, - "Enter a date.": this.txtEnterDate, - "Type equation here.": this.txtTypeEquation + "Choose an item": this.txtChoose, + "Enter a date": this.txtEnterDate, + "Type equation here": this.txtTypeEquation, + "Click to load image": this.txtClickToLoad }; styleNames.forEach(function(item){ translate[item] = me['txtStyle_' + item.replace(/ /g, '_')] || item; @@ -2825,15 +2826,15 @@ define([ uploadDocExtMessage: 'Unknown document format.', uploadDocFileCountMessage: 'No documents uploaded.', errorUpdateVersionOnDisconnect: 'Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.', - txtChoose: 'Choose an item.', + txtChoose: 'Choose an item', errorDirectUrl: 'Please verify the link to the document.
This link must be a direct link to the file for downloading.', txtStyle_Caption: 'Caption', errorCompare: 'The Compare documents feature is not available in the co-editing mode.', textConvertEquation: 'This equation was created with an old version of equation editor which is no longer supported. Converting this equation to Office Math ML format will make it editable.
Do you want to convert this equation?', textApplyAll: 'Apply to all equations', textLearnMore: 'Learn More', - txtEnterDate: 'Enter a date.', - txtTypeEquation: 'Type equation here.', + txtEnterDate: 'Enter a date', + txtTypeEquation: 'Type equation here', textHasMacros: 'The file contains automatic macros.
Do you want to run macros?', textRemember: 'Remember my choice', warnLicenseLimitedRenewed: 'License needs to be renewed.
You have a limited access to document editing functionality.
Please contact your administrator to get full access', @@ -2845,7 +2846,8 @@ define([ textRenameError: 'User name must not be empty.', textLongName: 'Enter a name that is less than 128 characters.', textGuest: 'Guest', - errorSubmit: 'Submit failed.' + errorSubmit: 'Submit failed.', + txtClickToLoad: 'Click to load image' } })(), DE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 2cb52ded2..de48b4ce3 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -1951,7 +1951,7 @@ define([ else if (item.value.indexOf('checkbox')>=0 || item.value.indexOf('radiobox')>=0) { if (isnew) { oPr = new AscCommon.CSdtCheckBoxPr(); - (item.value.indexOf('radiobox')>=0) && oPr.put_GroupKey('Group 1'); + (item.value.indexOf('radiobox')>=0) && oPr.put_GroupKey(this.textGroup + ' 1'); } this.api.asc_AddContentControlCheckBox(oPr, oFormPr); } else if (item.value == 'date') @@ -3568,7 +3568,8 @@ define([ txtMarginsW: 'Left and right margins are too high for a given page wight', txtMarginsH: 'Top and bottom margins are too high for a given page height', textInsert: 'Insert', - textTabForms: 'Forms' + textTabForms: 'Forms', + textGroup: 'Group' }, DE.Controllers.Toolbar || {})); }); diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 978a246a3..cc0245ee8 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -591,6 +591,7 @@ "DE.Controllers.Main.txtCallouts": "Callouts", "DE.Controllers.Main.txtCharts": "Charts", "DE.Controllers.Main.txtChoose": "Choose an item", + "DE.Controllers.Main.txtClickToLoad": "Click to load image", "DE.Controllers.Main.txtCurrentDocument": "Current Document", "DE.Controllers.Main.txtDiagramTitle": "Chart Title", "DE.Controllers.Main.txtEditingMode": "Set editing mode...", @@ -866,6 +867,7 @@ "DE.Controllers.Toolbar.textScript": "Scripts", "DE.Controllers.Toolbar.textSymbols": "Symbols", "DE.Controllers.Toolbar.textTabForms": "Forms", + "DE.Controllers.Toolbar.textGroup": "Group", "DE.Controllers.Toolbar.textWarning": "Warning", "DE.Controllers.Toolbar.txtAccent_Accent": "Acute", "DE.Controllers.Toolbar.txtAccent_ArrowD": "Right-left arrow above",