From b4efb340b920d13b2ecc40a2dba483557fc1ce93 Mon Sep 17 00:00:00 2001 From: Neko Nekowazarashi Date: Thu, 24 Aug 2023 23:41:29 +0700 Subject: [PATCH 1/6] ubah kesalahan sub-jalur --- config_panel.toml | 2 +- scripts/change_url | 1 + scripts/install | 1 + scripts/upgrade | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/config_panel.toml b/config_panel.toml index 187fd34..69a2e94 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -53,5 +53,5 @@ services = ["__APP__"] ask.en = "API key for LibreTranslate:" ask.id = "Kunci API untuk LibreTranslate:" type = "string" - help.en = "If you disable LibreTranslate or your instance didn't need API key, just leave this blank." + help.en = "If you disable LibreTranslate or your instance didn't need an API key, just leave this blank." help.id = "Jika LibreTranslate tidak dipilih atau LibreTranslate pilihanmu tidak memerlukan ini, biarkan ini kosong." diff --git a/scripts/change_url b/scripts/change_url index 2ba57d8..7e622b5 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -47,6 +47,7 @@ then ynh_replace_string -m "\"$old_st_path/?engine" -r "\"$new_st_path/?engine" -f "$install_dir/simplytranslate/templates/index.html" ynh_replace_string -m "$old_st_path/prefs" -r "$new_st_path/prefs" -f "$install_dir/simplytranslate/templates/index.html" + ynh_replace_string -m "$old_st_path/switchlanguages" -r "$new_st_path/switchlanguages" -f "$install_dir/simplytranslate/templates/index.html" ynh_replace_string -m "\"$old_st_path/\"" -r "\"$new_st_path/\"" -f "$install_dir/simplytranslate/templates/prefs.html" ynh_replace_string -m "$old_st_path/prefs" -r "$new_st_path/prefs" -f "$install_dir/simplytranslate/templates/prefs.html" ynh_replace_string -m "$old_st_path/api" -r "$new_st_path/api" -f "$install_dir/simplytranslate/main.py" diff --git a/scripts/install b/scripts/install index 3a8f30d..250687c 100755 --- a/scripts/install +++ b/scripts/install @@ -73,6 +73,7 @@ fi ynh_replace_string -m "\"/?engine" -r "\"$st_path/?engine" -f "$install_dir/simplytranslate/templates/index.html" ynh_replace_string -m "/prefs" -r "$st_path/prefs" -f "$install_dir/simplytranslate/templates/index.html" +ynh_replace_string -m "/switchlanguages" -r "$st_path/switchlanguages" -f "$install_dir/simplytranslate/templates/index.html" ynh_replace_string -m "\"/\"" -r "\"$st_path/\"" -f "$install_dir/simplytranslate/templates/prefs.html" ynh_replace_string -m "/prefs" -r "$st_path/prefs" -f "$install_dir/simplytranslate/templates/prefs.html" ynh_replace_string -m "/api" -r "$st_path/api" -f "$install_dir/simplytranslate/main.py" diff --git a/scripts/upgrade b/scripts/upgrade index 3c53376..590c396 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -60,6 +60,7 @@ fi ynh_replace_string -m "\"/?engine" -r "\"$st_path/?engine" -f "$install_dir/simplytranslate/templates/index.html" ynh_replace_string -m "/prefs" -r "$st_path/prefs" -f "$install_dir/simplytranslate/templates/index.html" +ynh_replace_string -m "/switchlanguages" -r "$st_path/switchlanguages" -f "$install_dir/simplytranslate/templates/index.html" ynh_replace_string -m "\"/\"" -r "\"$st_path/\"" -f "$install_dir/simplytranslate/templates/prefs.html" ynh_replace_string -m "/prefs" -r "$st_path/prefs" -f "$install_dir/simplytranslate/templates/prefs.html" ynh_replace_string -m "/api" -r "$st_path/api" -f "$install_dir/simplytranslate/main.py" From 1b9d4a2d4f4bf088f77c47e575d728e3bb55c244 Mon Sep 17 00:00:00 2001 From: Neko Nekowazarashi Date: Thu, 24 Aug 2023 23:45:54 +0700 Subject: [PATCH 2/6] ubah versi --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index efdc3ef..b32b58a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Simply Translate" description.en = "Web interface for many translation engine: DeepL, Reverso, ICIBA, Google Translate, and LibreTranslate." description.id = "Antarmuka web mesin penerjemahan: DeepL; Reverso; ICIBA; Google Translate; dan LibreTranslate." -version = "2023.4.9~ynh1" +version = "2023.4.9~ynh2" maintainers = ["the7thNightmare"] From dbe16418c137ebdfad0523357113e895f7f7fd2c Mon Sep 17 00:00:00 2001 From: Neko Nekowazarashi Date: Tue, 5 Sep 2023 22:17:13 +0700 Subject: [PATCH 3/6] rekomendasi diterima --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index f884327..a4c4d1f 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,7 +4,7 @@ proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - proxy_set_header Host $http_host; + proxy_set_header Host $host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_pass http://localhost:__PORT____PATH__; From 14a1b82a95f6691a162c1067b70f3d4a88ea9212 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 5 Sep 2023 20:53:40 +0200 Subject: [PATCH 4/6] fix linter --- conf/nginx.conf | 3 ++- conf/systemd.service | 2 +- doc/DESCRIPTION.id.md | 1 - doc/DESCRIPTION_fr.md | 1 + manifest.toml | 7 ++++--- 5 files changed, 8 insertions(+), 6 deletions(-) delete mode 100644 doc/DESCRIPTION.id.md create mode 100644 doc/DESCRIPTION_fr.md diff --git a/conf/nginx.conf b/conf/nginx.conf index a4c4d1f..3d920d6 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,5 +1,6 @@ #root_path_only location / { #sub_path_only location __PATH__ { + # Standard nginx configuration proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; @@ -7,7 +8,7 @@ proxy_set_header Host $host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://localhost:__PORT____PATH__; + proxy_pass http://127.0.0.1:__PORT____PATH__; # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; diff --git a/conf/systemd.service b/conf/systemd.service index 695dca6..5580662 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -1,5 +1,5 @@ [Unit] -Description=Small description of the service +Description=Simply Translate: translation engine Web interface After=network.target [Service] diff --git a/doc/DESCRIPTION.id.md b/doc/DESCRIPTION.id.md deleted file mode 100644 index af6ef4f..0000000 --- a/doc/DESCRIPTION.id.md +++ /dev/null @@ -1 +0,0 @@ -Antarmuka penerjemahan untuk berbagai mesin penerjemahan, ada DeepL, Reverso, ICIBA, Google Translate, dan LibreTranslate (bisa diubah peladen LibreTranslate mana yang mau dipakai). diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md new file mode 100644 index 0000000..4428655 --- /dev/null +++ b/doc/DESCRIPTION_fr.md @@ -0,0 +1 @@ +L'interface du moteur SimplyTranslate, que vous pouvez utiliser pour la traduction de nombreux moteurs de traduction, comprend les moteurs DeepL, Reverso, ICIBA, Google Translate et LibreTranslate (dont l'instance de récupération de LibreTranslate peut être configurée). \ No newline at end of file diff --git a/manifest.toml b/manifest.toml index b32b58a..99a94a4 100644 --- a/manifest.toml +++ b/manifest.toml @@ -2,8 +2,9 @@ packaging_format = 2 id = "simplytranslate" name = "Simply Translate" -description.en = "Web interface for many translation engine: DeepL, Reverso, ICIBA, Google Translate, and LibreTranslate." -description.id = "Antarmuka web mesin penerjemahan: DeepL; Reverso; ICIBA; Google Translate; dan LibreTranslate." +description.en = "Web interface for many translation engine" +description.fr = "Interface Web pour de nombreux moteurs de traduction" +description.id = "Antarmuka web mesin penerjemahan" version = "2023.4.9~ynh2" @@ -15,7 +16,7 @@ website = "https://simple-web.org/projects/simplytranslate.html" code = "https://codeberg.org/SimpleWeb/SimplyTranslate-Web" [integration] -yunohost = ">= 11.1.19" +yunohost = ">= 11.2" architectures = "all" multi_instance = true ldap = false From 3c4c6494cec8694bf18d6bbddc1cc05bdb7d2a6a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 5 Sep 2023 18:53:46 +0000 Subject: [PATCH 5/6] Auto-update README --- README.md | 69 +++++++++++++--------------------------------------- README_fr.md | 65 ++++++++++++++++--------------------------------- 2 files changed, 38 insertions(+), 96 deletions(-) diff --git a/README.md b/README.md index 8cf224e..792d6d5 100644 --- a/README.md +++ b/README.md @@ -1,85 +1,50 @@ -# Packaging an app, starting from this example - -* Copy this app before working on it, using the ['Use this template'](https://github.com/YunoHost/example_ynh/generate) button on the Github repo. -* Edit the `manifest.toml` with app specific info. -* Edit the `install`, `upgrade`, `remove`, `backup` and `restore` scripts, and any relevant conf files in `conf/`. - * Using the [script helpers documentation.](https://yunohost.org/packaging_apps_helpers) -* Edit the `change_url` and `config` scripts too, or remove them if you have no use of them -* Add a `LICENSE` file for the package. NB: this LICENSE file is not meant to necessarily be the LICENSE of the upstream app - it is only the LICENSE you want this package's code to published with ;). We recommend to use [the AGPL-3](https://www.gnu.org/licenses/agpl-3.0.txt). -* Edit `doc/DISCLAIMER*.md` -* The `README.md` files are to be automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator - ---- -# Example app for YunoHost +# Simply Translate for YunoHost -[![Integration level](https://dash.yunohost.org/integration/example.svg)](https://dash.yunohost.org/appci/app/example) ![Working status](https://ci-apps.yunohost.org/ci/badges/example.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/example.maintain.svg) -[![Install Example app with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=example) +[![Integration level](https://dash.yunohost.org/integration/simplytranslate.svg)](https://dash.yunohost.org/appci/app/simplytranslate) ![Working status](https://ci-apps.yunohost.org/ci/badges/simplytranslate.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/simplytranslate.maintain.svg) + +[![Install Simply Translate with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=simplytranslate) *[Lire ce readme en français.](./README_fr.md)* -> *This package allows you to install Example app quickly and simply on a YunoHost server. +> *This package allows you to install Simply Translate 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.* ## Overview -Some long and extensive description of what the app is and does, lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. +The frontend for SimplyTranslate engine, which you can use for translation for many translation engine, there are DeepL, Reverso, ICIBA, Google Translate, and LibreTranslate (which instance LibreTranslate fetch from can be configured) engine. -### Features - -- Ut enim ad minim veniam, quis nostrud exercitation ullamco ; -- Laboris nisi ut aliquip ex ea commodo consequat ; -- Duis aute irure dolor in reprehenderit in voluptate ; -- Velit esse cillum dolore eu fugiat nulla pariatur ; -- Excepteur sint occaecat cupidatat non proident, sunt in culpa." - - -**Shipped version:** 1.0~ynh1 - -**Demo:** https://demo.example.com +**Shipped version:** 2023.4.9~ynh2 ## Screenshots -![Screenshot of Example app](./doc/screenshots/example.jpg) +![Screenshot of Simply Translate](./doc/screenshots/st_id-en.png) -## Disclaimers / important information +## :red_circle: Antifeatures -* Any known limitations, constrains or stuff not working, such as (but not limited to): - * requiring a full dedicated domain ? - * architectures not supported ? - * not-working single-sign on or LDAP integration ? - * the app requires an important amount of RAM / disk / .. to install or to work properly - * etc... - -* Other infos that people should be aware of, such as: - * any specific step to perform after installing (such as manually finishing the install, specific admin credentials, ...) - * how to configure / administrate the application if it ain't obvious - * upgrade process / specificities / things to be aware of ? - * security considerations ? +- **Non-free Network Services**: Promotes or depends entirely on a non-free network service. ## Documentation and resources -* Official app website: -* Official user documentation: -* Official admin documentation: -* Upstream app code repository: -* YunoHost documentation for this app: -* Report a bug: +* Official app website: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/example_ynh/tree/testing). +Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/simplytranslate_ynh/tree/testing). To try the testing branch, please proceed like that. ``` bash -sudo yunohost app install https://github.com/YunoHost-Apps/example_ynh/tree/testing --debug +sudo yunohost app install https://github.com/YunoHost-Apps/simplytranslate_ynh/tree/testing --debug or -sudo yunohost app upgrade example -u https://github.com/YunoHost-Apps/example_ynh/tree/testing --debug +sudo yunohost app upgrade simplytranslate -u https://github.com/YunoHost-Apps/simplytranslate_ynh/tree/testing --debug ``` **More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index 4da6fb7..6a6c868 100644 --- a/README_fr.md +++ b/README_fr.md @@ -3,71 +3,48 @@ N.B.: This README was automatically generated by https://github.com/YunoHost/app It shall NOT be edited by hand. --> -# Exemple d'app pour YunoHost +# Simply Translate pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/example.svg)](https://dash.yunohost.org/appci/app/example) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/example.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/example.maintain.svg) -[![Installer Example app avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=example) +[![Niveau d’intégration](https://dash.yunohost.org/integration/simplytranslate.svg)](https://dash.yunohost.org/appci/app/simplytranslate) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/simplytranslate.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/simplytranslate.maintain.svg) + +[![Installer Simply Translate avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=simplytranslate) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer Example app rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* +> *Ce package vous permet d’installer Simply Translate rapidement et simplement sur un serveur YunoHost. +Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* -## Vue d'ensemble +## Vue d’ensemble -Some long and extensive description of what the app is and does, lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. +L'interface du moteur SimplyTranslate, que vous pouvez utiliser pour la traduction de nombreux moteurs de traduction, comprend les moteurs DeepL, Reverso, ICIBA, Google Translate et LibreTranslate (dont l'instance de récupération de LibreTranslate peut être configurée). -### Features +**Version incluse :** 2023.4.9~ynh2 -- Ut enim ad minim veniam, quis nostrud exercitation ullamco ; -- Laboris nisi ut aliquip ex ea commodo consequat ; -- Duis aute irure dolor in reprehenderit in voluptate ; -- Velit esse cillum dolore eu fugiat nulla pariatur ; -- Excepteur sint occaecat cupidatat non proident, sunt in culpa." +## Captures d’écran +![Capture d’écran de Simply Translate](./doc/screenshots/st_id-en.png) -**Version incluse :** 1.0~ynh1 +## :red_circle: Fonctions indésirables -**Démo :** https://demo.example.com - -## Captures d'écran - -![Capture d'écran de Example app](./doc/screenshots/example.jpg) - -## Avertissements / informations importantes - -* Any known limitations, constrains or stuff not working, such as (but not limited to): - * requiring a full dedicated domain ? - * architectures not supported ? - * not-working single-sign on or LDAP integration ? - * the app requires an important amount of RAM / disk / .. to install or to work properly - * etc... - -* Other infos that people should be aware of, such as: - * any specific step to perform after installing (such as manually finishing the install, specific admin credentials, ...) - * how to configure / administrate the application if it ain't obvious - * upgrade process / specificities / things to be aware of ? - * security considerations ? +- **Non-free Network Services**: Promotes or depends entirely on a non-free network service. ## Documentations et ressources -* Site officiel de l'app : -* Documentation officielle utilisateur : -* Documentation officielle de l'admin : -* Dépôt de code officiel de l'app : -* Documentation YunoHost pour cette app : -* Signaler un bug : +* Site officiel de l’app : +* Dépôt de code officiel de l’app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs -Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/example_ynh/tree/testing). +Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/simplytranslate_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. ``` bash -sudo yunohost app install https://github.com/YunoHost-Apps/example_ynh/tree/testing --debug +sudo yunohost app install https://github.com/YunoHost-Apps/simplytranslate_ynh/tree/testing --debug ou -sudo yunohost app upgrade example -u https://github.com/YunoHost-Apps/example_ynh/tree/testing --debug +sudo yunohost app upgrade simplytranslate -u https://github.com/YunoHost-Apps/simplytranslate_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file From fcc40ba3cd922fe6b4dfe0232995f9b9370b8c2c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 4 Oct 2023 07:20:33 +0000 Subject: [PATCH 6/6] Auto-update README --- README.md | 1 - README_fr.md | 1 - 2 files changed, 2 deletions(-) diff --git a/README.md b/README.md index 792d6d5..6ad8463 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,6 @@ The frontend for SimplyTranslate engine, which you can use for translation for m * Official app website: * Upstream app code repository: -* YunoHost documentation for this app: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 6a6c868..1a6f6a8 100644 --- a/README_fr.md +++ b/README_fr.md @@ -32,7 +32,6 @@ L'interface du moteur SimplyTranslate, que vous pouvez utiliser pour la traducti * Site officiel de l’app : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : * Signaler un bug : ## Informations pour les développeurs