From ce0d7f25216811e218cb0aa3b070bc053971392c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bonhomme?= Date: Thu, 20 Oct 2022 13:36:55 +0200 Subject: [PATCH] chg: renamed name to LHC !minor --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- AUTHORS.md | 4 ++-- CODE_OF_CONDUCT.md | 2 +- CONTRIBUTING.md | 4 ++-- README.md | 14 ++++++------ SECURITY.md | 2 +- app.json | 4 ++-- docs/conf.py | 6 ++--- docs/index.rst | 6 ++--- docs/installation.rst | 8 +++---- instance/development.py | 4 ++-- instance/docker.py | 4 ++-- instance/production.py.sample | 4 ++-- mosp/notifications/emails.py | 4 ++-- mosp/notifications/notifications.py | 4 ++-- mosp/templates/about.html | 2 +- mosp/templates/edit_user.html | 2 +- mosp/templates/emails/account_recovery.txt | 4 ++-- mosp/templates/help.html | 10 ++++---- mosp/templates/robots.txt | 2 +- mosp/templates/terms.html | 18 +++++++-------- mosp/translations/de/LC_MESSAGES/messages.po | 24 ++++++++++---------- mosp/translations/es/LC_MESSAGES/messages.po | 24 ++++++++++---------- mosp/translations/fr/LC_MESSAGES/messages.po | 24 ++++++++++---------- mosp/translations/it/LC_MESSAGES/messages.po | 16 ++++++------- mosp/translations/messages.pot | 8 +++---- mosp/translations/nl/LC_MESSAGES/messages.po | 16 ++++++------- mosp/translations/ro/LC_MESSAGES/messages.po | 10 ++++---- mosp/translations/ru/LC_MESSAGES/messages.po | 16 ++++++------- mosp/views/views.py | 6 ++--- runserver.py | 4 ++-- 31 files changed, 128 insertions(+), 130 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 476fc4c7..8db1b4b1 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -7,7 +7,7 @@ labels: bug, potential bug, needs triage This bug tracker is for tracking bugs, todos and confirmed new features. If you want to submit a feature request please discuss about it here: -https://github.com/CASES-LU/MOSP/discussions +https://github.com/NC3-LU/MOSP/discussions **Describe the bug** A clear and concise description of what the bug is. diff --git a/AUTHORS.md b/AUTHORS.md index 19fbd94f..24f53739 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -8,7 +8,7 @@ MOSP is a free software written and maintained by: # Contributors * Copyright (C) 2018-2022 Cédric Bonhomme -* Copyright (C) 2018-2022 SECURITYMADEIN.LU +* Copyright (C) 2018-2022 Luxembourg House of Cybersecurity MOSP is licensed under [GNU Affero General Public License version 3](https://www.gnu.org/licenses/agpl-3.0.html) @@ -16,4 +16,4 @@ MOSP is licensed under ## Logo Thank you to [Tebriz](https://github.com/tebriz159) who -[created](https://github.com/CASES-LU/MOSP/issues/7) the logo of MOSP. +[created](https://github.com/NC3-LU/MOSP/issues/7) the logo of MOSP. diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index d029c97a..4f58d87a 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -59,7 +59,7 @@ representative at an online or offline event. ## Enforcement Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported to the community leaders responsible for enforcement at info@cases.lu. +reported to the community leaders responsible for enforcement at opensource@nc3.lu. All complaints will be reviewed and investigated promptly and fairly. All community leaders are obligated to respect the privacy and security of the diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f6aa832c..02ba9419 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,7 +4,7 @@ project. Before starting to contribute please install the Git hook scripts: ```bash -$ git clone https://github.com/CASES-LU/MOSP +$ git clone https://github.com/NC3-LU/MOSP $ cd MOSP/ $ poetry install $ pre-commit install @@ -30,7 +30,7 @@ to update the documentation is strongly recommended. Please, do not open directly a GitHub issue if you think you have found a security vulnerability. See our -[security policy](https://github.com/CASES-LU/MOSP/security/policy) +[security policy](https://github.com/NC3-LU/MOSP/security/policy) page. [Flask](https://flask.palletsprojects.com) is used for the backend. diff --git a/README.md b/README.md index 78b9f0a1..946189c9 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,19 @@ # MONARC Objects Sharing Platform -[![MOSP logo](https://github.com/CASES-LU/MOSP/blob/master/mosp/static/img/logo-large.png)](https://github.com/CASES-LU/MOSP) +[![MOSP logo](https://github.com/NC3-LU/MOSP/blob/master/mosp/static/img/logo-large.png)](https://github.com/NC3-LU/MOSP) -[![Latest release](https://img.shields.io/github/release/CASES-LU/MOSP.svg?style=flat-square)](https://github.com/CASES-LU/MOSP/releases/latest) +[![Latest release](https://img.shields.io/github/release/CASES-LU/MOSP.svg?style=flat-square)](https://github.com/NC3-LU/MOSP/releases/latest) [![License](https://img.shields.io/github/license/CASES-LU/MOSP.svg?style=flat-square)](https://www.gnu.org/licenses/agpl-3.0.html) -[![Contributors](https://img.shields.io/github/contributors/CASES-LU/MOSP.svg?style=flat-square)](https://github.com/CASES-LU/MOSP/graphs/contributors) -[![Stars](https://img.shields.io/github/stars/CASES-LU/MOSP.svg?style=flat-square)](https://github.com/CASES-LU/MOSP/stargazers) -[![Workflow](https://github.com/CASES-LU/MOSP/workflows/Python%20application/badge.svg?style=flat-square)](https://github.com/CASES-LU/MOSP/actions?query=workflow%3A%22Python+application%22) +[![Contributors](https://img.shields.io/github/contributors/CASES-LU/MOSP.svg?style=flat-square)](https://github.com/NC3-LU/MOSP/graphs/contributors) +[![Stars](https://img.shields.io/github/stars/CASES-LU/MOSP.svg?style=flat-square)](https://github.com/NC3-LU/MOSP/stargazers) +[![Workflow](https://github.com/NC3-LU/MOSP/workflows/Python%20application/badge.svg?style=flat-square)](https://github.com/NC3-LU/MOSP/actions?query=workflow%3A%22Python+application%22) [![Translation status](https://translate.monarc.lu/widgets/mosp/-/svg-badge.svg)](https://translate.monarc.lu/engage/mosp/) [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit) ## Presentation -[MOSP](https://github.com/CASES-LU/MOSP) is a platform for creating, editing +[MOSP](https://github.com/NC3-LU/MOSP) is a platform for creating, editing and sharing *validated* JSON objects of any type. ![MOSP panorama](docs/_static/MOSP-panorama.png "MOSP panorama") @@ -60,7 +60,7 @@ This software is licensed under * Copyright (C) 2018-2022 Cédric Bonhomme -* Copyright (C) 2018-2022 SECURITYMADEIN.LU +* Copyright (C) 2018-2022 Luxembourg House of Cybersecurity For more information, the [list of authors and contributors](AUTHORS.md) is available. diff --git a/SECURITY.md b/SECURITY.md index 0be3e14b..eeafde71 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -9,7 +9,7 @@ There will be no security patches for other releases (tagged or not). If you think you have found a potential security issue in MOSP, do not open directly a GitHub issue. Please email us. You can contact -[info@cases.lu](mailto:info@cases.lu). +[opensource@nc3.lu](mailto:opensource@nc3.lu). You can also specify how you would like to be credited for your finding (commit message or release notes for the new release). We will diff --git a/app.json b/app.json index 16b6f6a7..53ba6895 100644 --- a/app.json +++ b/app.json @@ -6,8 +6,8 @@ "json", "json-schema" ], - "website": "https://github.com/CASES-LU/MOSP", - "repository": "https://github.com/CASES-LU/MOSP", + "website": "https://github.com/NC3-LU/MOSP", + "repository": "https://github.com/NC3-LU/MOSP", "scripts": { "postdeploy": "pybabel compile -d mosp/translations && flask db_init && flask create_admin --login admin --email admin@example.org --password password && flask import_licenses_from_spdx" }, diff --git a/docs/conf.py b/docs/conf.py index 24918fdd..479821da 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -14,7 +14,7 @@ # -- Project information ----------------------------------------------------- project = "MOSP" -copyright = "SECURITYMADEIN.LU " +copyright = "Luxembourg House of Cybersecurity " author = "Cédric Bonhomme " # The full version, including alpha/beta/rc tags @@ -78,10 +78,10 @@ html_theme_options = { "theme_dev_mode": True, "path_to_docs": "docs", - "repository_url": "https://github.com/CASES-LU/MOSP", + "repository_url": "https://github.com/NC3-LU/MOSP", # "repository_branch": "gh-pages", # For testing "launch_buttons": { - "binderhub_url": "https://github.com/CASES-LU/MOSP", + "binderhub_url": "https://github.com/NC3-LU/MOSP", }, "use_edit_page_button": True, "use_issues_button": True, diff --git a/docs/index.rst b/docs/index.rst index 63430535..66bf1678 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -7,7 +7,7 @@ Presentation ============ This document is intended to be a presentation and a user guide to -`MOSP `_, a platform to create, edit and share valid +`MOSP `_, a platform to create, edit and share valid JSON objects. MOSP supports any kind of JSON objects, you just have to specify a JSON schema. @@ -44,9 +44,9 @@ MOSP is licensed under * Copyright (C) 2018-2022 Cédric Bonhomme -* Copyright (C) 2018-2021 SECURITYMADEIN.LU +* Copyright (C) 2018-2021 Luxembourg House of Cybersecurity -For more information: https://github.com/CASES-LU/MOSP +For more information: https://github.com/NC3-LU/MOSP This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as diff --git a/docs/installation.rst b/docs/installation.rst index 752237eb..2d5b9aaa 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -48,7 +48,7 @@ Get the source code and install the software: $ sudo apt install python3-pip python3-venv $ curl -sSL https://install.python-poetry.org | python3 - - $ git clone https://github.com/CASES-LU/MOSP + $ git clone https://github.com/NC3-LU/MOSP $ cd MOSP/ $ npm install $ poetry install --no-dev @@ -78,7 +78,7 @@ Docker .. code-block:: bash - $ git clone https://github.com/CASES-LU/MOSP + $ git clone https://github.com/NC3-LU/MOSP $ cd MOSP/ $ docker-compose up -d @@ -100,7 +100,7 @@ Heroku Simply with this button: .. image:: https://www.herokucdn.com/deploy/button.png - :target: https://heroku.com/deploy?template=https://github.com/CASES-LU/MOSP + :target: https://heroku.com/deploy?template=https://github.com/NC3-LU/MOSP :alt: Latest release And voilà ! @@ -111,7 +111,7 @@ Alternatively, Deploy to Heroku manually: .. code-block:: bash - $ git clone https://github.com/CASES-LU/MOSP + $ git clone https://github.com/NC3-LU/MOSP $ cd MOSP/ $ heroku create --region eu $ heroku addons:add heroku-postgresql:hobby-dev diff --git a/instance/development.py b/instance/development.py index 1869a0a9..b68f198e 100644 --- a/instance/development.py +++ b/instance/development.py @@ -24,8 +24,8 @@ UPLOAD_FOLDER = "./mosp/web/public/pictures/" ALLOWED_EXTENSIONS = {"png"} -ADMIN_EMAIL = "info@cases.lu" -ADMIN_URL = "https://www.cases.lu" +ADMIN_EMAIL = "opensource@nc3.lu" +ADMIN_URL = "https://www.nc3.lu" LOG_PATH = "./var/log/mosp.log" LOG_LEVEL = "info" diff --git a/instance/docker.py b/instance/docker.py index 7634a7f4..55eb5ad8 100644 --- a/instance/docker.py +++ b/instance/docker.py @@ -37,8 +37,8 @@ UPLOAD_FOLDER = "./mosp/web/public/pictures/" ALLOWED_EXTENSIONS = {"png"} -ADMIN_EMAIL = "info@cases.lu" -ADMIN_URL = "https://www.cases.lu" +ADMIN_EMAIL = "opensource@nc3.lu" +ADMIN_URL = "https://www.nc3.lu" MAX_CONTENT_LENGTH = 16 * 1024 * 1024 diff --git a/instance/production.py.sample b/instance/production.py.sample index 4dec77c8..b277faff 100644 --- a/instance/production.py.sample +++ b/instance/production.py.sample @@ -27,8 +27,8 @@ LOG_LEVEL = "info" UPLOAD_FOLDER = "./mosp/web/public/pictures/" ALLOWED_EXTENSIONS = set(["png"]) -ADMIN_EMAIL = "info@cases.lu" -ADMIN_URL = "https://www.cases.lu" +ADMIN_EMAIL = "opensource@nc3.lu" +ADMIN_URL = "https://www.nc3.lu" MAX_CONTENT_LENGTH = 16 * 1024 * 1024 diff --git a/mosp/notifications/emails.py b/mosp/notifications/emails.py index d7c3c9bc..38772baf 100644 --- a/mosp/notifications/emails.py +++ b/mosp/notifications/emails.py @@ -1,9 +1,9 @@ #! /usr/bin/env python # MOSP - A platform for creating, editing and sharing JSON objects. # Copyright (C) 2018-2022 Cédric Bonhomme - https://www.cedricbonhomme.org -# Copyright (C) 2018-2022 SMILE gie - securitymadein.lu +# Copyright (C) 2018-2022 Luxembourg House of Cybersecurity # -# For more information: https://github.com/CASES-LU/MOSP +# For more information: https://github.com/NC3-LU/MOSP # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/mosp/notifications/notifications.py b/mosp/notifications/notifications.py index 42123957..81acccc4 100644 --- a/mosp/notifications/notifications.py +++ b/mosp/notifications/notifications.py @@ -1,9 +1,9 @@ #! /usr/bin/env python # MOSP - A platform for creating, editing and sharing JSON objects. # Copyright (C) 2018-2022 Cédric Bonhomme - https://www.cedricbonhomme.org -# Copyright (C) 2018-2022 SMILE gie - securitymadein.lu +# Copyright (C) 2018-2022 Luxembourg House of Cybersecurity # -# For more information: https://github.com/CASES-LU/MOSP +# For more information: https://github.com/NC3-LU/MOSP # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/mosp/templates/about.html b/mosp/templates/about.html index df8b9dcc..d750a290 100644 --- a/mosp/templates/about.html +++ b/mosp/templates/about.html @@ -19,7 +19,7 @@

