From bba42f4c57095c6b487dcca4db84ddcd199551a6 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Fri, 6 Apr 2018 16:37:41 +0300
Subject: [PATCH] [SSE] Added functions translation into French

---
 CHANGELOG.md                                           | 2 +-
 apps/spreadsheeteditor/main/app/view/FileMenuPanels.js | 3 +++
 apps/spreadsheeteditor/main/app/view/FormulaDialog.js  | 3 ++-
 apps/spreadsheeteditor/main/locale/en.json             | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 470404041..27083a694 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@
 * Export to RTF format
 
 ### Spreadsheet Editor
-* Support Spanish in formulas
+* Add Spanish, French formula translations
 * Set options for saving in PDF format
 
 ### Presentation Editor
diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
index 51e6755df..c90858193 100644
--- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
+++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
@@ -603,6 +603,7 @@ define([
                     { value: 'en', displayValue: this.txtEn, exampleValue: this.txtExampleEn },
                     { value: 'de', displayValue: this.txtDe, exampleValue: this.txtExampleDe },
                     { value: 'es', displayValue: this.txtEs, exampleValue: this.txtExampleEs },
+                    { value: 'fr', displayValue: this.txtFr, exampleValue: this.txtExampleFr },
                     { value: 'ru', displayValue: this.txtRu, exampleValue: this.txtExampleRu },
                     { value: 'pl', displayValue: this.txtPl, exampleValue: this.txtExamplePl }
                 ]
@@ -809,11 +810,13 @@ define([
         txtRu: 'Russian',
         txtPl: 'Polish',
         txtEs: 'Spanish',
+        txtFr: 'French',
         txtExampleEn: ' SUM; MIN; MAX; COUNT',
         txtExampleDe: ' SUMME; MIN; MAX; ANZAHL',
         txtExampleRu: ' СУММ; МИН; МАКС; СЧЁТ',
         txtExamplePl: ' SUMA; MIN; MAX; ILE.LICZB',
         txtExampleEs: ' SUMA; MIN; MAX; CALCULAR',
+        txtExampleFr: ' SOMME; MIN; MAX; NB',
         strFuncLocale: 'Formula Language',
         strFuncLocaleEx: 'Example: SUM; MIN; MAX; COUNT',
         strRegSettings: 'Regional Settings',
diff --git a/apps/spreadsheeteditor/main/app/view/FormulaDialog.js b/apps/spreadsheeteditor/main/app/view/FormulaDialog.js
index 252f4bcfa..dd32d248b 100644
--- a/apps/spreadsheeteditor/main/app/view/FormulaDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/FormulaDialog.js
@@ -117,7 +117,8 @@ define([
                     de: this[translate+'_de'],
                     ru: this[translate+'_ru'],
                     pl: this[translate+'_pl'],
-                    es: this[translate+'_es']
+                    es: this[translate+'_es'],
+                    fr: this[translate+'_fr']
                 };
             }
 
diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json
index f6b4cfbd9..310d57d59 100644
--- a/apps/spreadsheeteditor/main/locale/en.json
+++ b/apps/spreadsheeteditor/main/locale/en.json
@@ -1227,6 +1227,7 @@
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtDe": "German",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtEn": "English",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtEs": "Spanish",
+  "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtFr": "French",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtInch": "Inch",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtLiveComment": "Commenting Display",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtMac": "as OS X",