From db504241eae8fc93813b4eca2ddbdab3c52306b8 Mon Sep 17 00:00:00 2001
From: Asurada <43401755+ousugo@users.noreply.github.com>
Date: Fri, 14 Mar 2025 16:57:03 +0800
Subject: [PATCH] feat: add translation for "1 hour ago" in multiple languages
(#1096)
---
src/Resources/Locales/de_DE.axaml | 1 +
src/Resources/Locales/en_US.axaml | 1 +
src/Resources/Locales/es_ES.axaml | 1 +
src/Resources/Locales/fr_FR.axaml | 1 +
src/Resources/Locales/it_IT.axaml | 1 +
src/Resources/Locales/pt_BR.axaml | 1 +
src/Resources/Locales/ru_RU.axaml | 1 +
src/Resources/Locales/zh_CN.axaml | 1 +
src/Resources/Locales/zh_TW.axaml | 1 +
src/Views/CommitTimeTextBlock.cs | 5 ++++-
10 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index 759e3a53..aff8ffc5 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -443,6 +443,7 @@
Einfügen
Gerade eben
Vor {0} Minuten
+ Vor 1 Stunde
Vor {0} Stunden
Gestern
Vor {0} Tagen
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 90125de8..818bd9bb 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -444,6 +444,7 @@
Paste
Just now
{0} minutes ago
+ 1 hour ago
{0} hours ago
Yesterday
{0} days ago
diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index bcf09e1a..e909a14e 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -447,6 +447,7 @@
Pegar
Justo ahora
Hace {0} minutos
+ Hace 1 hora
Hace {0} horas
Ayer
Hace {0} días
diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index 76405b21..aecea9ad 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -422,6 +422,7 @@
Coller
A l'instant
il y a {0} minutes
+ il y a 1 heure
il y a {0} heures
Hier
il y a {0} jours
diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml
index f944689c..4dcc8771 100644
--- a/src/Resources/Locales/it_IT.axaml
+++ b/src/Resources/Locales/it_IT.axaml
@@ -448,6 +448,7 @@
Incolla
Proprio ora
{0} minuti fa
+ 1 ora fa
{0} ore fa
Ieri
{0} giorni fa
diff --git a/src/Resources/Locales/pt_BR.axaml b/src/Resources/Locales/pt_BR.axaml
index ebff746c..b146bf0e 100644
--- a/src/Resources/Locales/pt_BR.axaml
+++ b/src/Resources/Locales/pt_BR.axaml
@@ -435,6 +435,7 @@
Colar
Agora mesmo
{0} minutos atrás
+ 1 hora atrás
{0} horas atrás
Ontem
{0} dias atrás
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index 6815bbeb..07fb7c94 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -448,6 +448,7 @@
Вставить
Сейчас
{0} минут назад
+ 1 час назад
{0} часов назад
Вчера
{0} дней назад
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index cf796805..2d160ad2 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -447,6 +447,7 @@
粘贴
刚刚
{0}分钟前
+ 1小时前
{0}小时前
昨天
{0}天前
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 539001bd..e50a600d 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -447,6 +447,7 @@
貼上
剛剛
{0} 分鐘前
+ 1 小時前
{0} 小時前
昨天
{0} 天前
diff --git a/src/Views/CommitTimeTextBlock.cs b/src/Views/CommitTimeTextBlock.cs
index 6947f7f2..db63e8a6 100644
--- a/src/Views/CommitTimeTextBlock.cs
+++ b/src/Views/CommitTimeTextBlock.cs
@@ -129,7 +129,10 @@ namespace SourceGit.Views
return App.Text("Period.MinutesAgo", (int)span.TotalMinutes);
if (span.TotalDays < 1)
- return App.Text("Period.HoursAgo", (int)span.TotalHours);
+ {
+ var hours = (int)span.TotalHours;
+ return hours == 1 ? App.Text("Period.HourAgo") : App.Text("Period.HoursAgo", hours);
+ }
var lastDay = now.AddDays(-1).Date;
if (localTime >= lastDay)