Skip to content

Commit db50424

Browse files
authored
feat: add translation for "1 hour ago" in multiple languages (#1096)
1 parent c3e1fb9 commit db50424

File tree

10 files changed

+13
-1
lines changed

10 files changed

+13
-1
lines changed

src/Resources/Locales/de_DE.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,7 @@
443443
<x:String x:Key="Text.Paste" xml:space="preserve">Einfügen</x:String>
444444
<x:String x:Key="Text.Period.JustNow" xml:space="preserve">Gerade eben</x:String>
445445
<x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">Vor {0} Minuten</x:String>
446+
<x:String x:Key="Text.Period.HourAgo" xml:space="preserve">Vor 1 Stunde</x:String>
446447
<x:String x:Key="Text.Period.HoursAgo" xml:space="preserve">Vor {0} Stunden</x:String>
447448
<x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Gestern</x:String>
448449
<x:String x:Key="Text.Period.DaysAgo" xml:space="preserve">Vor {0} Tagen</x:String>

src/Resources/Locales/en_US.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,7 @@
444444
<x:String x:Key="Text.Paste" xml:space="preserve">Paste</x:String>
445445
<x:String x:Key="Text.Period.JustNow" xml:space="preserve">Just now</x:String>
446446
<x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">{0} minutes ago</x:String>
447+
<x:String x:Key="Text.Period.HourAgo" xml:space="preserve">1 hour ago</x:String>
447448
<x:String x:Key="Text.Period.HoursAgo" xml:space="preserve">{0} hours ago</x:String>
448449
<x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Yesterday</x:String>
449450
<x:String x:Key="Text.Period.DaysAgo" xml:space="preserve">{0} days ago</x:String>

src/Resources/Locales/es_ES.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,7 @@
447447
<x:String x:Key="Text.Paste" xml:space="preserve">Pegar</x:String>
448448
<x:String x:Key="Text.Period.JustNow" xml:space="preserve">Justo ahora</x:String>
449449
<x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">Hace {0} minutos</x:String>
450+
<x:String x:Key="Text.Period.HourAgo" xml:space="preserve">Hace 1 hora</x:String>
450451
<x:String x:Key="Text.Period.HoursAgo" xml:space="preserve">Hace {0} horas</x:String>
451452
<x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Ayer</x:String>
452453
<x:String x:Key="Text.Period.DaysAgo" xml:space="preserve">Hace {0} días</x:String>

src/Resources/Locales/fr_FR.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,7 @@
422422
<x:String x:Key="Text.Paste" xml:space="preserve">Coller</x:String>
423423
<x:String x:Key="Text.Period.JustNow" xml:space="preserve">A l'instant</x:String>
424424
<x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">il y a {0} minutes</x:String>
425+
<x:String x:Key="Text.Period.HourAgo" xml:space="preserve">il y a 1 heure</x:String>
425426
<x:String x:Key="Text.Period.HoursAgo" xml:space="preserve">il y a {0} heures</x:String>
426427
<x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Hier</x:String>
427428
<x:String x:Key="Text.Period.DaysAgo" xml:space="preserve">il y a {0} jours</x:String>

src/Resources/Locales/it_IT.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,7 @@
448448
<x:String x:Key="Text.Paste" xml:space="preserve">Incolla</x:String>
449449
<x:String x:Key="Text.Period.JustNow" xml:space="preserve">Proprio ora</x:String>
450450
<x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">{0} minuti fa</x:String>
451+
<x:String x:Key="Text.Period.HourAgo" xml:space="preserve">1 ora fa</x:String>
451452
<x:String x:Key="Text.Period.HoursAgo" xml:space="preserve">{0} ore fa</x:String>
452453
<x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Ieri</x:String>
453454
<x:String x:Key="Text.Period.DaysAgo" xml:space="preserve">{0} giorni fa</x:String>

src/Resources/Locales/pt_BR.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,7 @@
435435
<x:String x:Key="Text.Paste" xml:space="preserve">Colar</x:String>
436436
<x:String x:Key="Text.Period.JustNow" xml:space="preserve">Agora mesmo</x:String>
437437
<x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">{0} minutos atrás</x:String>
438+
<x:String x:Key="Text.Period.HourAgo" xml:space="preserve">1 hora atrás</x:String>
438439
<x:String x:Key="Text.Period.HoursAgo" xml:space="preserve">{0} horas atrás</x:String>
439440
<x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Ontem</x:String>
440441
<x:String x:Key="Text.Period.DaysAgo" xml:space="preserve">{0} dias atrás</x:String>

src/Resources/Locales/ru_RU.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,7 @@
448448
<x:String x:Key="Text.Paste" xml:space="preserve">Вставить</x:String>
449449
<x:String x:Key="Text.Period.JustNow" xml:space="preserve">Сейчас</x:String>
450450
<x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">{0} минут назад</x:String>
451+
<x:String x:Key="Text.Period.HourAgo" xml:space="preserve">1 час назад</x:String>
451452
<x:String x:Key="Text.Period.HoursAgo" xml:space="preserve">{0} часов назад</x:String>
452453
<x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Вчера</x:String>
453454
<x:String x:Key="Text.Period.DaysAgo" xml:space="preserve">{0} дней назад</x:String>

src/Resources/Locales/zh_CN.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,7 @@
447447
<x:String x:Key="Text.Paste" xml:space="preserve">粘贴</x:String>
448448
<x:String x:Key="Text.Period.JustNow" xml:space="preserve">刚刚</x:String>
449449
<x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">{0}分钟前</x:String>
450+
<x:String x:Key="Text.Period.HourAgo" xml:space="preserve">1小时前</x:String>
450451
<x:String x:Key="Text.Period.HoursAgo" xml:space="preserve">{0}小时前</x:String>
451452
<x:String x:Key="Text.Period.Yesterday" xml:space="preserve">昨天</x:String>
452453
<x:String x:Key="Text.Period.DaysAgo" xml:space="preserve">{0}天前</x:String>

src/Resources/Locales/zh_TW.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,7 @@
447447
<x:String x:Key="Text.Paste" xml:space="preserve">貼上</x:String>
448448
<x:String x:Key="Text.Period.JustNow" xml:space="preserve">剛剛</x:String>
449449
<x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">{0} 分鐘前</x:String>
450+
<x:String x:Key="Text.Period.HourAgo" xml:space="preserve">1 小時前</x:String>
450451
<x:String x:Key="Text.Period.HoursAgo" xml:space="preserve">{0} 小時前</x:String>
451452
<x:String x:Key="Text.Period.Yesterday" xml:space="preserve">昨天</x:String>
452453
<x:String x:Key="Text.Period.DaysAgo" xml:space="preserve">{0} 天前</x:String>

src/Views/CommitTimeTextBlock.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,10 @@ private string GetDisplayText()
129129
return App.Text("Period.MinutesAgo", (int)span.TotalMinutes);
130130

131131
if (span.TotalDays < 1)
132-
return App.Text("Period.HoursAgo", (int)span.TotalHours);
132+
{
133+
var hours = (int)span.TotalHours;
134+
return hours == 1 ? App.Text("Period.HourAgo") : App.Text("Period.HoursAgo", hours);
135+
}
133136

134137
var lastDay = now.AddDays(-1).Date;
135138
if (localTime >= lastDay)

0 commit comments

Comments
 (0)