Skip to content

Commit

Permalink
Merge branch 'WeblateOrg:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
boginw authored Oct 17, 2023
2 parents 002e9c3 + 55f7c4c commit 8cff009
Show file tree
Hide file tree
Showing 507 changed files with 458,607 additions and 325,259 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/licenses-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- run: ./scripts/generate-license-data
- name: Update renovate branch
if: github.ref != 'refs/heads/main'
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: 'utils: Update SPDX license data'
- name: Create Pull Request
Expand Down
34 changes: 34 additions & 0 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# Copyright © Michal Čihař <[email protected]>
#
# SPDX-License-Identifier: GPL-3.0-or-later

name: macOS

on:

Check warning on line 7 in .github/workflows/macos.yml

View workflow job for this annotation

GitHub Actions / pre-commit

7:1 [truthy] truthy value should be one of [false, true]
push:
branches-ignore:
- deepsource-fix-**
- renovate/**
- weblate
pull_request:

permissions:
contents: read

jobs:
macos:
# This verifies that installation instructions works, any changes here
# need to be reflected in docs/admin/install/venv-macos.rst
runs-on: macos-13
env:
PYTHONUNBUFFERED: 1
PYTHONWARNINGS: default,ignore:unclosed:ResourceWarning
steps:
- uses: actions/checkout@v4
- run: brew update
- name: Install Python
run: brew link --overwrite python
- name: Install brew dependencies
run: brew install pango cairo gobject-introspection glib libyaml tvuotila/libxmlsec1/[email protected] openssl pkg-config zstd xxhash
- name: Install Weblate
run: pip3 install -e .[all,test]
2 changes: 1 addition & 1 deletion .github/workflows/migrations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- name: Set up Python 3.11
uses: actions/setup-python@v4
with:
python-version: |
python-version: |-
3.11
cache: pip
cache-dependency-path: '**/requirements*.txt'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/schema-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
continue-on-error: true
- name: Update renovate branch
if: github.ref != 'refs/heads/main'
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: 'docs: Update JSON schemas'
- name: Create Pull Request
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
persist-credentials: false

- name: Run analysis
uses: ossf/scorecard-action@v2.2.0
uses: ossf/scorecard-action@v2.3.0
with:
results_file: results.sarif
results_format: sarif
Expand All @@ -61,6 +61,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.

Check warning on line 62 in .github/workflows/scorecards.yml

View workflow job for this annotation

GitHub Actions / pre-commit

62:7 [comments-indentation] comment not indented like content
- name: Upload to code-scanning
uses: github/codeql-action/upload-sarif@v2.21.8
uses: github/codeql-action/upload-sarif@v2.22.3
with:
sarif_file: results.sarif
14 changes: 0 additions & 14 deletions .github/workflows/setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,17 +116,3 @@ jobs:
with:
flags: setup
name: dist

macos:
# This verifies that installation instructions works, any changes here
# need to be reflected in docs/admin/install/venv-macos.rst
runs-on: macos-13
env:
PYTHONUNBUFFERED: 1
PYTHONWARNINGS: default,ignore:unclosed:ResourceWarning
steps:
- uses: actions/checkout@v4
- name: Install brew dependencies
run: brew install python pango cairo gobject-introspection glib libyaml tvuotila/libxmlsec1/[email protected] openssl pkg-config zstd xxhash
- name: Install Weblate
run: pip3 install -e .[all,test]
1 change: 1 addition & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ jobs:
- '3.9'
- '3.10'
- '3.11'
- '3.12'
requirements: [latest]
database: [postgresql]
include:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/yarn-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- run: ./scripts/yarn-update
- name: Update branch
if: github.ref != 'refs/heads/main'
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: 'js: Update vendored libraries'
- name: Create Pull Request
Expand Down
19 changes: 7 additions & 12 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# See https://pre-commit.com/hooks.html for more hooks
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
Expand All @@ -27,13 +27,8 @@ repos:
rev: v1.32.0
hooks:
- id: yamllint
- repo: https://github.com/asottile/pyupgrade
rev: v3.13.0
hooks:
- id: pyupgrade
args: [--py39-plus]
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.0.291
rev: v0.1.0
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
Expand All @@ -55,7 +50,7 @@ repos:
- id: prettier
types_or: [css, javascript]
- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
rev: v2.10.0
rev: v2.11.0
hooks:
- id: pretty-format-yaml
args: [--autofix, --indent, '2']
Expand All @@ -70,19 +65,19 @@ repos:
- mdformat-black==0.1.1
- mdformat-shfmt==0.1.0
- repo: https://github.com/pre-commit/mirrors-eslint
rev: v8.50.0
rev: v8.51.0
hooks:
- id: eslint
args: [--format=compact]
additional_dependencies:
- [email protected]
- eslint@8.50.0
- eslint@8.51.0
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected].0
- [email protected].1
- repo: https://github.com/awebdeveloper/pre-commit-stylelint
rev: 0.0.2
hooks:
Expand All @@ -95,7 +90,7 @@ repos:
hooks:
- id: reuse
- repo: https://github.com/shellcheck-py/shellcheck-py
rev: v0.9.0.5
rev: v0.9.0.6
hooks:
- id: shellcheck
require_serial: true
Expand Down
2 changes: 1 addition & 1 deletion docs/admin/config.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1571,7 +1571,7 @@ Sentry DSN to use for :ref:`collecting-errors`.

.. seealso::

`Django integration for Sentry <https://docs.sentry.io/platforms/python/guides/django/>`_
`Django integration for Sentry <https://docs.sentry.io/platforms/python/integrations/django/>`_

.. setting:: SESSION_COOKIE_AGE_AUTHENTICATED