{{ _('More information') }} {{ _('about this instance.') }}

{{ _('You are welcome to copy, modify or redistribute the - source code + source code according to the Affero GPL license.') }}

{{ _('Objects distributed through this platform are distributed under the open-source license choosed by their editor.') }}

diff --git a/mosp/templates/edit_user.html b/mosp/templates/edit_user.html index 5ffa459b..a273e817 100644 --- a/mosp/templates/edit_user.html +++ b/mosp/templates/edit_user.html @@ -44,7 +44,7 @@

{{ action | safe }}

-

{{ _('You can check the documentation of the API') }} +

{{ _('You can check the documentation of the API') }} or the OpenAPI Specification for the API v2.

diff --git a/mosp/templates/emails/account_recovery.txt b/mosp/templates/emails/account_recovery.txt index 0b3db18a..31a8c2be 100644 --- a/mosp/templates/emails/account_recovery.txt +++ b/mosp/templates/emails/account_recovery.txt @@ -10,5 +10,5 @@ The link expires at {{ expire_time.strftime('%Y-%m-%d %H:%M') }}. Kind regards, -The CASES team -https://www.cases.lu +The NC3 Open Source team +https://www.nc3.lu diff --git a/mosp/templates/help.html b/mosp/templates/help.html index 40f8636d..e9370a3e 100644 --- a/mosp/templates/help.html +++ b/mosp/templates/help.html @@ -11,7 +11,7 @@

