Skip to content

Commit

Permalink
Add links to english forum in UI and Github repository (#1873)
Browse files Browse the repository at this point in the history
  • Loading branch information
Pierre-Gilles authored Sep 8, 2023
1 parent ef40497 commit 3c545d2
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ We use github to host code, to track issues and feature requests, as well as acc

## Before making a Pull Request

Make sure you discussed with the team on [Gladys Community](https://community.gladysassistant.com/) to ensure your pull request goes in the same direction as current developements 🙂
Make sure you discussed with the team on our Gladys [french forum](https://community.gladysassistant.com/) or [english forum](https://en-community.gladysassistant.com/) to ensure your pull request goes in the same direction as current developements 🙂

Then, create a GitHub Issue to indicate that you're working on the topic.

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ about: Report a bug to help us improve Gladys Assistant

First, are you sure that you found a Gladys bug?

If you are not sure, you can come discuss with us on [Gladys Community](http://community.gladysassistant.com/) 🙂
If you are not sure, you can come discuss with us on our community, in [french](http://community.gladysassistant.com/) or [english](https://en-community.gladysassistant.com/) 🙂

**Describe the bug**
A clear and concise description of what the bug is.
Expand Down
12 changes: 9 additions & 3 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
blank_issues_enabled: true
contact_links:
- name: Gladys Assistant Forum
- name: Gladys Assistant english forum
url: https://en-community.gladysassistant.com/
about: We use this forum for questions & support in english.
- name: Gladys Assistant french Forum
url: https://community.gladysassistant.com/
about: We use the forum for questions & support.
- name: Feature Requests
about: We use the forum for questions & support in french.
- name: Feature Requests (english)
url: https://en-community.gladysassistant.com/c/feature-requests/7/l/latest?order=votes
about: We use our forum as feature requests. You can create feature requests there, and vote for them.
- name: Feature Requests (french)
url: https://community.gladysassistant.com/c/international/feature-requests/53
about: We use our forum as feature requests. You can create feature requests there, and vote for them.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ To ensure your Pull Request can be accepted as fast as possible, make sure to re
- [ ] Is the linter passing? (`npm run eslint` on both front/server)
- [ ] Did you run prettier? (`npm run prettier` on both front/server)
- [ ] If you are adding a new features/services, did you run integration comparator? (`npm run compare-translations` on front)
- [ ] Did you test this pull request in real life? With real devices? If this development is a big feature or a new service, we recommend that you provide a Docker image to [the community](https://community.gladysassistant.com/) for testing before merging.
- [ ] Did you test this pull request in real life? With real devices? If this development is a big feature or a new service, we recommend that you provide a Docker image to the community ([french forum](https://community.gladysassistant.com/)/[english forum](https://en-community.gladysassistant.com/)) for testing before merging.
- [ ] If your changes modify the API (REST or Node.js), did you modify the API documentation? (Documentation is based on comments in code)
- [ ] If you are adding a new features/services which needs explanation, did you modify the user documentation? See [the GitHub repo](https://github.com/GladysAssistant/v4-website) and the [website](https://gladysassistant.com).
- [ ] Did you add fake requests data for the demo mode (`front/src/config/demo.js`) so that the demo website is working without a backend? (if needed) See [https://demo.gladysassistant.com](https://demo.gladysassistant.com).
Expand Down
2 changes: 1 addition & 1 deletion .github/SUPPORT.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

First, thanks for trying out Gladys!

The best place to ask for help is our [Gladys Community Forum](https://community.gladysassistant.com/).
The best place to ask for help is our forum, in [french](https://community.gladysassistant.com/) or [english](https://en-community.gladysassistant.com/).

Please **_do not_** raise an issue on GitHub if it's a support problem!

Expand Down
2 changes: 1 addition & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

## Reporting a Vulnerability

To report a vulnerability, you can contact us on [Gladys Assistant forum](https://community.gladysassistant.com/) in private, or on the contact form [on our website](https://gladysassistant.com/contact/).
To report a vulnerability, you can contact us on Gladys Assistant [french forum](https://community.gladysassistant.com/) or [english forum](https://en-community.gladysassistant.com/) in private, or on the contact form [on our website](https://gladysassistant.com/contact/).
13 changes: 7 additions & 6 deletions front/src/components/header/index.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Text, Localizer } from 'preact-i18n';
import cx from 'classnames';
import get from 'get-value';
import { Link } from 'preact-router/match';
import { isUrlInArray } from '../../utils/url';
import { USER_ROLE } from '../../../../server/utils/constants';
Expand Down Expand Up @@ -27,6 +28,11 @@ const Header = ({ ...props }) => {
if (isUrlInArray(props.currentUrl, PAGES_WITHOUT_HEADER)) {
return null;
}
// Adapt forum URL to user language
const userLanguage = get(props, 'user.language');
const forumUrl =
userLanguage === 'fr' ? 'https://community.gladysassistant.com/' : 'https://en-community.gladysassistant.com/';

if (props.fullScreen) {
return null;
}
Expand Down Expand Up @@ -73,12 +79,7 @@ const Header = ({ ...props }) => {
</a>
)}
<div class="dropdown-divider" />
<a
class="dropdown-item"
href="https://community.gladysassistant.com/"
target="_blank"
rel="noopener noreferrer"
>
<a class="dropdown-item" href={forumUrl} target="_blank" rel="noopener noreferrer">
<i class="dropdown-icon fe fe-help-circle" /> <Text id="header.needHelp" />
</a>
<a class="dropdown-item" href="" onClick={props.logout}>
Expand Down
6 changes: 3 additions & 3 deletions front/src/config/i18n/en.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"global": {
"logoAlt": "Gladys logo",
"needHelpText": "Need help? Join us on <a href=\"https://community.gladysassistant.com/\" target=\"_blank\" rel=\"noopener noreferrer\"> Gladys Community</a>.",
"needHelpText": "Need help? Join us on <a href=\"https://en-community.gladysassistant.com/\" target=\"_blank\" rel=\"noopener noreferrer\"> Gladys Community</a>.",
"new": "New",
"orderDirAsc": "A - Z",
"orderDirDesc": "Z - A",
Expand Down Expand Up @@ -65,7 +65,7 @@
"loginButtonText": "Log in",
"wrongCredentials": "Wrong email/password.",
"invalidEmail": "Invalid email",
"needHelpText": "Need help? Join us on <a href=\"https://community.gladysassistant.com/\" target=\"_blank\" rel=\"noopener noreferrer\"> Gladys Community</a>."
"needHelpText": "Need help? Join us on <a href=\"https://en-community.gladysassistant.com/\" target=\"_blank\" rel=\"noopener noreferrer\"> Gladys Community</a>."
},
"signup": {
"welcome": {
Expand Down Expand Up @@ -1752,7 +1752,7 @@
"rateLimitError": "You have tried this form too many time. Please retry in 30 minutes or restart your Gladys instance now.",
"invalidEmail": "We are unable to verify your email address.",
"validationLinkConfirmation": "Are you sure you clicked/copied the link correctly?",
"contactUs": "If it still not working, please contact us on <a href=\"https://twitter.com/gladysassistant\">Twitter</a> or on <a href=\"https://community.gladysassistant.com\">Gladys Community</a>.",
"contactUs": "If it still not working, please contact us on <a href=\"https://twitter.com/gladysassistant\">Twitter</a> or on <a href=\"https://en-community.gladysassistant.com\">Gladys Community</a>.",
"emailConfirmed": "Email Confirmed",
"signIn": "Sign in",
"confirmationInProgress": "Confirmation in progress..."
Expand Down

0 comments on commit 3c545d2

Please sign in to comment.