8000 fix: Pull transifex strings from base directory when building a release by fsbraun · Pull Request #7623 · django-cms/django-cms · GitHub
[go: up one dir, main page]

Skip to content

fix: Pull transifex strings from base directory when building a release #7623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Aug 9, 2023
Merged
Show file tree
Hide file tree
Changes from 2 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
39 changes: 39 additions & 0 deletions .github/workflows/publish-to-live-pypi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Publish Python 🐍 distributions 📦 to pypi

on:
release:
types:
- published

jobs:
build-n-publish:
name: Build and publish Python 🐍 distributions 📦 to pypi
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up Python 3.10
uses: actions/setup-python@v3
with:
python-version: '3.10'

- name: Install pypa/build
run: >-
python -m
pip install
build
--user
- name: Build a binary wheel and a source tarball
run: >-
python -m
build
--sdist
--wheel
--outdir dist/
.

- name: Publish distribution 📦 to PyPI
if: startsWith(github.ref, 'refs/tags')
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.PYPI_API_TOKEN }}
41 changes: 41 additions & 0 deletions .github/workflows/publish-to-test-pypi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Publish Python 🐍 distributions 📦 to TestPyPI

on:
push:
branches:
- 'develop'
- 'release/**'

jobs:
build-n-publish:
name: Build and publish Python 🐍 distributions 📦 to TestPyPI
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up Python 3.10
uses: actions/setup-python@v3
with:
python-version: '3.10'

- name: Install pypa/build
run: >-
python -m
pip install
build
--user
- name: Build a binary wheel and a source tarball
run: >-
python -m
build
--sdist
--wheel
--outdir dist/
.

- name: Publish distribution 📦 to Test PyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.TEST_PYPI_API_TOKEN }}
repository_url: https://test.pypi.org/legacy/
skip_existing: true
9 changes: 3 additions & 6 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
unreleased
==========
4.1.0rc1 (unpublished)
======================

* Unified icon font with icons for versioning, moderation and version locking
* Django 4.1 and 4.0 support
Expand All @@ -10,7 +10,7 @@ unreleased
* Remove outdated Django setting SEND_BROKEN_LINK_EMAILS
* Introduce dropdown menus in the page tree for status indicators
* Fixed redirect issues when i18n_patterns had prefix_default_language = False

* add release scripts for develop-4 branch (#7466) (ddbc99a53) -- Fabian Braun

4.0.0 (unreleased)
==================
Expand All @@ -27,9 +27,6 @@ unreleased
* Backported from develop: Remove travis integration from the project as the project has moved to Github Actions.
* Fixed usage of ``get_object`` in ``edit_title_fields`` of the page admin.




3.6.0 (2019-01-29)
==================

Expand Down
2 changes: 1 addition & 1 deletion cms/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
__version__ = '4.0.0dev11'
__version__ = '4.1.0rc1'

default_app_config = 'cms.apps.CMSConfig'
1 change: 0 additions & 1 deletion cms/locale/en/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,6 @@ msgstr "no content"
msgid "Empty"
msgstr "Empty"

#: admin/pageadmin.py:1476
#, fuzzy
#| msgid "Content"
msgid "Create Content"
Expand Down
11 changes: 10 additions & 1 deletion cms/locale/en/LC_MESSAGES/djangojs.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django-cms\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-27 11:20+0100\n"
"POT-Creation-Date: 2022-12-30 16:56+0000\n"
"PO-Revision-Date: 2015-10-31 12:28+0000\n"
"Last-Translator: yakky <i.spalletti@nephila.it>\n"
"Language-Team: English (http://www.transifex.com/divio/django-cms/language/"
Expand All @@ -19,5 +19,14 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

msgid "pathname"
msgstr ""

msgid "urnpath"
msgstr ""

msgid "reserved"
msgstr ""

msgid "Are you sure you want to change tabs without saving the page first?"
msgstr "Are you sure you want to change tabs without saving the page first?"
3 changes: 0 additions & 3 deletions cms/static/cms/css/4.0.0dev11/cms.base.css

This file was deleted.

3 changes: 0 additions & 3 deletions cms/static/cms/css/4.0.0dev11/cms.pagetree.css

This file was deleted.

3 changes: 0 additions & 3 deletions cms/static/cms/css/4.0.0dev11/cms.welcome.css

This file was deleted.

3 changes: 3 additions & 0 deletions cms/static/cms/css/4.1.0rc1/cms.base.css

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions cms/static/cms/css/4.1.0rc1/cms.pagetree.css

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions cms/static/cms/css/4.1.0rc1/cms.welcome.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Loading
0