{{ _('Documentation') }}

{{ _('A more technical documentation with instructions concerning the deployment of MOSP is available - in the official repository.') }} + in the official repository.') }}

{{ _('The OpenAPI Specification for the API v2 is available') }} {{ _('here') }}.
@@ -19,11 +19,11 @@

{{ _('Documentation') }}

{{ _('Contributions') }}

-

{{ _('Please use GitHub for:') }}

+

{{ _('Please use GitHub for:') }}

diff --git a/mosp/templates/robots.txt b/mosp/templates/robots.txt index 8abe9d1d..f9484f20 100644 --- a/mosp/templates/robots.txt +++ b/mosp/templates/robots.txt @@ -9,7 +9,7 @@ # - Bots which are too agressive by default. This is subjective, if you annoy # our sysadmins you'll be blocked. # -# Reach out to info@cases.lu if you have questions. +# Reach out to opensource@nc3.lu if you have questions. User-agent: SemrushBot Disallow: / diff --git a/mosp/templates/terms.html b/mosp/templates/terms.html index a0c34663..a46d1f9c 100644 --- a/mosp/templates/terms.html +++ b/mosp/templates/terms.html @@ -4,8 +4,8 @@

Terms of Service

-

These terms govern use of the website https://objects.monarc.lu (“the website”). To use the website, you must agree to these terms with Security Made In Lëtzebuerg (hereinafter referred to as SECURITYMADEIN.LU), the company that runs the website.

