From e3005545d64d818595ab1ca437140d311fa757dc Mon Sep 17 00:00:00 2001
From: Benoit Lavenier <benoit.lavenier@e-is.pro>
Date: Tue, 2 Jan 2024 11:10:26 +0100
Subject: [PATCH] enh(about): Add link to technical forum, and telegram group -
close #997
---
scss/ionic.app.scss | 9 +++++++++
www/i18n/locale-ca.json | 6 +++++-
www/i18n/locale-de-DE.json | 6 +++++-
www/i18n/locale-en-GB.json | 6 +++++-
www/i18n/locale-en.json | 6 +++++-
www/i18n/locale-eo-EO.json | 6 +++++-
www/i18n/locale-es-ES.json | 6 +++++-
www/i18n/locale-fr-FR.json | 6 +++++-
www/i18n/locale-it-IT.json | 6 +++++-
www/i18n/locale-nl-NL.json | 6 +++++-
www/i18n/locale-pt-PT.json | 6 +++++-
www/img/logo_telegram.svg | 3 +++
www/js/services/settings-services.js | 2 ++
www/templates/modal_about.html | 22 +++++++++++++++++++++-
14 files changed, 85 insertions(+), 11 deletions(-)
create mode 100644 www/img/logo_telegram.svg
diff --git a/scss/ionic.app.scss b/scss/ionic.app.scss
index 0f87ffadf..a1259a717 100644
--- a/scss/ionic.app.scss
+++ b/scss/ionic.app.scss
@@ -1964,11 +1964,20 @@ $ionicon-var-badge-editable: $ionicon-var-edit + "\00a0";
}
}
+/**********
+ About modal
+**********/
.modal.about .bar.bar-header .button + .title {
left: 0 !important; /* avoid title offset on large screens, if button are 'visible-xs')'*/
}
+.modal.about {
+ .ion-telegram:before {
+ content: url('../img/logo_telegram.svg');
+ }
+}
+
/**********
Item buttons
**********/
diff --git a/www/i18n/locale-ca.json b/www/i18n/locale-ca.json
index 8c1613b11..9098fa580 100644
--- a/www/i18n/locale-ca.json
+++ b/www/i18n/locale-ca.json
@@ -112,7 +112,11 @@
"CODE": "Codi font:",
"OFFICIAL_WEB_SITE": "Web oficial:",
"DEVELOPERS": "Desenvolupat per:",
- "FORUM": "Fòrum:",
+ "USER_FORUM": "Fòrum d'usuaris:",
+ "TECH_FORUM": "Fòrum Tècnic:",
+ "TELEGRAM": "Grup de Telegram:",
+ "USER_HELP_DIVIDER": "Comunitat",
+ "CONTRIBUTE_DIVIDER": "Contribuir",
"PLEASE_REPORT_ISSUE": "Si trobeu errors no us ho penseu i informeu-nos",
"REPORT_ISSUE": "Informa d'un problema"
},
diff --git a/www/i18n/locale-de-DE.json b/www/i18n/locale-de-DE.json
index 162cbc7c9..57ba812b2 100644
--- a/www/i18n/locale-de-DE.json
+++ b/www/i18n/locale-de-DE.json
@@ -111,7 +111,11 @@
"CODE": "Quellcode:",
"OFFICIAL_WEB_SITE": "Offizielle Webseite:",
"DEVELOPERS": "Entwickler:",
- "FORUM": "Forum:",
+ "USER_FORUM": "Benutzerforum:",
+ "TECH_FORUM": "Technisches Forum:",
+ "TELEGRAM": "Telegram-Gruppe:",
+ "USER_HELP_DIVIDER": "Gemeinschaft",
+ "CONTRIBUTE_DIVIDER": "Beitragen",
"DEV_WARNING": "Warnung",
"DEV_WARNING_MESSAGE": "Diese Anwendung ist noch in der aktiven Entwicklung.<br/>Bitte melde uns jedes auftretende Problem!",
"DEV_WARNING_MESSAGE_SHORT": "Diese App ist evtentuell noch instabil(in Entwicklung).",
diff --git a/www/i18n/locale-en-GB.json b/www/i18n/locale-en-GB.json
index 70a4df1cd..424bb260b 100644
--- a/www/i18n/locale-en-GB.json
+++ b/www/i18n/locale-en-GB.json
@@ -111,7 +111,11 @@
"CODE": "Source code:",
"OFFICIAL_WEB_SITE": "Official web site:",
"DEVELOPERS": "Developers:",
- "FORUM": "Forum:",
+ "USER_FORUM": "User forum:",
+ "TECH_FORUM": "Technical forum:",
+ "TELEGRAM": "Telegram group:",
+ "USER_HELP_DIVIDER": "Community",
+ "CONTRIBUTE_DIVIDER": "Contribute",
"PLEASE_REPORT_ISSUE": "Please report any issue to us!",
"REPORT_ISSUE": "Report an issue",
"BTN_OPEN_DEV_WINDOW": "Open the debug window"
diff --git a/www/i18n/locale-en.json b/www/i18n/locale-en.json
index 3ad8f8db2..2629bf63c 100644
--- a/www/i18n/locale-en.json
+++ b/www/i18n/locale-en.json
@@ -111,7 +111,11 @@
"CODE": "Source code:",
"OFFICIAL_WEB_SITE": "Official web site:",
"DEVELOPERS": "Developers:",
- "FORUM": "Forum:",
+ "USER_FORUM": "User forum:",
+ "TECH_FORUM": "Technical forum:",
+ "TELEGRAM": "Telegram group:",
+ "USER_HELP_DIVIDER": "Community",
+ "CONTRIBUTE_DIVIDER": "Contribute",
"PLEASE_REPORT_ISSUE": "Please report any issue to us!",
"REPORT_ISSUE": "Report an issue",
"BTN_OPEN_DEV_WINDOW": "Open the debug window"
diff --git a/www/i18n/locale-eo-EO.json b/www/i18n/locale-eo-EO.json
index 5a5dda264..a7e91f8af 100644
--- a/www/i18n/locale-eo-EO.json
+++ b/www/i18n/locale-eo-EO.json
@@ -111,7 +111,11 @@
"CODE": "Fonto-kodo:",
"OFFICIAL_WEB_SITE": "Oficiala retejo:",
"DEVELOPERS": "Programita de:",
- "FORUM": "Forumo:",
+ "USER_FORUM": "Uzant-Forumo:",
+ "TECH_FORUM": "Teknika Forumo:",
+ "TELEGRAM": "Telegram-Grupo:",
+ "USER_HELP_DIVIDER": "Komunumo",
+ "CONTRIBUTE_DIVIDER": "Kontribui",
"PLEASE_REPORT_ISSUE": "Ne hezitu sciigi al ni la renkontitajn fuŝaĵojn",
"REPORT_ISSUE": "Sciigi problemon",
"BTN_OPEN_DEV_WINDOW": "Malfermi la fenestron pri malfuŝigado"
diff --git a/www/i18n/locale-es-ES.json b/www/i18n/locale-es-ES.json
index 99e6f2184..35e3c4815 100644
--- a/www/i18n/locale-es-ES.json
+++ b/www/i18n/locale-es-ES.json
@@ -112,7 +112,11 @@
"CODE": "Código fuente:",
"OFFICIAL_WEB_SITE": "Web oficial:",
"DEVELOPERS": "Desarrollado por:",
- "FORUM": "Foro:",
+ "USER_FORUM": "Foro de usuarios:",
+ "TECH_FORUM": "Foro técnico:",
+ "TELEGRAM": "Grupo de Telegram:",
+ "USER_HELP_DIVIDER": "Comunidad",
+ "CONTRIBUTE_DIVIDER": "Contribuir",
"PLEASE_REPORT_ISSUE": "No dude en informarnos de anomalías encontradas",
"REPORT_ISSUE": "Reportar un problema"
},
diff --git a/www/i18n/locale-fr-FR.json b/www/i18n/locale-fr-FR.json
index 71016cc67..cb9ae4d3f 100644
--- a/www/i18n/locale-fr-FR.json
+++ b/www/i18n/locale-fr-FR.json
@@ -111,9 +111,13 @@
"CODE": "Code source :",
"OFFICIAL_WEB_SITE": "Site web officiel :",
"DEVELOPERS": "Développé par :",
- "FORUM": "Forum :",
+ "USER_FORUM": "Forum utilisateur:",
+ "TECH_FORUM": "Forum technique :",
+ "TELEGRAM": "Groupe Telegram :",
"PLEASE_REPORT_ISSUE": "N'hésitez pas à nous remonter les anomalies rencontrées",
"REPORT_ISSUE": "Remonter un problème",
+ "USER_HELP_DIVIDER": "Communauté",
+ "CONTRIBUTE_DIVIDER": "Contribuer",
"BTN_OPEN_DEV_WINDOW": "Ouvrir la fenêtre de debuggage"
},
"HOME": {
diff --git a/www/i18n/locale-it-IT.json b/www/i18n/locale-it-IT.json
index 3b4edb919..eabf04464 100644
--- a/www/i18n/locale-it-IT.json
+++ b/www/i18n/locale-it-IT.json
@@ -111,7 +111,11 @@
"CODE": "Codice sorgente:",
"OFFICIAL_WEB_SITE": "Pagina web ufficiale:",
"DEVELOPERS": "Sviluppatori:",
- "FORUM": "Forum:",
+ "USER_FORUM": "Forum degli utenti:",
+ "TECH_FORUM": "Forum tecnico:",
+ "TELEGRAM": "Gruppo Telegram:",
+ "USER_HELP_DIVIDER": "Comunità",
+ "CONTRIBUTE_DIVIDER": "Contribuire",
"PLEASE_REPORT_ISSUE": "Per favore comunicaci qualunque problema!",
"REPORT_ISSUE": "Comunica un problema",
"BTN_OPEN_DEV_WINDOW": "Apri la finestra di debug"
diff --git a/www/i18n/locale-nl-NL.json b/www/i18n/locale-nl-NL.json
index ab88116f2..821a53c01 100644
--- a/www/i18n/locale-nl-NL.json
+++ b/www/i18n/locale-nl-NL.json
@@ -102,7 +102,11 @@
"LICENSE": "<b>Vrije</b> software (GNU AGPLv3 licentie).",
"CODE": "Broncode:",
"DEVELOPERS": "Ontwikkelaars:",
- "FORUM": "Forum:",
+ "USER_FORUM": "Gebruikersforum:",
+ "TECH_FORUM": "Technisch Forum:",
+ "TELEGRAM": "Telegram Groep:",
+ "USER_HELP_DIVIDER": "Gemeenschap",
+ "CONTRIBUTE_DIVIDER": "Bijdragen",
"DEV_WARNING": "Waarschuwing",
"DEV_WARNING_MESSAGE": "Deze applicatie is nog in actieve onwikkeling.<br/>Meld ons elk pobleem!",
"DEV_WARNING_MESSAGE_SHORT": "Deze App is nog instabiel (in ontwikkeling).",
diff --git a/www/i18n/locale-pt-PT.json b/www/i18n/locale-pt-PT.json
index c3c716576..52b694cda 100644
--- a/www/i18n/locale-pt-PT.json
+++ b/www/i18n/locale-pt-PT.json
@@ -112,7 +112,11 @@
"CODE": "Código fonte:",
"OFFICIAL_WEB_SITE": "Site oficial:",
"DEVELOPERS": "Desenvolvido por:",
- "FORUM": "Fórum:",
+ "USER_FORUM": "Fórum de usuários:",
+ "TECH_FORUM": "Fórum Técnico:",
+ "TELEGRAM": "Grupo Telegram:",
+ "USER_HELP_DIVIDER": "Comunidade",
+ "CONTRIBUTE_DIVIDER": "Contribuir",
"PLEASE_REPORT_ISSUE": "Não se iniba de nos informar sobre anomalias encontradas",
"REPORT_ISSUE": "Reportar um problema"
},
diff --git a/www/img/logo_telegram.svg b/www/img/logo_telegram.svg
new file mode 100644
index 000000000..ec6ee141f
--- /dev/null
+++ b/www/img/logo_telegram.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+ <path fill="#444" d="M16 0.5c-8.563 0-15.5 6.938-15.5 15.5s6.938 15.5 15.5 15.5c8.563 0 15.5-6.938 15.5-15.5s-6.938-15.5-15.5-15.5zM23.613 11.119l-2.544 11.988c-0.188 0.85-0.694 1.056-1.4 0.656l-3.875-2.856-1.869 1.8c-0.206 0.206-0.381 0.381-0.781 0.381l0.275-3.944 7.181-6.488c0.313-0.275-0.069-0.431-0.482-0.156l-8.875 5.587-3.825-1.194c-0.831-0.262-0.85-0.831 0.175-1.231l14.944-5.763c0.694-0.25 1.3 0.169 1.075 1.219z"/>
+</svg>
diff --git a/www/js/services/settings-services.js b/www/js/services/settings-services.js
index 988ea9686..34edcd25b 100644
--- a/www/js/services/settings-services.js
+++ b/www/js/services/settings-services.js
@@ -81,6 +81,8 @@ angular.module('cesium.settings.services', ['ngApi', 'cesium.config'])
sourceLicenseUrl: 'https://git.duniter.org/clients/cesium-grp/cesium/-/raw/master/LICENSE',
newIssueUrl: "https://git.duniter.org/clients/cesium-grp/cesium/issues/new",
userForumUrl: "https://forum.monnaie-libre.fr",
+ userTelegramUrl: "https://t.me/monnaielibrejune",
+ techForumUrl: "https://forum.duniter.org",
latestReleaseUrl: "https://api.github.com/repos/duniter/cesium/releases/latest",
// FIXME: get release from gitlab
duniterLatestReleaseUrl: undefined, // disable for now
diff --git a/www/templates/modal_about.html b/www/templates/modal_about.html
index e775eb7ef..af617cc00 100644
--- a/www/templates/modal_about.html
+++ b/www/templates/modal_about.html
@@ -37,12 +37,25 @@
</h3>
</ion-item>
+ <div class="item item-divider no-border">
+ <p translate>ABOUT.USER_HELP_DIVIDER</p>
+ </div>
+
<!-- forum -->
<ion-item class="item-icon-left">
<i class="item-image icon ion-chatbubbles"></i>
- {{'ABOUT.FORUM' | translate}}
+ {{'ABOUT.USER_FORUM' | translate}}
<h3><a ng-click="openLink($event, $root.settings.userForumUrl)">{{::$root.settings.userForumUrl}}</a></h3>
</ion-item>
+ <ion-item class="item-icon-left">
+ <i class="item-image icon ion-telegram"></i>
+ {{'ABOUT.TELEGRAM' | translate}}
+ <h3><a ng-click="openLink($event, $root.settings.userTelegramUrl)">{{::$root.settings.userTelegramUrl}}</a></h3>
+ </ion-item>
+
+ <div class="item item-divider no-border">
+ <p translate>ABOUT.CONTRIBUTE_DIVIDER</p>
+ </div>
<!-- report issue -->
<ion-item class="item-icon-left item-text-wrap">
@@ -60,6 +73,13 @@
<h3><a ng-click="openLink($event, $root.settings.sourceUrl)">{{$root.settings.sourceUrl}}</a></h3>
</ion-item>
+ <!-- tech forum -->
+ <ion-item class="item-icon-left">
+ <i class="item-image icon ion-chatbubbles"></i>
+ {{'ABOUT.TECH_FORUM' | translate}}
+ <h3><a ng-click="openLink($event, $root.settings.techForumUrl)">{{::$root.settings.techForumUrl}}</a></h3>
+ </ion-item>
+
<!-- team -->
<ion-item class="item-icon-left item-text-wrap">
<i class="item-image icon ion-person-stalker"></i>
--
GitLab