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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ This project (not yet) adheres to [Semantic Versioning](https://semver.org/spec/
- Adjusted Newsletter emails
- Installed HTMX rather than using script tag

### Fixed

- Translations: fork translations moved to locale-fork, no longer overwritten by transifex pulls


## v2602.01-partial

Expand Down
4 changes: 2 additions & 2 deletions adhocracy-plus/config/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,8 @@
LOCALE_PATHS = [
# use the first line in branches and forks to keep the original translations
# from main branch and overwrite or add extra translations in fork
# os.path.join(BASE_DIR, 'locale-fork/locale'),
os.path.join(BASE_DIR, "locale-source/locale")
os.path.join(BASE_DIR, "locale-fork/locale"),
os.path.join(BASE_DIR, "locale-source/locale"),
]

TEMPLATES = [
Expand Down
16 changes: 16 additions & 0 deletions docs/languages_and_translations.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,22 @@ compiled.
Here, the English translations are kept untranslated, so that they could
be used to overwrite strings.

Important rules for forks:

- `locale-source` is a pure mirror of the (shared) transifex resource. It is
only ever written by `tx pull -af`. Never hand-edit it and never add
fork-specific strings or translations to it - they will be overwritten and
lost on the next pull.
- All fork-specific strings and translations are added **only** in
`locale-fork`. Entries left untranslated in `locale-fork` fall through to
the transifex translations in `locale-source`, so only the strings that
should differ from the main branch need to be filled in.
- `tx pull`/`tx push` only ever touch `locale-source`; `locale-fork` is not
configured in `.tx/config` and is never touched by transifex.
- Because the transifex project is shared with adhocracy-plus, do not push
fork-specific source strings to it. New shared (main branch) strings are
pushed by the adhocracy-plus repo.

### Mark fork-specific translations for translators
There are two options to mark the strings for translators:
1. By comments, that are displayed to translators. Django docs on comments for translaters
Expand Down
6,746 changes: 6,746 additions & 0 deletions locale-fork/locale/de/LC_MESSAGES/django.po

Large diffs are not rendered by default.

Loading
Loading