-

SECURITYMADEIN.LU may offer other products and services, under different terms. These terms apply only to use of the website.

+

These terms govern use of the website https://objects.monarc.lu (“the website”). To use the website, you must agree to these terms with Security Made In Lëtzebuerg (hereinafter referred to as Luxembourg House of Cybersecurity), the company that runs the website.

+

Luxembourg House of Cybersecurity may offer other products and services, under different terms. These terms apply only to use of the website.

Skip to:

  • Your Permission to Use the Website
    • @@ -104,18 +104,18 @@

    Your Account

    To create an account, you can contact us or use this form. You must provide a valid e-mail address and a nickname. You may close your account at any time by e-mailing {{ config['ADMIN_EMAIL'] }} or via your profile page.

    For this purpose, you agree to:

      -
    1. Provide true, accurate, correct and complete information when required to register as a user of the Website (“Personal Information”) and notify immediately SECURITYMADEIN.LU of any change of Personal Information.
      2. +
    2. Provide true, accurate, correct and complete information when required to register as a user of the Website (“Personal Information”) and notify immediately Luxembourg House of Cybersecurity of any change of Personal Information.
    3. That you will not impersonate any other person or entity or use a false name or a name that you are not authorized to use, or disclose your password or username to any other person, or allow your password or user name to be used by any other person to access the Services.
      4. -
    4. SECURITYMADEIN.LU reserves the right to decline any application from you to register as a user of the platform in their sole discretion.
      5. +
    5. Luxembourg House of Cybersecurity reserves the right to decline any application from you to register as a user of the platform in their sole discretion.
    6. Be responsible for all action taken using your account, whether authorized by you or not, until you either close your account or notify the company that your account has been compromised. You agree to notify the company immediately if you suspect your account has been compromised. You agree to select a secure password for your account, and keep it secret.
      7. -
    7. SECURITYMADEIN.LU may restrict, suspend, or close your account on the website according to its policy for handling copyright-related takedown requests, or if the company reasonably believes that you’ve breached these terms.
      8. -
    8. SECURITYMADEIN.LU will at its own discretion decide to close your account on the website after one year on inactivity on the website. SECURITYMADEIN.LU will notify you immediately about this decision.
      9. +
    9. Luxembourg House of Cybersecurity may restrict, suspend, or close your account on the website according to its policy for handling copyright-related takedown requests, or if the company reasonably believes that you’ve breached these terms.
      10. +
    10. Luxembourg House of Cybersecurity will at its own discretion decide to close your account on the website after one year on inactivity on the website. Luxembourg House of Cybersecurity will notify you immediately about this decision.

    Your Content

    Nothing in these terms gives the company any ownership rights in intellectual property that you share with the website, such as your account information or other content you submit to the website. Nothing in these terms gives you any ownership rights in the company’s intellectual property, either.

    Between you and the company, you remain solely responsible for content you submit to the website. You agree not to wrongly imply that content you submit to the website is sponsored or approved by the company. These terms do not obligate the company to store, maintain, or provide copies of content you submit.

    -

    The content you submit to the website belongs to you, and you decide what permission to give others for it. If you agree to do so, you license SECURITYMADEIN.LU to provide content that you submit to the website to other users of the website for statistical purposes. That special license allows SECURITYMADEIN.LU to copy, publish, and analyze content you submit to the website.

    -

    When content you submit is removed from the website, whether by you or by SECURITYMADEIN.LU, SECURITYMADEIN.LU’s special license ends when the last copy disappears from the website.

    +

    The content you submit to the website belongs to you, and you decide what permission to give others for it. If you agree to do so, you license Luxembourg House of Cybersecurity to provide content that you submit to the website to other users of the website for statistical purposes. That special license allows Luxembourg House of Cybersecurity to copy, publish, and analyze content you submit to the website.

    +

    When content you submit is removed from the website, whether by you or by Luxembourg House of Cybersecurity, Luxembourg House of Cybersecurity’s special license ends when the last copy disappears from the website.

    Disclaimers

    You accept all risk of using the website and content on the website. As far as the law allows, the company provides the website as is, without any warranty whatsoever.

    The website may hyperlink to and integrate websites and services run by others. The company does not make any warranty about services run by others, or content they may provide. Use of services run by others may be governed by other terms between you and the one running service.

    @@ -132,7 +132,7 @@

    Contact

    The company may notify you under these terms using the e-mail address you provide for your account on the website, or by posting a message to the homepage of the website or your account page.

    Changes

      -
    • March 31, 2021. Simplification of the terms of service (diff).
      • +
    • March 31, 2021. Simplification of the terms of service (diff).
    • February 26, 2019. Initial version of the terms of service.

    The company will post all updates to the website. Once you are noticed an update at these terms, you must accept the new terms to continue using the website.

    diff --git a/mosp/translations/de/LC_MESSAGES/messages.po b/mosp/translations/de/LC_MESSAGES/messages.po index 0e8ae9aa..47435719 100644 --- a/mosp/translations/de/LC_MESSAGES/messages.po +++ b/mosp/translations/de/LC_MESSAGES/messages.po @@ -224,14 +224,14 @@ msgstr "über diesen Fall." #: mosp/templates/about.html:21 msgid "" "You are welcome to copy, modify or redistribute the\n" -" source code\n" " according to the Affero GPL " "license." msgstr "" "Sie können den Quellcode gerne kopieren, verändern oder weitergeben.\n" -" Quellcode\n" " gemäß der Affero GPL-Lizenz " @@ -392,11 +392,11 @@ msgstr "Neuen API-Schlüssel generieren" #: mosp/templates/edit_user.html:47 msgid "" -"You can check the documentation of " "the API" msgstr "" -"Sie können die Dokumentation der API einsehen" @@ -426,11 +426,11 @@ msgstr "" msgid "" "A more technical documentation with instructions concerning the deployment " "of MOSP is available\n" -" in the official repository." msgstr "" "Eine eher technische Dokumentation mit Anweisungen zum Einsatz von MOSP ist\n" -"                    im offiziellen Repository " "verfügbar." @@ -458,10 +458,10 @@ msgstr "Beiträge" #: mosp/templates/help.html:22 msgid "" -"Please use GitHub for:" msgstr "" -"Bitte verwenden Sie GitHub für:" #: mosp/templates/help.html:24 @@ -474,14 +474,14 @@ msgstr "Neue Funktionsanfragen" #: mosp/templates/help.html:26 msgid "" -"Contributions to the documentation or to the documentation or to the translations of the software" msgstr "" -"Beiträge zur Dokumentation oder zu den oder zu den Übersetzungen der Software" #: mosp/templates/index.html:15 diff --git a/mosp/translations/es/LC_MESSAGES/messages.po b/mosp/translations/es/LC_MESSAGES/messages.po index 3309061d..18d520a1 100644 --- a/mosp/translations/es/LC_MESSAGES/messages.po +++ b/mosp/translations/es/LC_MESSAGES/messages.po @@ -222,14 +222,14 @@ msgstr "sobre esta instancia." #: mosp/templates/about.html:21 msgid "" "You are welcome to copy, modify or redistribute the\n" -" source code\n" " according to the Affero GPL " "license." msgstr "" "Puede copiar, modificar o redistribuir el\n" -" código fuente\n" " según la licencia Affero GPL." @@ -388,11 +388,11 @@ msgstr "Generar nueva clave API" #: mosp/templates/edit_user.html:47 msgid "" -"You can check the documentation of " "the API" msgstr "" -"Puede consultar la documentación de la " "API" @@ -422,12 +422,12 @@ msgstr "" msgid "" "A more technical documentation with instructions concerning the deployment " "of MOSP is available\n" -" in the official repository." msgstr "" "Está disponible una documentación más técnica con instrucciones sobre la " "implementación de MOSP\n" -" en el repositorio oficial ." #: mosp/templates/help.html:17 @@ -454,10 +454,10 @@ msgstr "Contribuciones" #: mosp/templates/help.html:22 msgid "" -"Please use GitHub for:" msgstr "" -"Utilice GitHub para:" #: mosp/templates/help.html:24 @@ -470,14 +470,14 @@ msgstr "Solicitudes de nuevas funciones" #: mosp/templates/help.html:26 msgid "" -"Contributions to the documentation or to the documentation or to the translations of the software" msgstr "" -"Contribuciones a la documentación o al documentación o al traducciones del software" #: mosp/templates/index.html:15 diff --git a/mosp/translations/fr/LC_MESSAGES/messages.po b/mosp/translations/fr/LC_MESSAGES/messages.po index d5ab6ec6..a81df9a3 100644 --- a/mosp/translations/fr/LC_MESSAGES/messages.po +++ b/mosp/translations/fr/LC_MESSAGES/messages.po @@ -221,14 +221,14 @@ msgstr "à propos de cette instance." #: mosp/templates/about.html:21 msgid "" "You are welcome to copy, modify or redistribute the\n" -" source code\n" " according to the Affero GPL " "license." msgstr "" "Vous êtes invités à copier, modifier ou redistribuer le\n" -" code source\n" " selon la license Affero GPL." @@ -386,11 +386,11 @@ msgstr "Générer une nouvelle clé API" #: mosp/templates/edit_user.html:47 msgid "" -"You can check the documentation of " "the API" msgstr "" -"Vous pouvez lire la documentation de " "l'API" @@ -420,12 +420,12 @@ msgstr "" msgid "" "A more technical documentation with instructions concerning the deployment " "of MOSP is available\n" -" in the official repository." msgstr "" "Une documentation plus technique avec des instructions concernant le " "déploiement de MOSP est disponible\n" -" dans le dépôt officiel." #: mosp/templates/help.html:17 @@ -452,10 +452,10 @@ msgstr "Contributions" #: mosp/templates/help.html:22 msgid "" -"Please use GitHub for:" msgstr "" -"Veuillez utiliser GitHub pour :" #: mosp/templates/help.html:24 @@ -468,14 +468,14 @@ msgstr "Demandes de nouvelles fonctionnalités" #: mosp/templates/help.html:26 msgid "" -"Contributions to the documentation or to the documentation or to the translations of the software" msgstr "" -"Contributions à la documentation ou aux documentation ou aux traductions du logiciel" #: mosp/templates/index.html:15 diff --git a/mosp/translations/it/LC_MESSAGES/messages.po b/mosp/translations/it/LC_MESSAGES/messages.po index 47eeb4d6..9b254aab 100644 --- a/mosp/translations/it/LC_MESSAGES/messages.po +++ b/mosp/translations/it/LC_MESSAGES/messages.po @@ -227,14 +227,14 @@ msgstr "su questa istanza." #: mosp/templates/about.html:21 msgid "" "You are welcome to copy, modify or redistribute the\n" -" source code\n" " according to the Affero GPL " "license." msgstr "" "Siete invitati a copiare, modificare o ridistribuire il\n" -" codice sorgente\n" " secondo la licenza Affero GPL." @@ -392,11 +392,11 @@ msgstr "Generare una nuova chiave API" #: mosp/templates/edit_user.html:47 msgid "" -"You can check the documentation of " "the API" msgstr "" -"Potete controllare la documentazione dell'API" @@ -425,7 +425,7 @@ msgstr "" msgid "" "A more technical documentation with instructions concerning the deployment " "of MOSP is available\n" -" in the official repository." msgstr "" @@ -452,7 +452,7 @@ msgstr "Contributi recenti" #: mosp/templates/help.html:22 msgid "" -"Please use GitHub for:" msgstr "" @@ -466,9 +466,9 @@ msgstr "" #: mosp/templates/help.html:26 msgid "" -"Contributions to the documentation or to the documentation or to the translations of the software" msgstr "" diff --git a/mosp/translations/messages.pot b/mosp/translations/messages.pot index 981eff7d..e07cdd8f 100644 --- a/mosp/translations/messages.pot +++ b/mosp/translations/messages.pot @@ -211,7 +211,7 @@ msgstr "" #: mosp/templates/about.html:21 msgid "" "You are welcome to copy, modify or redistribute the\n" -" source code\n" " according to the documentation of the API" msgstr "" @@ -397,7 +397,7 @@ msgstr "" msgid "" "A more technical documentation with instructions concerning the " "deployment of MOSP is available\n" -" in the official repository." msgstr "" @@ -422,7 +422,7 @@ msgstr "" #: mosp/templates/help.html:22 msgid "" -"Please use GitHub for:" msgstr "" diff --git a/mosp/translations/nl/LC_MESSAGES/messages.po b/mosp/translations/nl/LC_MESSAGES/messages.po index f2ee6b24..af31d2a5 100644 --- a/mosp/translations/nl/LC_MESSAGES/messages.po +++ b/mosp/translations/nl/LC_MESSAGES/messages.po @@ -227,14 +227,14 @@ msgstr "over dit geval." #: mosp/templates/about.html:21 msgid "" "You are welcome to copy, modify or redistribute the\n" -" source code\n" " according to the Affero GPL " "license." msgstr "" "U bent welkom om te kopiëren, wijzigen of herverdelen van de\n" -" broncode\n" " volgens de Affero GPL-licentie." @@ -392,11 +392,11 @@ msgstr "Genereer nieuwe API sleutel" #: mosp/templates/edit_user.html:47 msgid "" -"You can check the documentation of " "the API" msgstr "" -"U kunt de documentatie van de API" @@ -425,7 +425,7 @@ msgstr "" msgid "" "A more technical documentation with instructions concerning the deployment " "of MOSP is available\n" -" in the official repository." msgstr "" @@ -452,7 +452,7 @@ msgstr "Recente bijdragen" #: mosp/templates/help.html:22 msgid "" -"Please use GitHub for:" msgstr "" @@ -466,9 +466,9 @@ msgstr "" #: mosp/templates/help.html:26 msgid "" -"Contributions to the documentation or to the documentation or to the translations of the software" msgstr "" diff --git a/mosp/translations/ro/LC_MESSAGES/messages.po b/mosp/translations/ro/LC_MESSAGES/messages.po index 7cc380b7..b2bdb321 100644 --- a/mosp/translations/ro/LC_MESSAGES/messages.po +++ b/mosp/translations/ro/LC_MESSAGES/messages.po @@ -221,7 +221,7 @@ msgstr "despre acest caz." #: mosp/templates/about.html:21 msgid "" "You are welcome to copy, modify or redistribute the\n" -" source code\n" " according to the documentation of the API" msgstr "" @@ -410,12 +410,12 @@ msgstr "" msgid "" "A more technical documentation with instructions concerning the " "deployment of MOSP is available\n" -" in the official repository." msgstr "" "Este disponibilă o documentație mai tehnică cu instrucțiuni privind " "implementarea MOSP\n" -" în depozitul oficial." #: mosp/templates/help.html:17 @@ -439,7 +439,7 @@ msgstr "" #: mosp/templates/help.html:22 msgid "" -"Please use GitHub for:" msgstr "" diff --git a/mosp/translations/ru/LC_MESSAGES/messages.po b/mosp/translations/ru/LC_MESSAGES/messages.po index 631d4d6a..0b8bc92d 100644 --- a/mosp/translations/ru/LC_MESSAGES/messages.po +++ b/mosp/translations/ru/LC_MESSAGES/messages.po @@ -228,14 +228,14 @@ msgstr "об этом экземпляре." #: mosp/templates/about.html:21 msgid "" "You are welcome to copy, modify or redistribute the\n" -" source code\n" " according to the Affero GPL " "license." msgstr "" "Вы можете копировать, изменять или распространять\n" -" исходный код\n" " в соответствии с Affero " @@ -394,11 +394,11 @@ msgstr "Сгенерируйте новый ключ API" #: mosp/templates/edit_user.html:47 msgid "" -"You can check the documentation of " "the API" msgstr "" -"Вы можете ознакомиться с документацией API" @@ -427,7 +427,7 @@ msgstr "" msgid "" "A more technical documentation with instructions concerning the deployment " "of MOSP is available\n" -" in the official repository." msgstr "" @@ -454,7 +454,7 @@ msgstr "Последние вклады" #: mosp/templates/help.html:22 msgid "" -"Please use GitHub for:" msgstr "" @@ -468,9 +468,9 @@ msgstr "" #: mosp/templates/help.html:26 msgid "" -"Contributions to the documentation or to the documentation or to the translations of the software" msgstr "" diff --git a/mosp/views/views.py b/mosp/views/views.py index 35262ba0..7f4b8256 100644 --- a/mosp/views/views.py +++ b/mosp/views/views.py @@ -76,14 +76,12 @@ def about_more(): version = __version__.split("-") if len(version) == 1: mosp_version = version[0] - version_url = "https://github.com/CASES-LU/MOSP/releases/tag/{}".format( + version_url = "https://github.com/NC3-LU/MOSP/releases/tag/{}".format( version[0] ) else: mosp_version = f"{version[0]} - {version[2][1:]}" - version_url = "https://github.com/CASES-LU/MOSP/commits/{}".format( - version[2][1:] - ) + version_url = f"https://github.com/NC3-LU/MOSP/commits/{version[2][1:]}" return render_template( "about_more.html", mosp_version=mosp_version, diff --git a/runserver.py b/runserver.py index 11288666..57e2b813 100644 --- a/runserver.py +++ b/runserver.py @@ -1,9 +1,9 @@ #! /usr/bin/env python # MOSP - A platform for creating, editing and sharing JSON objects. # Copyright (C) 2018-2022 Cédric Bonhomme - https://www.cedricbonhomme.org -# Copyright (C) 2018-2022 SMILE gie - securitymadein.lu +# Copyright (C) 2018-2022 Luxembourg House of Cybersecurity # -# For more information: https://github.com/CASES-LU/MOSP +# For more information: https://github.com/NC3-LU/MOSP # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as