Expand Down
3 changes: 2 additions & 1 deletion docs/admin/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,10 @@ Other services
Weblate is using other services for its operation. You will need at least
following services running:

* PostgreSQL database server, see :ref:`database-setup`.
* PostgreSQL database server for storing all the content, see :ref:`database-setup`.
* Redis server for cache and tasks queue, see :ref:`celery`.
* SMTP server for outgoing e-mail, see :ref:`out-mail`.
* Filesystem storage (networked if you plan to scale Weblate horizontally) for storing VCS repositories.

.. _python-deps:

Expand Down
2 changes: 1 addition & 1 deletion docs/admin/machine.rst
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ language (for example, there is ``de@formal`` and ``de@informal``).

.. seealso::

`DeepL website <https://www.deepl.com/>`_,
`DeepL translator <https://www.deepl.com/translator>`_,
`DeepL pricing <https://www.deepl.com/pro>`_,
`DeepL API documentation <https://www.deepl.com/docs-api.html>`_

Expand Down
19 changes: 10 additions & 9 deletions docs/admin/memory.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ Weblate comes with a built-in translation memory consisting of:

Content in the translation memory can be applied one of two ways:

* Manually, :ref:`machine-translation` view while translating.
* Automatically, by translating strings using :ref:`auto-translation`, or
:ref:`addon-weblate.autotranslate.autotranslate` add-on.
* Manually: in the :ref:`machine-translation` view while translating.
* Automatically: by translating strings using :ref:`auto-translation`, or
the :ref:`addon-weblate.autotranslate.autotranslate` add-on.

For installation tips, see :ref:`mt-weblate-translation-memory`, which is
turned on by default.
Expand Down Expand Up @@ -50,21 +50,22 @@ translation memory only available for this project.
Shared translation memory
+++++++++++++++++++++++++

All translation within projects with shared translation memory turned on
All translations within projects with shared translation memory turned on
are stored in a shared translation memory available to all projects.

Please consider carefully whether to turn this feature on for shared Weblate
installations, as it can have severe implications:

* The translations can be used by anybody else.
* This might lead to disclosing secret information.
* Make sure the translations you share have good quality.

.. seealso::

:ref:`project-contribute_shared_tm`, :ref:`project-use_shared_tm`

Managing translation memory
---------------------------
Managing the Translation Memory
-------------------------------

.. _memory-user:

Expand All @@ -81,11 +82,11 @@ project, component, or language contributed to, with options to download
In the basic user interface you can manage per-user and per-project translation
memories. It can be used to download, wipe or import translation memory.

There are multiple options for downloading the translation memory of the whole instance.
There are multiple options to download the translation memory of the whole instance.

.. hint::

Translation memory in JSON can be imported into Weblate, the TMX format
Translation memories in JSON can be imported into Weblate, the TMX format
is provided for interoperability with other tools.

.. seealso::
Expand Down Expand Up @@ -124,5 +125,5 @@ These operate on the translation memory as a whole, unfiltered by scopes
.. versionadded:: 4.14

The Weblate API covers the translation memory.
This allows automating manipulation for different purposes,
This allows automated manipulation for different purposes,
or based on events in the translation cycle.
38 changes: 37 additions & 1 deletion docs/admin/projects.rst
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ permission, and if your instance uses billing (e.g. like
https://hosted.weblate.org/ see :ref:`billing`), you can also create those
based on your plans allowance from the user account that manages billing.

.. hint::

To grant every user permission to create new projects create new
:ref:`autoteam` for the :guilabel:`Project creators` team.

You can view your current billing plan on a separate page:

.. image:: /screenshots/user-billing.webp
Expand Down Expand Up @@ -202,6 +207,10 @@ Enable reviews

Enable review workflow for translations, see :ref:`reviews`.

.. seealso::

:ref:`workflow-customization`

.. _project-source_review:

Enable source reviews
Expand Down Expand Up @@ -476,7 +485,14 @@ Base file containing string definitions for :ref:`monolingual`.
Edit base file
++++++++++++++

Whether to allow editing the base file for :ref:`monolingual`.
Whether to allow editing strings in the :ref:`component-template`.

.. seealso::

:ref:`bimono`,
:ref:`monolingual`,
:ref:`faq-duplicate-files`,
:ref:`component-manage_units`

.. _component-intermediate:

Expand Down Expand Up @@ -541,6 +557,9 @@ Source string bug reporting address
Email address used for reporting upstream bugs. This address will also receive
notification about any source string comments made in Weblate.

With the :ref:`gettext` format, this address is also saved by Weblate in the
:mailheader:`Report-Msgid-Bugs-To` header of the file.

.. _component-allow_translation_propagation:

Allow translation propagation
Expand All @@ -566,20 +585,32 @@ Enable suggestions

Whether translation suggestions are accepted for this component.

.. seealso::

:ref:`workflow-customization`

.. _component-suggestion_voting:

Suggestion voting
+++++++++++++++++

Turns on vote casting for suggestions, see :ref:`voting`.

.. seealso::

:ref:`workflow-customization`

.. _component-suggestion_autoaccept:

Autoaccept suggestions
++++++++++++++++++++++

Automatically accept voted suggestions, see :ref:`voting`.

.. seealso::

:ref:`workflow-customization`

.. _component-check_flags:

Translation flags
Expand Down Expand Up @@ -668,6 +699,11 @@ For monolingual formats, the strings are managed only on source language and
are automatically added or removed in the translations. The strings appear in
the translation files once they are translated.

.. hint::

You might want to turn on :ref:`component-edit_template` together with
:guilabel:`Manage strings` for monolingual formats.

.. seealso::

:ref:`bimono`,
Expand Down
Loading

0 comments on commit 8cff009

Please sign in to comment.