@@ -119,7 +119,7 @@ public DateTimeOffset ItemDateModifiedReal
119
119
get => _itemDateModifiedReal ;
120
120
set
121
121
{
122
- ItemDateModified = GetFriendlyDate ( value ) ;
122
+ ItemDateModified = GetFriendlyDateFromFormat ( value , DateReturnFormat ) ;
123
123
_itemDateModifiedReal = value ;
124
124
}
125
125
}
@@ -131,7 +131,7 @@ public DateTimeOffset ItemDateCreatedReal
131
131
get => _itemDateCreatedReal ;
132
132
set
133
133
{
134
- ItemDateCreated = GetFriendlyDate ( value ) ;
134
+ ItemDateCreated = GetFriendlyDateFromFormat ( value , DateReturnFormat ) ;
135
135
_itemDateCreatedReal = value ;
136
136
}
137
137
}
@@ -143,7 +143,7 @@ public DateTimeOffset ItemDateAccessedReal
143
143
get => _itemDateAccessedReal ;
144
144
set
145
145
{
146
- ItemDateAccessed = GetFriendlyDate ( value ) ;
146
+ ItemDateAccessed = GetFriendlyDateFromFormat ( value , DateReturnFormat ) ;
147
147
_itemDateAccessedReal = value ;
148
148
}
149
149
}
@@ -182,49 +182,11 @@ public ListedItem(string folderRelativeId, string dateReturnFormat = null)
182
182
183
183
private string DateReturnFormat { get ; }
184
184
185
- private string GetFriendlyDate ( DateTimeOffset d )
186
- {
187
- var elapsed = DateTimeOffset . Now - d ;
188
-
189
- if ( elapsed . TotalDays > 7 )
190
- {
191
- return d . ToString ( DateReturnFormat ) ;
192
- }
193
- else if ( elapsed . TotalDays > 2 )
194
- {
195
- return string . Format ( ResourceController . GetTranslation ( "DaysAgo" ) , elapsed . Days ) ;
196
- }
197
- else if ( elapsed . TotalDays > 1 )
198
- {
199
- return string . Format ( ResourceController . GetTranslation ( "DayAgo" ) , elapsed . Days ) ;
200
- }
201
- else if ( elapsed . TotalHours > 2 )
202
- {
203
- return string . Format ( ResourceController . GetTranslation ( "HoursAgo" ) , elapsed . Hours ) ;
204
- }
205
- else if ( elapsed . TotalHours > 1 )
206
- {
207
- return string . Format ( ResourceController . GetTranslation ( "HourAgo" ) , elapsed . Hours ) ;
208
- }
209
- else if ( elapsed . TotalMinutes > 2 )
210
- {
211
- return string . Format ( ResourceController . GetTranslation ( "MinutesAgo" ) , elapsed . Minutes ) ;
212
- }
213
- else if ( elapsed . TotalMinutes > 1 )
214
- {
215
- return string . Format ( ResourceController . GetTranslation ( "MinuteAgo" ) , elapsed . Minutes ) ;
216
- }
217
- else
218
- {
219
- return string . Format ( ResourceController . GetTranslation ( "SecondsAgo" ) , elapsed . Seconds ) ;
220
- }
221
- }
222
-
223
185
public static string GetFriendlyDateFromFormat ( DateTimeOffset d , string returnFormat )
224
186
{
225
187
var elapsed = DateTimeOffset . Now - d ;
226
188
227
- if ( elapsed . TotalDays > 7 )
189
+ if ( elapsed . TotalDays > 7 || returnFormat == "g" )
228
190
{
229
191
return d . ToString ( returnFormat ) ;
230
192
}
0 commit comments