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

Merge pull request #680 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2021-01-27 17:50:29 +03:00 committed by GitHub
parent 5104bf8f81 0be39828c4
commit 7d0546a368
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/documenteditor/main/app/template/FormSettings.template
View file

@ -79,7 +79,7 @@
</tr> </tr>
<tr style="vertical-align: top;"> <tr style="vertical-align: top;">
<td class="padding-large"> <td class="padding-large">
<div id="form-list-list" style="height: 95px;margin-right: 5px;background-color: #fff;"></div> <div id="form-list-list" style="width:162px; height: 95px;margin-right: 5px;background-color: #fff;"></div>
</td> </td>
<td class="padding-large"> <td class="padding-large">
<div id="form-list-delete" style="margin-bottom: 5px;margin-left: 5px;"></div> <div id="form-list-delete" style="margin-bottom: 5px;margin-left: 5px;"></div>

80
apps/spreadsheeteditor/mobile/app/view/add/AddFunction.js
View file

@ -111,35 +111,14 @@ define([
} }
var lang = me.lang; var lang = me.lang;
this.translatTable = {}; var name = '',
var name = '', translate = '',
descriptions = ['DateAndTime', 'Engineering', 'Financial', 'Information', 'Logical', 'LookupAndReference', 'Mathematic', 'Statistical', 'TextAndData' ]; descriptions = ['DateAndTime', 'Engineering', 'Financial', 'Information', 'Logical', 'LookupAndReference', 'Mathematic', 'Statistical', 'TextAndData' ];
me.groups = [];
for (var i=0; i<descriptions.length; i++) { for (var i=0; i<descriptions.length; i++) {
name = descriptions[i]; name = descriptions[i];
translate = 'sCat' + name; me.groups[name] = me['sCat' + name] || name;
this.translatTable[name] = {
en: this[translate],
de: this[translate+'_de'],
ru: this[translate+'_ru'],
pl: this[translate+'_pl'],
es: this[translate+'_es'],
fr: this[translate+'_fr']
};
} }
me.groups = {
'DateAndTime': me.translatTable['DateAndTime'][lang] || me.translatTable['DateAndTime']['en'],
'Engineering': me.translatTable['Engineering'][lang] || me.translatTable['Engineering']['en'],
'TextAndData': me.translatTable['TextAndData'][lang] || me.translatTable['TextAndData']['en'],
'Statistical': me.translatTable['Statistical'][lang] || me.translatTable['Statistical']['en'],
'Financial': me.translatTable['Financial'][lang] || me.translatTable['Financial']['en'],
'Mathematic': me.translatTable['Mathematic'][lang] || me.translatTable['Mathematic']['en'],
'LookupAndReference': me.translatTable['LookupAndReference'][lang] || me.translatTable['LookupAndReference']['en'],
'Information': me.translatTable['Information'][lang] || me.translatTable['Information']['en'],
'Logical': me.translatTable['Logical'][lang] || me.translatTable['Logical']['en']
};
me.layout = $('<div/>').append(_.template(me.template)({ me.layout = $('<div/>').append(_.template(me.template)({
android : Common.SharedSettings.get('android'), android : Common.SharedSettings.get('android'),
phone : Common.SharedSettings.get('phone'), phone : Common.SharedSettings.get('phone'),
@ -221,58 +200,7 @@ define([
sCatLookupAndReference: 'Lookup and Reference', sCatLookupAndReference: 'Lookup and Reference',
sCatMathematic: 'Math and trigonometry', sCatMathematic: 'Math and trigonometry',
sCatStatistical: 'Statistical', sCatStatistical: 'Statistical',
sCatTextAndData: 'Text and data', sCatTextAndData: 'Text and data'
sCatDateAndTime_ru: 'Дата и время',
sCatEngineering_ru: 'Инженерные',
sCatFinancial_ru: 'Финансовые',
sCatInformation_ru: 'Информационные',
sCatLogical_ru: 'Логические',
sCatLookupAndReference_ru: 'Поиск и ссылки',
sCatMathematic_ru: 'Математические',
sCatStatistical_ru: 'Статистические',
sCatTextAndData_ru: 'Текст и данные',
sCatLogical_es: 'Lógico',
sCatDateAndTime_es: 'Fecha y hora',
sCatEngineering_es: 'Ingenería',
sCatFinancial_es: 'Financial',
sCatInformation_es: 'Información',
sCatLookupAndReference_es: 'Búsqueda y referencia',
sCatMathematic_es: 'Matemáticas y trigonometría',
sCatStatistical_es: 'Estadístico',
sCatTextAndData_es: 'Texto y datos',
sCatLogical_fr: 'Logique',
sCatDateAndTime_fr: 'Date et heure',
sCatEngineering_fr: 'Ingénierie',
sCatFinancial_fr: 'Financier',
sCatInformation_fr: 'Information',
sCatLookupAndReference_fr: 'Recherche et référence',
sCatMathematic_fr: 'Maths et trigonométrie',
sCatStatistical_fr: 'Statistiques',
sCatTextAndData_fr: 'Texte et données',
sCatLogical_pl: 'Logiczny',
sCatDateAndTime_pl: 'Data i czas',
sCatEngineering_pl: 'Inżyniera',
sCatFinancial_pl: 'Finansowe',
sCatInformation_pl: 'Informacja',
sCatLookupAndReference_pl: 'Wyszukiwanie i odniesienie',
sCatMathematic_pl: 'Matematyczne i trygonometryczne',
sCatStatistical_pl: 'Statystyczny',
sCatTextAndData_pl: 'Tekst i data',
sCatDateAndTime_de: 'Datum und Uhrzeit',
sCatEngineering_de: 'Konstruktion',
sCatFinancial_de: 'Finanzmathematik',
sCatInformation_de: 'Information',
sCatLogical_de: 'Logisch',
sCatLookupAndReference_de: 'Suchen und Bezüge',
sCatMathematic_de: 'Mathematik und Trigonometrie',
sCatStatistical_de: 'Statistik',
sCatTextAndData_de: 'Text und Daten'
} }
})(), SSE.Views.AddFunction || {})); })(), SSE.Views.AddFunction || {}));
}); });