From 028f8fd8f019e4a9e6e16a0b4f7252aacee6b70b Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Thu, 20 Jan 2022 09:55:59 +0100 Subject: [PATCH 1/7] # 72 License * adds license info de and en --- LICENSE_de.md | 109 +++++++++++++++++++ LICENSE_en.md | 287 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 396 insertions(+) create mode 100644 LICENSE_de.md create mode 100644 LICENSE_en.md diff --git a/LICENSE_de.md b/LICENSE_de.md new file mode 100644 index 0000000..24e786c --- /dev/null +++ b/LICENSE_de.md @@ -0,0 +1,109 @@ +#OPEN-SOURCE-LIZENZ FÜR DIE EUROPÄISCHE UNION v. 1.2 +EUPL © Europäische Union 2007, 2016 + +Diese Open-Source-Lizenz für die Europäische Union („EUPL“) gilt für Werke (im Sinne der nachfolgenden Begriffsbestimmung), die unter EUPL-Bedingungen zur Verfügung gestellt werden. Das Werk darf nur in der durch diese Lizenz gestatteten Form genutzt werden (insoweit eine solche Nutzung dem Urheber vorbehalten ist). +Das Werk wird unter den Bedingungen dieser Lizenz zur Verfügung gestellt, wenn der Lizenzgeber (im Sinne der nachfolgenden Begriffsbestimmung) den folgenden Hinweis unmittelbar hinter dem Urheberrechtshinweis dieses Werks anbringt: + Lizenziert unter der EUPL +oder in einer anderen Form zum Ausdruck bringt, dass er es unter der EUPL lizenzieren möchte. + +## 1. Begriffsbestimmungen + +Für diese Lizenz gelten folgende Begriffsbestimmungen: +- „Lizenz“:diese Lizenz. +- „Originalwerk“:das Werk oder die Software, die vom Lizenzgeber unter dieser Lizenz verbreitet oder zugänglich gemacht wird, und zwar als Quellcode und gegebenenfalls auch als ausführbarer Code. +- „Bearbeitungen“:die Werke oder Software, die der Lizenznehmer auf der Grundlage des Originalwerks oder seiner Bearbeitungen schaffen kann. In dieser Lizenz wird nicht festgelegt, wie umfangreich die Änderung oder wie stark die Abhängigkeit vom Originalwerk für eine Einstufung als Bearbeitung sein muss; dies bestimmt sich nach dem Urheberrecht, das in dem unter Artikel 15 aufgeführten Land anwendbar ist. +- „Werk“:das Originalwerk oder seine Bearbeitungen. +- „Quellcode“:diejenige Form des Werkes, die zur Auffassung durch den Menschen bestimmt ist und die am besten geeignet ist, um vom Menschen verstanden und verändert zu werden. +- „Ausführbarer Code“:die - üblicherweise - kompilierte Form des Werks, die von einem Computer als Programm ausgeführt werden soll. +- „Lizenzgeber“:die natürliche oder juristische Person, die das Werk unter der Lizenz verbreitet oder zugänglich macht. +- „Bearbeiter“:jede natürliche oder juristische Person, die das Werk unter der Lizenz verändert oder auf andere Weise zur Schaffung einer Bearbeitung beiträgt. +- „Lizenznehmer“ („Sie“):jede natürliche oder juristische Person, die das Werk unter den Lizenzbedingungen nutzt. +- „Verbreitung“ oder „Zugänglichmachung“:alle Formen von Verkauf, Überlassung, Verleih, Vermietung, Verbreitung, Weitergabe, Übermittlung oder anderweitiger Online- oder Offline-Bereitstellung von Vervielfältigungen des Werks oder Zugänglichmachung seiner wesentlichen Funktionen für dritte natürliche oder juristische Personen. + +## 2. Umfang der Lizenzrechte + +Der Lizenzgeber erteilt Ihnen hiermit für die Gültigkeitsdauer der am Originalwerk bestehenden Urheberrechte eine weltweite, unentgeltliche, nicht ausschließliche, unterlizenzierbare Lizenz, die Sie berechtigt: +- das Werk uneingeschränkt zu nutzen, + +- das Werk zu vervielfältigen, + +- das Werk zu verändern und Bearbeitungen auf der Grundlage des Werks zu schaffen, +- das Werk öffentlich zugänglich zu machen, was das Recht einschließt, das Werk oder Vervielfältigungsstücke davon öffentlich bereitzustellen oder wahrnehmbar zu machen oder das Werk, soweit möglich, öffentlich aufzuführen, +- das Werk oder Vervielfältigungen davon zu verbreiten, +- das Werk oder Vervielfältigungen davon zu vermieten oder zu verleihen, +- das Werk oder Vervielfältigungen davon weiter zu lizenzieren. +Für die Wahrnehmung dieser Rechte können beliebige, derzeit bekannte oder künftige Medien, Träger und Formate verwendet werden, soweit das geltende Recht dem nicht entgegensteht. Für die Länder, in denen Urheberpersönlichkeitsrechte an dem Werk bestehen, verzichtet der Lizenzgeber im gesetzlich zulässigen Umfang auf seine Urheberpersönlichkeitsrechte, um die Lizenzierung der oben aufgeführten Verwertungsrechte wirksam durchführen zu können. Der Lizenzgeber erteilt dem Lizenznehmer ein nicht ausschließliches, unentgeltliches Nutzungsrecht an seinen Patenten, sofern dies zur Ausübung der durch die Lizenz erteilten Nutzungsrechte am Werk notwendig ist. + +## 3. Zugänglichmachung des Quellcodes + +Der Lizenzgeber kann das Werk entweder als Quellcode oder als ausführbaren Code zur Verfügung stellen. Stellt er es als ausführbaren Code zur Verfügung, so stellt er darüber hinaus eine maschinenlesbare Kopie des Quellcodes für jedes von ihm verbreitete Vervielfältigungsstück des Werks zur Verfügung, oder er verweist in einem Vermerk im Anschluss an den dem Werk beigefügten Urheberrechtshinweis auf einen Speicherort, an dem problemlos und unentgeltlich auf den Quellcode zugegriffen werden kann, solange der Lizenzgeber das Werk verbreitet oder zugänglich macht. + +## 4. Einschränkungen des Urheberrechts +Es ist nicht Zweck dieser Lizenz, Ausnahmen oder Schranken der ausschließlichen Rechte des Urhebers am Werk, die dem Lizenznehmer zugutekommen, einzuschränken. Auch die Erschöpfung dieser Rechte bleibt von dieser Lizenz unberührt. + +## 5. Pflichten des Lizenznehmers +Die Einräumung der oben genannten Rechte ist an mehrere Beschränkungen und Pflichten für den Lizenznehmer gebunden: + +Urheberrechtshinweis, Lizenztext, Nennung des Bearbeiters: Der Lizenznehmer muss alle Urheberrechts-, Patent- oder Markenrechtshinweise und alle Hinweise auf die Lizenz und den Haftungsausschluss unverändert lassen. Jedem von ihm verbreiteten oder zugänglich gemachten Vervielfältigungsstück des Werks muss der Lizenznehmer diese Hinweise sowie diese Lizenz beifügen. Der Lizenznehmer muss auf jedem abgeleiteten Werk deutlich darauf hinweisen, dass das Werk geändert wurde, und das Datum der Bearbeitung angeben. + +„Copyleft“-Klausel: Der Lizenznehmer darf Vervielfältigungen des Originalwerks oder Bearbeitungen nur unter den Bedingungen dieser EUPL oder einer neueren Version dieser Lizenz verbreiten oder zugänglich machen, außer wenn das Originalwerk ausdrücklich nur unter dieser Lizenzversion - z. B. mit der Angabe „Nur EUPL V. 1.2“ - verbreitet werden darf. Der Lizenznehmer (der zum Lizenzgeber wird) darf für das Werk oder die Bearbeitung keine zusätzlichen Bedingungen anbieten oder vorschreiben, die die Bedingungen dieser Lizenz verändern oder einschränken. + +Kompatibilitäts-Klausel: Wenn der Lizenznehmer Bearbeitungen, die auf dem Werk und einem anderen Werk, das unter einer kompatiblen Lizenz lizenziert wurde, basieren, oder die Kopien dieser Bearbeitungen verbreitet oder zugänglich macht, kann dies unter den Bedingungen dieser kompatiblen Lizenz erfolgen. Unter „kompatibler Lizenz“ ist eine im Anhang dieser Lizenz angeführte Lizenz zu verstehen. Sollten die Verpflichtungen des Lizenznehmers aus der kompatiblen Lizenz mit denjenigen aus der vorliegenden Lizenz (EUPL) in Konflikt stehen, werden die Verpflichtungen aus der kompatiblen Lizenz Vorrang haben. + +Bereitstellung des Quellcodes: Wenn der Lizenznehmer Vervielfältigungsstücke des Werks verbreitet oder zugänglich macht, muss er eine maschinenlesbare Fassung des Quellcodes mitliefern oder einen Speicherort angeben, über den problemlos und unentgeltlich so lange auf diesen Quellcode zugegriffen werden kann, wie der Lizenznehmer das Werk verbreitet oder zugänglich macht. + +Rechtsschutz: Diese Lizenz erlaubt nicht die Benutzung von Kennzeichen, Marken oder geschützten Namensrechten des Lizenzgebers, soweit dies nicht für die angemessene und übliche Beschreibung der Herkunft des Werks und der inhaltlichen Wiedergabe des Urheberrechtshinweises erforderlich ist. + +## 6. Urheber und Bearbeiter +Der ursprüngliche Lizenzgeber gewährleistet, dass er das Urheberrecht am Originalwerk innehat oder dieses an ihn lizenziert wurde und dass er befugt ist, diese Lizenz zu erteilen. +Jeder Bearbeiter gewährleistet, dass er das Urheberrecht an den von ihm vorgenommenen Änderungen des Werks besitzt und befugt ist, diese Lizenz zu erteilen. +Jedes Mal, wenn Sie die Lizenz annehmen, erteilen Ihnen der ursprüngliche Lizenzgeber und alle folgenden Bearbeiter eine Befugnis zur Nutzung ihrer Beiträge zum Werk unter den Bedingungen dieser Lizenz. + +## 7. Gewährleistungsausschluss +Die Arbeit an diesem Werk wird laufend fortgeführt; es wird durch unzählige Bearbeiter ständig verbessert. Das Werk ist nicht vollendet und kann daher Fehler („bugs“) enthalten, die dieser Art der Entwicklung inhärent sind. +Aus den genannten Gründen wird das Werk unter dieser Lizenz „so, wie es ist“ ohne jegliche Gewährleistung zur Verfügung gestellt. Dies gilt unter anderem - aber nicht ausschließlich - für Marktreife, Verwendbarkeit für einen bestimmten Zweck, Mängelfreiheit, Richtigkeit sowie Nichtverletzung von anderen Immaterialgüterrechten als dem Urheberrecht (vgl. dazu Artikel 6 dieser Lizenz). +Dieser Gewährleistungsausschluss ist wesentlicher Bestandteil der Lizenz und Bedingung für die Einräumung von Rechten an dem Werk. + +## 8. Haftungsausschluss/Haftungsbeschränkung +Außer in Fällen von Vorsatz oder der Verursachung von Personenschäden haftet der Lizenzgeber nicht für direkte oder indirekte, materielle oder immaterielle Schäden irgendwelcher Art, die aus der Lizenz oder der Benutzung des Werks folgen; dies gilt unter anderem, aber nicht ausschließlich, für Firmenwertverluste, Produktionsausfall, Computerausfall oder Computerfehler, Datenverlust oder wirtschaftliche Schäden, und zwar auch dann, wenn der Lizenzgeber auf die Möglichkeit solcher Schäden hingewiesen wurde. Unabhängig davon haftet der Lizenzgeber im Rahmen der gesetzlichen Produkthaftung, soweit die entsprechenden Regelungen auf das Werk anwendbar sind. + +## 9. Zusatzvereinbarungen +Wenn Sie das Werk verbreiten, können Sie Zusatzvereinbarungen schließen, in denen Verpflichtungen oder Dienstleistungen festgelegt werden, die mit dieser Lizenz vereinbar sind. Sie dürfen Verpflichtungen indessen nur in Ihrem eigenen Namen und auf Ihre eigene Verantwortung eingehen, nicht jedoch im Namen des ursprünglichen Lizenzgebers oder eines anderen Bearbeiters, und nur, wenn Sie sich gegenüber allen Bearbeitern verpflichten, sie zu entschädigen, zu verteidigen und von der Haftung freizustellen, falls aufgrund der von Ihnen eingegangenen Gewährleistungsverpflichtung oder Haftungsübernahme Forderungen gegen sie geltend gemacht werden oder eine Haftungsverpflichtung entsteht. + +## 10. Annahme der Lizenz +Sie können den Bestimmungen dieser Lizenz zustimmen, indem Sie das Symbol „Lizenz annehmen“ unter dem Fenster mit dem Lizenztext anklicken oder indem Sie Ihre Zustimmung auf vergleichbare Weise in einer nach anwendbarem Recht zulässigen Form geben. Das Anklicken des Symbols gilt als Anzeichen Ihrer eindeutigen und unwiderruflichen Annahme der Lizenz und der darin enthaltenen Klauseln und Bedingungen. In gleicher Weise gilt als Zeichen der eindeutigen und unwiderruflichen Zustimmung die Ausübung eines Rechtes, das in Artikel 2 dieser Lizenz angeführt ist, wie das Erstellen einer Bearbeitung oder die Verbreitung oder Zugänglichmachung des Werks oder dessen Vervielfältigungen. + +## 11. Informationspflichten +Wenn Sie das Werk verbreiten oder zugänglich machen (beispielsweise, indem Sie es zum Herunterladen von einer Website anbieten), müssen Sie über den Vertriebskanal oder das benutzte Verbreitungsmedium der Öffentlichkeit zumindest jene Informationen bereitstellen, die nach dem anwendbaren Recht bezüglich der Lizenzgeber, der Lizenz und ihrer Zugänglichkeit, des Abschlusses des Lizenzvertrags sowie darüber, wie die Lizenz durch den Lizenznehmer gespeichert und vervielfältigt werden kann, erforderlich sind. + +## 12. Beendigung der Lizenz +Die Lizenz und die damit eingeräumten Rechte erlöschen automatisch, wenn der Lizenznehmer gegen die Lizenzbedingungen verstößt. Ein solches Erlöschen der Lizenz führt nicht zum Erlöschen der Lizenzen von Personen, denen das Werk vom Lizenznehmer unter dieser Lizenz zur Verfügung gestellt worden ist, solange diese Personen die Lizenzbedingungen erfüllen. + +## 13. Sonstiges +Unbeschadet des Artikels 9 stellt die Lizenz die vollständige Vereinbarung der Parteien über das Werk dar. Sind einzelne Bestimmungen der Lizenz nach geltendem Recht nichtig oder unwirksam, so berührt dies nicht die Wirksamkeit oder Durchsetzbarkeit der Lizenz an sich. Solche Bestimmungen werden vielmehr so ausgelegt oder modifiziert, dass sie wirksam und durchsetzbar sind. Die Europäische Kommission kann weitere Sprachfassungen oder neue Versionen dieser Lizenz oder aktualisierte Fassungen des Anhangs veröffentlichen, soweit dies notwendig und angemessen ist, ohne den Umfang der Lizenzrechte zu verringern. Neue Versionen werden mit einer eindeutigen Versionsnummer veröffentlicht. Alle von der Europäischen Kommission anerkannten Sprachfassungen dieser Lizenz sind gleichwertig. Die Parteien können sich auf die Sprachfassung ihrer Wahl berufen. + +## 14. Gerichtsstand +Unbeschadet besonderer Vereinbarungen zwischen den Parteien gilt Folgendes: +- Für alle Streitigkeiten über die Auslegung dieser Lizenz zwischen den Organen, Einrichtungen und sonstigen Stellen der Europäischen Union als Lizenzgeber und einem Lizenznehmer ist der Gerichtshof der Europäischen Union gemäß Artikel 272 des Vertrags über die Arbeitsweise der Europäischen Union zuständig; +- Gerichtsstand für Streitigkeiten zwischen anderen Parteien über die Auslegung dieser Lizenz ist allein der Ort, an dem der Lizenzgeber seinen Wohnsitz oder den wirtschaftlichen Mittelpunkt seiner Tätigkeit hat. + +## 15. Anwendbares Recht +Unbeschadet besonderer Vereinbarungen zwischen den Parteien gilt Folgendes: +- Diese Lizenz unterliegt dem Recht des Mitgliedstaats der Europäischen Union, in dem der Lizenzgeber seinen Sitz, Wohnsitz oder eingetragenen Sitz hat; +- diese Lizenz unterliegt dem belgischen Recht, wenn der Lizenzgeber keinen Sitz, Wohnsitz oder eingetragenen Sitz in einem Mitgliedstaat der Europäischen Union hat. + +# Anlage +„Kompatible Lizenzen“ nach Artikel 5 der EUPL sind: +- GNU General Public License (GPL) v. 2, v. 3 +- GNU Affero General Public License (AGPL) v. 3 +- Open Software License (OSL) v. 2.1, v. 3.0 +- Eclipse Public License (EPL) v. 1.0 +- CeCILL v. 2.0, v. 2.1 +- Mozilla Public Licence (MPL) v. 2 +- GNU Lesser General Public Licence (LGPL) v. 2.1, v. 3 +- Creative Commons Attribution-ShareAlike v. 3.0 Unported (CC BY-SA 3.0) für andere Werke als Software +- European Union Public Licence (EUPL) v. 1.1, v. 1.2 +- Québec Free and Open-Source Licence - Reciprocity (LiLiQ-R) oder Strong Reciprocity (LiLiQ-R+) + +Die Europäische Kommission kann diesen Anhang aktualisieren, um neuere Fassungen der obigen Lizenzen aufzunehmen, ohne hierfür eine neue Fassung der EUPL auszuarbeiten, solange diese Lizenzen die in Artikel 2 gewährten Rechte gewährleisten und den erfassten Quellcode vor ausschließlicher Aneignung schützen. +Alle sonstigen Änderungen oder Ergänzungen dieses Anhangs bedürfen der Ausarbeitung einer neuen Version der EUPL. diff --git a/LICENSE_en.md b/LICENSE_en.md new file mode 100644 index 0000000..4153cd3 --- /dev/null +++ b/LICENSE_en.md @@ -0,0 +1,287 @@ + EUROPEAN UNION PUBLIC LICENCE v. 1.2 + EUPL © the European Union 2007, 2016 + +This European Union Public Licence (the ‘EUPL’) applies to the Work (as defined +below) which is provided under the terms of this Licence. Any use of the Work, +other than as authorised under this Licence is prohibited (to the extent such +use is covered by a right of the copyright holder of the Work). + +The Work is provided under the terms of this Licence when the Licensor (as +defined below) has placed the following notice immediately following the +copyright notice for the Work: + + Licensed under the EUPL + +or has expressed by any other means his willingness to license under the EUPL. + +1. Definitions + +In this Licence, the following terms have the following meaning: + +- ‘The Licence’: this Licence. + +- ‘The Original Work’: the work or software distributed or communicated by the + Licensor under this Licence, available as Source Code and also as Executable + Code as the case may be. + +- ‘Derivative Works’: the works or software that could be created by the + Licensee, based upon the Original Work or modifications thereof. This Licence + does not define the extent of modification or dependence on the Original Work + required in order to classify a work as a Derivative Work; this extent is + determined by copyright law applicable in the country mentioned in Article 15. + +- ‘The Work’: the Original Work or its Derivative Works. + +- ‘The Source Code’: the human-readable form of the Work which is the most + convenient for people to study and modify. + +- ‘The Executable Code’: any code which has generally been compiled and which is + meant to be interpreted by a computer as a program. + +- ‘The Licensor’: the natural or legal person that distributes or communicates + the Work under the Licence. + +- ‘Contributor(s)’: any natural or legal person who modifies the Work under the + Licence, or otherwise contributes to the creation of a Derivative Work. + +- ‘The Licensee’ or ‘You’: any natural or legal person who makes any usage of + the Work under the terms of the Licence. + +- ‘Distribution’ or ‘Communication’: any act of selling, giving, lending, + renting, distributing, communicating, transmitting, or otherwise making + available, online or offline, copies of the Work or providing access to its + essential functionalities at the disposal of any other natural or legal + person. + +2. Scope of the rights granted by the Licence + +The Licensor hereby grants You a worldwide, royalty-free, non-exclusive, +sublicensable licence to do the following, for the duration of copyright vested +in the Original Work: + +- use the Work in any circumstance and for all usage, +- reproduce the Work, +- modify the Work, and make Derivative Works based upon the Work, +- communicate to the public, including the right to make available or display + the Work or copies thereof to the public and perform publicly, as the case may + be, the Work, +- distribute the Work or copies thereof, +- lend and rent the Work or copies thereof, +- sublicense rights in the Work or copies thereof. + +Those rights can be exercised on any media, supports and formats, whether now +known or later invented, as far as the applicable law permits so. + +In the countries where moral rights apply, the Licensor waives his right to +exercise his moral right to the extent allowed by law in order to make effective +the licence of the economic rights here above listed. + +The Licensor grants to the Licensee royalty-free, non-exclusive usage rights to +any patents held by the Licensor, to the extent necessary to make use of the +rights granted on the Work under this Licence. + +3. Communication of the Source Code + +The Licensor may provide the Work either in its Source Code form, or as +Executable Code. If the Work is provided as Executable Code, the Licensor +provides in addition a machine-readable copy of the Source Code of the Work +along with each copy of the Work that the Licensor distributes or indicates, in +a notice following the copyright notice attached to the Work, a repository where +the Source Code is easily and freely accessible for as long as the Licensor +continues to distribute or communicate the Work. + +4. Limitations on copyright + +Nothing in this Licence is intended to deprive the Licensee of the benefits from +any exception or limitation to the exclusive rights of the rights owners in the +Work, of the exhaustion of those rights or of other applicable limitations +thereto. + +5. Obligations of the Licensee + +The grant of the rights mentioned above is subject to some restrictions and +obligations imposed on the Licensee. Those obligations are the following: + +Attribution right: The Licensee shall keep intact all copyright, patent or +trademarks notices and all notices that refer to the Licence and to the +disclaimer of warranties. The Licensee must include a copy of such notices and a +copy of the Licence with every copy of the Work he/she distributes or +communicates. The Licensee must cause any Derivative Work to carry prominent +notices stating that the Work has been modified and the date of modification. + +Copyleft clause: If the Licensee distributes or communicates copies of the +Original Works or Derivative Works, this Distribution or Communication will be +done under the terms of this Licence or of a later version of this Licence +unless the Original Work is expressly distributed only under this version of the +Licence — for example by communicating ‘EUPL v. 1.2 only’. The Licensee +(becoming Licensor) cannot offer or impose any additional terms or conditions on +the Work or Derivative Work that alter or restrict the terms of the Licence. + +Compatibility clause: If the Licensee Distributes or Communicates Derivative +Works or copies thereof based upon both the Work and another work licensed under +a Compatible Licence, this Distribution or Communication can be done under the +terms of this Compatible Licence. For the sake of this clause, ‘Compatible +Licence’ refers to the licences listed in the appendix attached to this Licence. +Should the Licensee's obligations under the Compatible Licence conflict with +his/her obligations under this Licence, the obligations of the Compatible +Licence shall prevail. + +Provision of Source Code: When distributing or communicating copies of the Work, +the Licensee will provide a machine-readable copy of the Source Code or indicate +a repository where this Source will be easily and freely available for as long +as the Licensee continues to distribute or communicate the Work. + +Legal Protection: This Licence does not grant permission to use the trade names, +trademarks, service marks, or names of the Licensor, except as required for +reasonable and customary use in describing the origin of the Work and +reproducing the content of the copyright notice. + +6. Chain of Authorship + +The original Licensor warrants that the copyright in the Original Work granted +hereunder is owned by him/her or licensed to him/her and that he/she has the +power and authority to grant the Licence. + +Each Contributor warrants that the copyright in the modifications he/she brings +to the Work are owned by him/her or licensed to him/her and that he/she has the +power and authority to grant the Licence. + +Each time You accept the Licence, the original Licensor and subsequent +Contributors grant You a licence to their contributions to the Work, under the +terms of this Licence. + +7. Disclaimer of Warranty + +The Work is a work in progress, which is continuously improved by numerous +Contributors. It is not a finished work and may therefore contain defects or +‘bugs’ inherent to this type of development. + +For the above reason, the Work is provided under the Licence on an ‘as is’ basis +and without warranties of any kind concerning the Work, including without +limitation merchantability, fitness for a particular purpose, absence of defects +or errors, accuracy, non-infringement of intellectual property rights other than +copyright as stated in Article 6 of this Licence. + +This disclaimer of warranty is an essential part of the Licence and a condition +for the grant of any rights to the Work. + +8. Disclaimer of Liability + +Except in the cases of wilful misconduct or damages directly caused to natural +persons, the Licensor will in no event be liable for any direct or indirect, +material or moral, damages of any kind, arising out of the Licence or of the use +of the Work, including without limitation, damages for loss of goodwill, work +stoppage, computer failure or malfunction, loss of data or any commercial +damage, even if the Licensor has been advised of the possibility of such damage. +However, the Licensor will be liable under statutory product liability laws as +far such laws apply to the Work. + +9. Additional agreements + +While distributing the Work, You may choose to conclude an additional agreement, +defining obligations or services consistent with this Licence. However, if +accepting obligations, You may act only on your own behalf and on your sole +responsibility, not on behalf of the original Licensor or any other Contributor, +and only if You agree to indemnify, defend, and hold each Contributor harmless +for any liability incurred by, or claims asserted against such Contributor by +the fact You have accepted any warranty or additional liability. + +10. Acceptance of the Licence + +The provisions of this Licence can be accepted by clicking on an icon ‘I agree’ +placed under the bottom of a window displaying the text of this Licence or by +affirming consent in any other similar way, in accordance with the rules of +applicable law. Clicking on that icon indicates your clear and irrevocable +acceptance of this Licence and all of its terms and conditions. + +Similarly, you irrevocably accept this Licence and all of its terms and +conditions by exercising any rights granted to You by Article 2 of this Licence, +such as the use of the Work, the creation by You of a Derivative Work or the +Distribution or Communication by You of the Work or copies thereof. + +11. Information to the public + +In case of any Distribution or Communication of the Work by means of electronic +communication by You (for example, by offering to download the Work from a +remote location) the distribution channel or media (for example, a website) must +at least provide to the public the information requested by the applicable law +regarding the Licensor, the Licence and the way it may be accessible, concluded, +stored and reproduced by the Licensee. + +12. Termination of the Licence + +The Licence and the rights granted hereunder will terminate automatically upon +any breach by the Licensee of the terms of the Licence. + +Such a termination will not terminate the licences of any person who has +received the Work from the Licensee under the Licence, provided such persons +remain in full compliance with the Licence. + +13. Miscellaneous + +Without prejudice of Article 9 above, the Licence represents the complete +agreement between the Parties as to the Work. + +If any provision of the Licence is invalid or unenforceable under applicable +law, this will not affect the validity or enforceability of the Licence as a +whole. Such provision will be construed or reformed so as necessary to make it +valid and enforceable. + +The European Commission may publish other linguistic versions or new versions of +this Licence or updated versions of the Appendix, so far this is required and +reasonable, without reducing the scope of the rights granted by the Licence. New +versions of the Licence will be published with a unique version number. + +All linguistic versions of this Licence, approved by the European Commission, +have identical value. Parties can take advantage of the linguistic version of +their choice. + +14. Jurisdiction + +Without prejudice to specific agreement between parties, + +- any litigation resulting from the interpretation of this License, arising + between the European Union institutions, bodies, offices or agencies, as a + Licensor, and any Licensee, will be subject to the jurisdiction of the Court + of Justice of the European Union, as laid down in article 272 of the Treaty on + the Functioning of the European Union, + +- any litigation arising between other parties and resulting from the + interpretation of this License, will be subject to the exclusive jurisdiction + of the competent court where the Licensor resides or conducts its primary + business. + +15. Applicable Law + +Without prejudice to specific agreement between parties, + +- this Licence shall be governed by the law of the European Union Member State + where the Licensor has his seat, resides or has his registered office, + +- this licence shall be governed by Belgian law if the Licensor has no seat, + residence or registered office inside a European Union Member State. + +Appendix + +‘Compatible Licences’ according to Article 5 EUPL are: + +- GNU General Public License (GPL) v. 2, v. 3 +- GNU Affero General Public License (AGPL) v. 3 +- Open Software License (OSL) v. 2.1, v. 3.0 +- Eclipse Public License (EPL) v. 1.0 +- CeCILL v. 2.0, v. 2.1 +- Mozilla Public Licence (MPL) v. 2 +- GNU Lesser General Public Licence (LGPL) v. 2.1, v. 3 +- Creative Commons Attribution-ShareAlike v. 3.0 Unported (CC BY-SA 3.0) for + works other than software +- European Union Public Licence (EUPL) v. 1.1, v. 1.2 +- Québec Free and Open-Source Licence — Reciprocity (LiLiQ-R) or Strong + Reciprocity (LiLiQ-R+). + +The European Commission may update this Appendix to later versions of the above +licences without producing a new version of the EUPL, as long as they provide +the rights granted in Article 2 of this Licence and protect the covered Source +Code from exclusive appropriation. + +All other changes or additions to this Appendix require the production of a new +EUPL version. -- 2.38.5 From 951bbef480b95993c874337a18702e6ee62a4c79 Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Thu, 20 Jan 2022 10:00:12 +0100 Subject: [PATCH 2/7] # License update * minor enhancement for online rendering --- LICENSE_de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE_de.md b/LICENSE_de.md index 24e786c..11539fe 100644 --- a/LICENSE_de.md +++ b/LICENSE_de.md @@ -1,4 +1,4 @@ -#OPEN-SOURCE-LIZENZ FÜR DIE EUROPÄISCHE UNION v. 1.2 +# OPEN-SOURCE-LIZENZ FÜR DIE EUROPÄISCHE UNION v. 1.2 EUPL © Europäische Union 2007, 2016 Diese Open-Source-Lizenz für die Europäische Union („EUPL“) gilt für Werke (im Sinne der nachfolgenden Begriffsbestimmung), die unter EUPL-Bedingungen zur Verfügung gestellt werden. Das Werk darf nur in der durch diese Lizenz gestatteten Form genutzt werden (insoweit eine solche Nutzung dem Urheber vorbehalten ist). -- 2.38.5 From dc422789430f8451575a66f1b350d8bbdc2bf4e0 Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Thu, 20 Jan 2022 12:12:04 +0100 Subject: [PATCH 3/7] # 70 Tab titles interventions * adds content related tab title * adds/updates translations --- intervention/views.py | 19 ++++++-- konova/contexts.py | 4 +- konova/sub_settings/context_settings.py | 1 + locale/de/LC_MESSAGES/django.mo | Bin 34223 -> 34377 bytes locale/de/LC_MESSAGES/django.po | 62 +++++++++++++----------- templates/base.html | 2 +- templates/public_base.html | 2 +- 7 files changed, 53 insertions(+), 37 deletions(-) diff --git a/intervention/views.py b/intervention/views.py index fc1625d..ad04615 100644 --- a/intervention/views.py +++ b/intervention/views.py @@ -10,11 +10,12 @@ from intervention.models import Intervention, Revocation, InterventionDocument, from intervention.tables import InterventionTable from konova.contexts import BaseContext from konova.decorators import * -from konova.forms import SimpleGeomForm, NewDocumentForm, RemoveModalForm, RecordModalForm +from konova.forms import SimpleGeomForm, RemoveModalForm, RecordModalForm +from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER from konova.utils.documents import remove_document, get_document from konova.utils.generators import generate_qr_code from konova.utils.message_templates import INTERVENTION_INVALID, FORM_INVALID, IDENTIFIER_REPLACED, \ - DATA_UNSHARED_EXPLANATION, CHECKED_RECORDED_RESET + CHECKED_RECORDED_RESET from konova.utils.user_checks import in_group @@ -44,6 +45,7 @@ def index_view(request: HttpRequest): ) context = { "table": table, + TAB_TITLE_IDENTIFIER: _("Interventions - Overview"), } context = BaseContext(request, context).context return render(request, template, context) @@ -86,6 +88,7 @@ def new_view(request: HttpRequest): context = { "form": data_form, "geom_form": geom_form, + TAB_TITLE_IDENTIFIER: _("New intervention"), } context = BaseContext(request, context).context return render(request, template, context) @@ -255,7 +258,8 @@ def detail_view(request: HttpRequest, id: str): "is_default_member": in_group(_user, DEFAULT_GROUP), "is_zb_member": in_group(_user, ZB_GROUP), "is_ets_member": in_group(_user, ETS_GROUP), - "LANIS_LINK": intervention.get_LANIS_link() + "LANIS_LINK": intervention.get_LANIS_link(), + TAB_TITLE_IDENTIFIER: f"{intervention.identifier} - {intervention.title}", } request = intervention.set_status_messages(request) @@ -302,6 +306,7 @@ def edit_view(request: HttpRequest, id: str): context = { "form": data_form, "geom_form": geom_form, + TAB_TITLE_IDENTIFIER: _("Edit {}").format(intervention.identifier), } context = BaseContext(request, context).context return render(request, template, context) @@ -538,10 +543,15 @@ def report_view(request:HttpRequest, id: str): template = "intervention/report/report.html" intervention = get_object_or_404(Intervention, id=id) + tab_title = _("Report {}").format(intervention.identifier) # If intervention is not recorded (yet or currently) we need to render another template without any data if not intervention.recorded: template = "report/unavailable.html" - return render(request, template, {}) + context = { + TAB_TITLE_IDENTIFIER: tab_title, + } + context = BaseContext(request, context).context + return render(request, template, context) # Prepare data for map viewer geom_form = SimpleGeomForm( @@ -567,6 +577,7 @@ def report_view(request:HttpRequest, id: str): "qrcode_lanis": qrcode_img_lanis, "geom_form": geom_form, "parcels": parcels, + TAB_TITLE_IDENTIFIER: tab_title, } context = BaseContext(request, context).context return render(request, template, context) diff --git a/konova/contexts.py b/konova/contexts.py index 751e355..4935731 100644 --- a/konova/contexts.py +++ b/konova/contexts.py @@ -7,7 +7,7 @@ Created on: 16.11.20 """ from django.http import HttpRequest -from konova.sub_settings.context_settings import BASE_TITLE, HELP_LINK, BASE_FRONTEND_TITLE +from konova.sub_settings.context_settings import BASE_TITLE, HELP_LINK, BASE_FRONTEND_TITLE, TAB_TITLE_IDENTIFIER from konova.sub_settings.django_settings import EMAIL_REPLY_TO @@ -20,7 +20,7 @@ class BaseContext: def __init__(self, request: HttpRequest, additional_context: dict = {}): self.context = { "base_title": BASE_TITLE, - "base_frontend_title": BASE_FRONTEND_TITLE, + TAB_TITLE_IDENTIFIER: BASE_FRONTEND_TITLE, "language": request.LANGUAGE_CODE, "user": request.user, "current_role": None, diff --git a/konova/sub_settings/context_settings.py b/konova/sub_settings/context_settings.py index 53177c7..c28b744 100644 --- a/konova/sub_settings/context_settings.py +++ b/konova/sub_settings/context_settings.py @@ -9,4 +9,5 @@ Created on: 16.11.20 BASE_TITLE_SHORT = "KSP" BASE_TITLE = "KSP - Kompensationsverzeichnis Service Portal" BASE_FRONTEND_TITLE = "Kompensationsverzeichnis Service Portal" +TAB_TITLE_IDENTIFIER = "tab_title" HELP_LINK = "https://dienste.naturschutz.rlp.de/doku/doku.php?id=ksp:start" diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index 4985688af6ab414f3f80c32c199aa4bcf56083bd..f32cd700492732b4f8862fe17daddafb41c590e7 100644 GIT binary patch delta 10075 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\n" "Language-Team: LANGUAGE \n" @@ -1064,7 +1064,7 @@ msgid "Compensation {} edited" msgstr "Kompensation {} bearbeitet" #: compensation/views/compensation.py:230 compensation/views/eco_account.py:309 -#: ema/views.py:183 intervention/views.py:478 +#: ema/views.py:183 intervention/views.py:482 msgid "Log" msgstr "Log" @@ -1073,7 +1073,7 @@ msgid "Compensation removed" msgstr "Kompensation entfernt" #: compensation/views/compensation.py:274 compensation/views/eco_account.py:461 -#: ema/views.py:350 intervention/views.py:129 +#: ema/views.py:350 intervention/views.py:132 msgid "Document added" msgstr "Dokument hinzugefügt" @@ -1119,36 +1119,36 @@ msgid "Deduction removed" msgstr "Abbuchung entfernt" #: compensation/views/eco_account.py:330 ema/views.py:263 -#: intervention/views.py:520 +#: intervention/views.py:524 msgid "{} unrecorded" msgstr "{} entzeichnet" #: compensation/views/eco_account.py:330 ema/views.py:263 -#: intervention/views.py:520 +#: intervention/views.py:524 msgid "{} recorded" msgstr "{} verzeichnet" -#: compensation/views/eco_account.py:531 intervention/views.py:501 +#: compensation/views/eco_account.py:531 intervention/views.py:505 msgid "Deduction added" msgstr "Abbuchung hinzugefügt" #: compensation/views/eco_account.py:616 ema/views.py:520 -#: intervention/views.py:376 +#: intervention/views.py:380 msgid "{} has already been shared with you" msgstr "{} wurde bereits für Sie freigegeben" #: compensation/views/eco_account.py:621 ema/views.py:525 -#: intervention/views.py:381 +#: intervention/views.py:385 msgid "{} has been shared with you" msgstr "{} ist nun für Sie freigegeben" #: compensation/views/eco_account.py:628 ema/views.py:532 -#: intervention/views.py:388 +#: intervention/views.py:392 msgid "Share link invalid" msgstr "Freigabelink ungültig" #: compensation/views/eco_account.py:651 ema/views.py:555 -#: intervention/views.py:411 +#: intervention/views.py:415 msgid "Share settings updated" msgstr "Freigabe Einstellungen aktualisiert" @@ -1257,7 +1257,7 @@ msgstr "Datum Zulassung bzw. Satzungsbeschluss" msgid "Binding on" msgstr "Datum Bestandskraft" -#: intervention/forms/forms.py:191 +#: intervention/forms/forms.py:191 intervention/views.py:91 msgid "New intervention" msgstr "Neuer Eingriff" @@ -1459,38 +1459,50 @@ msgstr "" "Kein Ausgleich jeglicher Art gefunden (Kompensation, Ersatzzahlung, " "Abbuchung)" -#: intervention/views.py:79 +#: intervention/views.py:48 +msgid "Interventions - Overview" +msgstr "Eingriffe - Übersicht" + +#: intervention/views.py:81 msgid "Intervention {} added" msgstr "Eingriff {} hinzugefügt" -#: intervention/views.py:246 +#: intervention/views.py:248 msgid "This intervention has {} revocations" msgstr "Dem Eingriff liegen {} Widersprüche vor" -#: intervention/views.py:294 +#: intervention/views.py:297 msgid "Intervention {} edited" msgstr "Eingriff {} bearbeitet" -#: intervention/views.py:329 +#: intervention/views.py:309 +msgid "Edit {}" +msgstr "Bearbeite {}" + +#: intervention/views.py:333 msgid "{} removed" msgstr "{} entfernt" -#: intervention/views.py:350 +#: intervention/views.py:354 msgid "Revocation removed" msgstr "Widerspruch entfernt" -#: intervention/views.py:432 +#: intervention/views.py:436 msgid "Check performed" msgstr "Prüfung durchgeführt" -#: intervention/views.py:454 +#: intervention/views.py:458 msgid "Revocation added" msgstr "Widerspruch hinzugefügt" -#: intervention/views.py:525 +#: intervention/views.py:529 msgid "There are errors on this intervention:" msgstr "Es liegen Fehler in diesem Eingriff vor:" +#: intervention/views.py:546 +msgid "Report {}" +msgstr "Bericht {}" + #: konova/decorators.py:30 msgid "You need to be staff to perform this action!" msgstr "Hierfür müssen Sie Mitarbeiter sein!" @@ -2165,22 +2177,14 @@ msgid "More" msgstr "Mehr" #: templates/navbars/navbar.html:44 -msgid "Import..." -msgstr "" - -#: templates/navbars/navbar.html:45 -msgid "Export..." -msgstr "" - -#: templates/navbars/navbar.html:46 msgid "Reports" msgstr "Berichte" -#: templates/navbars/navbar.html:58 user/templates/user/index.html:31 +#: templates/navbars/navbar.html:56 user/templates/user/index.html:31 msgid "Settings" msgstr "Einstellungen" -#: templates/navbars/navbar.html:59 +#: templates/navbars/navbar.html:57 msgid "Logout" msgstr "Abmelden" diff --git a/templates/base.html b/templates/base.html index e728405..2f5e5b2 100644 --- a/templates/base.html +++ b/templates/base.html @@ -4,7 +4,7 @@ - {{ base_frontend_title }} + {{ tab_title }} {% bootstrap_css %} {% bootstrap_javascript jquery='full' %} diff --git a/templates/public_base.html b/templates/public_base.html index d09d74b..62193c4 100644 --- a/templates/public_base.html +++ b/templates/public_base.html @@ -4,7 +4,7 @@ - {{ base_frontend_title }} + {{ tab_title }} {% bootstrap_css %} {% bootstrap_javascript jquery='full' %} -- 2.38.5 From 014155b0a49dd842f0f77b52bc6f0d7663a3d73f Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Thu, 20 Jan 2022 12:19:08 +0100 Subject: [PATCH 4/7] # 70 Tab title compensation * adds tab titles for compensations * adds/updates translations * optimizes identifier generating, so that one-digit months will be converted into two digits --- compensation/views/compensation.py | 13 ++++++++- konova/models/object.py | 7 ++++- locale/de/LC_MESSAGES/django.mo | Bin 34377 -> 34446 bytes locale/de/LC_MESSAGES/django.po | 44 ++++++++++++++++------------- 4 files changed, 42 insertions(+), 22 deletions(-) diff --git a/compensation/views/compensation.py b/compensation/views/compensation.py index 71efb5e..ab11a62 100644 --- a/compensation/views/compensation.py +++ b/compensation/views/compensation.py @@ -13,6 +13,7 @@ from intervention.models import Intervention from konova.contexts import BaseContext from konova.decorators import * from konova.forms import RemoveModalForm, SimpleGeomForm +from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER from konova.utils.documents import get_document, remove_document from konova.utils.generators import generate_qr_code from konova.utils.message_templates import FORM_INVALID, IDENTIFIER_REPLACED, DATA_UNSHARED_EXPLANATION, \ @@ -43,6 +44,7 @@ def index_view(request: HttpRequest): ) context = { "table": table, + TAB_TITLE_IDENTIFIER: _("Compensations - Overview"), } context = BaseContext(request, context).context return render(request, template, context) @@ -86,6 +88,7 @@ def new_view(request: HttpRequest, intervention_id: str = None): context = { "form": data_form, "geom_form": geom_form, + TAB_TITLE_IDENTIFIER: _("New compensation"), } context = BaseContext(request, context).context return render(request, template, context) @@ -150,6 +153,7 @@ def edit_view(request: HttpRequest, id: str): context = { "form": data_form, "geom_form": geom_form, + TAB_TITLE_IDENTIFIER: _("Edit {}").format(comp.identifier), } context = BaseContext(request, context).context return render(request, template, context) @@ -202,6 +206,7 @@ def detail_view(request: HttpRequest, id: str): "is_zb_member": in_group(_user, ZB_GROUP), "is_ets_member": in_group(_user, ETS_GROUP), "LANIS_LINK": comp.get_LANIS_link(), + TAB_TITLE_IDENTIFIER: f"{comp.identifier} - {comp.title}", } context = BaseContext(request, context).context return render(request, template, context) @@ -444,10 +449,15 @@ def report_view(request: HttpRequest, id: str): template = "compensation/report/compensation/report.html" comp = get_object_or_404(Compensation, id=id) + tab_title = _("Report {}").format(comp.identifier) # If intervention is not recorded (yet or currently) we need to render another template without any data if not comp.intervention.recorded: template = "report/unavailable.html" - return render(request, template, {}) + context = { + TAB_TITLE_IDENTIFIER: tab_title, + } + context = BaseContext(request, context).context + return render(request, template, context) # Prepare data for map viewer geom_form = SimpleGeomForm( @@ -477,6 +487,7 @@ def report_view(request: HttpRequest, id: str): "geom_form": geom_form, "parcels": parcels, "actions": actions, + TAB_TITLE_IDENTIFIER: tab_title, } context = BaseContext(request, context).context return render(request, template, context) diff --git a/konova/models/object.py b/konova/models/object.py index c9a8e6c..900542d 100644 --- a/konova/models/object.py +++ b/konova/models/object.py @@ -182,7 +182,12 @@ class BaseObject(BaseResource): return generate_random_string(10) _now = now() - curr_month = str(_now.month) + curr_month = _now.month + if curr_month < 10: + # Make sure month part has two digits to have same length identifiers by default + curr_month = f"0{curr_month}" + else: + curr_month = str(curr_month) curr_year = str(_now.year) rand_str = generate_random_string( length=definitions[self.__class__]["length"], diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index f32cd700492732b4f8862fe17daddafb41c590e7..097aff994d6ce0453171b0f4a589c1d019648987 100644 GIT binary patch delta 10021 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 delta 9982 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 AfB*mh diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index aa8c41b..8e2ef9c 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -26,7 +26,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-20 12:07+0100\n" +"POT-Creation-Date: 2022-01-20 12:17+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -426,7 +426,7 @@ msgstr "kompensiert Eingriff" msgid "Select the intervention for which this compensation compensates" msgstr "Wählen Sie den Eingriff, für den diese Kompensation bestimmt ist" -#: compensation/forms/forms.py:184 +#: compensation/forms/forms.py:184 compensation/views/compensation.py:91 msgid "New compensation" msgstr "Neue Kompensation" @@ -1055,53 +1055,65 @@ msgstr "" msgid "Responsible data" msgstr "Daten zu den verantwortlichen Stellen" -#: compensation/views/compensation.py:79 +#: compensation/views/compensation.py:47 +msgid "Compensations - Overview" +msgstr "Kompensationen - Übersicht" + +#: compensation/views/compensation.py:81 msgid "Compensation {} added" msgstr "Kompensation {} hinzugefügt" -#: compensation/views/compensation.py:143 +#: compensation/views/compensation.py:146 msgid "Compensation {} edited" msgstr "Kompensation {} bearbeitet" -#: compensation/views/compensation.py:230 compensation/views/eco_account.py:309 +#: compensation/views/compensation.py:156 intervention/views.py:309 +msgid "Edit {}" +msgstr "Bearbeite {}" + +#: compensation/views/compensation.py:235 compensation/views/eco_account.py:309 #: ema/views.py:183 intervention/views.py:482 msgid "Log" msgstr "Log" -#: compensation/views/compensation.py:253 +#: compensation/views/compensation.py:258 msgid "Compensation removed" msgstr "Kompensation entfernt" -#: compensation/views/compensation.py:274 compensation/views/eco_account.py:461 +#: compensation/views/compensation.py:279 compensation/views/eco_account.py:461 #: ema/views.py:350 intervention/views.py:132 msgid "Document added" msgstr "Dokument hinzugefügt" -#: compensation/views/compensation.py:343 compensation/views/eco_account.py:355 +#: compensation/views/compensation.py:348 compensation/views/eco_account.py:355 #: ema/views.py:288 msgid "State added" msgstr "Zustand hinzugefügt" -#: compensation/views/compensation.py:364 compensation/views/eco_account.py:376 +#: compensation/views/compensation.py:369 compensation/views/eco_account.py:376 #: ema/views.py:309 msgid "Action added" msgstr "Maßnahme hinzugefügt" -#: compensation/views/compensation.py:385 compensation/views/eco_account.py:441 +#: compensation/views/compensation.py:390 compensation/views/eco_account.py:441 #: ema/views.py:330 msgid "Deadline added" msgstr "Frist/Termin hinzugefügt" -#: compensation/views/compensation.py:407 compensation/views/eco_account.py:398 +#: compensation/views/compensation.py:412 compensation/views/eco_account.py:398 #: ema/views.py:420 msgid "State removed" msgstr "Zustand gelöscht" -#: compensation/views/compensation.py:429 compensation/views/eco_account.py:420 +#: compensation/views/compensation.py:434 compensation/views/eco_account.py:420 #: ema/views.py:442 msgid "Action removed" msgstr "Maßnahme entfernt" +#: compensation/views/compensation.py:452 intervention/views.py:546 +msgid "Report {}" +msgstr "Bericht {}" + #: compensation/views/eco_account.py:89 msgid "Eco-Account {} added" msgstr "Ökokonto {} hinzugefügt" @@ -1475,10 +1487,6 @@ msgstr "Dem Eingriff liegen {} Widersprüche vor" msgid "Intervention {} edited" msgstr "Eingriff {} bearbeitet" -#: intervention/views.py:309 -msgid "Edit {}" -msgstr "Bearbeite {}" - #: intervention/views.py:333 msgid "{} removed" msgstr "{} entfernt" @@ -1499,10 +1507,6 @@ msgstr "Widerspruch hinzugefügt" msgid "There are errors on this intervention:" msgstr "Es liegen Fehler in diesem Eingriff vor:" -#: intervention/views.py:546 -msgid "Report {}" -msgstr "Bericht {}" - #: konova/decorators.py:30 msgid "You need to be staff to perform this action!" msgstr "Hierfür müssen Sie Mitarbeiter sein!" -- 2.38.5 From b9bec828769f9ed06ebbf1bdc9b6cd36fd55953e Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Thu, 20 Jan 2022 12:23:19 +0100 Subject: [PATCH 5/7] # 70 Tab title eco-account * adds tab titles for eco account * adds/updates translations --- compensation/views/eco_account.py | 13 +++++++- locale/de/LC_MESSAGES/django.mo | Bin 34446 -> 34517 bytes locale/de/LC_MESSAGES/django.po | 50 +++++++++++++++++------------- 3 files changed, 40 insertions(+), 23 deletions(-) diff --git a/compensation/views/eco_account.py b/compensation/views/eco_account.py index 0895823..14caf9d 100644 --- a/compensation/views/eco_account.py +++ b/compensation/views/eco_account.py @@ -25,6 +25,7 @@ from konova.decorators import any_group_check, default_group_required, conservat shared_access_required from konova.forms import RemoveModalForm, SimpleGeomForm, NewDocumentForm, RecordModalForm from konova.settings import DEFAULT_GROUP, ZB_GROUP, ETS_GROUP +from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER from konova.utils.documents import get_document, remove_document from konova.utils.generators import generate_qr_code from konova.utils.message_templates import IDENTIFIER_REPLACED, FORM_INVALID, DATA_UNSHARED, DATA_UNSHARED_EXPLANATION, \ @@ -54,6 +55,7 @@ def index_view(request: HttpRequest): ) context = { "table": table, + TAB_TITLE_IDENTIFIER: _("Eco-account - Overview"), } context = BaseContext(request, context).context return render(request, template, context) @@ -96,6 +98,7 @@ def new_view(request: HttpRequest): context = { "form": data_form, "geom_form": geom_form, + TAB_TITLE_IDENTIFIER: _("New Eco-Account"), } context = BaseContext(request, context).context return render(request, template, context) @@ -153,6 +156,7 @@ def edit_view(request: HttpRequest, id: str): context = { "form": data_form, "geom_form": geom_form, + TAB_TITLE_IDENTIFIER: _("Edit {}").format(acc.identifier), } context = BaseContext(request, context).context return render(request, template, context) @@ -223,6 +227,7 @@ def detail_view(request: HttpRequest, id: str): "LANIS_LINK": acc.get_LANIS_link(), "deductions": deductions, "actions": actions, + TAB_TITLE_IDENTIFIER: f"{acc.identifier} - {acc.title}", } context = BaseContext(request, context).context return render(request, template, context) @@ -546,10 +551,15 @@ def report_view(request:HttpRequest, id: str): template = "compensation/report/eco_account/report.html" acc = get_object_or_404(EcoAccount, id=id) + tab_title = _("Report {}").format(acc.identifier) # If intervention is not recorded (yet or currently) we need to render another template without any data if not acc.recorded: template = "report/unavailable.html" - return render(request, template, {}) + context = { + TAB_TITLE_IDENTIFIER: tab_title, + } + context = BaseContext(request, context).context + return render(request, template, context) # Prepare data for map viewer geom_form = SimpleGeomForm( @@ -586,6 +596,7 @@ def report_view(request:HttpRequest, id: str): "parcels": parcels, "actions": actions, "deductions": deductions, + TAB_TITLE_IDENTIFIER: tab_title, } context = BaseContext(request, context).context return render(request, template, context) diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index 097aff994d6ce0453171b0f4a589c1d019648987..b80bbd8bbfa518373de989dea0adc5ff09c6e48b 100644 GIT binary patch delta 10059 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 M==gmHv#(bBAG%6oK>z>% delta 10009 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 diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 8e2ef9c..30a1c3c 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -26,7 +26,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-20 12:17+0100\n" +"POT-Creation-Date: 2022-01-20 12:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -452,7 +452,7 @@ msgstr "Vereinbarungsdatum" msgid "When did the parties agree on this?" msgstr "Wann wurde dieses Ökokonto offiziell vereinbart?" -#: compensation/forms/forms.py:340 +#: compensation/forms/forms.py:340 compensation/views/eco_account.py:101 msgid "New Eco-Account" msgstr "Neues Ökokonto" @@ -1067,11 +1067,12 @@ msgstr "Kompensation {} hinzugefügt" msgid "Compensation {} edited" msgstr "Kompensation {} bearbeitet" -#: compensation/views/compensation.py:156 intervention/views.py:309 +#: compensation/views/compensation.py:156 compensation/views/eco_account.py:159 +#: intervention/views.py:309 msgid "Edit {}" msgstr "Bearbeite {}" -#: compensation/views/compensation.py:235 compensation/views/eco_account.py:309 +#: compensation/views/compensation.py:235 compensation/views/eco_account.py:314 #: ema/views.py:183 intervention/views.py:482 msgid "Log" msgstr "Log" @@ -1080,86 +1081,91 @@ msgstr "Log" msgid "Compensation removed" msgstr "Kompensation entfernt" -#: compensation/views/compensation.py:279 compensation/views/eco_account.py:461 +#: compensation/views/compensation.py:279 compensation/views/eco_account.py:466 #: ema/views.py:350 intervention/views.py:132 msgid "Document added" msgstr "Dokument hinzugefügt" -#: compensation/views/compensation.py:348 compensation/views/eco_account.py:355 +#: compensation/views/compensation.py:348 compensation/views/eco_account.py:360 #: ema/views.py:288 msgid "State added" msgstr "Zustand hinzugefügt" -#: compensation/views/compensation.py:369 compensation/views/eco_account.py:376 +#: compensation/views/compensation.py:369 compensation/views/eco_account.py:381 #: ema/views.py:309 msgid "Action added" msgstr "Maßnahme hinzugefügt" -#: compensation/views/compensation.py:390 compensation/views/eco_account.py:441 +#: compensation/views/compensation.py:390 compensation/views/eco_account.py:446 #: ema/views.py:330 msgid "Deadline added" msgstr "Frist/Termin hinzugefügt" -#: compensation/views/compensation.py:412 compensation/views/eco_account.py:398 +#: compensation/views/compensation.py:412 compensation/views/eco_account.py:403 #: ema/views.py:420 msgid "State removed" msgstr "Zustand gelöscht" -#: compensation/views/compensation.py:434 compensation/views/eco_account.py:420 +#: compensation/views/compensation.py:434 compensation/views/eco_account.py:425 #: ema/views.py:442 msgid "Action removed" msgstr "Maßnahme entfernt" -#: compensation/views/compensation.py:452 intervention/views.py:546 +#: compensation/views/compensation.py:452 compensation/views/eco_account.py:554 +#: intervention/views.py:546 msgid "Report {}" msgstr "Bericht {}" -#: compensation/views/eco_account.py:89 +#: compensation/views/eco_account.py:58 +msgid "Eco-account - Overview" +msgstr "Ökokonten - Übersicht" + +#: compensation/views/eco_account.py:91 msgid "Eco-Account {} added" msgstr "Ökokonto {} hinzugefügt" -#: compensation/views/eco_account.py:146 +#: compensation/views/eco_account.py:149 msgid "Eco-Account {} edited" msgstr "Ökokonto {} bearbeitet" -#: compensation/views/eco_account.py:257 +#: compensation/views/eco_account.py:262 msgid "Eco-account removed" msgstr "Ökokonto entfernt" -#: compensation/views/eco_account.py:285 +#: compensation/views/eco_account.py:290 msgid "Deduction removed" msgstr "Abbuchung entfernt" -#: compensation/views/eco_account.py:330 ema/views.py:263 +#: compensation/views/eco_account.py:335 ema/views.py:263 #: intervention/views.py:524 msgid "{} unrecorded" msgstr "{} entzeichnet" -#: compensation/views/eco_account.py:330 ema/views.py:263 +#: compensation/views/eco_account.py:335 ema/views.py:263 #: intervention/views.py:524 msgid "{} recorded" msgstr "{} verzeichnet" -#: compensation/views/eco_account.py:531 intervention/views.py:505 +#: compensation/views/eco_account.py:536 intervention/views.py:505 msgid "Deduction added" msgstr "Abbuchung hinzugefügt" -#: compensation/views/eco_account.py:616 ema/views.py:520 +#: compensation/views/eco_account.py:627 ema/views.py:520 #: intervention/views.py:380 msgid "{} has already been shared with you" msgstr "{} wurde bereits für Sie freigegeben" -#: compensation/views/eco_account.py:621 ema/views.py:525 +#: compensation/views/eco_account.py:632 ema/views.py:525 #: intervention/views.py:385 msgid "{} has been shared with you" msgstr "{} ist nun für Sie freigegeben" -#: compensation/views/eco_account.py:628 ema/views.py:532 +#: compensation/views/eco_account.py:639 ema/views.py:532 #: intervention/views.py:392 msgid "Share link invalid" msgstr "Freigabelink ungültig" -#: compensation/views/eco_account.py:651 ema/views.py:555 +#: compensation/views/eco_account.py:662 ema/views.py:555 #: intervention/views.py:415 msgid "Share settings updated" msgstr "Freigabe Einstellungen aktualisiert" -- 2.38.5 From 7a8cafcd773020f1408dfeaaa76f5a56a73d104d Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Thu, 20 Jan 2022 12:26:22 +0100 Subject: [PATCH 6/7] # 70 Tab title EMA * adds ema tab titles * adds/updates translations --- ema/views.py | 13 +++++++++- locale/de/LC_MESSAGES/django.mo | Bin 34517 -> 34615 bytes locale/de/LC_MESSAGES/django.po | 44 +++++++++++++++++--------------- 3 files changed, 36 insertions(+), 21 deletions(-) diff --git a/ema/views.py b/ema/views.py index 0ae886e..cc7bbc9 100644 --- a/ema/views.py +++ b/ema/views.py @@ -16,6 +16,7 @@ from konova.decorators import conservation_office_group_required, shared_access_ from ema.models import Ema, EmaDocument from konova.forms import RemoveModalForm, SimpleGeomForm, RecordModalForm from konova.settings import DEFAULT_GROUP, ZB_GROUP, ETS_GROUP +from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER from konova.utils.documents import get_document, remove_document from konova.utils.generators import generate_qr_code from konova.utils.message_templates import IDENTIFIER_REPLACED, FORM_INVALID, DATA_UNSHARED, DATA_UNSHARED_EXPLANATION @@ -44,6 +45,7 @@ def index_view(request: HttpRequest): ) context = { "table": table, + TAB_TITLE_IDENTIFIER: _("EMAs - Overview"), } context = BaseContext(request, context).context return render(request, template, context) @@ -86,6 +88,7 @@ def new_view(request: HttpRequest): context = { "form": data_form, "geom_form": geom_form, + TAB_TITLE_IDENTIFIER: _("New EMA"), } context = BaseContext(request, context).context return render(request, template, context) @@ -155,6 +158,7 @@ def detail_view(request: HttpRequest, id: str): "is_zb_member": in_group(_user, ZB_GROUP), "is_ets_member": in_group(_user, ETS_GROUP), "LANIS_LINK": ema.get_LANIS_link(), + TAB_TITLE_IDENTIFIER: f"{ema.identifier} - {ema.title}", } context = BaseContext(request, context).context return render(request, template, context) @@ -219,6 +223,7 @@ def edit_view(request: HttpRequest, id: str): context = { "form": data_form, "geom_form": geom_form, + TAB_TITLE_IDENTIFIER: _("Edit {}").format(ema.identifier), } context = BaseContext(request, context).context return render(request, template, context) @@ -457,10 +462,15 @@ def report_view(request:HttpRequest, id: str): template = "ema/report/report.html" ema = get_object_or_404(Ema, id=id) + tab_title = _("Report {}").format(ema.identifier) # If intervention is not recorded (yet or currently) we need to render another template without any data if not ema.recorded: template = "report/unavailable.html" - return render(request, template, {}) + context = { + TAB_TITLE_IDENTIFIER: tab_title, + } + context = BaseContext(request, context).context + return render(request, template, context) # Prepare data for map viewer geom_form = SimpleGeomForm( @@ -490,6 +500,7 @@ def report_view(request:HttpRequest, id: str): "geom_form": geom_form, "parcels": parcels, "actions": actions, + TAB_TITLE_IDENTIFIER: tab_title, } context = BaseContext(request, context).context return render(request, template, context) diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index b80bbd8bbfa518373de989dea0adc5ff09c6e48b..87ac689b8766276b9b18c7238f66d14bfc9d74cf 100644 GIT binary patch delta 10128 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 V<)IaWhh}7sOdGLdWZLNJ{|B=DdWQf2 delta 10029 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 kvGBjnEzt$RvHv-i&d&pLj^-+P2x!2kdN diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 30a1c3c..a56e6ff 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -26,7 +26,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-20 12:22+0100\n" +"POT-Creation-Date: 2022-01-20 12:25+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1068,12 +1068,12 @@ msgid "Compensation {} edited" msgstr "Kompensation {} bearbeitet" #: compensation/views/compensation.py:156 compensation/views/eco_account.py:159 -#: intervention/views.py:309 +#: ema/views.py:226 intervention/views.py:309 msgid "Edit {}" msgstr "Bearbeite {}" #: compensation/views/compensation.py:235 compensation/views/eco_account.py:314 -#: ema/views.py:183 intervention/views.py:482 +#: ema/views.py:187 intervention/views.py:482 msgid "Log" msgstr "Log" @@ -1082,37 +1082,37 @@ msgid "Compensation removed" msgstr "Kompensation entfernt" #: compensation/views/compensation.py:279 compensation/views/eco_account.py:466 -#: ema/views.py:350 intervention/views.py:132 +#: ema/views.py:355 intervention/views.py:132 msgid "Document added" msgstr "Dokument hinzugefügt" #: compensation/views/compensation.py:348 compensation/views/eco_account.py:360 -#: ema/views.py:288 +#: ema/views.py:293 msgid "State added" msgstr "Zustand hinzugefügt" #: compensation/views/compensation.py:369 compensation/views/eco_account.py:381 -#: ema/views.py:309 +#: ema/views.py:314 msgid "Action added" msgstr "Maßnahme hinzugefügt" #: compensation/views/compensation.py:390 compensation/views/eco_account.py:446 -#: ema/views.py:330 +#: ema/views.py:335 msgid "Deadline added" msgstr "Frist/Termin hinzugefügt" #: compensation/views/compensation.py:412 compensation/views/eco_account.py:403 -#: ema/views.py:420 +#: ema/views.py:425 msgid "State removed" msgstr "Zustand gelöscht" #: compensation/views/compensation.py:434 compensation/views/eco_account.py:425 -#: ema/views.py:442 +#: ema/views.py:447 msgid "Action removed" msgstr "Maßnahme entfernt" #: compensation/views/compensation.py:452 compensation/views/eco_account.py:554 -#: intervention/views.py:546 +#: ema/views.py:465 intervention/views.py:546 msgid "Report {}" msgstr "Bericht {}" @@ -1136,12 +1136,12 @@ msgstr "Ökokonto entfernt" msgid "Deduction removed" msgstr "Abbuchung entfernt" -#: compensation/views/eco_account.py:335 ema/views.py:263 +#: compensation/views/eco_account.py:335 ema/views.py:268 #: intervention/views.py:524 msgid "{} unrecorded" msgstr "{} entzeichnet" -#: compensation/views/eco_account.py:335 ema/views.py:263 +#: compensation/views/eco_account.py:335 ema/views.py:268 #: intervention/views.py:524 msgid "{} recorded" msgstr "{} verzeichnet" @@ -1150,22 +1150,22 @@ msgstr "{} verzeichnet" msgid "Deduction added" msgstr "Abbuchung hinzugefügt" -#: compensation/views/eco_account.py:627 ema/views.py:520 +#: compensation/views/eco_account.py:627 ema/views.py:531 #: intervention/views.py:380 msgid "{} has already been shared with you" msgstr "{} wurde bereits für Sie freigegeben" -#: compensation/views/eco_account.py:632 ema/views.py:525 +#: compensation/views/eco_account.py:632 ema/views.py:536 #: intervention/views.py:385 msgid "{} has been shared with you" msgstr "{} ist nun für Sie freigegeben" -#: compensation/views/eco_account.py:639 ema/views.py:532 +#: compensation/views/eco_account.py:639 ema/views.py:543 #: intervention/views.py:392 msgid "Share link invalid" msgstr "Freigabelink ungültig" -#: compensation/views/eco_account.py:662 ema/views.py:555 +#: compensation/views/eco_account.py:662 ema/views.py:566 #: intervention/views.py:415 msgid "Share settings updated" msgstr "Freigabe Einstellungen aktualisiert" @@ -1178,7 +1178,7 @@ msgstr "Zahlung hinzugefügt" msgid "Payment removed" msgstr "Zahlung gelöscht" -#: ema/forms.py:40 +#: ema/forms.py:40 ema/views.py:91 msgid "New EMA" msgstr "Neue EMA hinzufügen" @@ -1206,15 +1206,19 @@ msgstr "" msgid "Payment funded compensation" msgstr "Ersatzzahlungsmaßnahme" -#: ema/views.py:79 +#: ema/views.py:48 +msgid "EMAs - Overview" +msgstr "EMAs - Übersicht" + +#: ema/views.py:81 msgid "EMA {} added" msgstr "EMA {} hinzugefügt" -#: ema/views.py:212 +#: ema/views.py:216 msgid "EMA {} edited" msgstr "EMA {} bearbeitet" -#: ema/views.py:244 +#: ema/views.py:249 msgid "EMA removed" msgstr "EMA entfernt" -- 2.38.5 From 79b9be5637793f9cc80ba38af753a858c19d74a5 Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Thu, 20 Jan 2022 12:31:20 +0100 Subject: [PATCH 7/7] # 70 Tab title rest * adds tab titles for some other pages * adds/updates translations --- konova/views.py | 2 ++ locale/de/LC_MESSAGES/django.mo | Bin 34615 -> 34713 bytes locale/de/LC_MESSAGES/django.po | 24 ++++++++++++++++-------- news/views.py | 3 +++ user/views.py | 4 ++++ 5 files changed, 25 insertions(+), 8 deletions(-) diff --git a/konova/views.py b/konova/views.py index 1f16b9e..abfea28 100644 --- a/konova/views.py +++ b/konova/views.py @@ -18,6 +18,7 @@ from konova.contexts import BaseContext from konova.decorators import any_group_check from konova.forms import RemoveModalForm from konova.models import Deadline +from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER from news.models import ServerMessage from konova.settings import SSO_SERVER_BASE @@ -92,6 +93,7 @@ def home_view(request: HttpRequest): "user_compensation_count": user_comps.count(), "total_eco_count": eco_accs.count(), "user_eco_count": user_ecco_accs.count(), + TAB_TITLE_IDENTIFIER: _("Home"), } context = BaseContext(request, additional_context).context return render(request, template, context) diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index 87ac689b8766276b9b18c7238f66d14bfc9d74cf..619b6ef4f243212e38b6b5aceaefebcb847129ec 100644 GIT binary patch delta 8206 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 Gq5lILI~VK# delta 8113 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\n" "Language-Team: LANGUAGE \n" @@ -1885,7 +1885,11 @@ msgstr "{} wurde erfolgreich vom Nutzer {} geprüft! {}" msgid "missing" msgstr "fehlt" -#: konova/views.py:115 +#: konova/views.py:96 templates/navbars/navbar.html:16 +msgid "Home" +msgstr "Home" + +#: konova/views.py:117 msgid "Deadline removed" msgstr "Frist gelöscht" @@ -1913,7 +1917,7 @@ msgstr "Ältere ..." msgid "All" msgstr "Alle" -#: news/templates/news/index.html:9 +#: news/templates/news/index.html:9 news/views.py:34 msgid "News" msgstr "Neuigkeiten" @@ -2182,10 +2186,6 @@ msgstr "" msgid "KSP" msgstr "" -#: templates/navbars/navbar.html:16 -msgid "Home" -msgstr "Home" - #: templates/navbars/navbar.html:40 msgid "More" msgstr "Mehr" @@ -2300,10 +2300,18 @@ msgstr "Benachrichtigungseinstellungen ändern" msgid "Notification settings" msgstr "Benachrichtigungen" -#: user/views.py:52 +#: user/views.py:29 +msgid "User settings" +msgstr "Einstellungen" + +#: user/views.py:55 msgid "Notifications edited" msgstr "Benachrichtigungen bearbeitet" +#: user/views.py:67 +msgid "User notifications" +msgstr "Benachrichtigungen" + #: venv/lib/python3.7/site-packages/bootstrap4/components.py:17 #: venv/lib/python3.7/site-packages/bootstrap4/templates/bootstrap4/form_errors.html:3 #: venv/lib/python3.7/site-packages/bootstrap4/templates/bootstrap4/messages.html:4 diff --git a/news/views.py b/news/views.py index d386de0..a556e4c 100644 --- a/news/views.py +++ b/news/views.py @@ -2,8 +2,10 @@ from django.contrib.auth.decorators import login_required from django.http import HttpRequest from django.shortcuts import render from django.utils import timezone +from django.utils.translation import gettext_lazy as _ from konova.contexts import BaseContext +from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER from news.models import ServerMessage @@ -29,6 +31,7 @@ def index_view(request: HttpRequest): context = { "news": news, + TAB_TITLE_IDENTIFIER: _("News"), } context = BaseContext(request, context).context return render(request, template, context) diff --git a/user/views.py b/user/views.py index 13fecf5..5979675 100644 --- a/user/views.py +++ b/user/views.py @@ -1,5 +1,7 @@ from django.contrib import messages from django.contrib.auth.decorators import login_required + +from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER from user.models import User from django.http import HttpRequest from django.shortcuts import render, redirect, get_object_or_404 @@ -24,6 +26,7 @@ def index_view(request: HttpRequest): template = "user/index.html" context = { "user": request.user, + TAB_TITLE_IDENTIFIER: _("User settings"), } context = BaseContext(request, context).context return render(request, template, context) @@ -61,6 +64,7 @@ def notifications_view(request: HttpRequest): context = { "user": user, "form": form, + TAB_TITLE_IDENTIFIER: _("User notifications"), } context = BaseContext(request, context).context return render(request, template, context) -- 2.38.5