Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[PE] Fix translation for themes (#319)

Browse source
This commit is contained in:
Julia Radzhabova 2020-01-29 11:32:22 +03:00 committed by GitHub
parent fbee9a5103
commit 5bcef477da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/presentationeditor/main/app/controller/Main.js
View file

@ -98,7 +98,7 @@ define([
}); });
var me = this, var me = this,
themeNames = ['blank', 'pixel', 'classic', 'official', 'green', 'lines', 'office', 'safari', 'dotted', 'corner', 'turtle'], themeNames = ['blank', 'pixel', 'classic', 'official', 'green', 'lines', 'office', 'safari', 'dotted', 'corner', 'turtle', 'basic', 'office theme', 'green leaf'],
translate = { translate = {
'Series': this.txtSeries, 'Series': this.txtSeries,
'Diagram Title': this.txtDiagramTitle, 'Diagram Title': this.txtDiagramTitle,
@ -2021,6 +2021,9 @@ define([
txtTheme_dotted: 'Dotted', txtTheme_dotted: 'Dotted',
txtTheme_corner: 'Corner', txtTheme_corner: 'Corner',
txtTheme_turtle: 'Turtle', txtTheme_turtle: 'Turtle',
txtTheme_basic: 'Basic',
txtTheme_green_leaf: 'Green leaf',
txtTheme_office_theme: 'Office Theme',
warnNoLicense: 'This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.', warnNoLicense: 'This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.',
warnNoLicenseUsers: 'This version of %1 editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.', warnNoLicenseUsers: 'This version of %1 editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.',
warnLicenseExceeded: 'The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.<br>Please contact your administrator for more information.', warnLicenseExceeded: 'The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.<br>Please contact your administrator for more information.',

4
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -2037,7 +2037,7 @@ define([
if (themeStore) { if (themeStore) {
var arr1 = [], arr2 = []; var arr1 = [], arr2 = [];
_.each(defaultThemes, function(theme, index) { _.each(defaultThemes, function(theme, index) {
var tip = mainController.translationTable[theme.get_Name()] || theme.get_Name(); var tip = mainController.translationTable[(theme.get_Name() || '').toLocaleLowerCase()] || theme.get_Name();
arr1.push(new Common.UI.DataViewModel({ arr1.push(new Common.UI.DataViewModel({
uid : Common.UI.getId(), uid : Common.UI.getId(),
themeId : theme.get_Index(), themeId : theme.get_Index(),
@ -2053,7 +2053,7 @@ define([
}); });
_.each(docThemes, function(theme) { _.each(docThemes, function(theme) {
var image = theme.get_Image(), var image = theme.get_Image(),
tip = mainController.translationTable[theme.get_Name()] || theme.get_Name(); tip = mainController.translationTable[(theme.get_Name() || '').toLocaleLowerCase()] || theme.get_Name();
arr1.push(new Common.UI.DataViewModel({ arr1.push(new Common.UI.DataViewModel({
imageUrl: image, imageUrl: image,
uid : Common.UI.getId(), uid : Common.UI.getId(),

3
apps/presentationeditor/main/locale/en.json
View file

@ -581,6 +581,9 @@
"PE.Controllers.Main.txtTheme_pixel": "Pixel", "PE.Controllers.Main.txtTheme_pixel": "Pixel",
"PE.Controllers.Main.txtTheme_safari": "Safari", "PE.Controllers.Main.txtTheme_safari": "Safari",
"PE.Controllers.Main.txtTheme_turtle": "Turtle", "PE.Controllers.Main.txtTheme_turtle": "Turtle",
"PE.Controllers.Main.txtTheme_basic": "Basic",
"PE.Controllers.Main.txtTheme_green_leaf": "Green leaf",
"PE.Controllers.Main.txtTheme_office_theme": "Office Theme",
"PE.Controllers.Main.txtXAxis": "X Axis", "PE.Controllers.Main.txtXAxis": "X Axis",
"PE.Controllers.Main.txtYAxis": "Y Axis", "PE.Controllers.Main.txtYAxis": "Y Axis",
"PE.Controllers.Main.unknownErrorText": "Unknown error.", "PE.Controllers.Main.unknownErrorText": "Unknown error.",

3
apps/presentationeditor/main/locale/ru.json
View file

@ -581,6 +581,9 @@
"PE.Controllers.Main.txtTheme_pixel": "Пиксельная", "PE.Controllers.Main.txtTheme_pixel": "Пиксельная",
"PE.Controllers.Main.txtTheme_safari": "Сафари", "PE.Controllers.Main.txtTheme_safari": "Сафари",
"PE.Controllers.Main.txtTheme_turtle": "Черепаха", "PE.Controllers.Main.txtTheme_turtle": "Черепаха",
"PE.Controllers.Main.txtTheme_basic": "Базовая",
"PE.Controllers.Main.txtTheme_green_leaf": "Зеленый лист",
"PE.Controllers.Main.txtTheme_office_theme": "Тема Офис",
"PE.Controllers.Main.txtXAxis": "Ось X", "PE.Controllers.Main.txtXAxis": "Ось X",
"PE.Controllers.Main.txtYAxis": "Ось Y", "PE.Controllers.Main.txtYAxis": "Ось Y",
"PE.Controllers.Main.unknownErrorText": "Неизвестная ошибка.", "PE.Controllers.Main.unknownErrorText": "Неизвестная ошибка.",