diff --git a/docs/_static/theme_overrides.css b/docs/_static/theme_overrides.css index d23f68ef8c..2dc2a5774f 100644 --- a/docs/_static/theme_overrides.css +++ b/docs/_static/theme_overrides.css @@ -1,35 +1,51 @@ - .wy-table-responsive table td { - /* !important prevents the common CSS stylesheets from overriding - this as on RTD they are loaded after this stylesheet */ - white-space: normal !important; - vertical-align: top !important; - } +.wy-table-responsive table td { + /* !important prevents the common CSS stylesheets from overriding + this as on RTD they are loaded after this stylesheet */ + white-space: normal !important; + vertical-align: top !important; +} - .rst-content .section ol p, .rst-content .section ul p { - margin-bottom: 0px; - } +.wy-plain-list-disc li p:last-child, +.rst-content .section ul li p:last-child, +.rst-content .toctree-wrapper ul li p:last-child, +article ul li p:last-child { + margin-bottom: 8px; +} +.wy-plain-list-disc li ul, +.rst-content .section ul li ul, +.rst-content .toctree-wrapper ul li ul, +article ul li ul { + margin-bottom: 8px; +} - .rst-content #contents.hidden-first-item > ul:nth-of-type(1) { - margin-left: 0; - padding-left: 0; - } - .rst-content #contents.hidden-first-item > ul:nth-of-type(1) > li { - list-style: none; - margin-left: 0; - padding-left: 0; - } - .rst-content #contents.hidden-first-item > ul:nth-of-type(1) > li > p { - display: none; - } - .rst-content #contents.hidden-first-item ul li li { - list-style: disc; - } - .rst-content #contents.hidden-first-item ul li li li { - list-style: circle; - } +/*.rst-content .section ul li p:last-child, { + margin-bottom: 0; +} + +.rst-content .section ol p, .rst-content .section ul p { +margin-bottom: 0px; +} +.rst-content #contents.hidden-first-item > ul:nth-of-type(1) > li { + list-style: none; + margin-left: 0; + padding-left: 0; +} +.rst-content #contents.hidden-first-item > ul:nth-of-type(1) > li > p { + display: none; +} +.rst-content #contents.hidden-first-item > ul:nth-of-type(1) { + margin-left: 0; + padding-left: 0; +} +.rst-content #contents.hidden-first-item ul li li { + list-style: disc; +} +.rst-content #contents.hidden-first-item ul li li li { + list-style: circle; +}*/ /* push down the RTD banner so it's not confused with menu */ .keep-us-sustainable { margin-top: 20em !important; -} +} diff --git a/docs/i18n.rst b/docs/i18n.rst index e70ddbb41f..a1be9e3c6d 100644 --- a/docs/i18n.rst +++ b/docs/i18n.rst @@ -239,6 +239,7 @@ See the `Perseus plugin development guide `__ should always be available for translation efforts. - Each minor release (``N.N.*``) is maintained in a CrowdIn Version Branch, following the existing naming scheme ``release-vN.N.x``. The branch is automatically created when running the first ``make i18n-upload`` command. CrowdIn will automatically reuse previously translated strings in new branches. + Each minor release (``N.N.*``) is maintained in a Crowdin Version Branch, following the existing naming scheme ``release-vN.N.x``. The branch is automatically created when running the first ``make i18n-upload`` command. Crowdin will automatically reuse previously translated strings in new branches. The strings for the upcoming release need to be uploaded as described in :ref:`crowdin`. * Run ``make i18n-stats branch=`` to get figures on the translation work. * Send the stats to the i18n team, who will use them for communication with translators to measure the translation efforts needed. - Strings from the Perseus plugin also need to be revisited. They are maintained in the repo `learningequality/kolibri-exercise-perseus-plugin `__, but the source strings are generated and uploaded through the main ``kolibri`` project. The translated files from CrowdIn such as ``kolibri_exercise_perseus_plugin.exercise_perseus_render_module-messages.json`` are downloaded through the ``kolibri-exercise-perseus-plugin`` project. For instructions, see :ref:`crowdin`. + **Strings from the Perseus plugin also need to be revisited.** They are maintained in the repo `learningequality/kolibri-exercise-perseus-plugin `__, but the source strings are generated and uploaded through the main ``kolibri`` project. The translated files from Crowdin such as ``kolibri_exercise_perseus_plugin.exercise_perseus_render_module-messages.json`` are downloaded through the ``kolibri-exercise-perseus-plugin`` project. For instructions, see :ref:`crowdin`. - .. warning:: Strings exist in more places than just the Kolibri repo. Ensure we have translations for the Perseus plugin as well as other Crowdin projects such as Kolibri Server, and the Windows, Mac, Android, and Gnome apps. + .. warning:: Strings exist in more places than just the Kolibri repo. Ensure we have translations for the Perseus plugin as well as other Crowdin projects such as Kolibri Server, and the Windows, Mac, Android, and GNOME Linux apps. + + **Don't forget to include the new version notifications!** Before the string freeze, make sure that the messages in the `UpdateNotfication.vue component `__ have been updated for the upcoming release. + + In the component's ``$trs`` options, add a new message with a key indicating the upcoming version. Provide 1-2 sentences describing the most important new features.:: + + upgradeMessage_0_13_0: + 'Kolibri version 0.13.0 is available! It contains major improvements to resource management, coach tools, and much more.' Continuing the release process diff --git a/kolibri/core/assets/src/views/UpdateNotification.vue b/kolibri/core/assets/src/views/UpdateNotification.vue index 02e27c7dd6..7395d05410 100644 --- a/kolibri/core/assets/src/views/UpdateNotification.vue +++ b/kolibri/core/assets/src/views/UpdateNotification.vue @@ -94,8 +94,8 @@ upgradeMessageGeneric: 'A new version of Kolibri is available.', upgradeMessageImportant: 'We have released an important update with fixes to this version of Kolibri.', - upgradeMessage0130: - 'Kolibri version 0.13.0 is available! It contains major improvements to resource management, coach tools, and much more.', + // TODO(i18n): Write a final version of this copy + upgradeMessage_0_15_0: 'Kolibri version 0.15.0 is available! It has a lot of new features!', upgradeDownload: 'Download it here', upgradeLearnAndDownload: 'Learn more and download it here', /* eslint-enable kolibri/vue-no-unused-translations */