Skip to content
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

locale: update .po, make it regular with ci #3951

Draft
wants to merge 34 commits into
base: latest
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
ad4ad24
Update Tarantool version
andreyaksenov Oct 16, 2023
1ed757d
Cartridge deprecation: remove Cartridge content from docs (#3780)
p7nov Oct 24, 2023
148f217
Cartridge deprecation: remove Cartridge and Cartridge CLI modules (#3…
p7nov Oct 24, 2023
289f260
3.0 configuration (#3825)
andreyaksenov Nov 13, 2023
6efd3b7
Add TCM overview (#3848)
p7nov Nov 15, 2023
e373bc1
ci: added workflow to update POT locale files
lastoCHka42 Nov 17, 2023
ff836d4
updated pot
TarantoolBot Nov 17, 2023
ab63b5a
updated pot
TarantoolBot Nov 21, 2023
55ea644
Add TCM access control page (#3866)
p7nov Nov 22, 2023
2d8aaa3
updated pot
TarantoolBot Nov 22, 2023
fa92bce
3.0 config: replication reference (#3834)
andreyaksenov Nov 23, 2023
ea4e35a
updated pot
TarantoolBot Nov 23, 2023
517ac36
Add TCM audit log docs (#3869)
p7nov Dec 5, 2023
61f563c
updated pot
TarantoolBot Dec 5, 2023
5cf032a
updated pot
TarantoolBot Dec 6, 2023
3eab90f
3.0 config: update replication tutorials (#3862)
andreyaksenov Dec 7, 2023
cedb131
updated pot
TarantoolBot Dec 7, 2023
edf2a0a
Add TCM config reference (#3876)
p7nov Dec 7, 2023
b837702
updated pot
TarantoolBot Dec 7, 2023
9cd61a8
Add TCM to EE setup guide (#3910)
p7nov Dec 8, 2023
bf0c00e
updated pot
TarantoolBot Dec 8, 2023
7fb9492
Fix TCM config reference (#3911)
p7nov Dec 8, 2023
ab23dcd
updated pot
TarantoolBot Dec 8, 2023
55b2936
'supervised' bootstrap strategy (#3909)
andreyaksenov Dec 11, 2023
257bf3f
updated pot
TarantoolBot Dec 11, 2023
55ffbe2
Add a 'rockspec' file to a sharding sample (#3926)
andreyaksenov Dec 12, 2023
496be5d
updated pot
TarantoolBot Dec 12, 2023
85be4f0
Add TCM clusters connecting and configuring docs (#3925)
p7nov Dec 15, 2023
cf703aa
updated pot
TarantoolBot Dec 15, 2023
6d966b6
3.0 config: updated the 'Instance configuration' and 'Starting and st…
andreyaksenov Dec 20, 2023
0952d19
updated pot
TarantoolBot Dec 20, 2023
22cdc43
ci: remove .pot from gitignore
lastoCHka42 Dec 20, 2023
848f47b
locale: update .po, make it regular with ci
lastoCHka42 Dec 20, 2023
a9c9491
updated locale
TarantoolBot Dec 21, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
35 changes: 35 additions & 0 deletions .github/workflows/push-pot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Push POTs
on:
push:
branches:
- '3.0'
- 'lastochka42/update-po'
permissions:
contents: write
jobs:
generate-pot:
runs-on: ubuntu-latest
container: tarantool/doc-builder:fat-4.3
steps:
- uses: actions/checkout@v3

- name: Generate Portable Object Templates
run: |
cmake .
make update-po

- name: Commit generated pots
run: |
git config --global --add safe.directory /__w/doc/doc
git config --global user.name 'TarantoolBot'
git config --global user.email '[email protected]'

if [[ $(git status) =~ .*"nothing to commit".* ]]; then
echo "status=nothing-to-commit"
exit 0
fi

git add locale/
git commit -m "updated locale"
git push origin lastochka42/update-po

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ webhooks/.env

locale/*
!locale/ru
!locale/en

# redundant folders created by sphinx

Expand Down
6 changes: 0 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
[submodule "modules/cartridge"]
path = modules/cartridge
url = https://github.com/tarantool/cartridge.git
[submodule "modules/cartridge-cli"]
path = modules/cartridge-cli
url = https://github.com/tarantool/cartridge-cli.git
[submodule "modules/metrics"]
path = modules/metrics
url = https://github.com/tarantool/metrics.git
Expand Down
44 changes: 0 additions & 44 deletions build_submodules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,50 +12,6 @@ po_dest="${project_root}/locale/ru/LC_MESSAGES"
cp README.rst doc/contributing/docs/_includes/README.rst


# Cartridge
cartridge_root="${project_root}/modules/cartridge"

# Build Cartridge to extract docs
cd "${cartridge_root}" || exit
CMAKE_DUMMY_WEBUI=true tarantoolctl rocks make

# Copy Cartridge docs, including diagrams and images
cartridge_rst_src="${cartridge_root}/build.luarocks/build.rst"
cartridge_rst_dest="${project_root}/doc/book/cartridge"
cd "${cartridge_rst_src}" || exit
mkdir -p "${cartridge_rst_dest}"
find . -iregex '.*\.\(rst\|png\|puml\|svg\)$' -exec cp -r --parents {} "${cartridge_rst_dest}" \;

# Copy translation templates
cartridge_pot_src="${cartridge_root}/build.luarocks/build.rst/locale"
cartridge_pot_dest="${project_root}/locale/book/cartridge"
cd "${cartridge_pot_src}" || exit
mkdir -p "${cartridge_pot_dest}"
find . -name '*.pot' -exec cp -rv --parents {} "${cartridge_pot_dest}" \;

# Copy translations
cartridge_po_src="${cartridge_root}/build.luarocks/build.rst/locale/ru/LC_MESSAGES"
cartridge_po_dest="${po_dest}/book/cartridge"
cd "${cartridge_po_src}" || exit
mkdir -p "${cartridge_po_dest}"
find . -name '*.po' -exec cp -rv --parents {} "${cartridge_po_dest}" \;


# Cartridge CLI
cartridge_cli_root="${project_root}/modules/cartridge-cli/doc"
cartridge_cli_dest="${cartridge_rst_dest}/cartridge_cli"
cartridge_cli_po_dest="${po_dest}/book/cartridge/cartridge_cli"

# Copy Cartridge CLI docs, including diagrams and images
mkdir -p "${cartridge_cli_dest}"
cd ${cartridge_cli_root} || exit
find . -iregex '.*\.\(rst\|png\|puml\|svg\)$' -exec cp -rv --parents {} "${cartridge_cli_dest}" \;

# Copy translations
mkdir -p "${cartridge_cli_po_dest}"
cd "${cartridge_cli_root}/locale/ru/LC_MESSAGES/doc/" || exit
find . -name '*.po' -exec cp -rv --parents {} "${cartridge_cli_po_dest}" \;

# Monitoring
monitoring_root="${project_root}/modules/metrics/doc/monitoring"
monitoring_dest="${project_root}/doc/book"
Expand Down
6 changes: 1 addition & 5 deletions conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
project = u'Tarantool'

# |release| The full version, including alpha/beta/rc tags.
release = "2.11.1"
release = "3.0.0"
# |version| The short X.Y version.
version = '.'.join(release.split('.')[0:2])

Expand All @@ -73,10 +73,6 @@
'how-to/using_docker.rst',
'reference/configuration/cfg_*',
'images',
'book/cartridge/cartridge_overview.rst',
'book/cartridge/CONTRIBUTING.rst',
'book/cartridge/topics',
'book/cartridge/cartridge_api/modules/cartridge.test-helpers.rst',
'reference/reference_rock/luatest/README.rst',
'reference/reference_rock/luatest/modules/luatest.rst',
'**/_includes/*'
Expand Down
1 change: 0 additions & 1 deletion doc/alternate_build_master.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
how-to/index
concepts/index
CRUD operations <reference/reference_lua/box_space>
book/cartridge/index
book/admin/index
book/connectors
enterprise/index
Expand Down
Binary file added doc/book/admin/admin_instances_dev.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/book/admin/admin_instances_prod.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading