From 5dfebe83401b0e7008ae657039dafce6f37dab4e Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Wed, 15 Feb 2017 13:58:18 +0300
Subject: [PATCH] [SSE] Format setting: change description for fraction types.

---
 .../main/app/view/FormatSettingsDialog.js     | 26 +++++++++----------
 apps/spreadsheeteditor/main/locale/en.json    | 18 ++++++-------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js b/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js
index ceab4c64c..5b86339d6 100644
--- a/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js
@@ -183,7 +183,7 @@ define([
             this.cmbNegative = new Common.UI.ComboBox({
                 el: $('#format-settings-combo-negative'),
                 cls: 'input-group-nr',
-                menuStyle: 'min-width: 264px;max-height:210px;',
+                menuStyle: 'min-width: 264px;max-height:235px;',
                 editable: false,
                 data: [],
                 scrollAlwaysVisible: true
@@ -211,7 +211,7 @@ define([
             this.cmbSymbols = new Common.UI.ComboBox({
                 el: $('#format-settings-combo-symbols'),
                 cls: 'input-group-nr',
-                menuStyle: 'min-width: 264px;max-height:210px;',
+                menuStyle: 'min-width: 264px;max-height:235px;',
                 editable: false,
                 data: [],
                 scrollAlwaysVisible: true
@@ -221,7 +221,7 @@ define([
             this.cmbType = new Common.UI.ComboBox({
                 el: $('#format-settings-combo-type'),
                 cls: 'input-group-nr',
-                menuStyle: 'min-width: 264px;max-height:210px;',
+                menuStyle: 'min-width: 264px;max-height:235px;',
                 editable: false,
                 data: [],
                 scrollAlwaysVisible: true
@@ -231,7 +231,7 @@ define([
             this.cmbCode = new Common.UI.ComboBox({
                 el: $('#format-settings-combo-code'),
                 cls: 'input-group-nr',
-                menuStyle: 'min-width: 310px;max-height:210px;',
+                menuStyle: 'min-width: 310px;max-height:235px;',
                 editable: false,
                 data: [],
                 scrollAlwaysVisible: true
@@ -507,15 +507,15 @@ define([
         txtFraction:        'Fraction',
         txtScientific:      'Scientific',
         txtText:            'Text',
-        txtUpto1: 'Up to one digit',
-        txtUpto2: 'Up to two digits',
-        txtUpto3: 'Up to three digits',
-        txtAs2:  'As halfs',
-        txtAs8:  'As eighths',
-        txtAs4:  'As fourths',
-        txtAs16:  'As sixteenths',
-        txtAs10:  'As tenths',
-        txtAs100: 'As hundredths',
+        txtUpto1: 'Up to one digit (1/3)',
+        txtUpto2: 'Up to two digits (12/25)',
+        txtUpto3: 'Up to three digits (131/135)',
+        txtAs2:  'As halfs (1/2)',
+        txtAs8:  'As eighths (4/8)',
+        txtAs4:  'As fourths (2/4)',
+        txtAs16:  'As sixteenths (8/16)',
+        txtAs10:  'As tenths (5/10)',
+        txtAs100: 'As hundredths (50/100)',
         txtSample: 'Sample:'
 
     }, SSE.Views.FormatSettingsDialog || {}))
diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json
index 269679080..866d69098 100644
--- a/apps/spreadsheeteditor/main/locale/en.json
+++ b/apps/spreadsheeteditor/main/locale/en.json
@@ -1067,12 +1067,12 @@
   "SSE.Views.FormatSettingsDialog.textSymbols": "Symbols",
   "SSE.Views.FormatSettingsDialog.textTitle": "Number Format",
   "SSE.Views.FormatSettingsDialog.txtAccounting": "Accounting",
-  "SSE.Views.FormatSettingsDialog.txtAs10": "As tenths",
-  "SSE.Views.FormatSettingsDialog.txtAs100": "As hundredths",
-  "SSE.Views.FormatSettingsDialog.txtAs16": "As sixteenths",
-  "SSE.Views.FormatSettingsDialog.txtAs2": "As halves",
-  "SSE.Views.FormatSettingsDialog.txtAs4": "As fourths",
-  "SSE.Views.FormatSettingsDialog.txtAs8": "As eighths",
+  "SSE.Views.FormatSettingsDialog.txtAs10": "As tenths (5/10)",
+  "SSE.Views.FormatSettingsDialog.txtAs100": "As hundredths (50/100)",
+  "SSE.Views.FormatSettingsDialog.txtAs16": "As sixteenths (8/16)",
+  "SSE.Views.FormatSettingsDialog.txtAs2": "As halves (1/2)",
+  "SSE.Views.FormatSettingsDialog.txtAs4": "As fourths (2/4)",
+  "SSE.Views.FormatSettingsDialog.txtAs8": "As eighths (4/8)",
   "SSE.Views.FormatSettingsDialog.txtCurrency": "Currency",
   "SSE.Views.FormatSettingsDialog.txtCustom": "Custom",
   "SSE.Views.FormatSettingsDialog.txtDate": "Date",
@@ -1084,9 +1084,9 @@
   "SSE.Views.FormatSettingsDialog.txtScientific": "Scientific",
   "SSE.Views.FormatSettingsDialog.txtText": "Text",
   "SSE.Views.FormatSettingsDialog.txtTime": "Time",
-  "SSE.Views.FormatSettingsDialog.txtUpto1": "Up to one digit",
-  "SSE.Views.FormatSettingsDialog.txtUpto2": "Up to two digits",
-  "SSE.Views.FormatSettingsDialog.txtUpto3": "Up to three digits",
+  "SSE.Views.FormatSettingsDialog.txtUpto1": "Up to one digit (1/3)",
+  "SSE.Views.FormatSettingsDialog.txtUpto2": "Up to two digits (12/25)",
+  "SSE.Views.FormatSettingsDialog.txtUpto3": "Up to three digits (131/135)",
   "SSE.Views.FormulaDialog.cancelButtonText": "Cancel",
   "SSE.Views.FormulaDialog.okButtonText": "OK",
   "SSE.Views.FormulaDialog.sCategoryAll": "All",