From 42dbe90861fdf0c3440a645437eeeffef5a3943f Mon Sep 17 00:00:00 2001 From: Ultrabug Date: Mon, 26 Apr 2021 22:02:57 +0200 Subject: [PATCH 1/3] theme pot file update but missing po files update on release --- mkdocs/__init__.py | 2 +- mkdocs/themes/mkdocs/404.html | 2 +- mkdocs/themes/mkdocs/messages.pot | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/mkdocs/__init__.py b/mkdocs/__init__.py index fee47ff7bc..3340ae3210 100644 --- a/mkdocs/__init__.py +++ b/mkdocs/__init__.py @@ -2,4 +2,4 @@ # For acceptable version formats, see https://www.python.org/dev/peps/pep-0440/ -__version__ = '1.2.dev1' +__version__ = '1.2.release' diff --git a/mkdocs/themes/mkdocs/404.html b/mkdocs/themes/mkdocs/404.html index c0503d7469..6c81d2b4d0 100644 --- a/mkdocs/themes/mkdocs/404.html +++ b/mkdocs/themes/mkdocs/404.html @@ -5,7 +5,7 @@

404

-

{% trans %}Page not found{% endtrans %}

+

{% trans %}Page not found at all{% endtrans %}

diff --git a/mkdocs/themes/mkdocs/messages.pot b/mkdocs/themes/mkdocs/messages.pot index 90db90bd43..378d22458c 100644 --- a/mkdocs/themes/mkdocs/messages.pot +++ b/mkdocs/themes/mkdocs/messages.pot @@ -1,22 +1,24 @@ # Translations template for MkDocs. # Copyright (C) 2021 MkDocs # This file is distributed under the same license as the MkDocs project. +# FIRST AUTHOR , 2021. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: MkDocs 1.2\n" "Report-Msgid-Bugs-To: https://github.com/mkdocs/mkdocs/issues\n" -"POT-Creation-Date: 2021-04-08 22:44+0200\n" -"PO-Revision-Date: YYYY-MM-DD HH:MM:SS+0000\n" -"Last-Translator: YOUR NAME <@nickname or @email>\n" +"POT-Creation-Date: 2021-04-26 22:02+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.9.0\n" #: mkdocs/themes/mkdocs/404.html:8 -msgid "Page not found" +msgid "Page not found at all" msgstr "" #: mkdocs/themes/mkdocs/base.html:107 From 6cf4069748364918c678944aafc1c040b2207f22 Mon Sep 17 00:00:00 2001 From: Ultrabug Date: Mon, 26 Apr 2021 22:10:34 +0200 Subject: [PATCH 2/3] fix release failure detection --- .github/workflows/tox.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index db0d70e774..d74d422172 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -116,7 +116,8 @@ jobs: echo "inspecting changed file: ${changed_file}"; if [[ "${changed_file}" == "mkdocs/__init__.py" ]]; then echo "mkdocs version changed!"; - git diff -G "msgid" --exit-code && git diff -G "msgstr" --exit-code; + git diff -G "msgid" --exit-code || exit 1 + git diff -G "msgstr" --exit-code || exit 2 fi done shell: bash From b331bea96def8bdff52b6a20a14b7f24d9ee48b7 Mon Sep 17 00:00:00 2001 From: Ultrabug Date: Tue, 27 Apr 2021 17:49:23 +0200 Subject: [PATCH 3/3] adding po file should fix the CI --- mkdocs/themes/mkdocs/locales/fr/LC_MESSAGES/messages.po | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mkdocs/themes/mkdocs/locales/fr/LC_MESSAGES/messages.po b/mkdocs/themes/mkdocs/locales/fr/LC_MESSAGES/messages.po index 711164de31..0f0a527dc2 100644 --- a/mkdocs/themes/mkdocs/locales/fr/LC_MESSAGES/messages.po +++ b/mkdocs/themes/mkdocs/locales/fr/LC_MESSAGES/messages.po @@ -1,15 +1,17 @@ # French translations for MkDocs. # Copyright (C) 2021 MkDocs # This file is distributed under the same license as the MkDocs project. +# FIRST AUTHOR , 2021. # msgid "" msgstr "" "Project-Id-Version: MkDocs 1.2\n" "Report-Msgid-Bugs-To: https://github.com/mkdocs/mkdocs/issues\n" -"POT-Creation-Date: 2021-04-08 22:46+0200\n" +"POT-Creation-Date: 2021-04-26 22:02+0200\n" "PO-Revision-Date: 2021-02-23 23:56+0100\n" "Last-Translator: Alexys Jacob @ultrabug\n" "Language: fr\n" +"Language-Team: fr \n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -17,7 +19,8 @@ msgstr "" "Generated-By: Babel 2.9.0\n" #: mkdocs/themes/mkdocs/404.html:8 -msgid "Page not found" +#, fuzzy +msgid "Page not found at all" msgstr "Page non trouvée" #: mkdocs/themes/mkdocs/base.html:107