Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions ARCHITECTURE.md
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,11 @@ asks for a phrase with Forgejo's own text as the fallback:
```

Without the add-on, and with it for a reader whose language has no theme phrases, the fallback shows, so no English
shows up in another language. A phrase is a string or one string per plural form; `{count}` and `{branch}` take the
dict's `Count` and `Branch`. A test checks that every language has every English key, the plural forms its rule needs
and the same placeholders.
shows up in another language. A phrase is a string or one string per plural form; a placeholder takes the dict's value
of the same name, so `{count}` is `Count` and `{branch}` is `Branch`; a value passed as HTML stays HTML. A text that has
no Forgejo translation at all keeps the theme's English as the fallback, as before; everywhere else the fallback is
Forgejo's own text or the word-free design it replaced. A test checks that every language has every English key, the
plural forms its rule needs and the same placeholders.

### Asset versions

Expand Down
5 changes: 5 additions & 0 deletions components/common/empty/empty.css
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@
line-height: 21px;
}

/* A sentence that only the wording add-on fills. */
.theme-empty p:empty {
display: none;
}

@media (max-width: 767px) {
.theme-empty {
min-height: 180px;
Expand Down
6 changes: 6 additions & 0 deletions components/common/settings/settings.css
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,12 @@
margin-bottom: 8px;
}

/* A group the wording add-on does not name is a rule, as the separator. */
.theme-settings-group:empty {
margin-bottom: 8px;
padding: 0;
}

/* The page side is anchored on the page structure, which outranks the theme's older boxed style for settings
content. */
.page-content > .ui.container.flex-container.theme-settings > .flex-container-main {
Expand Down
8 changes: 8 additions & 0 deletions components/common/sidebar/sidebar.css
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,14 @@
line-height: 18px;
}

/* A group named by the wording add-on drops its rule; without the add-on the empty name leaves the rule alone. */
.theme-sidebar-label:empty {
display: none;
}
.theme-sidebar hr:has(+ .theme-sidebar-label:not(:empty)) {
display: none;
}

/* "On this page" (data-theme-sidebar-outline): a heading with an icon over links to the page's sections. sidebar.js
marks the section in view as the active entry. */
.theme-sidebar-label:has(> svg) {
Expand Down
2 changes: 1 addition & 1 deletion components/dashboard/feed/feed.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ Forgejo's own, so every event type and language reads as on the profile. Data is
</ol>
{{with $data.Page.Paginater}}
{{if .HasNext}}
<a class="theme-feed-older" href="{{$link}}?page={{.Next}}{{if $params}}&{{$params}}{{end}}" data-theme-feed-older>{{ctx.Locale.Tr "repo.diff.show_more"}}</a>
<a class="theme-feed-older" href="{{$link}}?page={{.Next}}{{if $params}}&{{$params}}{{end}}" data-theme-feed-older>{{template "theme/phrase" dict "Key" "home.feed.load_older" "Fallback" (ctx.Locale.Tr "repo.diff.show_more")}}</a>
{{end}}
{{end}}
<template data-theme-feed-text data-error="{{ctx.Locale.Tr "error.network_error"}}"></template>
Expand Down
2 changes: 1 addition & 1 deletion components/package/list/list.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ headed by the package count with a row per package, or the empty state. Called w
</form>
{{end}}
<div class="theme-package-list">
{{if .PackageDescriptors}}<div class="theme-package-list-header" title="{{ctx.Locale.Tr "packages.title"}}">{{svg "octicon-package" 16}}{{.Total}}</div>{{end}}
{{if .PackageDescriptors}}<div class="theme-package-list-header" title="{{ctx.Locale.Tr "packages.title"}}">{{svg "octicon-package" 16}}{{template "theme/phrase" dict "Key" "packages.count" "Count" .Total "Fallback" .Total}}</div>{{end}}
{{range .PackageDescriptors}}
<div class="theme-package-row">
<div class="flex-item">
Expand Down
6 changes: 3 additions & 3 deletions components/repository/branch/table.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ Title the heading, and either Default the default branch or Branches the other r
<tr>
<th scope="col">{{ctx.Locale.Tr "repo.branch"}}</th>
<th scope="col" class="theme-branch-updated">{{ctx.Locale.Tr "admin.auths.updated"}}</th>
<th scope="col" class="theme-branch-status">{{ctx.Locale.Tr "actions.runs.status"}}</th>
<th scope="col" class="theme-branch-divergence" aria-label="{{ctx.Locale.Tr "repo.commits.commits"}}"><span>{{svg "octicon-arrow-down" 16}}</span><span>{{svg "octicon-arrow-up" 16}}</span></th>
<th scope="col" class="theme-branch-pull">{{ctx.Locale.Tr "pull_requests"}}</th>
<th scope="col" class="theme-branch-status">{{template "theme/phrase" dict "Key" "repo.branches.check_status" "Fallback" (ctx.Locale.Tr "actions.runs.status")}}</th>
<th scope="col" class="theme-branch-divergence" aria-label="{{ctx.Locale.Tr "repo.commits.commits"}}"><span>{{template "theme/phrase" dict "Key" "repo.branches.behind" "Fallback" (svg "octicon-arrow-down" 16)}}</span><span>{{template "theme/phrase" dict "Key" "repo.branches.ahead" "Fallback" (svg "octicon-arrow-up" 16)}}</span></th>
<th scope="col" class="theme-branch-pull">{{template "theme/phrase" dict "Key" "repo.branches.pull_request" "Fallback" (ctx.Locale.Tr "pull_requests")}}</th>
<th scope="col" class="theme-branch-actions"><span class="tw-sr-only">{{ctx.Locale.Tr "profile.actions.tooltip"}}</span></th>
</tr>
</thead>
Expand Down
104 changes: 103 additions & 1 deletion locales/bg.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,107 @@
"pulls.merge.command_line_hint": "Можете също да слеете това от командния ред.",
"pulls.merged.description": "Всичко е готово — клонът {branch} може безопасно да бъде изтрит.",
"pulls.closed.title": "Затворена с неслети подавания",
"pulls.closed.description": "Тази заявка за сливане е затворена, но клонът {branch} има неслети подавания."
"pulls.closed.description": "Тази заявка за сливане е затворена, но клонът {branch} има неслети подавания.",
"projects.card.move_top": "Преместване най-горе",
"projects.card.move_bottom": "Преместване най-долу",
"projects.card.move_to_column": "Преместване в колона",
"diff.settings.minimize_comments": "Минимизиране на коментарите",
"diff.settings.compact_lines": "Компактна височина на редовете",
"diff.tree.resize": "Преоразмеряване на дървото с файлове",
"diff.search.count": "{current} от {total}",
"pulls.title.wants_to_merge": {
"one": "иска да слее {count} подаване в {base} от {head}{copy}",
"other": "иска да слее {count} подавания в {base} от {head}{copy}"
},
"pulls.title.merged": {
"one": "сля {count} подаване в {base} от {head}{copy} {time}",
"other": "сля {count} подавания в {base} от {head}{copy} {time}"
},
"issues.header.opened": "{author} отвори {time}",
"issues.comment.heading": "Добавяне на коментар",
"actions.sidebar.workflows": "Работни потоци",
"actions.runs.count": {
"one": "{count} изпълнение на работен поток",
"other": "{count} изпълнения на работни потоци"
},
"settings.group.access": "Достъп",
"settings.group.code_planning_automation": "Код, планиране и автоматизация",
"settings.group.code_automation": "Код и автоматизация",
"home.greeting.morning": "Добро утро, {name}!",
"home.greeting.afternoon": "Добър ден, {name}!",
"home.greeting.evening": "Добър вечер, {name}!",
"repo.readme.code_of_conduct": "Кодекс на поведение",
"repo.readme.contributing": "Допринасяне",
"repo.forks.empty_title": "Все още никой не е разклонил това хранилище",
"repo.forks.empty_description": "Разклоненията са чудесен начин да допринесете за хранилище. След като разклоните хранилище, можете да изпратите заявка за сливане на оригиналния автор.",
"repo.sidebar.no_releases": "Няма публикувани издания",
"repo.sidebar.first_package": "Публикувайте първия си пакет",
"packages.count": {
"one": "{count} пакет",
"other": "{count} пакета"
},
"packages.recent_versions": "Последни версии",
"profile.popular_repositories": "Популярни хранилища",
"commits.files_changed": {
"one": "{count} променен файл",
"other": "{count} променени файла"
},
"commits.verified": "Проверено",
"commits.partially_verified": "Частично проверено",
"commits.unverified": "Непроверено",
"repo.branches.check_status": "Статус на проверките",
"repo.branches.behind": "Изостава",
"repo.branches.ahead": "Изпреварва",
"repo.branches.pull_request": "Заявка за сливане",
"actions.new_workflow": "Нов работен поток",
"actions.subtitle.workflow_runs": "Изпълнения на работни потоци",
"actions.subtitle.all_workflows": "Изпълнения на всички работни потоци",
"actions.filter.by_workflow": "Филтриране по работен поток",
"actions.filter.find_workflow": "Намиране на работен поток",
"actions.filter.by_actor": "Филтриране по изпълнител",
"actions.filter.by_status": "Филтриране по статус",
"actions.filter.no_runs": "Нито едно изпълнение на тази страница не отговаря на филтъра.",
"actions.run.summary": "Обобщение",
"actions.run.workflow_file": "Файл на работния поток",
"actions.run.details": "Подробности за изпълнението",
"actions.run.more_actions": "Още действия",
"actions.run.triggered_by": "Стартирано от",
"diff.loading_more": "Зареждане на още файлове…",
"diff.large_not_rendered": "Големите разлики не се показват по подразбиране.",
"diff.file_deleted": "Този файл е изтрит.",
"diff.settings.unified": "Обединен",
"diff.settings.split": "Разделен",
"diff.settings.layout": "Оформление",
"repo.go_to_file": "Към файл",
"repo.about.title": "Относно",
"repo.about.edit": "Редактиране на метаданните на хранилището",
"repo.about.no_description": "Няма описание, уебсайт или теми.",
"repo.about.edit_title": "Редактиране на подробностите за хранилището",
"repo.about.save": "Запазване на промените",
"repo.languages": "Езици",
"releases.latest": "Последно",
"releases.draft_new": "Чернова на ново издание",
"releases.drafted_this": "създаде чернова",
"releases.assets": "Ресурси",
"releases.empty_search_title": "Няма намерени издания",
"releases.empty_title": "Все още няма издания",
"releases.empty_search_hint": "Опитайте друго търсене.",
"releases.empty_description": "Изданията обединяват софтуер, бележки към изданието и изтегляния за вашия проект.",
"releases.view_all": "Всички издания",
"releases.on_this_page": "На тази страница",
"repo.collaboration.manage_visibility": "Управление на видимостта",
"repo.collaboration.manage_access": "Управление на достъпа",
"repo.collaboration.no_teams": "Нито един екип няма достъп до това хранилище.",
"issues.sidebar.development": "Разработка",
"commits.browse_files": "Разглеждане на файловете",
"home.top_repositories": "Основни хранилища",
"settings.avatar.upload": "Качване на снимка…",
"settings.avatar.remove": "Премахване на снимката",
"settings.keys.new_gpg": "Нов GPG ключ",
"settings.keys.new_ssh": "Нов SSH ключ",
"settings.profile_picture": "Профилна снимка",
"home.feed.load_older": "Зареждане на по-стара активност",
"issues.filter.all_states": "Всички състояния",
"projects.create_issue_in": "Създаване на задача в хранилище",
"projects.open_in_new_tab": "Отваряне в нов раздел"
}
109 changes: 108 additions & 1 deletion locales/cs-CZ.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,112 @@
"pulls.merge.command_line_hint": "Můžete ji také sloučit z příkazové řádky.",
"pulls.merged.description": "Vše je hotovo — větev {branch} lze bezpečně smazat.",
"pulls.closed.title": "Uzavřeno s nesloučenými revizemi",
"pulls.closed.description": "Tato žádost o sloučení je uzavřena, ale větev {branch} obsahuje nesloučené revize."
"pulls.closed.description": "Tato žádost o sloučení je uzavřena, ale větev {branch} obsahuje nesloučené revize.",
"projects.card.move_top": "Přesunout nahoru",
"projects.card.move_bottom": "Přesunout dolů",
"projects.card.move_to_column": "Přesunout do sloupce",
"diff.settings.minimize_comments": "Minimalizovat komentáře",
"diff.settings.compact_lines": "Kompaktní výška řádků",
"diff.tree.resize": "Změnit velikost stromu souborů",
"diff.search.count": "{current} z {total}",
"pulls.title.wants_to_merge": {
"one": "chce sloučit {count} revizi do {base} z {head}{copy}",
"few": "chce sloučit {count} revize do {base} z {head}{copy}",
"other": "chce sloučit {count} revizí do {base} z {head}{copy}"
},
"pulls.title.merged": {
"one": "sloučil(a) {count} revizi do {base} z {head}{copy} {time}",
"few": "sloučil(a) {count} revize do {base} z {head}{copy} {time}",
"other": "sloučil(a) {count} revizí do {base} z {head}{copy} {time}"
},
"issues.header.opened": "{author} otevřel(a) {time}",
"issues.comment.heading": "Přidat komentář",
"actions.sidebar.workflows": "Pracovní postupy",
"actions.runs.count": {
"one": "{count} běh pracovního postupu",
"few": "{count} běhy pracovních postupů",
"other": "{count} běhů pracovních postupů"
},
"settings.group.access": "Přístup",
"settings.group.code_planning_automation": "Kód, plánování a automatizace",
"settings.group.code_automation": "Kód a automatizace",
"home.greeting.morning": "Dobré ráno, {name}!",
"home.greeting.afternoon": "Dobré odpoledne, {name}!",
"home.greeting.evening": "Dobrý večer, {name}!",
"repo.readme.code_of_conduct": "Kodex chování",
"repo.readme.contributing": "Přispívání",
"repo.forks.empty_title": "Tento repozitář ještě nikdo neforkoval",
"repo.forks.empty_description": "Forky jsou skvělý způsob, jak přispět do repozitáře. Po vytvoření forku můžete původnímu autorovi poslat žádost o sloučení.",
"repo.sidebar.no_releases": "Žádná vydání nebyla zveřejněna",
"repo.sidebar.first_package": "Zveřejněte svůj první balíček",
"packages.count": {
"one": "{count} balíček",
"few": "{count} balíčky",
"other": "{count} balíčků"
},
"packages.recent_versions": "Nejnovější verze",
"profile.popular_repositories": "Oblíbené repozitáře",
"commits.files_changed": {
"one": "{count} soubor změněn",
"few": "{count} soubory změněny",
"other": "{count} souborů změněno"
},
"commits.verified": "Ověřeno",
"commits.partially_verified": "Částečně ověřeno",
"commits.unverified": "Neověřeno",
"repo.branches.check_status": "Stav kontrol",
"repo.branches.behind": "Pozadu",
"repo.branches.ahead": "Napřed",
"repo.branches.pull_request": "Žádost o sloučení",
"actions.new_workflow": "Nový pracovní postup",
"actions.subtitle.workflow_runs": "Běhy pracovních postupů",
"actions.subtitle.all_workflows": "Běhy všech pracovních postupů",
"actions.filter.by_workflow": "Filtrovat podle pracovního postupu",
"actions.filter.find_workflow": "Najít pracovní postup",
"actions.filter.by_actor": "Filtrovat podle aktéra",
"actions.filter.by_status": "Filtrovat podle stavu",
"actions.filter.no_runs": "Filtru neodpovídá žádný běh na této stránce.",
"actions.run.summary": "Shrnutí",
"actions.run.workflow_file": "Soubor pracovního postupu",
"actions.run.details": "Podrobnosti běhu",
"actions.run.more_actions": "Další akce",
"actions.run.triggered_by": "Spustil(a)",
"diff.loading_more": "Načítání dalších souborů…",
"diff.large_not_rendered": "Velké rozdíly se ve výchozím stavu nezobrazují.",
"diff.file_deleted": "Tento soubor byl smazán.",
"diff.settings.unified": "Sjednocené",
"diff.settings.split": "Rozdělené",
"diff.settings.layout": "Rozvržení",
"repo.go_to_file": "Přejít na soubor",
"repo.about.title": "O repozitáři",
"repo.about.edit": "Upravit metadata repozitáře",
"repo.about.no_description": "Není uveden popis, web ani témata.",
"repo.about.edit_title": "Upravit podrobnosti repozitáře",
"repo.about.save": "Uložit změny",
"repo.languages": "Jazyky",
"releases.latest": "Nejnovější",
"releases.draft_new": "Připravit nové vydání",
"releases.drafted_this": "připravil(a) koncept",
"releases.assets": "Soubory",
"releases.empty_search_title": "Nebyla nalezena žádná vydání",
"releases.empty_title": "Zatím zde nejsou žádná vydání",
"releases.empty_search_hint": "Zkuste jiné hledání.",
"releases.empty_description": "Vydání sdružují software, poznámky k vydání a soubory ke stažení vašeho projektu.",
"releases.view_all": "Zobrazit všechna vydání",
"releases.on_this_page": "Na této stránce",
"repo.collaboration.manage_visibility": "Spravovat viditelnost",
"repo.collaboration.manage_access": "Spravovat přístup",
"repo.collaboration.no_teams": "K tomuto repozitáři nemá přístup žádný tým.",
"issues.sidebar.development": "Vývoj",
"commits.browse_files": "Procházet soubory",
"home.top_repositories": "Hlavní repozitáře",
"settings.avatar.upload": "Nahrát fotku…",
"settings.avatar.remove": "Odebrat fotku",
"settings.keys.new_gpg": "Nový klíč GPG",
"settings.keys.new_ssh": "Nový klíč SSH",
"settings.profile_picture": "Profilová fotka",
"home.feed.load_older": "Načíst starší aktivitu",
"issues.filter.all_states": "Všechny stavy",
"projects.create_issue_in": "Vytvořit úkol v repozitáři",
"projects.open_in_new_tab": "Otevřít na nové kartě"
}
Loading
Loading