Rename repo_updated to repo_updated_v7 to prevent regressions (#4117)

Currently this string has different amount of placeholders in v8 and v7 because https://codeberg.org/forgejo/forgejo/pulls/3837 was not backported to v7. ### The problem This string is currently [not translated](https://translate.codeberg.org/translate/forgejo/forgejo/en/?checksum=405b09ee2c2371d4) in every language. For example, when UI is in Slovenian, it would be in English. But if someone translates it into Slovenian, it will be something like `Posodobljen %s`. Then we merge the Weblate PR, @forgejo-backport-action creates a backport and we forget to check this backport for presence of `repo_updated`. We ship this as a point release of our LTS v7, and then Slovenian users will literally see `Posodobljen %s` in the UI instead of `Posodobljen včeraj`. By renaming this key in v7 we protect it from these kinds of regressions. ### Test Go to Explore, look at repo entries, they should contain relative time. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4117 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Reviewed-by: twenty-panda <twenty-panda@noreply.codeberg.org>
2024-06-26 09:08:17 +02:00 · 2024-06-14 13:26:46 +00:00 · 2024-06-14 13:26:46 +00:00 · e997cbc8d5
parent 5c59a1347a
commit e997cbc8d5
32 changed files with 33 additions and 33 deletions
--- a/options/locale/locale_ar.ini
+++ b/options/locale/locale_ar.ini
@ -517,7 +517,7 @@ settings.delete_org_desc = هذه المنظمة ستحذف إلى الأبد،
 create_org = أنشئ منظمة
 teams.add_all_repos_desc = سيضيف هذا كل مستودعات المنظمة إلى الفريق.
 settings.labels_desc = أضف التصنيفات القابلة للاستخدام في المسائل التابعة <strong>لكل مستودعات</strong> هذه المنظمة.
-repo_updated = حُدِّث
+repo_updated_v7 = حُدِّث
 org_desc = الوصف
 org_name_helper = ينبغي أن تكون أسماء المنظمات قصيرة وسهلة التذكر.
 team_permission_desc = الأذونات
--- a/options/locale/locale_bg.ini
+++ b/options/locale/locale_bg.ini
@ -1212,7 +1212,7 @@ settings.delete_prompt = Организацията ще бъде премахн
 settings.labels_desc = Добавете етикети, които могат да се използват за задачи за <strong>всички хранилища</strong> в тази организация.
 teams.none_access = Без достъп
 teams.members.none = Няма членове в този екип.
-repo_updated = Обновено
+repo_updated_v7 = Обновено
 teams.delete_team_success = Екипът е изтрит.
 teams.search_repo_placeholder = Потърсете хранилище…
 teams.delete_team_title = Изтриване на екипа
--- a/options/locale/locale_cs-CZ.ini
+++ b/options/locale/locale_cs-CZ.ini
@ -2788,7 +2788,7 @@ org_name_holder=Název organizace
 org_full_name_holder=Celý název organizace
 org_name_helper=Jména organizací by měla být krátká a zapamatovatelná.
 create_org=Vytvořit organizaci
-repo_updated=Upraveno
+repo_updated_v7=Upraveno
 members=Členové
 teams=Týmy
 code=Kód
--- a/options/locale/locale_de-DE.ini
+++ b/options/locale/locale_de-DE.ini
@ -2765,7 +2765,7 @@ org_name_holder=Name der Organisation
 org_full_name_holder=Vollständiger Name der Organisation
 org_name_helper=Organisationsnamen sollten kurz und einprägsam sein.
 create_org=Organisation erstellen
-repo_updated=Aktualisiert
+repo_updated_v7=Aktualisiert
 members=Mitglieder
 teams=Teams
 code=Quelltext
--- a/options/locale/locale_el-GR.ini
+++ b/options/locale/locale_el-GR.ini
@ -2737,7 +2737,7 @@ org_name_holder=Όνομα οργανισμού
 org_full_name_holder=Πλήρες όνομα οργανισμού
 org_name_helper=Τα ονόματα οργανισμών θα πρέπει να είναι σύντομα και εύκολα στην απομνημόνευση.
 create_org=Δημιουργία οργανισμού
-repo_updated=Ενημερώθηκε
+repo_updated_v7=Ενημερώθηκε
 members=Μέλη
 teams=Ομάδες
 code=Κώδικας
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@ -2729,7 +2729,7 @@ org_name_holder = Organization name
 org_full_name_holder = Organization full name
 org_name_helper = Organization names should be short and memorable.
 create_org = Create organization
-repo_updated = Updated
+repo_updated_v7 = Updated
 members = Members
 teams = Teams
 code = Code
--- a/options/locale/locale_es-ES.ini
+++ b/options/locale/locale_es-ES.ini
@ -2623,7 +2623,7 @@ org_name_holder=Nombre de la organización
 org_full_name_holder=Nombre completo de la organización
 org_name_helper=Los nombres de organización deben ser cortos y destacados.
 create_org=Crear Organización
-repo_updated=Actualizado
+repo_updated_v7=Actualizado
 members=Miembros
 teams=Equipos
 code=Código
--- a/options/locale/locale_fa-IR.ini
+++ b/options/locale/locale_fa-IR.ini
@ -1981,7 +1981,7 @@ org_name_holder=نام سازمان
 org_full_name_holder=نام کامل سازمان
 org_name_helper=نام سازمان باید کوتاه و قابل حفظ کردن باشد.
 create_org=ایجاد سازمان
-repo_updated=به روز رسانی شده
+repo_updated_v7=به روز رسانی شده
 members=اعضاء
 teams=تیم‌ها
 lower_members=اعضا
--- a/options/locale/locale_fi-FI.ini
+++ b/options/locale/locale_fi-FI.ini
@ -1352,7 +1352,7 @@ org_name_holder=Organisaatio
 org_full_name_holder=Organisaation täydellinen nimi
 org_name_helper=Organisaation nimen tulisi olla lyhyt ja mieleenpainuva.
 create_org=Luo organisaatio
-repo_updated=Päivitetty
+repo_updated_v7=Päivitetty
 members=Jäsenet
 teams=Tiimit
 lower_members=jäsenet
--- a/options/locale/locale_fil.ini
+++ b/options/locale/locale_fil.ini
@ -2073,7 +2073,7 @@ auths.default_domain_name = Default domain name na gagamitin para sa email addre
 auths.allow_deactivate_all = Pinapayagan ang walang laman na resulta ng paghahanap para i-deactivate ang lahat ng mga user

 [org]
-repo_updated = Binago
+repo_updated_v7 = Binago
 team_access_desc = Access ng repositoryo
 team_permission_desc = Pahintulot
 org_desc = Deskripsyon
--- a/options/locale/locale_fr-FR.ini
+++ b/options/locale/locale_fr-FR.ini
@ -2775,7 +2775,7 @@ org_name_holder=Nom de l'organisation
 org_full_name_holder=Nom complet de l'organisation
 org_name_helper=Le nom de l'organisation doit être court et mémorable.
 create_org=Créer une organisation
-repo_updated=Actualisé
+repo_updated_v7=Actualisé
 members=Membres
 teams=Équipes
 code=Code
--- a/options/locale/locale_hu-HU.ini
+++ b/options/locale/locale_hu-HU.ini
@ -1179,7 +1179,7 @@ org_name_holder=Szervezet neve
 org_full_name_holder=Szervezet teljes neve
 org_name_helper=A szervezetek nevének rövidnek és megjegyezhetőnek kell lennie.
 create_org=Szervezet létrehozása
-repo_updated=Frissítve
+repo_updated_v7=Frissítve
 members=Tagok
 teams=Csoportok
 lower_members=tagok
--- a/options/locale/locale_id-ID.ini
+++ b/options/locale/locale_id-ID.ini
@ -963,7 +963,7 @@ branch.deleted_by=Dihapus oleh %s
 org_name_holder=Nama Organisasi
 org_full_name_holder=Organisasi Nama Lengkap
 create_org=Buat Organisasi
-repo_updated=Diperbarui
+repo_updated_v7=Diperbarui
 members=Anggota
 teams=Tim
 lower_members=anggota
--- a/options/locale/locale_is-IS.ini
+++ b/options/locale/locale_is-IS.ini
@ -1120,7 +1120,7 @@ topic.done=Í lagi
 [graphs]

 [org]
-repo_updated=Uppfært
+repo_updated_v7=Uppfært
 members=Meðlimar
 teams=Lið
 lower_members=meðlimar
--- a/options/locale/locale_it-IT.ini
+++ b/options/locale/locale_it-IT.ini
@ -2748,7 +2748,7 @@ org_name_holder=Nome dell'organizzazione
 org_full_name_holder=Nome completo dell'organizzazione
 org_name_helper=I nomi delle organizzazioni devono essere brevi e semplici da ricordare.
 create_org=Crea organizzazione
-repo_updated=Aggiornato
+repo_updated_v7=Aggiornato
 members=Membri
 teams=Team
 lower_members=membri
--- a/options/locale/locale_ja-JP.ini
+++ b/options/locale/locale_ja-JP.ini
@ -2755,7 +2755,7 @@ org_name_holder=組織名
 org_full_name_holder=組織のフルネーム
 org_name_helper=組織名は短く覚えやすいものにしましょう。
 create_org=組織を作成
-repo_updated=最終更新
+repo_updated_v7=最終更新
 members=メンバー
 teams=チーム
 code=コード
--- a/options/locale/locale_ko-KR.ini
+++ b/options/locale/locale_ko-KR.ini
@ -1300,7 +1300,7 @@ issues.new.no_projects = 프로젝트 없음
 org_name_holder=조직 이름
 org_full_name_holder=조직 전체 이름
 create_org=새로운 조직
-repo_updated=업데이트됨
+repo_updated_v7=업데이트됨
 members=멤버
 teams=팀
 lower_members=회원
--- a/options/locale/locale_lv-LV.ini
+++ b/options/locale/locale_lv-LV.ini
@ -2581,7 +2581,7 @@ org_name_holder=Organizācijas nosaukums
 org_full_name_holder=Organizācijas pilnais nosaukums
 org_name_helper=Organizāciju nosaukumiem vēlams būt īsiem un tādiem, ko viegli atcerēties.
 create_org=Izveidot organizāciju
-repo_updated=Atjaunināts
+repo_updated_v7=Atjaunināts
 members=Dalībnieki
 teams=Komandas
 code=Kods
--- a/options/locale/locale_nl-NL.ini
+++ b/options/locale/locale_nl-NL.ini
@ -2731,7 +2731,7 @@ org_name_holder=Organisatienaam
 org_full_name_holder=Volledige naam organisatie
 org_name_helper=Organisatienamen horen kort en memorabel zijn.
 create_org=Nieuwe organisatie aanmaken
-repo_updated=Geupdate
+repo_updated_v7=Geupdate
 members=Leden
 teams=Teams
 lower_members=leden
--- a/options/locale/locale_pl-PL.ini
+++ b/options/locale/locale_pl-PL.ini
@ -2033,7 +2033,7 @@ org_name_holder=Nazwa organizacji
 org_full_name_holder=Pełna nazwa organizacji
 org_name_helper=Nazwa organizacji powinna być krótka i łatwa do zapamiętania.
 create_org=Utwórz organizację
-repo_updated=Zaktualizowano
+repo_updated_v7=Zaktualizowano
 members=Członkowie
 teams=Zespoły
 lower_members=członkowie
--- a/options/locale/locale_pt-BR.ini
+++ b/options/locale/locale_pt-BR.ini
@ -2670,7 +2670,7 @@ org_name_holder=Nome da organização
 org_full_name_holder=Nome completo da organização
 org_name_helper=Nomes de organização devem ser curtos e memoráveis.
 create_org=Criar organização
-repo_updated=Atualizado
+repo_updated_v7=Atualizado
 members=Membros
 teams=Equipes
 code=Código
--- a/options/locale/locale_pt-PT.ini
+++ b/options/locale/locale_pt-PT.ini
@ -2755,7 +2755,7 @@ org_name_holder=Nome da organização
 org_full_name_holder=Nome completo da organização
 org_name_helper=Nomes das organizações devem ser curtos e memoráveis.
 create_org=Criar organização
-repo_updated=Modificado
+repo_updated_v7=Modificado
 members=Membros
 teams=Equipas
 code=Código
--- a/options/locale/locale_ru-RU.ini
+++ b/options/locale/locale_ru-RU.ini
@ -2765,7 +2765,7 @@ org_name_holder=Название организации
 org_full_name_holder=Полное название
 org_name_helper=Лучшие названия организаций коротки и запоминаемы.
 create_org=Создать организацию
-repo_updated=Обновлён
+repo_updated_v7=Обновлён
 members=Участники
 teams=Команды
 code=Код
--- a/options/locale/locale_si-LK.ini
+++ b/options/locale/locale_si-LK.ini
@ -1921,7 +1921,7 @@ org_name_holder=සංවිධානයේ නම
 org_full_name_holder=සංවිධානයේ සම්පූර්ණ නම
 org_name_helper=සංවිධාන නම් කෙටි හා අමතක නොවන විය යුතුය.
 create_org=සංවිධානය සාදන්න
-repo_updated=යාවත්කාල කෙරිණි
+repo_updated_v7=යාවත්කාල කෙරිණි
 members=සාමාජිකයින්
 teams=කණ්ඩායම්
 lower_members=සාමාජිකයින්
--- a/options/locale/locale_sv-SE.ini
+++ b/options/locale/locale_sv-SE.ini
@ -1549,7 +1549,7 @@ org_name_holder=Organisationsnamn
 org_full_name_holder=Organisationens Fullständiga Namn
 org_name_helper=Organisationsnamn bör vara korta och enkla att komma ihåg.
 create_org=Skapa organisation
-repo_updated=Uppdaterad
+repo_updated_v7=Uppdaterad
 members=Medlemmar
 teams=Grupper
 lower_members=medlemmar
--- a/options/locale/locale_tr-TR.ini
+++ b/options/locale/locale_tr-TR.ini
@ -2591,7 +2591,7 @@ org_name_holder=Organizasyon Adı
 org_full_name_holder=Organizasyon Tam Adı
 org_name_helper=Organizasyon adları kısa ve hatırlanabilir olmalıdır.
 create_org=Organizasyon Oluştur
-repo_updated=Güncellendi
+repo_updated_v7=Güncellendi
 members=Üyeler
 teams=Takımlar
 code=Kod
--- a/options/locale/locale_uk-UA.ini
+++ b/options/locale/locale_uk-UA.ini
@ -2078,7 +2078,7 @@ org_name_holder=Назва організації
 org_full_name_holder=Повна назва організації
 org_name_helper=Назва організації має бути простою та зрозумілою.
 create_org=Створити організацію
-repo_updated=Оновлено
+repo_updated_v7=Оновлено
 members=Учасники
 teams=Команди
 lower_members=учасники
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@ -2777,7 +2777,7 @@ org_name_holder=组织名称
 org_full_name_holder=组织全名
 org_name_helper=组织名字应该简单明了。
 create_org=创建组织
-repo_updated=最后更新于
+repo_updated_v7=最后更新于
 members=成员
 teams=团队
 code=代码
--- a/options/locale/locale_zh-HK.ini
+++ b/options/locale/locale_zh-HK.ini
@ -676,7 +676,7 @@ release.downloads=下載附件
 org_name_holder=組織名稱
 org_full_name_holder=組織全名
 create_org=建立組織
-repo_updated=最後更新於
+repo_updated_v7=最後更新於
 members=成員數
 teams=組織團隊
 lower_members=名成員
--- a/options/locale/locale_zh-TW.ini
+++ b/options/locale/locale_zh-TW.ini
@ -2656,7 +2656,7 @@ org_name_holder=組織名稱
 org_full_name_holder=組織全名
 org_name_helper=組織名稱應該要簡短且好記。
 create_org=建立組織
-repo_updated=更新於
+repo_updated_v7=更新於
 members=成員
 teams=團隊
 code=程式碼
--- a/templates/explore/repo_list.tmpl
+++ b/templates/explore/repo_list.tmpl
@ -62,7 +62,7 @@
 					{{end}}
 					</div>
 				{{end}}
-				<div class="flex-item-body">{{ctx.Locale.Tr "org.repo_updated"}} {{TimeSinceUnix .UpdatedUnix ctx.Locale}}</div>
+				<div class="flex-item-body">{{ctx.Locale.Tr "org.repo_updated_v7"}} {{TimeSinceUnix .UpdatedUnix ctx.Locale}}</div>
 			</div>
 		</div>
 	{{else}}
--- a/templates/repo/branch/list.tmpl
+++ b/templates/repo/branch/list.tmpl
@ -25,7 +25,7 @@
 									<button class="btn interact-fg tw-px-1" data-clipboard-text="{{.DefaultBranchBranch.DBBranch.Name}}">{{svg "octicon-copy" 14}}</button>
 									{{template "repo/commit_statuses" dict "Status" (index $.CommitStatus .DefaultBranchBranch.DBBranch.CommitID) "Statuses" (index $.CommitStatuses .DefaultBranchBranch.DBBranch.CommitID)}}
 								</div>
-								<p class="info tw-flex tw-items-center tw-my-1">{{svg "octicon-git-commit" 16 "tw-mr-1"}}<a href="{{.RepoLink}}/commit/{{PathEscape .DefaultBranchBranch.DBBranch.CommitID}}">{{ShortSha .DefaultBranchBranch.DBBranch.CommitID}}</a> · <span class="commit-message">{{RenderCommitMessage $.Context .DefaultBranchBranch.DBBranch.CommitMessage (.Repository.ComposeMetas ctx)}}</span> · {{ctx.Locale.Tr "org.repo_updated"}} {{TimeSince .DefaultBranchBranch.DBBranch.CommitTime.AsTime ctx.Locale}}{{if .DefaultBranchBranch.DBBranch.Pusher}} &nbsp;{{template "shared/user/avatarlink" dict "user" .DefaultBranchBranch.DBBranch.Pusher}}{{template "shared/user/namelink" .DefaultBranchBranch.DBBranch.Pusher}}{{end}}</p>
+								<p class="info tw-flex tw-items-center tw-my-1">{{svg "octicon-git-commit" 16 "tw-mr-1"}}<a href="{{.RepoLink}}/commit/{{PathEscape .DefaultBranchBranch.DBBranch.CommitID}}">{{ShortSha .DefaultBranchBranch.DBBranch.CommitID}}</a> · <span class="commit-message">{{RenderCommitMessage $.Context .DefaultBranchBranch.DBBranch.CommitMessage (.Repository.ComposeMetas ctx)}}</span> · {{ctx.Locale.Tr "org.repo_updated_v7"}} {{TimeSince .DefaultBranchBranch.DBBranch.CommitTime.AsTime ctx.Locale}}{{if .DefaultBranchBranch.DBBranch.Pusher}} &nbsp;{{template "shared/user/avatarlink" dict "user" .DefaultBranchBranch.DBBranch.Pusher}}{{template "shared/user/namelink" .DefaultBranchBranch.DBBranch.Pusher}}{{end}}</p>
 							</td>
 							<td class="right aligned middle aligned overflow-visible">
 								{{if and $.IsWriter (not $.Repository.IsArchived) (not .IsDeleted)}}
@ -98,7 +98,7 @@
 									<button class="btn interact-fg tw-px-1" data-clipboard-text="{{.DBBranch.Name}}">{{svg "octicon-copy" 14}}</button>
 									{{template "repo/commit_statuses" dict "Status" (index $.CommitStatus .DBBranch.CommitID) "Statuses" (index $.CommitStatuses .DBBranch.CommitID)}}
 								</div>
-								<p class="info tw-flex tw-items-center tw-my-1">{{svg "octicon-git-commit" 16 "tw-mr-1"}}<a href="{{$.RepoLink}}/commit/{{PathEscape .DBBranch.CommitID}}">{{ShortSha .DBBranch.CommitID}}</a> · <span class="commit-message">{{RenderCommitMessage $.Context .DBBranch.CommitMessage ($.Repository.ComposeMetas ctx)}}</span> · {{ctx.Locale.Tr "org.repo_updated"}} {{TimeSince .DBBranch.CommitTime.AsTime ctx.Locale}}{{if .DBBranch.Pusher}} &nbsp;{{template "shared/user/avatarlink" dict "user" .DBBranch.Pusher}} &nbsp;{{template "shared/user/namelink" .DBBranch.Pusher}}{{end}}</p>
+								<p class="info tw-flex tw-items-center tw-my-1">{{svg "octicon-git-commit" 16 "tw-mr-1"}}<a href="{{$.RepoLink}}/commit/{{PathEscape .DBBranch.CommitID}}">{{ShortSha .DBBranch.CommitID}}</a> · <span class="commit-message">{{RenderCommitMessage $.Context .DBBranch.CommitMessage ($.Repository.ComposeMetas ctx)}}</span> · {{ctx.Locale.Tr "org.repo_updated_v7"}} {{TimeSince .DBBranch.CommitTime.AsTime ctx.Locale}}{{if .DBBranch.Pusher}} &nbsp;{{template "shared/user/avatarlink" dict "user" .DBBranch.Pusher}} &nbsp;{{template "shared/user/namelink" .DBBranch.Pusher}}{{end}}</p>
 							{{end}}
 							</td>
 							<td class="two wide ui">