Merge pull request #45 from YunoHost-Apps/testing

Testing / 1.1.0

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)

README.md

@@ -9,7 +9,7 @@ It shall NOT be edited by hand.
 
 [![Install Galette with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=galette)
 
-*[Read this README is other languages.](./ALL_README.md)*
+*[Read this README in other languages.](./ALL_README.md)*
 
 > *This package allows you to install Galette 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.*
@@ -30,7 +30,7 @@ Galette is a membership management web application towards non profit organizati
 - Plugin support
 
 
-**Shipped version:** 1.0.0~ynh3
+**Shipped version:** 1.1.0~ynh1
 
 **Demo:** <https://demo.galette.eu/login>
 

README_es.md

@@ -0,0 +1,61 @@
+<!--
+Este archivo README esta generado automaticamente<https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+No se debe editar a mano.
+-->
+
+# Galette para Yunohost
+
+[![Nivel de integración](https://dash.yunohost.org/integration/galette.svg)](https://dash.yunohost.org/appci/app/galette) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/galette.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/galette.maintain.svg)
+
+[![Instalar Galette con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=galette)
+
+*[Leer este README en otros idiomas.](./ALL_README.md)*
+
+> *Este paquete le permite instalarGalette 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
+
+Galette is a membership management web application towards non profit organizations.
+
+### Features
+
+- Member management
+- Management of contributions and transactions
+- Management of groups and managers
+- Imports and exports (open formats)
+- Increased accessibility (use and compliance with web standards)
+- Configuration of cards and lists
+- Addition of dynamic fields to members, contributions and transactions files
+- Plugin support
+
+
+**Versión actual:** 1.1.0~ynh1
+
+**Demo:** <https://demo.galette.eu/login>
+
+## Capturas
+
+![Captura de Galette](./doc/screenshots/edit_member.png)
+
+## Documentaciones y recursos
+
+- Sitio web oficial: <https://www.galette.eu>
+- Documentación administrador oficial: <https://doc.galette.eu/fr/master/>
+- Repositorio del código fuente oficial de la aplicación : <https://github.com/galette/galette>
+- Catálogo YunoHost: <https://apps.yunohost.org/app/galette>
+- Reportar un error: <https://github.com/YunoHost-Apps/galette_ynh/issues>
+
+## Información para desarrolladores
+
+Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/galette_ynh/tree/testing
+
+Para probar la rama `testing`, sigue asÍ:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/galette_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade galette -u https://github.com/YunoHost-Apps/galette_ynh/tree/testing --debug
+```
+
+**Mas informaciones sobre el empaquetado de aplicaciones:** <https://yunohost.org/packaging_apps>

README_eu.md

@@ -0,0 +1,61 @@
+<!--
+Ohart ongi: README hau automatikoki sortu da <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>ri esker
+EZ editatu eskuz.
+-->
+
+# Galette YunoHost-erako
+
+[![Integrazio maila](https://dash.yunohost.org/integration/galette.svg)](https://dash.yunohost.org/appci/app/galette) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/galette.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/galette.maintain.svg)
+
+[![Instalatu Galette YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=galette)
+
+*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)*
+
+> *Pakete honek Galette YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.*  
+> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.*
+
+## Aurreikuspena
+
+Galette is a membership management web application towards non profit organizations.
+
+### Features
+
+- Member management
+- Management of contributions and transactions
+- Management of groups and managers
+- Imports and exports (open formats)
+- Increased accessibility (use and compliance with web standards)
+- Configuration of cards and lists
+- Addition of dynamic fields to members, contributions and transactions files
+- Plugin support
+
+
+**Paketatutako bertsioa:** 1.1.0~ynh1
+
+**Demoa:** <https://demo.galette.eu/login>
+
+## Pantaila-argazkiak
+
+![Galette(r)en pantaila-argazkia](./doc/screenshots/edit_member.png)
+
+## Dokumentazioa eta baliabideak
+
+- Aplikazioaren webgune ofiziala: <https://www.galette.eu>
+- Administratzaileen dokumentazio ofiziala: <https://doc.galette.eu/fr/master/>
+- Jatorrizko aplikazioaren kode-gordailua: <https://github.com/galette/galette>
+- YunoHost Denda: <https://apps.yunohost.org/app/galette>
+- Eman errore baten berri: <https://github.com/YunoHost-Apps/galette_ynh/issues>
+
+## Garatzaileentzako informazioa
+
+Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/galette_ynh/tree/testing).
+
+`testing` abarra probatzeko, ondorengoa egin:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/galette_ynh/tree/testing --debug
+edo
+sudo yunohost app upgrade galette -u https://github.com/YunoHost-Apps/galette_ynh/tree/testing --debug
+```
+
+**Informazio gehiago aplikazioaren paketatzeari buruz:** <https://yunohost.org/packaging_apps>

README_fr.md

@@ -31,7 +31,7 @@ Outil de gestion d'adhérents et de cotisation en ligne pour associations.
 - Support de plugins
 
 
-**Version incluse :** 1.0.0~ynh3
+**Version incluse :** 1.1.0~ynh1
 
 **Démo :** <https://demo.galette.eu/login>
 

README_gl.md

@@ -30,7 +30,7 @@ Galette is a membership management web application towards non profit organizati
 - Plugin support
 
 
-**Versión proporcionada:** 1.0.0~ynh3
+**Versión proporcionada:** 1.1.0~ynh1
 
 **Demo:** <https://demo.galette.eu/login>
 

README_zh_Hans.md

@@ -0,0 +1,61 @@
+<!--
+注意：此 README 由 <https://github.com/YunoHost/apps/tree/master/tools/readme_generator> 自动生成
+请勿手动编辑。
+-->
+
+# YunoHost 上的 Galette
+
+[![集成程度](https://dash.yunohost.org/integration/galette.svg)](https://dash.yunohost.org/appci/app/galette) ![工作状态](https://ci-apps.yunohost.org/ci/badges/galette.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/galette.maintain.svg)
+
+[![使用 YunoHost 安装 Galette](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=galette)
+
+*[阅读此 README 的其它语言版本。](./ALL_README.md)*
+
+> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Galette。*  
+> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。*
+
+## 概况
+
+Galette is a membership management web application towards non profit organizations.
+
+### Features
+
+- Member management
+- Management of contributions and transactions
+- Management of groups and managers
+- Imports and exports (open formats)
+- Increased accessibility (use and compliance with web standards)
+- Configuration of cards and lists
+- Addition of dynamic fields to members, contributions and transactions files
+- Plugin support
+
+
+**分发版本：** 1.1.0~ynh1
+
+**演示：** <https://demo.galette.eu/login>
+
+## 截图
+
+![Galette 的截图](./doc/screenshots/edit_member.png)
+
+## 文档与资源
+
+- 官方应用网站： <https://www.galette.eu>
+- 官方管理文档： <https://doc.galette.eu/fr/master/>
+- 上游应用代码库： <https://github.com/galette/galette>
+- YunoHost 商店： <https://apps.yunohost.org/app/galette>
+- 报告 bug： <https://github.com/YunoHost-Apps/galette_ynh/issues>
+
+## 开发者信息
+
+请向 [`testing` 分支](https://github.com/YunoHost-Apps/galette_ynh/tree/testing) 发送拉取请求。
+
+如要尝试 `testing` 分支，请这样操作：
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/galette_ynh/tree/testing --debug
+或
+sudo yunohost app upgrade galette -u https://github.com/YunoHost-Apps/galette_ynh/tree/testing --debug
+```
+
+**有关应用打包的更多信息：** <https://yunohost.org/packaging_apps>

conf/config.inc.php

@@ -1,4 +1,23 @@
 <?php
+/**
+ * Copyright © 2003-2024 The Galette Team
+ *
+ * This file is part of Galette (https://galette.eu).
+ *
+ * Galette is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Galette is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Galette. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 /*
 This is an example for your configuration file,
 read comments and replace the "blanks".

conf/nginx.conf

@@ -25,7 +25,7 @@ location __PATH__/ {
   include conf.d/yunohost_panel.conf.inc;
 }
 
-#location ~ __PATH__/(data|config|lib)/ {
+#location ~ ^__PATH__/(data|config|lib)/ {
 #        deny all;
 #    }
 

doc/ADMIN_fr.md

@@ -0,0 +1,6 @@
+Email credentials
+
+Serveur SMTP : localhost
+Port SMTP : 25
+Utilisateur SMTP : __APP__
+Mot de passe SMTP : __MAIL_PWD__

doc/PRE_UPGRADE.md

@@ -1,3 +1,3 @@
-If you were using a MySQL DB, the new version only supports postgres and you should migrate it manually before upgrading.
+If you were using a MySQL DB, the new version only supports PostgreSQL and you should migrate it manually before upgrading.
 
-NB: DO NOT confirm the upgrade without making sure first that you are using a postgresql database.
+NB: DO NOT confirm the upgrade without making sure first that you are using a PostgreSQL database.

doc/PRE_UPGRADE_fr.md

@@ -0,0 +1,3 @@
+Si vous utilisiez une base de données MySQL, la nouvelle version ne prend en charge que PostgreSQL et vous devez la migrer manuellement avant la mise à niveau.
+
+NB : NE confirmez PAS la mise à niveau sans vous assurer au préalable que vous utilisez une base de données PostgreSQL.

manifest.toml

@@ -5,7 +5,7 @@ name = "Galette"
 description.en = "Membership management web application for non profit organizations"
 description.fr = "Outil de gestion d'adhérents et de cotisation en ligne pour associations"
 
-version = "1.0.0~ynh3"
+version = "1.1.0~ynh1"
 
 maintainers = []
 
@@ -49,8 +49,8 @@ ram.runtime = "50M"
 
 [resources]
         [resources.sources.main]
-        url = "https://github.com/galette/galette/releases/download/1.0.0rc3/galette-1.0.0-rc3-20231122-a9c2ed838d.1.tar.bz2"
+        url = "https://galette.eu/download/galette-1.1.0.tar.bz2"
-        sha256 = "b4d5ed0c47baf03d5f1be69e3ba25b10ece5e22e62c308b4bc9867f4003a0a55"
+        sha256 = "dddec991c9a48b4ec7b9c25a5365a5cff8d35cbe674975092014f5512804d021"
         autoupdate.strategy = "latest_github_tag"
 
     [resources.system_user]
@@ -62,7 +62,7 @@ ram.runtime = "50M"
     main.url = "/"
 
     [resources.apt]
-    packages = "postgresql, php8.2-tidy, php8.2-intl, php8.2-mbstring, php8.2-xml, php8.2-gd, php8.2-curl, php8.2-pgsql"
+    packages = "postgresql, php8.3-tidy, php8.3-intl, php8.3-mbstring, php8.3-xml, php8.3-gd, php8.3-curl, php8.3-pgsql"
 
     [resources.database]
     type = "postgresql"

scripts/backup

@@ -22,23 +22,13 @@ ynh_print_info --message="Declaring files to be backed up..."
 ynh_backup --src_path="$install_dir"
 
 #=================================================
-# BACKUP THE NGINX CONFIGURATION
+# SYSTEM CONFIGURATION
 #=================================================
 
 ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
-#=================================================
-# BACKUP THE PHP-FPM CONFIGURATION
-#=================================================
-
 ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
-#=================================================
-# SPECIFIC BACKUP
-#=================================================
-# BACKUP LOGROTATE
-#=================================================
-
 ynh_backup --src_path="/etc/logrotate.d/$app"
 
 #=================================================

scripts/upgrade

@@ -15,22 +15,12 @@ source /usr/share/yunohost/helpers
 
 timezone="$(cat /etc/timezone)"
 
-#=================================================
-# CHECK VERSION
-#=================================================
-
-upgrade_type=$(ynh_check_app_version_changed)
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
+ynh_script_progression --message="Upgrading source files..."
 
-if [ "$upgrade_type" == "UPGRADE_APP" ]
+ynh_setup_source --dest_dir="$install_dir" --keep="galette/config/config.inc.php galette/data galette/plugins"
-then
-	ynh_script_progression --message="Upgrading source files..."
-
-	ynh_setup_source --dest_dir="$install_dir" --keep="galette/config/config.inc.php galette/data galette/plugins"
-fi
 
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"