From 40320a6cda5b4573f724b964b58e9c8aef528a7b Mon Sep 17 00:00:00 2001 From: Alexander Yuzhin Date: Tue, 24 Jan 2017 14:43:31 +0300 Subject: [PATCH] [mobile] Fixed translation. --- .../mobile/app/controller/Settings.js | 27 ++++++++++--------- apps/documenteditor/mobile/locale/en.json | 2 ++ apps/documenteditor/mobile/locale/fr.json | 2 ++ apps/documenteditor/mobile/locale/ru.json | 4 ++- apps/presentationeditor/mobile/locale/en.json | 3 +++ apps/spreadsheeteditor/mobile/locale/en.json | 4 ++- apps/spreadsheeteditor/mobile/locale/ru.json | 4 ++- 7 files changed, 30 insertions(+), 16 deletions(-) diff --git a/apps/documenteditor/mobile/app/controller/Settings.js b/apps/documenteditor/mobile/app/controller/Settings.js index 1366ee595..ee7481032 100644 --- a/apps/documenteditor/mobile/app/controller/Settings.js +++ b/apps/documenteditor/mobile/app/controller/Settings.js @@ -59,20 +59,21 @@ define([ _isPortrait = false, _pageSizesIndex = -1, _pageSizesCurrent = [0, 0], + txtCm = Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.cm), _pageSizes = [ - { caption: 'US Letter', subtitle: '21,59cm x 27,94cm', value: [215.9, 279.4] }, - { caption: 'US Legal', subtitle: '21,59cm x 35,56cm', value: [215.9, 355.6] }, - { caption: 'A4', subtitle: '21cm x 29,7cm', value: [210, 297] }, - { caption: 'A5', subtitle: '14,81cm x 20,99cm', value: [148.1, 209.9] }, - { caption: 'B5', subtitle: '17,6cm x 25,01cm', value: [176, 250.1] }, - { caption: 'Envelope #10', subtitle: '10,48cm x 24,13cm', value: [104.8, 241.3] }, - { caption: 'Envelope DL', subtitle: '11,01cm x 22,01cm', value: [110.1, 220.1] }, - { caption: 'Tabloid', subtitle: '27,94cm x 43,17cm', value: [279.4, 431.7] }, - { caption: 'A3', subtitle: '29,7cm x 42,01cm', value: [297, 420.1] }, - { caption: 'Tabloid Oversize', subtitle: '30,48cm x 45,71cm', value: [304.8, 457.1] }, - { caption: 'ROC 16K', subtitle: '19,68cm x 27,3cm', value: [196.8, 273] }, - { caption: 'Envelope Choukei 3', subtitle: '11,99cm x 23,49cm', value: [119.9, 234.9] }, - { caption: 'Super B/A3', subtitle: '33,02cm x 48,25cm', value: [330.2, 482.5] } + { caption: 'US Letter', subtitle: Common.Utils.String.format('21,59{0} x 27,94{0}', txtCm), value: [215.9, 279.4] }, + { caption: 'US Legal', subtitle: Common.Utils.String.format('21,59{0} x 35,56{0}', txtCm), value: [215.9, 355.6] }, + { caption: 'A4', subtitle: Common.Utils.String.format('21{0} x 29,7{0}', txtCm), value: [210, 297] }, + { caption: 'A5', subtitle: Common.Utils.String.format('14,81{0} x 20,99{0}', txtCm), value: [148.1, 209.9] }, + { caption: 'B5', subtitle: Common.Utils.String.format('17,6{0} x 25,01{0}', txtCm), value: [176, 250.1] }, + { caption: 'Envelope #10', subtitle: Common.Utils.String.format('10,48{0} x 24,13{0}', txtCm), value: [104.8, 241.3] }, + { caption: 'Envelope DL', subtitle: Common.Utils.String.format('11,01{0} x 22,01{0}', txtCm), value: [110.1, 220.1] }, + { caption: 'Tabloid', subtitle: Common.Utils.String.format('27,94{0} x 43,17{0}', txtCm), value: [279.4, 431.7] }, + { caption: 'A3', subtitle: Common.Utils.String.format('29,7{0} x 42,01{0}', txtCm), value: [297, 420.1] }, + { caption: 'Tabloid Oversize', subtitle: Common.Utils.String.format('30,48{0} x 45,71{0}', txtCm), value: [304.8, 457.1] }, + { caption: 'ROC 16K', subtitle: Common.Utils.String.format('19,68{0} x 27,3{0}', txtCm), value: [196.8, 273] }, + { caption: 'Envelope Choukei 3', subtitle: Common.Utils.String.format('11,99{0} x 23,49{0}', txtCm), value: [119.9, 234.9] }, + { caption: 'Super B/A3', subtitle: Common.Utils.String.format('33,02{0} x 48,25{0}', txtCm), value: [330.2, 482.5] } ]; return { diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index f3c7980f0..9a5c3fa2b 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -1,6 +1,8 @@ { "Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors", "Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors", + "Common.Utils.Metric.txtCm": "cm", + "Common.Utils.Metric.txtPt": "pt", "DE.Controllers.AddContainer.textImage": "Image", "DE.Controllers.AddContainer.textOther": "Other", "DE.Controllers.AddContainer.textShape": "Shape", diff --git a/apps/documenteditor/mobile/locale/fr.json b/apps/documenteditor/mobile/locale/fr.json index 1144b2291..8f891c124 100644 --- a/apps/documenteditor/mobile/locale/fr.json +++ b/apps/documenteditor/mobile/locale/fr.json @@ -1,6 +1,8 @@ { "Common.UI.ThemeColorPalette.textStandartColors": "Couleurs standard", "Common.UI.ThemeColorPalette.textThemeColors": "Couleurs de thème", + "Common.Utils.Metric.txtCm": "cm", + "Common.Utils.Metric.txtPt": "pt", "DE.Controllers.AddContainer.textImage": "Image", "DE.Controllers.AddContainer.textOther": "Autre", "DE.Controllers.AddContainer.textShape": "Forme", diff --git a/apps/documenteditor/mobile/locale/ru.json b/apps/documenteditor/mobile/locale/ru.json index 4074e4407..3f2cf5579 100644 --- a/apps/documenteditor/mobile/locale/ru.json +++ b/apps/documenteditor/mobile/locale/ru.json @@ -1,7 +1,9 @@ { "Common.UI.ThemeColorPalette.textStandartColors": "Стандартные цвета", "Common.UI.ThemeColorPalette.textThemeColors": "Цвета темы", - "DE.Controllers.AddContainer.textImage": "Изображение", + "Common.Utils.Metric.txtCm": "см", + "Common.Utils.Metric.txtPt": "пт", + "DE.Controllers.AddContainer.textImage": "Рисунок", "DE.Controllers.AddContainer.textOther": "Другое", "DE.Controllers.AddContainer.textShape": "Фигура", "DE.Controllers.AddContainer.textTable": "Таблица", diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index a087ff635..e81063787 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -2,6 +2,9 @@ "Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors", "Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors", + "Common.Utils.Metric.txtCm": "cm", + "Common.Utils.Metric.txtPt": "pt", + "PE.Controllers.Main.leavePageText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.", "PE.Controllers.Main.defaultTitleText": "ONLYOFFICE Presentation Editor", "PE.Controllers.Main.criticalErrorTitle": "Error", diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index d197be3aa..3663ed317 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -1,6 +1,8 @@ { "Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors", "Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors", + "Common.Utils.Metric.txtCm": "cm", + "Common.Utils.Metric.txtPt": "pt", "SSE.Controllers.AddChart.txtDiagramTitle": "Chart Title", "SSE.Controllers.AddChart.txtSeries": "Series", "SSE.Controllers.AddChart.txtXAxis": "X Axis", @@ -220,7 +222,7 @@ "SSE.Views.AddFunction.sCatMathematic": "Math and trigonometry", "SSE.Views.AddFunction.sCatStatistical": "Statistical", "SSE.Views.AddFunction.sCatTextAndData": "Text and data", - "SSE.Views.AddFunction.textGroups": "CATEGORIES", + "SSE.Views.AddFunction.textGroups": "Categories", "SSE.Views.AddLink.textAddLink": "Add Link", "SSE.Views.AddLink.textAddress": "Address", "SSE.Views.AddLink.textDisplay": "Display", diff --git a/apps/spreadsheeteditor/mobile/locale/ru.json b/apps/spreadsheeteditor/mobile/locale/ru.json index 64729d08f..1593b3403 100644 --- a/apps/spreadsheeteditor/mobile/locale/ru.json +++ b/apps/spreadsheeteditor/mobile/locale/ru.json @@ -1,6 +1,8 @@ { "Common.UI.ThemeColorPalette.textStandartColors": "Стандартные цвета", "Common.UI.ThemeColorPalette.textThemeColors": "Цвета темы", + "Common.Utils.Metric.txtCm": "см", + "Common.Utils.Metric.txtPt": "пт", "SSE.Controllers.AddChart.txtDiagramTitle": "Заголовок диаграммы", "SSE.Controllers.AddChart.txtSeries": "Ряд", "SSE.Controllers.AddChart.txtXAxis": "Ось X", @@ -220,7 +222,7 @@ "SSE.Views.AddFunction.sCatMathematic": "Математические", "SSE.Views.AddFunction.sCatStatistical": "Статистические", "SSE.Views.AddFunction.sCatTextAndData": "Текст и данные", - "SSE.Views.AddFunction.textGroups": "КАТЕГОРИИ", + "SSE.Views.AddFunction.textGroups": "Категории", "SSE.Views.AddLink.textAddLink": "Добавить ссылку", "SSE.Views.AddLink.textAddress": "Адрес", "SSE.Views.AddLink.textDisplay": "Отображать",