diff --git a/build/get-server-sources.sh b/build/get-server-sources.sh index 2ceb058fc..0aa3a7516 100755 --- a/build/get-server-sources.sh +++ b/build/get-server-sources.sh @@ -13,9 +13,9 @@ printf "\n" if [ -d server/.git ]; then cd server git remote set-branches --add origin $NC_BRANCH - git fetch + git fetch --depth 1 git checkout $NC_BRANCH git reset --hard origin/$NC_BRANCH else - git clone https://github.com/nextcloud/server server --depth 1 --branch $NC_BRANCH + git clone https://github.com/nextcloud/server server --depth 1 --single-branch --branch $NC_BRANCH fi; diff --git a/developer_manual/conf.py b/developer_manual/conf.py index d1e88f33a..fb692b10a 100644 --- a/developer_manual/conf.py +++ b/developer_manual/conf.py @@ -29,7 +29,7 @@ from conf import * # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. -extensions += ['sphinx.ext.todo', 'rst2pdf.pdfbuilder', 'sphinx.ext.intersphinx', 'sphinxcontrib.phpdomain', 'sphinx_toolbox.collapse'] +extensions += ['sphinx.ext.todo', 'rst2pdf.pdfbuilder', 'sphinx.ext.intersphinx', 'sphinxcontrib.phpdomain', 'sphinx_toolbox.collapse', 'sphinx_reredirects'] # Add any paths that contain templates here, relative to this directory. templates_path = ['../_shared_assets/templates'] @@ -314,3 +314,14 @@ html_context['theme_vcs_pageview_mode'] += current_docs highlight_options = { 'php': {'startinline': True}, } + +# Redirect old URLs +# https://documatt.gitlab.io/sphinx-reredirects/usage.html +redirects = { + "core/index": "../server", + "core/code-back-end": "../server/code-back-end.html", + "core/code-front-end": "../server/code-front-end.html", + "core/externalapi": "../server/externalapi.html", + "core/static-analysis": "../server/static-analysis.html", + "core/unit-testing": "../server/unit-testing.html" +} diff --git a/developer_manual/index.rst b/developer_manual/index.rst index 495e81bf7..6203eb01f 100644 --- a/developer_manual/index.rst +++ b/developer_manual/index.rst @@ -18,7 +18,7 @@ Table of contents getting_started/index basics/index app_development/index - core/index + server/index digging_deeper/index app_publishing_maintenance/index design/index diff --git a/developer_manual/core/architecture/files.rst b/developer_manual/server/architecture/files.rst similarity index 100% rename from developer_manual/core/architecture/files.rst rename to developer_manual/server/architecture/files.rst diff --git a/developer_manual/core/architecture/index.rst b/developer_manual/server/architecture/index.rst similarity index 100% rename from developer_manual/core/architecture/index.rst rename to developer_manual/server/architecture/index.rst diff --git a/developer_manual/core/code-back-end.rst b/developer_manual/server/code-back-end.rst similarity index 100% rename from developer_manual/core/code-back-end.rst rename to developer_manual/server/code-back-end.rst diff --git a/developer_manual/core/code-front-end.rst b/developer_manual/server/code-front-end.rst similarity index 100% rename from developer_manual/core/code-front-end.rst rename to developer_manual/server/code-front-end.rst diff --git a/developer_manual/core/externalapi.rst b/developer_manual/server/externalapi.rst similarity index 100% rename from developer_manual/core/externalapi.rst rename to developer_manual/server/externalapi.rst diff --git a/developer_manual/core/index.rst b/developer_manual/server/index.rst similarity index 100% rename from developer_manual/core/index.rst rename to developer_manual/server/index.rst diff --git a/developer_manual/core/static-analysis.rst b/developer_manual/server/static-analysis.rst similarity index 100% rename from developer_manual/core/static-analysis.rst rename to developer_manual/server/static-analysis.rst diff --git a/developer_manual/core/unit-testing.rst b/developer_manual/server/unit-testing.rst similarity index 91% rename from developer_manual/core/unit-testing.rst rename to developer_manual/server/unit-testing.rst index 878970945..61231cc53 100644 --- a/developer_manual/core/unit-testing.rst +++ b/developer_manual/server/unit-testing.rst @@ -97,9 +97,9 @@ adjust your php.ini and file rights. su -c "chmod a+rx data/" su -c "chmod a+w data/nextcloud.log" -Running unit tests for the Nextcloud core project -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -The core project provides core unit tests using different database backends like sqlite, mysql, pgsql, oci (for Oracle). +Running unit tests for the Nextcloud server project +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +The server project provides server unit tests using different database backends like sqlite, mysql, pgsql, oci (for Oracle). Every database to test needs to accessible either - natively, setup with @@ -133,10 +133,10 @@ Further reading - https://www.youtube.com/watch?v=4E4672CS58Q&feature=bf_prev&list=PLBDAB2BA83BB6588E - Clean Code: A Handbook of Agile Software Craftsmanship (Robert C. Martin) -JavaScript unit testing for core --------------------------------- +JavaScript unit testing for server +---------------------------------- -JavaScript Unit testing for **core** and **core apps** is done using the `Karma `_ test runner with `Jasmine `_. +JavaScript Unit testing for **server** and **server apps** is done using the `Karma `_ test runner with `Jasmine `_. Installing Node JS ^^^^^^^^^^^^^^^^^^ diff --git a/requirements.txt b/requirements.txt index c1224c72b..81390c022 100644 --- a/requirements.txt +++ b/requirements.txt @@ -29,5 +29,6 @@ sphinxcontrib-phpdomain==0.11.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 sphinx-toolbox==3.4.0 +sphinx-reredirects==0.1.2 urllib3==2.0.4 zipp==3.16.2 diff --git a/user_manual/locale/fr/LC_MESSAGES/external_storage/index.pot b/user_manual/locale/fr/LC_MESSAGES/external_storage/index.pot index 009a486ad..5d2766c76 100644 --- a/user_manual/locale/fr/LC_MESSAGES/external_storage/index.pot +++ b/user_manual/locale/fr/LC_MESSAGES/external_storage/index.pot @@ -4,7 +4,7 @@ # FIRST AUTHOR , YEAR. # # Translators: -# RC, 2020 +# Mordecai, 2023 # #, fuzzy msgid "" @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-03-01 16:07+0000\n" "PO-Revision-Date: 2020-07-27 13:48+0000\n" -"Last-Translator: RC, 2020\n" +"Last-Translator: Mordecai, 2023\n" "Language-Team: French (https://app.transifex.com/nextcloud/teams/64236/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,4 +23,4 @@ msgstr "" #: ../../external_storage/index.rst:3 msgid "External Storage" -msgstr "Stockage Externe" +msgstr "Stockage externe" diff --git a/user_manual/locale/fr/LC_MESSAGES/webinterface.pot b/user_manual/locale/fr/LC_MESSAGES/webinterface.pot index 88b0728f0..236bb2380 100644 --- a/user_manual/locale/fr/LC_MESSAGES/webinterface.pot +++ b/user_manual/locale/fr/LC_MESSAGES/webinterface.pot @@ -1,24 +1,27 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2022 Nextcloud GmbH +# Copyright (C) 2023 Nextcloud GmbH # This file is distributed under the same license as the Nextcloud latest User Manual package. # FIRST AUTHOR , YEAR. # # Translators: # Pierre Ozoux , 2019 # Aurélie V, 2019 -# Martijn Sassen , 2021 +# Martijn Sassen, 2021 # Hugo Robert , 2021 # Florent Poinsaut, 2022 +# Jérôme HERBINET, 2022 +# Jérémie Tarot , 2023 +# Mordecai, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Nextcloud latest User Manual latest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-03 12:01+0000\n" +"POT-Creation-Date: 2023-04-17 10:07+0000\n" "PO-Revision-Date: 2019-11-07 20:28+0000\n" -"Last-Translator: Florent Poinsaut, 2022\n" -"Language-Team: French (https://www.transifex.com/nextcloud/teams/64236/fr/)\n" +"Last-Translator: Mordecai, 2023\n" +"Language-Team: French (https://app.transifex.com/nextcloud/teams/64236/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -39,6 +42,10 @@ msgstr "" "web. Il suffit de naviguer vers l'URL de votre serveur Nextcloud (par ex. " "cloud.exemple.com) et de saisir votre nom d'utilisateur et mot de passe." +#: ../../webinterface.rstNone +msgid "Nextcloud login screen." +msgstr "Écran d'identification de Nextcloud" + #: ../../webinterface.rst:12 msgid "Web browser requirements" msgstr "Les navigateurs Web supportés sont:" @@ -52,41 +59,51 @@ msgstr "" "recommandons que vous utilisiez la dernière version supportée des " "navigateurs de cette liste." +#: ../../webinterface.rst:17 +msgid "Google **Chrome**/Chromium (Desktop and Android)" +msgstr "Google **Chrome**/Chromium (Bureau et Android)" + +#: ../../webinterface.rst:18 +msgid "Mozilla **Firefox** (Desktop and Android)" +msgstr "Mozilla **Firefox** (Bureau et Android)" + +#: ../../webinterface.rst:19 +msgid "Apple **Safari** (Desktop and iOS)" +msgstr "Apple **Safari** (Bureau et iOS)" + #: ../../webinterface.rst:20 -msgid "Google **Chrome**/Chromium" -msgstr "Google **Chrome**/Chromium" - -#: ../../webinterface.rst:24 -msgid "Mozilla **Firefox**" -msgstr "Mozilla **Firefox**" - -#: ../../webinterface.rst:28 -msgid "Apple **Safari**" -msgstr "Apple **Safari**" - -#: ../../webinterface.rst:32 msgid "Microsoft **Edge**" msgstr "Microsoft **Edge**" -#: ../../webinterface.rst:34 +#: ../../webinterface.rst:22 +msgid "" +"Not all versions are supported. Nextcloud is tested and built to work with " +"`these versions only. " +"`_" +msgstr "" +"Toutes les versions ne sont pas prises en charge. Nextcloud n'est testé et " +"compilé que pour fonctionner avec `un nombre limité de versions. " +"`_" + +#: ../../webinterface.rst:25 msgid "" "If you want to use Nextcloud Talk you need to run Mozilla **Firefox** 52+ or" " Google **Chrome**/Chromium 49+ to have the full experience with video calls" -" and screensharing. Google **Chrome**/Chromium requires a additional plugin " -"for screensharing." +" and screensharing." msgstr "" -"Si vous souhaitez utiliser Nextcloud Talk, vous devez disposer au minimum de" -" Mozilla Firefox 52 ou de Google Chrome/Chromium 49." +"Si vous souhaitez utiliser Nextcloud Talk, vous devez alors avoir pour " +"navigateur **Firefox** 52+ ou Google **Chrome/Chromium** 49+ pour profiter " +"de l'expérience complète avec les appels vidéo et le partage d'écran." -#: ../../webinterface.rst:38 +#: ../../webinterface.rst:29 msgid "Microsoft **Internet Explorer** is **NOT** supported." -msgstr "Microsoft **Internet Explorer** n'est **PAS** supporté." +msgstr "Microsoft **Internet Explorer** n'est **PAS** pris en charge." -#: ../../webinterface.rst:41 +#: ../../webinterface.rst:32 msgid "Navigating the main user interface" msgstr "Navigation dans la fenêtre par défaut" -#: ../../webinterface.rst:43 +#: ../../webinterface.rst:34 msgid "" "By default, the Nextcloud Web interface opens to your Dashboard or Files " "page:" @@ -94,7 +111,11 @@ msgstr "" "Par défaut, l'interface web Nextcloud s'ouvre sur votre Tableau de Bord ou " "la page Fichiers : " -#: ../../webinterface.rst:49 +#: ../../webinterface.rstNone +msgid "The main Files view." +msgstr "La vue principale des Fichiers" + +#: ../../webinterface.rst:40 msgid "" "In Files you can add, remove, and share files, and the server administrator " "can change access privileges." @@ -102,14 +123,14 @@ msgstr "" "Dans Fichiers, vous pouvez ajouter, supprimer et partager des fichiers, et " "l'administrateur du serveur peut modifier les privilèges d'accès." -#: ../../webinterface.rst:52 +#: ../../webinterface.rst:43 msgid "" "The Nextcloud user interface contains the following fields and functions:" msgstr "" "L'interface utilisateur de Nextcloud permet d'accéder aux champs ou aux " "fonctions suivants:" -#: ../../webinterface.rst:54 +#: ../../webinterface.rst:45 msgid "" "**Apps Selection Menu** (1): Located in the upper left corner, you'll find " "all your apps which are available on your instance of Nextcloud. Clicking on" @@ -120,7 +141,7 @@ msgstr "" "votre instance Nextcloud. En cliquant sur l'icône d'une application, vous " "serez redirigé vers l'application en question." -#: ../../webinterface.rst:58 +#: ../../webinterface.rst:49 msgid "" "**Apps Information** field (2): Located in the left sidebar, this provides " "filters and tasks associated with your selected app. For example, when you " @@ -136,7 +157,7 @@ msgstr "" " avec vous et les fichiers que vous avez partagés avec d'autres personnes. " "Vous verrez des éléments différents pour les autres applications." -#: ../../webinterface.rst:64 +#: ../../webinterface.rst:55 msgid "" "**Application View** (3): The main central field in the Nextcloud user " "interface. This field displays the contents or user features of your " @@ -145,7 +166,7 @@ msgstr "" "**La vue centrale de l'application** (3) : Cette zone centrale affiche le " "contenu spécifique à l'application sélectionnée." -#: ../../webinterface.rst:67 +#: ../../webinterface.rst:58 msgid "" "**Navigation Bar** (4): Located over the main viewing window (the " "Application View), this bar provides a type of breadcrumbs navigation that " @@ -157,7 +178,7 @@ msgstr "" "permet de revenir à un niveau de dossier supérieur ou à la racine de " "l'arborescence de fichiers (l’icône de maison)." -#: ../../webinterface.rst:71 +#: ../../webinterface.rst:62 msgid "" "**New** button (5): Located in the Navigation Bar, the ``New`` button " "enables you to create new files, new folders, or upload files." @@ -166,7 +187,7 @@ msgstr "" "``Nouveau`` permet de créer de nouveaux fichiers, de nouveaux dossiers ou de" " téléverser des fichiers." -#: ../../webinterface.rst:74 +#: ../../webinterface.rst:65 msgid "" "You can also drag and drop files from your file manager into the Files " "Application View to upload them to your instance." @@ -174,7 +195,7 @@ msgstr "" "Vous pouvez aussi glisser/déposer depuis votre gestionnaire de fichier vers " "votre navigateur pour les enregistrer sur votre instance." -#: ../../webinterface.rst:77 +#: ../../webinterface.rst:68 msgid "" "**Search** field (6): Click on the Magnifier in the upper right corner to " "search for files and entries of the current app." @@ -182,18 +203,18 @@ msgstr "" "Champ **Recherche** (6) : Cliquez sur la loupe en haut à droite pour " "rechercher des fichiers et d'autres entrées dans l'application actuelle." -#: ../../webinterface.rst:80 +#: ../../webinterface.rst:71 msgid "" "**Contacts Menu** (7): Gives you an overview about your contacts and users " "on your server. Dependent on the given details and available apps, you can " "directly start a video call with them or send emails." msgstr "" "**Contacts** (7) : Donne la liste de vos contacts et des utilisateurs sur le" -" serveur. Selon les données enregistrée sur votre contact et les " +" serveur. Selon les données enregistrées sur votre contact et les " "applications disponibles, vous pourrez démarrer une conférence web ou " -"envoyer un courriel." +"envoyer un e-mail." -#: ../../webinterface.rst:84 +#: ../../webinterface.rst:75 msgid "" "**Grid view** button (8): This looks like four little squares, which toggles" " the grid view for folders and files." @@ -201,7 +222,7 @@ msgstr "" "Bouton **Affichage mosaïque** (8) : Il ressemble à quatre petits carrés, il " "permet d'activer la vue en mosaïque pour les dossiers et fichiers." -#: ../../webinterface.rst:87 +#: ../../webinterface.rst:78 msgid "" "**Settings** menu (9): Click on your profile picture, located to the right " "of the Search field, to open your Settings dropdown menu. Your Settings page" @@ -210,55 +231,55 @@ msgstr "" "**Paramètres** (9) : Cliquez sur votre photo de profil, située en haut à " "droite de l'écran et vous verrez le menu paramètres s'afficher:" -#: ../../webinterface.rst:91 +#: ../../webinterface.rst:82 msgid "Links to download desktop and mobile apps" msgstr "" "Liens de téléchargement des applications mobiles ou ordinateur de bureau" -#: ../../webinterface.rst:92 +#: ../../webinterface.rst:83 msgid "Server usage and space availability" msgstr "Taux d'utilisation du serveur et espace disque disponible" -#: ../../webinterface.rst:93 +#: ../../webinterface.rst:84 msgid "Password management" msgstr "Gestion du mot de passe" -#: ../../webinterface.rst:94 +#: ../../webinterface.rst:85 msgid "Name, email, and profile picture settings" msgstr "Paramétrage Nom, e-mail, et photo de profil" -#: ../../webinterface.rst:95 +#: ../../webinterface.rst:86 msgid "Manage connected browsers and devices" msgstr "Gestion des appareils connectés" -#: ../../webinterface.rst:96 +#: ../../webinterface.rst:87 msgid "Group memberships" msgstr "Gestion des groupes" -#: ../../webinterface.rst:97 +#: ../../webinterface.rst:88 msgid "Interface language settings" msgstr "Paramétrage de la langue" -#: ../../webinterface.rst:98 +#: ../../webinterface.rst:89 msgid "Manage notifications" msgstr "Gestion des notifications" -#: ../../webinterface.rst:99 +#: ../../webinterface.rst:90 msgid "Federated Cloud ID and social media-sharing buttons" -msgstr "Fédération de cloud ID et partage via les réseaux sociaux" +msgstr "ID de Cloud Fédéré et boutons de partage via les réseaux sociaux" -#: ../../webinterface.rst:100 +#: ../../webinterface.rst:91 msgid "SSL/TLS certificate manager for external storages" msgstr "Gestion des certificats SSL/TLS pour les stockages externes" -#: ../../webinterface.rst:101 +#: ../../webinterface.rst:92 msgid "Your Two-factor Settings" msgstr "Authentification à deux facteurs" -#: ../../webinterface.rst:102 +#: ../../webinterface.rst:93 msgid "Nextcloud Version information" msgstr "n° de version de Nextcloud" -#: ../../webinterface.rst:104 +#: ../../webinterface.rst:95 msgid "See :doc:`userpreferences` section to learn more about these settings." msgstr "Voir :doc:`userpreferences` pour en savoir plus sur les paramètres."