Merge branch 'testing' into master

2024-09-03 18:26:29 +02:00 · 2024-05-21 19:54:27 +02:00 · 2024-05-21 19:54:27 +02:00 · c26fb32562
commit c26fb32562
parent 8e54fc2348 a02f358a80
6 changed files with 155 additions and 3 deletions
--- a/ALL_README.md
+++ b/ALL_README.md
@ -1,6 +1,8 @@
 # All available README files by language

 - [Read the README in English](README.md)
+- [Lea el README en español](README_es.md)
+- [Irakurri README euskaraz](README_eu.md)
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)
- [Leggi il “README” in italiano](README_it.md)
+- [阅读中文（简体）的 README](README_zh_Hans.md)
--- a/README.md
+++ b/README.md
@ -9,7 +9,7 @@ It shall NOT be edited by hand.

 [![Install DotClear 2 with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dotclear2)

-*[Read this README is other languages.](./ALL_README.md)*
+*[Read this README in other languages.](./ALL_README.md)*

 > *This package allows you to install DotClear 2 quickly and simply on a YunoHost server.*  
 > *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.*
--- a/README_es.md
+++ b/README_es.md
@ -0,0 +1,50 @@
+<!--
+Este archivo README esta generado automaticamente<https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+No se debe editar a mano.
+-->
+
+# DotClear 2 para Yunohost
+
+[![Nivel de integración](https://dash.yunohost.org/integration/dotclear2.svg)](https://dash.yunohost.org/appci/app/dotclear2) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg)
+
+[![Instalar DotClear 2 con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dotclear2)
+
+*[Leer este README en otros idiomas.](./ALL_README.md)*
+
+> *Este paquete le permite instalarDotClear 2 rapidamente y simplement en un servidor YunoHost.*  
+> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.*
+
+## Descripción general
+
+Dotclear is an open-source web publishing software. Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills.
+
+
+**Versión actual:** 2.27.3~ynh1
+
+**Demo:** <https://www.softaculous.com/demos/Dotclear>
+
+## Capturas
+
+![Captura de DotClear 2](./doc/screenshots/ss2_dotclear.png)
+
+## Documentaciones y recursos
+
+- Sitio web oficial: <https://dotclear.org>
+- Documentación administrador oficial: <https://dotclear.org/documentation/2.0>
+- Repositorio del código fuente oficial de la aplicación : <https://git.dotclear.org/dev/dotclear>
+- Catálogo YunoHost: <https://apps.yunohost.org/app/dotclear2>
+- Reportar un error: <https://github.com/YunoHost-Apps/dotclear2_ynh/issues>
+
+## Información para desarrolladores
+
+Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing
+
+Para probar la rama `testing`, sigue asÍ:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade dotclear2 -u https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug
+```
+
+**Mas informaciones sobre el empaquetado de aplicaciones:** <https://yunohost.org/packaging_apps>
--- a/README_eu.md
+++ b/README_eu.md
@ -0,0 +1,50 @@
+<!--
+Ohart ongi: README hau automatikoki sortu da <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>ri esker
+EZ editatu eskuz.
+-->
+
+# DotClear 2 YunoHost-erako
+
+[![Integrazio maila](https://dash.yunohost.org/integration/dotclear2.svg)](https://dash.yunohost.org/appci/app/dotclear2) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg)
+
+[![Instalatu DotClear 2 YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dotclear2)
+
+*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)*
+
+> *Pakete honek DotClear 2 YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.*  
+> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.*
+
+## Aurreikuspena
+
+Dotclear is an open-source web publishing software. Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills.
+
+
+**Paketatutako bertsioa:** 2.27.3~ynh1
+
+**Demoa:** <https://www.softaculous.com/demos/Dotclear>
+
+## Pantaila-argazkiak
+
+![DotClear 2(r)en pantaila-argazkia](./doc/screenshots/ss2_dotclear.png)
+
+## Dokumentazioa eta baliabideak
+
+- Aplikazioaren webgune ofiziala: <https://dotclear.org>
+- Administratzaileen dokumentazio ofiziala: <https://dotclear.org/documentation/2.0>
+- Jatorrizko aplikazioaren kode-gordailua: <https://git.dotclear.org/dev/dotclear>
+- YunoHost Denda: <https://apps.yunohost.org/app/dotclear2>
+- Eman errore baten berri: <https://github.com/YunoHost-Apps/dotclear2_ynh/issues>
+
+## Garatzaileentzako informazioa
+
+Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing).
+
+`testing` abarra probatzeko, ondorengoa egin:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug
+edo
+sudo yunohost app upgrade dotclear2 -u https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug
+```
+
+**Informazio gehiago aplikazioaren paketatzeari buruz:** <https://yunohost.org/packaging_apps>
--- a/README_zh_Hans.md
+++ b/README_zh_Hans.md
@ -0,0 +1,50 @@
+<!--
+注意：此 README 由 <https://github.com/YunoHost/apps/tree/master/tools/readme_generator> 自动生成
+请勿手动编辑。
+-->
+
+# YunoHost 上的 DotClear 2
+
+[![集成程度](https://dash.yunohost.org/integration/dotclear2.svg)](https://dash.yunohost.org/appci/app/dotclear2) ![工作状态](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg)
+
+[![使用 YunoHost 安装 DotClear 2](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dotclear2)
+
+*[阅读此 README 的其它语言版本。](./ALL_README.md)*
+
+> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 DotClear 2。*  
+> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。*
+
+## 概况
+
+Dotclear is an open-source web publishing software. Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills.
+
+
+**分发版本：** 2.27.3~ynh1
+
+**演示：** <https://www.softaculous.com/demos/Dotclear>
+
+## 截图
+
+![DotClear 2 的截图](./doc/screenshots/ss2_dotclear.png)
+
+## 文档与资源
+
+- 官方应用网站： <https://dotclear.org>
+- 官方管理文档： <https://dotclear.org/documentation/2.0>
+- 上游应用代码库： <https://git.dotclear.org/dev/dotclear>
+- YunoHost 商店： <https://apps.yunohost.org/app/dotclear2>
+- 报告 bug： <https://github.com/YunoHost-Apps/dotclear2_ynh/issues>
+
+## 开发者信息
+
+请向 [`testing` 分支](https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing) 发送拉取请求。
+
+如要尝试 `testing` 分支，请这样操作：
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug
+或
+sudo yunohost app upgrade dotclear2 -u https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug
+```
+
+**有关应用打包的更多信息：** <https://yunohost.org/packaging_apps>
--- a/conf/class.auth.ldap.php
+++ b/conf/class.auth.ldap.php
@ -1,5 +1,5 @@
 <?php
-class ldapDcAuth extends dcAuth
+class ldapDcAuth extends Auth
 {
    # The user can't change his password
    protected $allow_pass_change = false;