IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved from hotfix/10.5.2

Browse Source
This commit is contained in:
pavelbannov 2020-01-16 21:17:17 +03:00
parent 8f6252f6e3
commit 7798898100
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/ASC.Common/Utils/TimeZoneConverter/TimeZoneConverter.cs
View File

@ -33,7 +33,9 @@ using System.Reflection;
using System.Text.RegularExpressions;
using System.Xml.Linq;
using System.Xml.XPath;
using ASC.Common.Logging;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Options;
@ -45,7 +47,7 @@ namespace ASC.Common.Utils
private IEnumerable<MapZone> _mapZones;
private bool _isR7;
private bool _customMode;
private Dictionary<string, string> _translations;
@ -203,9 +205,9 @@ namespace ASC.Common.Utils
{
try
{
_isR7 = Configuration["core:r7office"] == "true";
_customMode = Configuration["core:r7office"] == "true";
if (!_isR7)
if (!_customMode)
{
_translations = new Dictionary<string, string>();
return;
@ -228,7 +230,7 @@ namespace ASC.Common.Utils
public string GetTimeZoneName(TimeZoneInfo timeZone)
{
if (!_isR7)
if (!_customMode)
return timeZone.DisplayName;
return _translations.ContainsKey(timeZone.Id) ? _translations[timeZone.Id] : timeZone.DisplayName;

4
common/ASC.Common/Utils/TimeZoneConverter/timeZoneNames.xml
View File

@ -233,7 +233,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<zone type="Antarctica/Syowa">Антарктида/Сёва</zone>
<zone type="Antarctica/Troll">Антарктида/Тролль</zone>
<zone type="Antarctica/Vostok">Антарктида/Восток</zone>
<zone type="Arctic/Longyearbyen">ru_Arctic/Лонгйир</zone>
<zone type="Arctic/Longyearbyen">Шпицберген/Лонгйир</zone>
<zone type="Asia/Aden">Азия/Аден</zone>
<zone type="Asia/Almaty">Азия/Алматы</zone>
<zone type="Asia/Amman">Азия/Амман</zone>
@ -361,7 +361,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<zone type="Australia/North">Австралия/Дарвин</zone>
<zone type="Australia/NSW">Австралия/Сидней</zone>
<zone type="Australia/Perth">Австралия/Перт</zone>
<zone type="Australia/Queensland">Australia/Квинсленд</zone>
<zone type="Australia/Queensland">Австралия/Квинсленд</zone>
<zone type="Australia/South">Австралия/Аделаида</zone>
<zone type="Australia/Sydney">Австралия/Сидней</zone>
<zone type="Australia/Tasmania">Австралия/Тасмания</zone>