From 64e4cadff0a8ccb59d9c1d7e5e9529e8cdd1822c Mon Sep 17 00:00:00 2001
From: Julia Svinareva <julia.svinaryova@onlyoffice.com>
Date: Thu, 25 Apr 2019 15:38:48 +0300
Subject: [PATCH] [DE mobile] Add current units in page size settings

---
 apps/documenteditor/mobile/app/controller/Settings.js | 9 ++++++---
 apps/documenteditor/mobile/app/view/Settings.js       | 3 +--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/apps/documenteditor/mobile/app/controller/Settings.js b/apps/documenteditor/mobile/app/controller/Settings.js
index 1c3b5d56f..5513d6934 100644
--- a/apps/documenteditor/mobile/app/controller/Settings.js
+++ b/apps/documenteditor/mobile/app/controller/Settings.js
@@ -312,8 +312,7 @@ define([
             initPageDocumentSettings: function () {
                 var me = this,
                     $pageOrientation = $('.page[data-page=settings-document-view] input:radio[name=doc-orientation]'),
-                    $pageSize = $('#settings-document-format'),
-                    txtCm = Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.cm);
+                    $pageSize = $('#settings-document-format');
 
                 // Init orientation
                 $pageOrientation.val([_isPortrait]);
@@ -321,8 +320,12 @@ define([
 
                 // Init format
                 $pageSize.find('.item-title').text(_pageSizes[_pageSizesIndex]['caption']);
-                $pageSize.find('.item-subtitle').text(_pageSizes[_pageSizesIndex]['subtitle']);
+                var curMetricName = Common.Utils.Metric.getMetricName(Common.Utils.Metric.getCurrentMetric()),
+                    sizeW = Common.Utils.Metric.fnRecalcFromMM(_pageSizes[_pageSizesIndex]['value'][0]).toFixed(2),
+                    sizeH = Common.Utils.Metric.fnRecalcFromMM(_pageSizes[_pageSizesIndex]['value'][1]).toFixed(2);
 
+                var pageSizeTxt = sizeW + ' ' + curMetricName + ' x ' + sizeH + ' ' + curMetricName;
+                $pageSize.find('.item-subtitle').text(pageSizeTxt);
             },
 
             initPageInfo: function () {
diff --git a/apps/documenteditor/mobile/app/view/Settings.js b/apps/documenteditor/mobile/app/view/Settings.js
index 8adba6250..0c534e27e 100644
--- a/apps/documenteditor/mobile/app/view/Settings.js
+++ b/apps/documenteditor/mobile/app/view/Settings.js
@@ -210,8 +210,7 @@ define([
                                     '<div class="item-title-row">',
                                         '<div class="item-title"><%= item.caption %></div>',
                                     '</div>',
-                                    // '<div class="item-subtitle"><%= parseFloat(Common.Utils.Metric.fnRecalcFromMM(item.value[0]).toFixed(2)) %><%= Common.Utils.Metric.getCurrentMetricName() %> x <%= parseFloat(Common.Utils.Metric.fnRecalcFromMM(item.value[1]).toFixed(2)) %> <%= Common.Utils.Metric.getCurrentMetricName() %></div>',
-                                    '<div class="item-subtitle"><%= item.subtitle %></div>',
+                                    '<div class="item-subtitle"><%= parseFloat(Common.Utils.Metric.fnRecalcFromMM(item.value[0]).toFixed(2)) %> <%= Common.Utils.Metric.getCurrentMetricName() %> x <%= parseFloat(Common.Utils.Metric.fnRecalcFromMM(item.value[1]).toFixed(2)) %> <%= Common.Utils.Metric.getCurrentMetricName() %></div>',
                                 '</div>',
                             '</label>',
                         '</li>'