Merge pull request #20 from YunoHost-Apps/testing

Co-authored-by: OniriCorpe <oniricorpe@disroot.org>
Co-authored-by: eric_G <46165813+ericgaspar@users.noreply.github.com>
Co-authored-by: OniriCorpe <github@oniricorpe.eu>
Co-authored-by: Yunohost-Bot <>
Co-authored-by: Salamandar <6552989+Salamandar@users.noreply.github.com>
Co-authored-by: YunoHost Bot <yunohost-bot@users.noreply.github.com>
Co-authored-by: yunohost-bot <yunohost@yunohost.org>

ALL_README.md

@@ -1,6 +1,5 @@
 # All available README files by language
 
 - [Read the README in English](README.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.md

@@ -9,7 +9,7 @@ It shall NOT be edited by hand.
 
 [![Install Fluffychat with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=fluffychat)
 
-*[Read this README is other languages.](./ALL_README.md)*
+*[Read this README in other languages.](./ALL_README.md)*
 
 > *This package allows you to install Fluffychat 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.*
@@ -20,7 +20,7 @@ FluffyChat is an open source, nonprofit and cute [[matrix](https://matrix.org)]
 The goal of the app is to create an easy to use instant messenger which is open source and accessible for everyone.
 
 
-**Shipped version:** 1.18.0~ynh2
+**Shipped version:** 1.19.0~ynh1
 
 **Demo:** <https://fluffychat.im/web>
 

README_eu.md

@@ -0,0 +1,51 @@
+<!--
+Ohart ongi: README hau automatikoki sortu da <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>ri esker
+EZ editatu eskuz.
+-->
+
+# Fluffychat YunoHost-erako
+
+[![Integrazio maila](https://dash.yunohost.org/integration/fluffychat.svg)](https://dash.yunohost.org/appci/app/fluffychat) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/fluffychat.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/fluffychat.maintain.svg)
+
+[![Instalatu Fluffychat YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=fluffychat)
+
+*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)*
+
+> *Pakete honek Fluffychat YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.*  
+> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.*
+
+## Aurreikuspena
+
+FluffyChat is an open source, nonprofit and cute [[matrix](https://matrix.org)] client written in [Flutter](https://flutter.dev).  
+The goal of the app is to create an easy to use instant messenger which is open source and accessible for everyone.
+
+
+**Paketatutako bertsioa:** 1.19.0~ynh1
+
+**Demoa:** <https://fluffychat.im/web>
+
+## Pantaila-argazkiak
+
+![Fluffychat(r)en pantaila-argazkia](./doc/screenshots/screenshot.png)
+
+## Dokumentazioa eta baliabideak
+
+- Aplikazioaren webgune ofiziala: <https://fluffychat.im/>
+- Erabiltzaileen dokumentazio ofiziala: <https://github.com/krille-chan/fluffychat/wiki#-user-guides>
+- Jatorrizko aplikazioaren kode-gordailua: <https://github.com/krille-chan/fluffychat>
+- YunoHost Denda: <https://apps.yunohost.org/app/fluffychat>
+- Eman errore baten berri: <https://github.com/YunoHost-Apps/fluffychat_ynh/issues>
+
+## Garatzaileentzako informazioa
+
+Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/fluffychat_ynh/tree/testing).
+
+`testing` abarra probatzeko, ondorengoa egin:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/fluffychat_ynh/tree/testing --debug
+edo
+sudo yunohost app upgrade fluffychat -u https://github.com/YunoHost-Apps/fluffychat_ynh/tree/testing --debug
+```
+
+**Informazio gehiago aplikazioaren paketatzeari buruz:** <https://yunohost.org/packaging_apps>

README_fr.md

@@ -20,7 +20,7 @@ FluffyChat est un client [[matrix](https://matrix.org)] open-source, à but non
 Le but de cette app est de créer un client de messagerie instantannée facile d'utilisation, open-source et accessible pour tout le monde.
 
 
-**Version incluse :** 1.18.0~ynh2
+**Version incluse :** 1.19.0~ynh1
 
 **Démo :** <https://fluffychat.im/web>
 

manifest.toml

@@ -7,7 +7,7 @@ name = "Fluffychat"
 description.en = "Matrix messenger client"
 description.fr = "Client de messagerie Matrix"
 
-version = "1.18.0~ynh2"
+version = "1.19.0~ynh1"
 
 maintainers = [ "OniriCorpe" ]
 
@@ -47,15 +47,17 @@ ram.runtime = "50M"
 
     [install.default_matrix_server]
     ask.en = "Default Matrix server"
+    ask.fr = "Serveur Matrix par défaut"
     help.en = "Must be a domain name or a sub-domain. Must not contain a path."
+    help.fr = "Doit être un nom de domaine ou un sous-domaine. Ne doit pas contenir de chemin d'accès."
     type = "url"
     default = "https://matrix.org"
 
 [resources]
     [resources.sources]
         [resources.sources.main]
-        url = "https://github.com/krille-chan/fluffychat/releases/download/v1.18.0/fluffychat-web.tar.gz"
-        sha256 = "0b9fbc74e1098c3df966dd1b689ec16bef5aa3e83cecb7d3f408a5fab6128cf7"
+        url = "https://github.com/krille-chan/fluffychat/releases/download/v1.19.0/fluffychat-web.tar.gz"
+        sha256 = "b5083f9932f711f85d9dd778cec359cb603af375abdc20168fd4504e23b54ae9"
         in_subdir = 2
 
         autoupdate.asset = "fluffychat-web.tar.gz"

scripts/install

@@ -34,7 +34,7 @@ path_without_trailing_slash=${path%/}
 ynh_replace_string --match_string="<base href=".*">" --replace_string="<base href=\"$path_without_trailing_slash/\">" --target_file="$install_dir/index.html"
 
 # patching main.dart.js to replace the default matrix server
-ynh_replace_string --match_string="\$\.cmx=\"matrix.org\"" --replace_string="\$\.cmx=\"$default_matrix_server\"" --target_file="$install_dir/main.dart.js"
+ynh_replace_string --match_string="=\"matrix.org\"" --replace_string="=\"$default_matrix_server\"" --target_file="$install_dir/main.dart.js"
 
 chown -R "www-data:www-data" "$install_dir"
 

scripts/upgrade

@@ -28,14 +28,14 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=1
 
 	# Download, check integrity, uncompress and patch the source from manifest.toml
-	ynh_setup_source --dest_dir="$install_dir"
+	ynh_setup_source --dest_dir="$install_dir" --full_replace=1
 
 	# remove potential trailing slash to avoid double slashes
 	path_without_trailing_slash=${path%/}
 	ynh_replace_string --match_string="<base href=".*">" --replace_string="<base href=\"$path_without_trailing_slash/\">" --target_file="$install_dir/index.html"
 
 	# patching main.dart.js to replace the default matrix server
-	ynh_replace_string --match_string="\$\.cmx=\".*\"" --replace_string="\$\.cmx=\"$default_matrix_server\"" --target_file="$install_dir/main.dart.js"
+	ynh_replace_string --match_string="=\"matrix.org\"" --replace_string="=\"$default_matrix_server\"" --target_file="$install_dir/main.dart.js"
 fi
 
 chown -R "www-data:www-data" "$install_dir"