From bc257a8f5eaba44c06455ef5193feb0ec14cff31 Mon Sep 17 00:00:00 2001 From: Odoo Translation Bot Date: Sun, 11 Jul 2021 02:30:18 +0200 Subject: [PATCH 1/3] [I18N] Update translation terms from Transifex --- locale/es/LC_MESSAGES/finance.po | 10 ++++++---- locale/es/LC_MESSAGES/settings.po | 9 +++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/locale/es/LC_MESSAGES/finance.po b/locale/es/LC_MESSAGES/finance.po index a3201d780..433286dd1 100644 --- a/locale/es/LC_MESSAGES/finance.po +++ b/locale/es/LC_MESSAGES/finance.po @@ -52,8 +52,8 @@ # Jon Perez , 2021 # Althay Ramallo Fuentes , 2021 # Cinthya Yepez , 2021 -# Josep Anton Belchi Riera, 2021 # cristobal jose espinoza , 2021 +# jabelchi, 2021 # #, fuzzy msgid "" @@ -62,7 +62,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-14 14:55+0200\n" "PO-Revision-Date: 2021-05-14 13:19+0000\n" -"Last-Translator: cristobal jose espinoza , 2021\n" +"Last-Translator: jabelchi, 2021\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2595,7 +2595,7 @@ msgstr "" #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:3 msgid "Colombia (ES)" -msgstr "" +msgstr "Colombia (ES)" #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:5 msgid "**Facturación Electrónica para Colombia**" @@ -2603,7 +2603,7 @@ msgstr "" #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:8 msgid "Introducción" -msgstr "" +msgstr "Introducció" #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:10 msgid "" @@ -2665,6 +2665,8 @@ msgid "" "Para esto ve a las aplicaciones y busca “Colombia”, luego da click en " "Instalar a los primeros dos módulos:" msgstr "" +"Para esto ve a las aplicaciones y busca “Colombia”, luego da click en " +"Instalar a los primeros dos módulos:" #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:39 msgid "cz" diff --git a/locale/es/LC_MESSAGES/settings.po b/locale/es/LC_MESSAGES/settings.po index b906a562c..598ce50a9 100644 --- a/locale/es/LC_MESSAGES/settings.po +++ b/locale/es/LC_MESSAGES/settings.po @@ -8,7 +8,8 @@ # Jesús Alan Ramos Rodríguez , 2021 # Lina Maria Avendaño Carvajal , 2021 # Pablo Rojas , 2021 -# Josep Anton Belchi Riera, 2021 +# Xabi Spacebiker , 2021 +# jabelchi, 2021 # #, fuzzy msgid "" @@ -17,7 +18,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-14 14:55+0200\n" "PO-Revision-Date: 2021-05-14 13:22+0000\n" -"Last-Translator: Josep Anton Belchi Riera, 2021\n" +"Last-Translator: jabelchi, 2021\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -121,7 +122,7 @@ msgstr "|ajustes|" #: ../../content/applications/settings/users_and_features.rst:126 #: ../../content/applications/settings/users_and_features.rst:126 msgid "settings" -msgstr "" +msgstr "configuració" #: ../../content/applications/settings/users_and_features.rst:43 msgid "|browse_users|" @@ -198,7 +199,7 @@ msgstr "|buscar_aplicaciones|" #: ../../content/applications/settings/users_and_features.rst:127 #: ../../content/applications/settings/users_and_features.rst:127 msgid "browse_apps" -msgstr "" +msgstr "browse_apps" #: ../../content/applications/settings/users_and_features.rst:84 msgid "" From afdd4388189f03a1d2405021861b069e3b390be7 Mon Sep 17 00:00:00 2001 From: Odoo Translation Bot Date: Sun, 18 Jul 2021 02:30:17 +0200 Subject: [PATCH 2/3] [I18N] Update translation terms from Transifex --- locale/nl/LC_MESSAGES/finance.po | 15 +++++++++++++-- locale/nl/LC_MESSAGES/index.po | 6 +++++- locale/nl/LC_MESSAGES/sphinx.po | 5 +++-- locale/nl/LC_MESSAGES/websites.po | 6 +++--- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/locale/nl/LC_MESSAGES/finance.po b/locale/nl/LC_MESSAGES/finance.po index 7b4768514..1057b3331 100644 --- a/locale/nl/LC_MESSAGES/finance.po +++ b/locale/nl/LC_MESSAGES/finance.po @@ -8707,6 +8707,8 @@ msgstr "" msgid "" "Users can access several companies but always work in one company at a time." msgstr "" +"Gebruikers kunnen toegang hebben tot meerdere bedrijven, maar werken altijd " +"in één bedrijf tegelijk." #: ../../content/applications/finance/accounting/overview/main_concepts/in_odoo.rst:40 msgid "Multi-currencies" @@ -8737,6 +8739,10 @@ msgid "" "modules exist per country for the specificities of the country like the " "chart of accounts, taxes, or bank interfaces." msgstr "" +"Odoo boekhouding ondersteunt meer dan 50 landen. De kernboekhouding van Odoo" +" implementeert algemene boekhoudnormen voor alle landen. Er zijn per land " +"specifieke modules met specifieke kenmerken van het land, zoals het " +"rekeningschema, belastingen of bankinterfaces." #: ../../content/applications/finance/accounting/overview/main_concepts/in_odoo.rst:60 msgid "In particular, Odoo's core accounting engine supports:" @@ -8752,10 +8758,12 @@ msgstr "" #: ../../content/applications/finance/accounting/overview/main_concepts/in_odoo.rst:66 msgid "European accounting where expenses are accounted at the supplier bill." msgstr "" +"Europese boekhouding waarbij kosten worden geboekt op de " +"leveranciersfactuur." #: ../../content/applications/finance/accounting/overview/main_concepts/in_odoo.rst:69 msgid "Odoo has modules to comply with IFRS rules." -msgstr "" +msgstr "Odoo heeft ook modules die voldoen aan de IFRS regels." #: ../../content/applications/finance/accounting/overview/main_concepts/in_odoo.rst:72 msgid "Accounts Receivable & Payable" @@ -8785,6 +8793,9 @@ msgid "" "range from basic accounting reports to advanced management reports. Odoo's " "reports include:" msgstr "" +"In Odoo kunt u in realtime financiële rapporten genereren. De rapporten van " +"Odoo variëren van eenvoudige boekhoudrapporten tot geavanceerde " +"managementrapporten. De rapporten van Odoo omvatten:" #: ../../content/applications/finance/accounting/overview/main_concepts/in_odoo.rst:90 msgid "Performance reports (such as Profit and Loss, Budget Variance)" @@ -8837,7 +8848,7 @@ msgstr "" #: ../../content/applications/finance/accounting/overview/main_concepts/in_odoo.rst:117 msgid "Calculate the tax you owe your tax authority" -msgstr "" +msgstr "Bereken de belasting die u verschuldigd bent aan de belastingdienst" #: ../../content/applications/finance/accounting/overview/main_concepts/in_odoo.rst:119 msgid "" diff --git a/locale/nl/LC_MESSAGES/index.po b/locale/nl/LC_MESSAGES/index.po index c4aba766d..7d297086f 100644 --- a/locale/nl/LC_MESSAGES/index.po +++ b/locale/nl/LC_MESSAGES/index.po @@ -3,6 +3,9 @@ # This file is distributed under the same license as the Odoo package. # FIRST AUTHOR , YEAR. # +# Translators: +# Gunther Clauwaert , 2021 +# #, fuzzy msgid "" msgstr "" @@ -10,6 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-05-14 15:27+0200\n" "PO-Revision-Date: 2018-10-19 08:15+0000\n" +"Last-Translator: Gunther Clauwaert , 2021\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,4 +23,4 @@ msgstr "" #: ../../content/index.rst:3 msgid "Odoo Documentation" -msgstr "" +msgstr "Odoo Documentatie" diff --git a/locale/nl/LC_MESSAGES/sphinx.po b/locale/nl/LC_MESSAGES/sphinx.po index 657ed2e32..e1b1a2c2c 100644 --- a/locale/nl/LC_MESSAGES/sphinx.po +++ b/locale/nl/LC_MESSAGES/sphinx.po @@ -9,6 +9,7 @@ # Yenthe Van Ginneken , 2021 # Nils van Odoo , 2021 # Martien van Geene , 2021 +# Gunther Clauwaert , 2021 # #, fuzzy msgid "" @@ -17,7 +18,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-14 14:55+0200\n" "PO-Revision-Date: 2021-06-14 12:40+0000\n" -"Last-Translator: Martien van Geene , 2021\n" +"Last-Translator: Gunther Clauwaert , 2021\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -44,7 +45,7 @@ msgstr "" #: ../../extensions/odoo_theme/layout_templates/homepage.html:4 msgid "Odoo Documentation" -msgstr "" +msgstr "Odoo Documentatie" #: ../../extensions/odoo_theme/layout_templates/homepage.html:5 msgid "" diff --git a/locale/nl/LC_MESSAGES/websites.po b/locale/nl/LC_MESSAGES/websites.po index c0da119ee..a88b11d7e 100644 --- a/locale/nl/LC_MESSAGES/websites.po +++ b/locale/nl/LC_MESSAGES/websites.po @@ -6,11 +6,11 @@ # Translators: # Cas Vissers , 2021 # Eric Geens , 2021 -# Gunther Clauwaert , 2021 # Martin Trigaux, 2021 # Erwin van der Ploeg , 2021 # Yenthe Van Ginneken , 2021 # Pol Van Dingenen , 2021 +# Gunther Clauwaert , 2021 # #, fuzzy msgid "" @@ -19,7 +19,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-14 14:55+0200\n" "PO-Revision-Date: 2021-05-14 13:23+0000\n" -"Last-Translator: Pol Van Dingenen , 2021\n" +"Last-Translator: Gunther Clauwaert , 2021\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -135,7 +135,7 @@ msgstr ":doc:`../managing_products/variants`" #: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:27 msgid ":doc:`/applications/sales/sales/products_prices/taxes`" -msgstr "" +msgstr ":doc:`/applications/sales/sales/products_prices/taxes`" #: ../../content/applications/websites/ecommerce/getting_started/product_page.rst:28 msgid ":doc:`../managing_products/stock`" From 9a31ed8f67e5d174a2f7113b1d72c92bb7725f89 Mon Sep 17 00:00:00 2001 From: Xavier-Do Date: Mon, 19 Jul 2021 16:02:37 +0200 Subject: [PATCH 3/3] [IMP] allow to define BUILD_DIR and better odoo detection Building documentation implies some constraints: the source folder is readonly, mainly because the sources are shared accros builds. This implies that nor a symlink and a _build dir cannot be added in the source directory. The symlink will work in most cases localy for user with strange multiverse structure, but if not found, the fallback will check in parent directory. Most users and runbot will have all sources in the same directory (both in universe and basic multiverse cases) -(version?) -odoo -enterprise -upgrade -documentation The second change will check if BUILD_DIR is defined before setting it, allowing to use 'make BUILD_DIR=../build' to output the documentation somewhere else. --- Makefile | 20 ++++++++++++-------- conf.py | 5 +++++ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 7b7a6ea87..7f7f2feb5 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,10 @@ ifndef WORKERS WORKERS = auto endif +ifndef BUILD_DIR + BUILD_DIR = _build +endif + SPHINX_BUILD = sphinx-build CONFIG_DIR = . SPHINXOPTS = -D project_root=$(ROOT) -D canonical_version=$(CANONICAL_VERSION) \ @@ -13,7 +17,7 @@ SPHINXOPTS = -D project_root=$(ROOT) -D canonical_version=$(CANONICAL_VERSIO -A google_analytics_key=$(GOOGLE_ANALYTICS_KEY) \ -j $(WORKERS) SOURCE_DIR = content -BUILD_DIR = _build + HTML_BUILD_DIR = $(BUILD_DIR)/html ifdef VERSIONS @@ -37,10 +41,9 @@ help: clean: @echo "Cleaning build files..." rm -rf $(BUILD_DIR)/* - rm extensions/odoo_theme/static/style.css @echo "Cleaning finished." -html: extensions/odoo_theme/static/style.css +html: $(BUILD_DIR)/html/_static/style.css @echo "Starting build..." $(SPHINX_BUILD) -c $(CONFIG_DIR) -b html $(SPHINXOPTS) $(SOURCE_DIR) $(HTML_BUILD_DIR) @echo "Build finished." @@ -60,9 +63,10 @@ gettext: $(SPHINX_BUILD) -c $(CONFIG_DIR) -b gettext $(SOURCE_DIR) locale/sources @echo "Generation finished." -extensions/odoo_theme/static/style.css: extensions/odoo_theme/static/style.scss extensions/odoo_theme/static/scss/*.scss +$(BUILD_DIR)/html/_static/style.css: extensions/odoo_theme/static/style.scss extensions/odoo_theme/static/scss/*.scss @echo "Compiling stylesheets..." - pysassc $(subst .css,.scss,$@) $@ + mkdir -p $(BUILD_DIR)/html/_static + pysassc extensions/odoo_theme/static/style.scss $(BUILD_DIR)/html/_static/style.css @echo "Compilation finished." #=== Development and debugging rules ===# @@ -70,6 +74,6 @@ extensions/odoo_theme/static/style.css: extensions/odoo_theme/static/style.scss fast: SPHINXOPTS += -A collapse_menu=True fast: html -static: extensions/odoo_theme/static/style.css - cp -r extensions/odoo_theme/static/* _build/html/_static/ - cp -r static/* _build/html/_static/ +static: $(BUILD_DIR)/static/style.css + cp -r extensions/odoo_theme/static/* $(BUILD_DIR)/html/_static/ + cp -r static/* $(BUILD_DIR)/html/_static/ diff --git a/conf.py b/conf.py index 07452c3c5..e7e18cd05 100644 --- a/conf.py +++ b/conf.py @@ -60,6 +60,11 @@ sys.path.insert(0, str(extension_dir.absolute())) # Search for the directory of odoo sources to know whether autodoc should be used on the dev doc odoo_dir = Path('odoo') odoo_dir_in_path = False +if not odoo_dir.is_dir(): + parent_odoo_dir = Path('../odoo') + if parent_odoo_dir.is_dir(): + _logger.info('Using parent dir to find odoo sources') + odoo_dir = parent_odoo_dir if not odoo_dir.is_dir(): _logger.warning( f"Could not find Odoo sources directory at {odoo_dir.absolute()}.\n"