Merge pull request 'Plurals and translations for heatmap' (#2612) from 0ko/forgejo:oneisone into forgejo

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2612
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
This commit is contained in:
Earl Warren 2024-03-19 13:24:12 +00:00
commit 2c80727e8f
25 changed files with 57 additions and 33 deletions

View file

@ -1535,7 +1535,7 @@ filter.container.tagged = موسوم
[heatmap] [heatmap]
less = أقل less = أقل
number_of_contributions_in_the_last_12_months = %s مساهم في آخر 12 شهر number_of_contributions_in_the_last_12_months = %s مساهم في آخر 12 شهر
no_contributions = بلا مساهمات contributions_zero = بلا مساهمات
more = أكثر more = أكثر
[admin] [admin]

View file

@ -1357,7 +1357,7 @@ runners.description = Описание
[heatmap] [heatmap]
less = По-малко less = По-малко
number_of_contributions_in_the_last_12_months = %s приноса през последните 12 месеца number_of_contributions_in_the_last_12_months = %s приноса през последните 12 месеца
no_contributions = Няма приноси contributions_zero = Няма приноси
more = Повече more = Повече
[git.filemode] [git.filemode]

View file

@ -166,7 +166,7 @@ footer.links=Odkazy
[heatmap] [heatmap]
number_of_contributions_in_the_last_12_months=%s příspěvků za posledních 12 měsíců number_of_contributions_in_the_last_12_months=%s příspěvků za posledních 12 měsíců
no_contributions=Žádné příspěvky contributions_zero=Žádné příspěvky
less=Méně less=Méně
more=Více more=Více

View file

@ -164,7 +164,7 @@ footer.links=Links
[heatmap] [heatmap]
number_of_contributions_in_the_last_12_months=%s Beiträge in den letzten 12 Monaten number_of_contributions_in_the_last_12_months=%s Beiträge in den letzten 12 Monaten
no_contributions=Keine Beiträge contributions_zero=Keine Beiträge
less=Weniger less=Weniger
more=Mehr more=Mehr

View file

@ -159,7 +159,7 @@ footer.links=Συνδέσεις
[heatmap] [heatmap]
number_of_contributions_in_the_last_12_months=%s συνεισφορές τους τελευταίους 12 μήνες number_of_contributions_in_the_last_12_months=%s συνεισφορές τους τελευταίους 12 μήνες
no_contributions=Χωρίς συνεισφορές contributions_zero=Χωρίς συνεισφορές
less=Λιγότερα less=Λιγότερα
more=Περισσότερα more=Περισσότερα

View file

@ -164,7 +164,10 @@ footer.links = Links
[heatmap] [heatmap]
number_of_contributions_in_the_last_12_months = %s contributions in the last 12 months number_of_contributions_in_the_last_12_months = %s contributions in the last 12 months
no_contributions = No contributions contributions_zero = No contributions
contributions_format = {contributions} on {month} {day}, {year}
contributions_one = contribution
contributions_few = contributions
less = Less less = Less
more = More more = More

View file

@ -174,7 +174,7 @@ server_internal = Eraris interno de servilo
[heatmap] [heatmap]
less = Malpli less = Malpli
number_of_contributions_in_the_last_12_months = %s kontribuoj dum la pasintaj 12 monatoj number_of_contributions_in_the_last_12_months = %s kontribuoj dum la pasintaj 12 monatoj
no_contributions = Neniu kontribuo contributions_zero = Neniu kontribuo
more = Pli more = Pli
[startpage] [startpage]

View file

@ -150,7 +150,7 @@ footer.links=Enlaces
[heatmap] [heatmap]
number_of_contributions_in_the_last_12_months=%s contribuciones en los últimos 12 meses number_of_contributions_in_the_last_12_months=%s contribuciones en los últimos 12 meses
no_contributions=No hay contribuciones contributions_zero=No hay contribuciones
less=Menos less=Menos
more=Más more=Más

View file

@ -165,7 +165,7 @@ footer.links=Liens
[heatmap] [heatmap]
number_of_contributions_in_the_last_12_months=%s contributions au cours des 12 derniers mois number_of_contributions_in_the_last_12_months=%s contributions au cours des 12 derniers mois
no_contributions=Aucune contribution contributions_zero=Aucune contribution
less=Moins less=Moins
more=Plus more=Plus

View file

@ -131,7 +131,7 @@ footer.software = Sobre o Software
footer.links = Ligazóns footer.links = Ligazóns
[heatmap] [heatmap]
no_contributions = Sen Achegas contributions_zero = Sen Achegas
less = Menos less = Menos
more = Máis more = Máis
number_of_contributions_in_the_last_12_months = %s de contribucións nos últimos 12 meses number_of_contributions_in_the_last_12_months = %s de contribucións nos últimos 12 meses

View file

@ -152,7 +152,7 @@ footer.software = A proposito del Software
[heatmap] [heatmap]
more = Più more = Più
no_contributions = Nessun contributo contributions_zero = Nessun contributo
less = Meno less = Meno
number_of_contributions_in_the_last_12_months = %s contributi negli ultimi 12 mesi number_of_contributions_in_the_last_12_months = %s contributi negli ultimi 12 mesi

View file

@ -163,7 +163,7 @@ footer.links=リンク
[heatmap] [heatmap]
number_of_contributions_in_the_last_12_months=過去 12 か月間で %s 件の実績 number_of_contributions_in_the_last_12_months=過去 12 か月間で %s 件の実績
no_contributions=実績なし contributions_zero=実績なし
less= less=
more= more=

View file

@ -150,7 +150,7 @@ footer.links=Saites
[heatmap] [heatmap]
number_of_contributions_in_the_last_12_months=%s darbības pēdējo 12 mēnešu laikā number_of_contributions_in_the_last_12_months=%s darbības pēdējo 12 mēnešu laikā
no_contributions=Nav aktivitātes contributions_zero=Nav aktivitātes
less=Mazāk less=Mazāk
more=Vairāk more=Vairāk

View file

@ -164,7 +164,7 @@ footer.links = Verwijzingen
[heatmap] [heatmap]
number_of_contributions_in_the_last_12_months = %s contributies in de laatste 12 maanden number_of_contributions_in_the_last_12_months = %s contributies in de laatste 12 maanden
no_contributions = Geen contributies contributions_zero = Geen contributies
less = Minder less = Minder
more = Meer more = Meer

View file

@ -151,7 +151,7 @@ footer.links=Links
[heatmap] [heatmap]
number_of_contributions_in_the_last_12_months=%s contribuições nos últimos 12 meses number_of_contributions_in_the_last_12_months=%s contribuições nos últimos 12 meses
no_contributions=Sem contribuições contributions_zero=Sem contribuições
less=Menos less=Menos
more=Mais more=Mais

View file

@ -151,7 +151,7 @@ footer.links=Ligações
[heatmap] [heatmap]
number_of_contributions_in_the_last_12_months=%s contribuições nos últimos 12 meses number_of_contributions_in_the_last_12_months=%s contribuições nos últimos 12 meses
no_contributions=Nenhuma contribuição contributions_zero=Nenhuma contribuição
less=Menos less=Menos
more=Mais more=Mais

View file

@ -164,7 +164,10 @@ footer.links=Ссылки
[heatmap] [heatmap]
number_of_contributions_in_the_last_12_months=Принимал(а) участие %s раз за последние 12 месяцев number_of_contributions_in_the_last_12_months=Принимал(а) участие %s раз за последние 12 месяцев
no_contributions=Не принимал(а) участия contributions_zero=Действий не было
contributions_format = {contributions} {day} {month} {year}
contributions_one=действие
contributions_few=действий
less=Меньше less=Меньше
more=Больше more=Больше

View file

@ -149,7 +149,7 @@ footer.links=Odkazy
[heatmap] [heatmap]
number_of_contributions_in_the_last_12_months=%s príspevkov za posledných 12 mesiacov number_of_contributions_in_the_last_12_months=%s príspevkov za posledných 12 mesiacov
no_contributions=Žiadne príspevky contributions_zero=Žiadne príspevky
less=Menej less=Menej
more=Viac more=Viac

View file

@ -377,7 +377,7 @@ gpg_key_verified_long = Ključ je bil preverjen z žetonom in ga je mogoče upor
[heatmap] [heatmap]
less = Manj less = Manj
number_of_contributions_in_the_last_12_months = %s prispevkov v zadnjih 12 mesecih number_of_contributions_in_the_last_12_months = %s prispevkov v zadnjih 12 mesecih
no_contributions = Ni prispevkov contributions_zero = Ni prispevkov
more = Več more = Več
[filter] [filter]

View file

@ -150,7 +150,7 @@ footer.links=Bağlantılar
[heatmap] [heatmap]
number_of_contributions_in_the_last_12_months=son 12 ayda %s katkı number_of_contributions_in_the_last_12_months=son 12 ayda %s katkı
no_contributions=Katkı yapılmamış contributions_zero=Katkı yapılmamış
less=Daha az less=Daha az
more=Daha Fazla more=Daha Fazla

View file

@ -164,7 +164,7 @@ footer.links=链接
[heatmap] [heatmap]
number_of_contributions_in_the_last_12_months=一年内 %s 次贡献 number_of_contributions_in_the_last_12_months=一年内 %s 次贡献
no_contributions=目前还没有贡献。 contributions_zero=目前还没有贡献。
less=更少的 less=更少的
more=更多的 more=更多的

View file

@ -134,7 +134,7 @@ footer.links=連結
[heatmap] [heatmap]
number_of_contributions_in_the_last_12_months=過去十二個月內有 %s 個貢獻 number_of_contributions_in_the_last_12_months=過去十二個月內有 %s 個貢獻
no_contributions=沒有貢獻 contributions_zero=沒有貢獻
less= less=
more= more=

View file

@ -2,7 +2,10 @@
<div id="user-heatmap" class="is-loading" <div id="user-heatmap" class="is-loading"
data-heatmap-data="{{JsonUtils.EncodeToString .HeatmapData}}" data-heatmap-data="{{JsonUtils.EncodeToString .HeatmapData}}"
data-locale-total-contributions="{{ctx.Locale.Tr "heatmap.number_of_contributions_in_the_last_12_months" (ctx.Locale.PrettyNumber .HeatmapTotalContributions)}}" data-locale-total-contributions="{{ctx.Locale.Tr "heatmap.number_of_contributions_in_the_last_12_months" (ctx.Locale.PrettyNumber .HeatmapTotalContributions)}}"
data-locale-no-contributions="{{ctx.Locale.Tr "heatmap.no_contributions"}}" data-locale-contributions-zero="{{ctx.Locale.Tr "heatmap.contributions_zero"}}"
data-locale-contributions-format="{{ctx.Locale.Tr "heatmap.contributions_format"}}"
data-locale-contributions-one="{{ctx.Locale.Tr "heatmap.contributions_one"}}"
data-locale-contributions-few="{{ctx.Locale.Tr "heatmap.contributions_few"}}"
data-locale-more="{{ctx.Locale.Tr "heatmap.more"}}" data-locale-more="{{ctx.Locale.Tr "heatmap.more"}}"
data-locale-less="{{ctx.Locale.Tr "heatmap.less"}}" data-locale-less="{{ctx.Locale.Tr "heatmap.less"}}"
></div> ></div>

View file

@ -59,8 +59,22 @@ export default {
</div> </div>
<calendar-heatmap <calendar-heatmap
:locale="locale" :locale="locale"
:no-data-text="locale.no_contributions" :no-data-text="locale.contributions_zero"
:tooltip-unit="locale.contributions" :tooltip-formatter="
(v) =>
locale.contributions_format
.replace(
'{contributions}',
`<b>${v.count} ${
v.count === 1
? locale.contributions_one
: locale.contributions_few
}</b>`
)
.replace('{month}', locale.months[v.date.getMonth()])
.replace('{day}', v.date.getDate())
.replace('{year}', v.date.getFullYear())
"
:end-date="endDate" :end-date="endDate"
:values="values" :values="values"
:range-color="colorRange" :range-color="colorRange"

View file

@ -18,13 +18,14 @@ export function initHeatmap() {
return {date: new Date(v), count: heatmap[v]}; return {date: new Date(v), count: heatmap[v]};
}); });
// last heatmap tooltip localization attempt https://github.com/go-gitea/gitea/pull/24131/commits/a83761cbbae3c2e3b4bced71e680f44432073ac8
const locale = { const locale = {
months: new Array(12).fill().map((_, idx) => translateMonth(idx)), months: new Array(12).fill().map((_, idx) => translateMonth(idx)),
days: new Array(7).fill().map((_, idx) => translateDay(idx)), days: new Array(7).fill().map((_, idx) => translateDay(idx)),
contributions: 'contributions',
contributions_in_the_last_12_months: el.getAttribute('data-locale-total-contributions'), contributions_in_the_last_12_months: el.getAttribute('data-locale-total-contributions'),
no_contributions: el.getAttribute('data-locale-no-contributions'), contributions_zero: el.getAttribute('data-locale-contributions-zero'),
contributions_format: el.getAttribute('data-locale-contributions-format'),
contributions_one: el.getAttribute('data-locale-contributions-one'),
contributions_few: el.getAttribute('data-locale-contributions-few'),
more: el.getAttribute('data-locale-more'), more: el.getAttribute('data-locale-more'),
less: el.getAttribute('data-locale-less'), less: el.getAttribute('data-locale-less'),
}; };