Merge pull request #93 from YunoHost-Apps/testing

Testing (#92)

README.md

@@ -3,14 +3,15 @@
 [![Integration level](https://dash.yunohost.org/integration/roundcube.svg)](https://dash.yunohost.org/appci/app/roundcube) ![](https://ci-apps.yunohost.org/ci/badges/roundcube.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/roundcube.maintain.svg)  
 [![Install Roundcube with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=roundcube)
 
+*[Lire ce readme en français.](./README_fr.md)*
+
 > *This package allow you to install Roundcube quickly and simply on a YunoHost server.
 If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.*
 
 ## Overview
-[Roundcube](https://roundcube.net/) is a browser-based multilingual IMAP client with
+[Roundcube](https://roundcube.net/) is a browser-based multilingual IMAP client with an application-like user interface.
-an application-like user interface.
 
-**Shipped version:** 1.4.7
+**Shipped version:** 1.4.9
 
 ## Screenshots
 
@@ -31,21 +32,14 @@ You can extend - or even override - the Roundcube configuration which is coming
 
 ## YunoHost specific features
 
-In addition to Roundcube core features, the following are made available with
+In addition to Roundcube core features, the following are made available with this package:
-this package:
 
  * Synchronize your email aliases as identities in Roundcube
- * Install the [contextmenu](https://plugins.roundcube.net/packages/johndoh/contextmenu)
+ * Install the [contextmenu](https://plugins.roundcube.net/packages/johndoh/contextmenu) and [automatic addressbook](https://plugins.roundcube.net/packages/sblaisot/automatic_addressbook) plugins by default
-   and [automatic addressbook](https://plugins.roundcube.net/packages/sblaisot/automatic_addressbook)
+ * Allow to install the [CardDAV](https://plugins.roundcube.net/packages/roundcube/carddav) (address book) synchronization plugin at the installation - note that if you have installed Nextcloud or Baïkal, it will automatically add the corresponding and existing address book.
-   plugins by default
- * Allow to install the [CardDAV](https://plugins.roundcube.net/packages/roundcube/carddav)
-   (address book) synchronization plugin at the installation - note that if
-   you have installed ownCloud or Baïkal, it will automatically add the
-   corresponding and existing address book.
 
 #### Multi-users support
-* Integrate with YunoHost users and SSO - i.e logout button, YunoHost users
+* Integrate with YunoHost users and SSO - i.e logout button, YunoHost users search
-  search
 
 #### Supported architectures
 
@@ -60,13 +54,11 @@ this package:
 
 #### Plugins
 
-You can also install other plugins - which will not be removed with upgrades. To do so,
+You can also install other plugins - which will not be removed with upgrades. To do so, you can use the official [Plugin Repository](https://plugins.roundcube.net/).
-you can use the official [Plugin Repository](https://plugins.roundcube.net/).
 
 ##### From the Plugin Repository
 
-Let's say for example that we want to install the
+Let's say for example that we want to install the [html5_notifier](https://plugins.roundcube.net/packages/kitist/html5_notifier) plugin.
-[html5_notifier](https://plugins.roundcube.net/packages/kitist/html5_notifier) plugin.
 
 1. Connect to your server as root using SSH:
    ```
@@ -74,33 +66,28 @@ Let's say for example that we want to install the
    $ sudo -i
    ```
 
-2. Log in as the `roundcube` user - which owns the roundcube directory - and navigate
+2. Log in as the `roundcube` user - which owns the roundcube directory - and navigate in it:
-   in it:
    ```
    # su -s /bin/bash - roundcube
    $ cd /var/www/roundcube
    ```
 
-3. Install the plugin you want using composer - note that you have to specify
+3. Install the plugin you want using composer - note that you have to specify *kitist/html5_notifier* and not only *html5_notifier*:
-   *kitist/html5_notifier* and not only *html5_notifier*:
    ```
    $ COMPOSER_HOME=./.composer php composer.phar require "kitist/html5_notifier"
    ```
 
-4. Enable it in the local configuration file `conf/local.inc.php` using your
+4. Enable it in the local configuration file `conf/local.inc.php` using your favorite text editor by adding:
-   favorite text editor by adding:
    ```
    <?php
    $config['plugins'][] = 'html5_notifier';
    ```
 
-Note that you should also check the plugin homepage for additional installation
+Note that you should also check the plugin homepage for additional installation steps as needed.
-steps as needed.
 
 ##### Manual installation
 
-You can also download the plugin and put it under the `plugins/` directory. In this
+You can also download the plugin and put it under the `plugins/` directory. In this case, do not forget to change ownerships of this folder to `roundcube`.
-case, do not forget to change ownerships of this folder to `roundcube`.
 
 ## Links
 
@@ -111,8 +98,7 @@ case, do not forget to change ownerships of this folder to `roundcube`.
 
 ---
 
-Developers info
+## Developers info
-----------------
 
 Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/roundcube_ynh/tree/testing).
 

README_fr.md

@@ -0,0 +1,113 @@
+# Roundcube pour YunoHost
+
+[![Integration level](https://dash.yunohost.org/integration/roundcube.svg)](https://dash.yunohost.org/appci/app/roundcube) ![](https://ci-apps.yunohost.org/ci/badges/roundcube.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/roundcube.maintain.svg)  
+[![Installer Roundcube avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=roundcube)
+
+*[Read this readme in english.](./README.md)* 
+
+> *Ce package vous permet d'installer Roundcube rapidement et simplement sur un serveur YunoHost.  
+Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.*
+
+## Overview
+[Roundcube](https://roundcube.net/) est un client IMAP multilingue basé sur un navigateur avec une interface utilisateur semblable à une application.
+
+**Shipped version:** 1.4.9
+
+## Screenshots
+
+![](https://roundcube.net/screens/skins/elastic/desktop/screens/mailbox_widescreen.png)
+
+## Démo
+
+* [Démo YunoHost](https://demo.yunohost.org/webmail/)
+
+## Configuration
+
+Vous pouvez étendre (ou même remplacer) la configuration de Roundcube fournie avec ce paquet dans le fichier `conf/local.inc.php`. Ne modifiez pas le fichier `conf/config.inc.php` car les futures mises à jour le remplaceront.
+
+## Documentation
+
+ * Documentation officielle : https://github.com/roundcube/roundcubemail/wiki
+ * Documentation YunoHost : https://github.com/YunoHost/doc/blob/master/app_roundcube.md:
+
+## Caractéristiques spécifiques YunoHost
+
+En plus des fonctionnalités principales de Roundcube, les éléments suivants sont disponibles avec ce paquet :
+
+ * Synchronisez vos alias de messagerie en tant qu'identités dans Roundcube.
+ * Installation des plugins [contextmenu](https://plugins.roundcube.net/packages/johndoh/contextmenu)
+   et [automatic addressbook](https://plugins.roundcube.net/packages/sblaisot/automatic_addressbook) par default.
+ * Permettre d'installer [CardDAV](https://plugins.roundcube.net/packages/roundcube/carddav) (carnet d'adresses) de synchronisation à l'installation - notez que si vous avez installé Nextcloud ou Baïkal, il ajoutera automatiquement le carnet d'adresses correspondant.
+
+#### Support multi-utilisateur
+
+* Intégration avec les utilisateurs YunoHost et SSO - c'est-à-dire le bouton de déconnexion, reconnaissance des autres utilisateurs de l'instance YunoHost.
+
+#### Supported architectures
+
+* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/roundcube%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/roundcube/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/roundcube%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/roundcube/)
+
+## Limitations
+
+* Aucune limitation connue.
+
+## Additional information
+
+#### Plugins
+
+Vous pouvez également installer d'autres plugins (qui ne seront pas supprimés avec les mises à niveau). Pour cela, vous pouvez utiliser le [Plugin Repository](https://plugins.roundcube.net/) officiel.
+
+##### Depuis le dépôt de plugins
+
+Si, par exemple, vous voulez installer le plugin [html5_notifier](https://plugins.roundcube.net/packages/kitist/html5_notifier).
+
+1. Connectez-vous en SSH à votre serveur en tant que root :
+   ```
+   $ ssh admin@1.2.3.4
+   $ sudo -i
+   ```
+
+2. Connectez-vous en tant qu'utilisateur `roundcube` (qui possède le répertoire roundcube) et naviguez dedans :
+   ```
+   # su -s /bin/bash - roundcube
+   $ cd /var/www/roundcube
+   ```
+
+3. Installez le plugin que vous voulez en utilisant Composer - notez que vous devez spécifier
+   *kitist/html5_notifier* et pas seulement *html5_notifier* :
+   ```
+   $ COMPOSER_HOME=./.composer php composer.phar require "kitist/html5_notifier"
+   ```
+
+4. Activez-le dans le fichier de configuration local `conf/local.inc.php` en utilisant un éditeur de texte en ajoutant :
+   ```
+   <?php
+   $config['plugins'][] = 'html5_notifier';
+   ```
+
+Notez que vous devriez également vérifier la page d'accueil du plugin pour une installation supplémentaire si besoin.
+
+##### Installation manuelle
+
+Vous pouvez également télécharger le plugin et le placer dans le répertoire `plugins/`. Dans ce cas, n'oubliez pas de changer l'*ownerships* de ce dossier à `roundcube`.
+
+## Liens
+
+ * Signaler un bug : https://github.com/YunoHost-Apps/roundcube_ynh/issues
+ * Site de l'application : https://roundcube.net/
+ * Dépôt de l'application principale : https://github.com/roundcube/roundcubemail
+ * Site web YunoHost : https://yunohost.org/
+
+---
+
+## Informations pour les développeurs
+
+Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/roundcube_ynh/tree/testing).
+
+Pour essayer la branche testing, procédez comme suit.
+```
+sudo yunohost app install https://github.com/YunoHost-Apps/roundcube_ynh/tree/testing --debug
+ou
+sudo yunohost app upgrade roundcube -u https://github.com/YunoHost-Apps/roundcube_ynh/tree/testing --debug
+```

conf/app.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.4.7/roundcubemail-1.4.7.tar.gz
+SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.4.9/roundcubemail-1.4.9.tar.gz
-SOURCE_SUM=72f1d31db27203abb5842ee493ae335f6e4ac421b2ced6fce889c8690eba3bca
+SOURCE_SUM=8f9dabb01de4e80b9c9cbdf6b36107ef37e4e841c09d90aef526ce5e1402b430
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

manifest.json

@@ -6,7 +6,7 @@
         "en": "Open Source Webmail software",
         "fr": "Webmail Open Source"
     },
-    "version": "1.4.7~ynh1",
+    "version": "1.4.9~ynh1",
     "url": "https://roundcube.net/",
     "license": "GPL-3.0-only",
     "maintainer": {