bitwarden/mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile synced 2026-01-20 01:13:30 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into feature/maui-migration

Browse Source 
Fixed conflicts and added null check on ForwardEmailDomainName

# Conflicts:
#	src/Core/Pages/Vault/CipherAddEditPage.xaml
#	src/Core/Pages/Vault/CipherDetailsPage.xaml
#	src/iOS.Core/Renderers/CollectionView/ExtendedGroupableItemsViewController.cs
This commit is contained in:
Dinis Vieira
2023-11-05 23:59:30 +00:00
parent eb25ee5d1b 658c1eaf64
commit e840dc2e30
124 changed files with 7786 additions and 2159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/Utilities/DateTimeConverter.cs
View File

@@ -8,6 +8,8 @@ namespace Bit.App.Utilities
{
public class DateTimeConverter : IValueConverter
{
public string Format { get; set; } = "{0} {1}";
private readonly ILocalizeService _localizeService;
public DateTimeConverter()
@@ -27,7 +29,7 @@ namespace Bit.App.Utilities
return string.Empty;
}
var d = ((DateTime)value).ToLocalTime();
return string.Format("{0} {1}",
return string.Format(Format,
_localizeService.GetLocaleShortDate(d),
_localizeService.GetLocaleShortTime(d));
}

3
src/Core/Utilities/ServiceContainer.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Globalization;
using System.Text;
using System.Threading.Tasks;
using Bit.Core.Abstractions;
@@ -228,7 +229,7 @@ namespace Bit.Core.Utilities
// and lower case the 2nd one (index 1)
indexToLowerCase = 1;
}
sb.Append(char.ToLower(typeName[indexToLowerCase]));
sb.Append(char.ToLower(typeName[indexToLowerCase], new CultureInfo("en-US")));
sb.Append(typeName.Substring(++indexToLowerCase));
return sb.ToString();
}