mirror of https://gitlab.crans.org/bde/nk20
Merge branch 'beta' into 'master'
Fix note pictures, better ansible See merge request bde/nk20!113
This commit is contained in:
commit
81ad38927d
674
LICENSE
674
LICENSE
|
@ -1,674 +0,0 @@
|
|||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The GNU General Public License is a free, copyleft license for
|
||||
software and other kinds of works.
|
||||
|
||||
The licenses for most software and other practical works are designed
|
||||
to take away your freedom to share and change the works. By contrast,
|
||||
the GNU General Public License is intended to guarantee your freedom to
|
||||
share and change all versions of a program--to make sure it remains free
|
||||
software for all its users. We, the Free Software Foundation, use the
|
||||
GNU General Public License for most of our software; it applies also to
|
||||
any other work released this way by its authors. You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
them if you wish), that you receive source code or can get it if you
|
||||
want it, that you can change the software or use pieces of it in new
|
||||
free programs, and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to prevent others from denying you
|
||||
these rights or asking you to surrender the rights. Therefore, you have
|
||||
certain responsibilities if you distribute copies of the software, or if
|
||||
you modify it: responsibilities to respect the freedom of others.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must pass on to the recipients the same
|
||||
freedoms that you received. You must make sure that they, too, receive
|
||||
or can get the source code. And you must show them these terms so they
|
||||
know their rights.
|
||||
|
||||
Developers that use the GNU GPL protect your rights with two steps:
|
||||
(1) assert copyright on the software, and (2) offer you this License
|
||||
giving you legal permission to copy, distribute and/or modify it.
|
||||
|
||||
For the developers' and authors' protection, the GPL clearly explains
|
||||
that there is no warranty for this free software. For both users' and
|
||||
authors' sake, the GPL requires that modified versions be marked as
|
||||
changed, so that their problems will not be attributed erroneously to
|
||||
authors of previous versions.
|
||||
|
||||
Some devices are designed to deny users access to install or run
|
||||
modified versions of the software inside them, although the manufacturer
|
||||
can do so. This is fundamentally incompatible with the aim of
|
||||
protecting users' freedom to change the software. The systematic
|
||||
pattern of such abuse occurs in the area of products for individuals to
|
||||
use, which is precisely where it is most unacceptable. Therefore, we
|
||||
have designed this version of the GPL to prohibit the practice for those
|
||||
products. If such problems arise substantially in other domains, we
|
||||
stand ready to extend this provision to those domains in future versions
|
||||
of the GPL, as needed to protect the freedom of users.
|
||||
|
||||
Finally, every program is threatened constantly by software patents.
|
||||
States should not allow patents to restrict development and use of
|
||||
software on general-purpose computers, but in those that do, we wish to
|
||||
avoid the special danger that patents applied to a free program could
|
||||
make it effectively proprietary. To prevent this, the GPL assures that
|
||||
patents cannot be used to render the program non-free.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
TERMS AND CONDITIONS
|
||||
|
||||
0. Definitions.
|
||||
|
||||
"This License" refers to version 3 of the GNU General Public License.
|
||||
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
|
||||
"The Program" refers to any copyrightable work licensed under this
|
||||
License. Each licensee is addressed as "you". "Licensees" and
|
||||
"recipients" may be individuals or organizations.
|
||||
|
||||
To "modify" a work means to copy from or adapt all or part of the work
|
||||
in a fashion requiring copyright permission, other than the making of an
|
||||
exact copy. The resulting work is called a "modified version" of the
|
||||
earlier work or a work "based on" the earlier work.
|
||||
|
||||
A "covered work" means either the unmodified Program or a work based
|
||||
on the Program.
|
||||
|
||||
To "propagate" a work means to do anything with it that, without
|
||||
permission, would make you directly or secondarily liable for
|
||||
infringement under applicable copyright law, except executing it on a
|
||||
computer or modifying a private copy. Propagation includes copying,
|
||||
distribution (with or without modification), making available to the
|
||||
public, and in some countries other activities as well.
|
||||
|
||||
To "convey" a work means any kind of propagation that enables other
|
||||
parties to make or receive copies. Mere interaction with a user through
|
||||
a computer network, with no transfer of a copy, is not conveying.
|
||||
|
||||
An interactive user interface displays "Appropriate Legal Notices"
|
||||
to the extent that it includes a convenient and prominently visible
|
||||
feature that (1) displays an appropriate copyright notice, and (2)
|
||||
tells the user that there is no warranty for the work (except to the
|
||||
extent that warranties are provided), that licensees may convey the
|
||||
work under this License, and how to view a copy of this License. If
|
||||
the interface presents a list of user commands or options, such as a
|
||||
menu, a prominent item in the list meets this criterion.
|
||||
|
||||
1. Source Code.
|
||||
|
||||
The "source code" for a work means the preferred form of the work
|
||||
for making modifications to it. "Object code" means any non-source
|
||||
form of a work.
|
||||
|
||||
A "Standard Interface" means an interface that either is an official
|
||||
standard defined by a recognized standards body, or, in the case of
|
||||
interfaces specified for a particular programming language, one that
|
||||
is widely used among developers working in that language.
|
||||
|
||||
The "System Libraries" of an executable work include anything, other
|
||||
than the work as a whole, that (a) is included in the normal form of
|
||||
packaging a Major Component, but which is not part of that Major
|
||||
Component, and (b) serves only to enable use of the work with that
|
||||
Major Component, or to implement a Standard Interface for which an
|
||||
implementation is available to the public in source code form. A
|
||||
"Major Component", in this context, means a major essential component
|
||||
(kernel, window system, and so on) of the specific operating system
|
||||
(if any) on which the executable work runs, or a compiler used to
|
||||
produce the work, or an object code interpreter used to run it.
|
||||
|
||||
The "Corresponding Source" for a work in object code form means all
|
||||
the source code needed to generate, install, and (for an executable
|
||||
work) run the object code and to modify the work, including scripts to
|
||||
control those activities. However, it does not include the work's
|
||||
System Libraries, or general-purpose tools or generally available free
|
||||
programs which are used unmodified in performing those activities but
|
||||
which are not part of the work. For example, Corresponding Source
|
||||
includes interface definition files associated with source files for
|
||||
the work, and the source code for shared libraries and dynamically
|
||||
linked subprograms that the work is specifically designed to require,
|
||||
such as by intimate data communication or control flow between those
|
||||
subprograms and other parts of the work.
|
||||
|
||||
The Corresponding Source need not include anything that users
|
||||
can regenerate automatically from other parts of the Corresponding
|
||||
Source.
|
||||
|
||||
The Corresponding Source for a work in source code form is that
|
||||
same work.
|
||||
|
||||
2. Basic Permissions.
|
||||
|
||||
All rights granted under this License are granted for the term of
|
||||
copyright on the Program, and are irrevocable provided the stated
|
||||
conditions are met. This License explicitly affirms your unlimited
|
||||
permission to run the unmodified Program. The output from running a
|
||||
covered work is covered by this License only if the output, given its
|
||||
content, constitutes a covered work. This License acknowledges your
|
||||
rights of fair use or other equivalent, as provided by copyright law.
|
||||
|
||||
You may make, run and propagate covered works that you do not
|
||||
convey, without conditions so long as your license otherwise remains
|
||||
in force. You may convey covered works to others for the sole purpose
|
||||
of having them make modifications exclusively for you, or provide you
|
||||
with facilities for running those works, provided that you comply with
|
||||
the terms of this License in conveying all material for which you do
|
||||
not control copyright. Those thus making or running the covered works
|
||||
for you must do so exclusively on your behalf, under your direction
|
||||
and control, on terms that prohibit them from making any copies of
|
||||
your copyrighted material outside their relationship with you.
|
||||
|
||||
Conveying under any other circumstances is permitted solely under
|
||||
the conditions stated below. Sublicensing is not allowed; section 10
|
||||
makes it unnecessary.
|
||||
|
||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||
|
||||
No covered work shall be deemed part of an effective technological
|
||||
measure under any applicable law fulfilling obligations under article
|
||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||
similar laws prohibiting or restricting circumvention of such
|
||||
measures.
|
||||
|
||||
When you convey a covered work, you waive any legal power to forbid
|
||||
circumvention of technological measures to the extent such circumvention
|
||||
is effected by exercising rights under this License with respect to
|
||||
the covered work, and you disclaim any intention to limit operation or
|
||||
modification of the work as a means of enforcing, against the work's
|
||||
users, your or third parties' legal rights to forbid circumvention of
|
||||
technological measures.
|
||||
|
||||
4. Conveying Verbatim Copies.
|
||||
|
||||
You may convey verbatim copies of the Program's source code as you
|
||||
receive it, in any medium, provided that you conspicuously and
|
||||
appropriately publish on each copy an appropriate copyright notice;
|
||||
keep intact all notices stating that this License and any
|
||||
non-permissive terms added in accord with section 7 apply to the code;
|
||||
keep intact all notices of the absence of any warranty; and give all
|
||||
recipients a copy of this License along with the Program.
|
||||
|
||||
You may charge any price or no price for each copy that you convey,
|
||||
and you may offer support or warranty protection for a fee.
|
||||
|
||||
5. Conveying Modified Source Versions.
|
||||
|
||||
You may convey a work based on the Program, or the modifications to
|
||||
produce it from the Program, in the form of source code under the
|
||||
terms of section 4, provided that you also meet all of these conditions:
|
||||
|
||||
a) The work must carry prominent notices stating that you modified
|
||||
it, and giving a relevant date.
|
||||
|
||||
b) The work must carry prominent notices stating that it is
|
||||
released under this License and any conditions added under section
|
||||
7. This requirement modifies the requirement in section 4 to
|
||||
"keep intact all notices".
|
||||
|
||||
c) You must license the entire work, as a whole, under this
|
||||
License to anyone who comes into possession of a copy. This
|
||||
License will therefore apply, along with any applicable section 7
|
||||
additional terms, to the whole of the work, and all its parts,
|
||||
regardless of how they are packaged. This License gives no
|
||||
permission to license the work in any other way, but it does not
|
||||
invalidate such permission if you have separately received it.
|
||||
|
||||
d) If the work has interactive user interfaces, each must display
|
||||
Appropriate Legal Notices; however, if the Program has interactive
|
||||
interfaces that do not display Appropriate Legal Notices, your
|
||||
work need not make them do so.
|
||||
|
||||
A compilation of a covered work with other separate and independent
|
||||
works, which are not by their nature extensions of the covered work,
|
||||
and which are not combined with it such as to form a larger program,
|
||||
in or on a volume of a storage or distribution medium, is called an
|
||||
"aggregate" if the compilation and its resulting copyright are not
|
||||
used to limit the access or legal rights of the compilation's users
|
||||
beyond what the individual works permit. Inclusion of a covered work
|
||||
in an aggregate does not cause this License to apply to the other
|
||||
parts of the aggregate.
|
||||
|
||||
6. Conveying Non-Source Forms.
|
||||
|
||||
You may convey a covered work in object code form under the terms
|
||||
of sections 4 and 5, provided that you also convey the
|
||||
machine-readable Corresponding Source under the terms of this License,
|
||||
in one of these ways:
|
||||
|
||||
a) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by the
|
||||
Corresponding Source fixed on a durable physical medium
|
||||
customarily used for software interchange.
|
||||
|
||||
b) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by a
|
||||
written offer, valid for at least three years and valid for as
|
||||
long as you offer spare parts or customer support for that product
|
||||
model, to give anyone who possesses the object code either (1) a
|
||||
copy of the Corresponding Source for all the software in the
|
||||
product that is covered by this License, on a durable physical
|
||||
medium customarily used for software interchange, for a price no
|
||||
more than your reasonable cost of physically performing this
|
||||
conveying of source, or (2) access to copy the
|
||||
Corresponding Source from a network server at no charge.
|
||||
|
||||
c) Convey individual copies of the object code with a copy of the
|
||||
written offer to provide the Corresponding Source. This
|
||||
alternative is allowed only occasionally and noncommercially, and
|
||||
only if you received the object code with such an offer, in accord
|
||||
with subsection 6b.
|
||||
|
||||
d) Convey the object code by offering access from a designated
|
||||
place (gratis or for a charge), and offer equivalent access to the
|
||||
Corresponding Source in the same way through the same place at no
|
||||
further charge. You need not require recipients to copy the
|
||||
Corresponding Source along with the object code. If the place to
|
||||
copy the object code is a network server, the Corresponding Source
|
||||
may be on a different server (operated by you or a third party)
|
||||
that supports equivalent copying facilities, provided you maintain
|
||||
clear directions next to the object code saying where to find the
|
||||
Corresponding Source. Regardless of what server hosts the
|
||||
Corresponding Source, you remain obligated to ensure that it is
|
||||
available for as long as needed to satisfy these requirements.
|
||||
|
||||
e) Convey the object code using peer-to-peer transmission, provided
|
||||
you inform other peers where the object code and Corresponding
|
||||
Source of the work are being offered to the general public at no
|
||||
charge under subsection 6d.
|
||||
|
||||
A separable portion of the object code, whose source code is excluded
|
||||
from the Corresponding Source as a System Library, need not be
|
||||
included in conveying the object code work.
|
||||
|
||||
A "User Product" is either (1) a "consumer product", which means any
|
||||
tangible personal property which is normally used for personal, family,
|
||||
or household purposes, or (2) anything designed or sold for incorporation
|
||||
into a dwelling. In determining whether a product is a consumer product,
|
||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||
product received by a particular user, "normally used" refers to a
|
||||
typical or common use of that class of product, regardless of the status
|
||||
of the particular user or of the way in which the particular user
|
||||
actually uses, or expects or is expected to use, the product. A product
|
||||
is a consumer product regardless of whether the product has substantial
|
||||
commercial, industrial or non-consumer uses, unless such uses represent
|
||||
the only significant mode of use of the product.
|
||||
|
||||
"Installation Information" for a User Product means any methods,
|
||||
procedures, authorization keys, or other information required to install
|
||||
and execute modified versions of a covered work in that User Product from
|
||||
a modified version of its Corresponding Source. The information must
|
||||
suffice to ensure that the continued functioning of the modified object
|
||||
code is in no case prevented or interfered with solely because
|
||||
modification has been made.
|
||||
|
||||
If you convey an object code work under this section in, or with, or
|
||||
specifically for use in, a User Product, and the conveying occurs as
|
||||
part of a transaction in which the right of possession and use of the
|
||||
User Product is transferred to the recipient in perpetuity or for a
|
||||
fixed term (regardless of how the transaction is characterized), the
|
||||
Corresponding Source conveyed under this section must be accompanied
|
||||
by the Installation Information. But this requirement does not apply
|
||||
if neither you nor any third party retains the ability to install
|
||||
modified object code on the User Product (for example, the work has
|
||||
been installed in ROM).
|
||||
|
||||
The requirement to provide Installation Information does not include a
|
||||
requirement to continue to provide support service, warranty, or updates
|
||||
for a work that has been modified or installed by the recipient, or for
|
||||
the User Product in which it has been modified or installed. Access to a
|
||||
network may be denied when the modification itself materially and
|
||||
adversely affects the operation of the network or violates the rules and
|
||||
protocols for communication across the network.
|
||||
|
||||
Corresponding Source conveyed, and Installation Information provided,
|
||||
in accord with this section must be in a format that is publicly
|
||||
documented (and with an implementation available to the public in
|
||||
source code form), and must require no special password or key for
|
||||
unpacking, reading or copying.
|
||||
|
||||
7. Additional Terms.
|
||||
|
||||
"Additional permissions" are terms that supplement the terms of this
|
||||
License by making exceptions from one or more of its conditions.
|
||||
Additional permissions that are applicable to the entire Program shall
|
||||
be treated as though they were included in this License, to the extent
|
||||
that they are valid under applicable law. If additional permissions
|
||||
apply only to part of the Program, that part may be used separately
|
||||
under those permissions, but the entire Program remains governed by
|
||||
this License without regard to the additional permissions.
|
||||
|
||||
When you convey a copy of a covered work, you may at your option
|
||||
remove any additional permissions from that copy, or from any part of
|
||||
it. (Additional permissions may be written to require their own
|
||||
removal in certain cases when you modify the work.) You may place
|
||||
additional permissions on material, added by you to a covered work,
|
||||
for which you have or can give appropriate copyright permission.
|
||||
|
||||
Notwithstanding any other provision of this License, for material you
|
||||
add to a covered work, you may (if authorized by the copyright holders of
|
||||
that material) supplement the terms of this License with terms:
|
||||
|
||||
a) Disclaiming warranty or limiting liability differently from the
|
||||
terms of sections 15 and 16 of this License; or
|
||||
|
||||
b) Requiring preservation of specified reasonable legal notices or
|
||||
author attributions in that material or in the Appropriate Legal
|
||||
Notices displayed by works containing it; or
|
||||
|
||||
c) Prohibiting misrepresentation of the origin of that material, or
|
||||
requiring that modified versions of such material be marked in
|
||||
reasonable ways as different from the original version; or
|
||||
|
||||
d) Limiting the use for publicity purposes of names of licensors or
|
||||
authors of the material; or
|
||||
|
||||
e) Declining to grant rights under trademark law for use of some
|
||||
trade names, trademarks, or service marks; or
|
||||
|
||||
f) Requiring indemnification of licensors and authors of that
|
||||
material by anyone who conveys the material (or modified versions of
|
||||
it) with contractual assumptions of liability to the recipient, for
|
||||
any liability that these contractual assumptions directly impose on
|
||||
those licensors and authors.
|
||||
|
||||
All other non-permissive additional terms are considered "further
|
||||
restrictions" within the meaning of section 10. If the Program as you
|
||||
received it, or any part of it, contains a notice stating that it is
|
||||
governed by this License along with a term that is a further
|
||||
restriction, you may remove that term. If a license document contains
|
||||
a further restriction but permits relicensing or conveying under this
|
||||
License, you may add to a covered work material governed by the terms
|
||||
of that license document, provided that the further restriction does
|
||||
not survive such relicensing or conveying.
|
||||
|
||||
If you add terms to a covered work in accord with this section, you
|
||||
must place, in the relevant source files, a statement of the
|
||||
additional terms that apply to those files, or a notice indicating
|
||||
where to find the applicable terms.
|
||||
|
||||
Additional terms, permissive or non-permissive, may be stated in the
|
||||
form of a separately written license, or stated as exceptions;
|
||||
the above requirements apply either way.
|
||||
|
||||
8. Termination.
|
||||
|
||||
You may not propagate or modify a covered work except as expressly
|
||||
provided under this License. Any attempt otherwise to propagate or
|
||||
modify it is void, and will automatically terminate your rights under
|
||||
this License (including any patent licenses granted under the third
|
||||
paragraph of section 11).
|
||||
|
||||
However, if you cease all violation of this License, then your
|
||||
license from a particular copyright holder is reinstated (a)
|
||||
provisionally, unless and until the copyright holder explicitly and
|
||||
finally terminates your license, and (b) permanently, if the copyright
|
||||
holder fails to notify you of the violation by some reasonable means
|
||||
prior to 60 days after the cessation.
|
||||
|
||||
Moreover, your license from a particular copyright holder is
|
||||
reinstated permanently if the copyright holder notifies you of the
|
||||
violation by some reasonable means, this is the first time you have
|
||||
received notice of violation of this License (for any work) from that
|
||||
copyright holder, and you cure the violation prior to 30 days after
|
||||
your receipt of the notice.
|
||||
|
||||
Termination of your rights under this section does not terminate the
|
||||
licenses of parties who have received copies or rights from you under
|
||||
this License. If your rights have been terminated and not permanently
|
||||
reinstated, you do not qualify to receive new licenses for the same
|
||||
material under section 10.
|
||||
|
||||
9. Acceptance Not Required for Having Copies.
|
||||
|
||||
You are not required to accept this License in order to receive or
|
||||
run a copy of the Program. Ancillary propagation of a covered work
|
||||
occurring solely as a consequence of using peer-to-peer transmission
|
||||
to receive a copy likewise does not require acceptance. However,
|
||||
nothing other than this License grants you permission to propagate or
|
||||
modify any covered work. These actions infringe copyright if you do
|
||||
not accept this License. Therefore, by modifying or propagating a
|
||||
covered work, you indicate your acceptance of this License to do so.
|
||||
|
||||
10. Automatic Licensing of Downstream Recipients.
|
||||
|
||||
Each time you convey a covered work, the recipient automatically
|
||||
receives a license from the original licensors, to run, modify and
|
||||
propagate that work, subject to this License. You are not responsible
|
||||
for enforcing compliance by third parties with this License.
|
||||
|
||||
An "entity transaction" is a transaction transferring control of an
|
||||
organization, or substantially all assets of one, or subdividing an
|
||||
organization, or merging organizations. If propagation of a covered
|
||||
work results from an entity transaction, each party to that
|
||||
transaction who receives a copy of the work also receives whatever
|
||||
licenses to the work the party's predecessor in interest had or could
|
||||
give under the previous paragraph, plus a right to possession of the
|
||||
Corresponding Source of the work from the predecessor in interest, if
|
||||
the predecessor has it or can get it with reasonable efforts.
|
||||
|
||||
You may not impose any further restrictions on the exercise of the
|
||||
rights granted or affirmed under this License. For example, you may
|
||||
not impose a license fee, royalty, or other charge for exercise of
|
||||
rights granted under this License, and you may not initiate litigation
|
||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||
any patent claim is infringed by making, using, selling, offering for
|
||||
sale, or importing the Program or any portion of it.
|
||||
|
||||
11. Patents.
|
||||
|
||||
A "contributor" is a copyright holder who authorizes use under this
|
||||
License of the Program or a work on which the Program is based. The
|
||||
work thus licensed is called the contributor's "contributor version".
|
||||
|
||||
A contributor's "essential patent claims" are all patent claims
|
||||
owned or controlled by the contributor, whether already acquired or
|
||||
hereafter acquired, that would be infringed by some manner, permitted
|
||||
by this License, of making, using, or selling its contributor version,
|
||||
but do not include claims that would be infringed only as a
|
||||
consequence of further modification of the contributor version. For
|
||||
purposes of this definition, "control" includes the right to grant
|
||||
patent sublicenses in a manner consistent with the requirements of
|
||||
this License.
|
||||
|
||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||
patent license under the contributor's essential patent claims, to
|
||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||
propagate the contents of its contributor version.
|
||||
|
||||
In the following three paragraphs, a "patent license" is any express
|
||||
agreement or commitment, however denominated, not to enforce a patent
|
||||
(such as an express permission to practice a patent or covenant not to
|
||||
sue for patent infringement). To "grant" such a patent license to a
|
||||
party means to make such an agreement or commitment not to enforce a
|
||||
patent against the party.
|
||||
|
||||
If you convey a covered work, knowingly relying on a patent license,
|
||||
and the Corresponding Source of the work is not available for anyone
|
||||
to copy, free of charge and under the terms of this License, through a
|
||||
publicly available network server or other readily accessible means,
|
||||
then you must either (1) cause the Corresponding Source to be so
|
||||
available, or (2) arrange to deprive yourself of the benefit of the
|
||||
patent license for this particular work, or (3) arrange, in a manner
|
||||
consistent with the requirements of this License, to extend the patent
|
||||
license to downstream recipients. "Knowingly relying" means you have
|
||||
actual knowledge that, but for the patent license, your conveying the
|
||||
covered work in a country, or your recipient's use of the covered work
|
||||
in a country, would infringe one or more identifiable patents in that
|
||||
country that you have reason to believe are valid.
|
||||
|
||||
If, pursuant to or in connection with a single transaction or
|
||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||
covered work, and grant a patent license to some of the parties
|
||||
receiving the covered work authorizing them to use, propagate, modify
|
||||
or convey a specific copy of the covered work, then the patent license
|
||||
you grant is automatically extended to all recipients of the covered
|
||||
work and works based on it.
|
||||
|
||||
A patent license is "discriminatory" if it does not include within
|
||||
the scope of its coverage, prohibits the exercise of, or is
|
||||
conditioned on the non-exercise of one or more of the rights that are
|
||||
specifically granted under this License. You may not convey a covered
|
||||
work if you are a party to an arrangement with a third party that is
|
||||
in the business of distributing software, under which you make payment
|
||||
to the third party based on the extent of your activity of conveying
|
||||
the work, and under which the third party grants, to any of the
|
||||
parties who would receive the covered work from you, a discriminatory
|
||||
patent license (a) in connection with copies of the covered work
|
||||
conveyed by you (or copies made from those copies), or (b) primarily
|
||||
for and in connection with specific products or compilations that
|
||||
contain the covered work, unless you entered into that arrangement,
|
||||
or that patent license was granted, prior to 28 March 2007.
|
||||
|
||||
Nothing in this License shall be construed as excluding or limiting
|
||||
any implied license or other defenses to infringement that may
|
||||
otherwise be available to you under applicable patent law.
|
||||
|
||||
12. No Surrender of Others' Freedom.
|
||||
|
||||
If conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot convey a
|
||||
covered work so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you may
|
||||
not convey it at all. For example, if you agree to terms that obligate you
|
||||
to collect a royalty for further conveying from those to whom you convey
|
||||
the Program, the only way you could satisfy both those terms and this
|
||||
License would be to refrain entirely from conveying the Program.
|
||||
|
||||
13. Use with the GNU Affero General Public License.
|
||||
|
||||
Notwithstanding any other provision of this License, you have
|
||||
permission to link or combine any covered work with a work licensed
|
||||
under version 3 of the GNU Affero General Public License into a single
|
||||
combined work, and to convey the resulting work. The terms of this
|
||||
License will continue to apply to the part which is the covered work,
|
||||
but the special requirements of the GNU Affero General Public License,
|
||||
section 13, concerning interaction through a network will apply to the
|
||||
combination as such.
|
||||
|
||||
14. Revised Versions of this License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of
|
||||
the GNU General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Program specifies that a certain numbered version of the GNU General
|
||||
Public License "or any later version" applies to it, you have the
|
||||
option of following the terms and conditions either of that numbered
|
||||
version or of any later version published by the Free Software
|
||||
Foundation. If the Program does not specify a version number of the
|
||||
GNU General Public License, you may choose any version ever published
|
||||
by the Free Software Foundation.
|
||||
|
||||
If the Program specifies that a proxy can decide which future
|
||||
versions of the GNU General Public License can be used, that proxy's
|
||||
public statement of acceptance of a version permanently authorizes you
|
||||
to choose that version for the Program.
|
||||
|
||||
Later license versions may give you additional or different
|
||||
permissions. However, no additional obligations are imposed on any
|
||||
author or copyright holder as a result of your choosing to follow a
|
||||
later version.
|
||||
|
||||
15. Disclaimer of Warranty.
|
||||
|
||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. Limitation of Liability.
|
||||
|
||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||
SUCH DAMAGES.
|
||||
|
||||
17. Interpretation of Sections 15 and 16.
|
||||
|
||||
If the disclaimer of warranty and limitation of liability provided
|
||||
above cannot be given local legal effect according to their terms,
|
||||
reviewing courts shall apply local law that most closely approximates
|
||||
an absolute waiver of all civil liability in connection with the
|
||||
Program, unless a warranty or assumption of liability accompanies a
|
||||
copy of the Program in return for a fee.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
state the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program does terminal interaction, make it output a short
|
||||
notice like this when it starts in an interactive mode:
|
||||
|
||||
<program> Copyright (C) <year> <name of author>
|
||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, your program's commands
|
||||
might be different; for a GUI interface, you would use an "about box".
|
||||
|
||||
You should also get your employer (if you work as a programmer) or school,
|
||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||
For more information on this, and how to apply and follow the GNU GPL, see
|
||||
<https://www.gnu.org/licenses/>.
|
||||
|
||||
The GNU General Public License does not permit incorporating your program
|
||||
into proprietary programs. If your program is a subroutine library, you
|
||||
may consider it more useful to permit linking proprietary applications with
|
||||
the library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License. But first, please read
|
||||
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
|
@ -1,15 +1,13 @@
|
|||
#!/usr/bin/env ansible-playbook
|
||||
---
|
||||
|
||||
- hosts: bde-note.adh.crans.org
|
||||
- hosts: all
|
||||
vars_prompt:
|
||||
- name: DB_PASSWORD
|
||||
prompt: "Password of the database"
|
||||
prompt: "Password of the database (leave it blank to skip database init)"
|
||||
private: yes
|
||||
vars:
|
||||
mirror: deb.debian.org
|
||||
note:
|
||||
server_name: note.crans.org
|
||||
roles:
|
||||
- 1-apt-basic
|
||||
- 2-nk20
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
note:
|
||||
server_name: note-beta.crans.org
|
||||
git_branch: beta
|
||||
cron_enabled: false
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
note:
|
||||
server_name: note.crans.org
|
||||
git_branch: master
|
||||
cron_enabled: true
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
note:
|
||||
server_name: note-dev.crans.org
|
||||
git_branch: beta
|
||||
cron_enabled: false
|
|
@ -1,5 +1,8 @@
|
|||
[server]
|
||||
[dev]
|
||||
bde3-virt.adh.crans.org
|
||||
bde-nk20-beta.adh.crans.org
|
||||
|
||||
[prod]
|
||||
bde-note.adh.crans.org
|
||||
|
||||
[all:vars]
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
git:
|
||||
repo: https://gitlab.crans.org/bde/nk20.git
|
||||
dest: /var/www/note_kfet
|
||||
version: master
|
||||
version: "{{ note.git_branch }}"
|
||||
force: true
|
||||
|
||||
- name: Use default env vars (should be updated!)
|
||||
|
@ -30,6 +30,7 @@
|
|||
group: www-data
|
||||
|
||||
- name: Setup cron jobs
|
||||
when: "note.cron_enabled"
|
||||
template:
|
||||
src: note.cron.j2
|
||||
dest: /etc/cron.d/note
|
||||
|
|
|
@ -1,22 +0,0 @@
|
|||
# {{ ansible_managed }}
|
||||
# Les cronjobs dont a besoin la Note Kfet
|
||||
|
||||
# m h dom mon dow user command
|
||||
# Envoyer les mails en attente
|
||||
* * * * * root cd /var/www/note_kfet && env/bin/python manage.py send_mail >> /var/www/note_kfet/cron_mail.log
|
||||
* * * * * root cd /var/www/note_kfet && env/bin/python manage.py retry_deferred >> /var/www/note_kfet/cron_mail_deferred.log
|
||||
00 0 * * * root cd /var/www/note_kfet && env/bin/python manage.py purge_mail_log 7 >> /var/www/note_kfet/cron_mail_purge.log
|
||||
# Faire une sauvegarde de la base de données
|
||||
00 2 * * * root cd /var/www/note_kfet && apps/scripts/shell/backup_db
|
||||
# Vérifier la cohérence de la base et mailer en cas de problème
|
||||
00 4 * * * root cd /var/www/note_kfet && env/bin/python manage.py check_consistency --sum-all --check-all --mail
|
||||
# Mettre à jour le wiki (modification sans (dé)validation, activités passées)
|
||||
#30 5 * * * root cd /var/www/note_kfet && env/bin/python manage.py refresh_activities --raw --comment refresh
|
||||
# Spammer les gens en négatif
|
||||
00 5 * * 2 root cd /var/www/note_kfet && env/bin/python manage.py send_mail_to_negative_balances --spam
|
||||
# Envoyer le rapport mensuel aux trésoriers et respos info
|
||||
00 8 6 * * root cd /var/www/note_kfet && env/bin/python manage.py send_mail_to_negative_balances --report
|
||||
# Envoyer les rapports aux gens
|
||||
55 6 * * * root cd /var/www/note_kfet && env/bin/python manage.py send_reports
|
||||
# Envoyer les rapports aux gens
|
||||
00 9 * * * root cd /var/www/note_kfet && env/bin/python manage.py refresh_highlighted_buttons
|
|
@ -0,0 +1 @@
|
|||
../../../../note.cron
|
|
@ -0,0 +1,21 @@
|
|||
---
|
||||
- name: Install basic APT packages
|
||||
apt:
|
||||
update_cache: true
|
||||
name:
|
||||
- certbot
|
||||
- python3-certbot-nginx
|
||||
register: pkg_result
|
||||
retries: 3
|
||||
until: pkg_result is succeeded
|
||||
|
||||
- name: Create /etc/letsencrypt/conf.d
|
||||
file:
|
||||
path: /etc/letsencrypt/conf.d
|
||||
state: directory
|
||||
|
||||
- name: Add Certbot configuration
|
||||
template:
|
||||
src: "letsencrypt/conf.d/nk20.ini.j2"
|
||||
dest: "/etc/letsencrypt/conf.d/nk20.ini"
|
||||
mode: 0644
|
|
@ -0,0 +1,20 @@
|
|||
{{ ansible_managed | comment }}
|
||||
|
||||
# To generate the certificate, please use the following command
|
||||
# certbot --config /etc/letsencrypt/conf.d/nk20.ini certonly
|
||||
|
||||
# Use a 4096 bit RSA key instead of 2048
|
||||
rsa-key-size = 4096
|
||||
|
||||
# Always use the staging/testing server
|
||||
# server = https://acme-staging.api.letsencrypt.org/directory
|
||||
|
||||
# Uncomment and update to register with the specified e-mail address
|
||||
email = notekfet2020@lists.crans.org
|
||||
|
||||
# Uncomment to use a text interface instead of ncurses
|
||||
text = True
|
||||
|
||||
# Use DNS-01 challenge
|
||||
authenticator = nginx
|
||||
|
|
@ -0,0 +1,44 @@
|
|||
---
|
||||
- name: Install NGINX
|
||||
apt:
|
||||
name: nginx
|
||||
register: pkg_result
|
||||
retries: 3
|
||||
until: pkg_result is succeeded
|
||||
|
||||
- name: Copy conf of Nginx
|
||||
template:
|
||||
src: "nginx_note.conf"
|
||||
dest: /etc/nginx/sites-available/nginx_note.conf
|
||||
mode: 0644
|
||||
owner: www-data
|
||||
group: www-data
|
||||
|
||||
- name: Enable Nginx site
|
||||
file:
|
||||
src: /etc/nginx/sites-available/nginx_note.conf
|
||||
dest: /etc/nginx/sites-enabled/nginx_note.conf
|
||||
owner: www-data
|
||||
group: www-data
|
||||
state: link
|
||||
|
||||
- name: Disable default Nginx site
|
||||
file:
|
||||
dest: /etc/nginx/sites-enabled/default
|
||||
state: absent
|
||||
|
||||
- name: Copy conf of UWSGI
|
||||
file:
|
||||
src: /var/www/note_kfet/uwsgi_note.ini
|
||||
dest: /etc/uwsgi/apps-enabled/uwsgi_note.ini
|
||||
state: link
|
||||
|
||||
- name: Reload Nginx
|
||||
systemd:
|
||||
name: nginx
|
||||
state: reloaded
|
||||
|
||||
- name: Restart UWSGI
|
||||
systemd:
|
||||
name: uwsgi
|
||||
state: restarted
|
|
@ -0,0 +1,63 @@
|
|||
# the upstream component nginx needs to connect to
|
||||
upstream note{
|
||||
server unix:///var/www/note_kfet/note_kfet.sock; # file socket
|
||||
}
|
||||
|
||||
# Redirect HTTP to nk20 HTTPS
|
||||
server {
|
||||
listen 80 default_server;
|
||||
listen [::]:80 default_server;
|
||||
|
||||
location / {
|
||||
return 301 https://{{ note.server_name }}$request_uri;
|
||||
}
|
||||
}
|
||||
|
||||
# Redirect all HTTPS to nk20 HTTPS
|
||||
server {
|
||||
listen 443 ssl default_server;
|
||||
listen [::]:443 ssl default_server;
|
||||
|
||||
location / {
|
||||
return 301 https://{{ note.server_name }}$request_uri;
|
||||
}
|
||||
|
||||
ssl_certificate /etc/letsencrypt/live/{{ note.server_name }}/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/{{ note.server_name }}/privkey.pem;
|
||||
include /etc/letsencrypt/options-ssl-nginx.conf;
|
||||
ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
|
||||
}
|
||||
|
||||
# configuration of the server
|
||||
server {
|
||||
listen 443 ssl;
|
||||
listen [::]:443 ssl;
|
||||
|
||||
# the port your site will be served on
|
||||
# the domain name it will serve for
|
||||
server_name {{ note.server_name }}; # substitute your machine's IP address or FQDN
|
||||
charset utf-8;
|
||||
|
||||
# max upload size
|
||||
client_max_body_size 75M; # adjust to taste
|
||||
|
||||
# Django media
|
||||
location /media {
|
||||
alias /var/www/note_kfet/media; # your Django project's media files - amend as required
|
||||
}
|
||||
|
||||
location /static {
|
||||
alias /var/www/note_kfet/static; # your Django project's static files - amend as required
|
||||
}
|
||||
|
||||
# Finally, send all non-media requests to the Django server.
|
||||
location / {
|
||||
uwsgi_pass note;
|
||||
include /etc/nginx/uwsgi_params;
|
||||
}
|
||||
|
||||
ssl_certificate /etc/letsencrypt/live/{{ note.server_name }}/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/{{ note.server_name }}/privkey.pem;
|
||||
include /etc/letsencrypt/options-ssl-nginx.conf;
|
||||
ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
|
||||
}
|
|
@ -10,17 +10,15 @@
|
|||
retries: 3
|
||||
until: pkg_result is succeeded
|
||||
|
||||
- name: Install Psycopg2
|
||||
pip:
|
||||
name: psycopg2-binary
|
||||
|
||||
- name: Create role note
|
||||
when: "DB_PASSWORD|bool" # If the password is not defined, skip the installation
|
||||
postgresql_user:
|
||||
name: note
|
||||
password: "{{ DB_PASSWORD }}"
|
||||
become_user: postgres
|
||||
|
||||
- name: Create NK20 database
|
||||
when: "DB_PASSWORD|bool"
|
||||
postgresql_db:
|
||||
name: note_db
|
||||
owner: note
|
||||
|
|
|
@ -1,7 +1,11 @@
|
|||
# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
import io
|
||||
|
||||
from PIL import Image
|
||||
from django import forms
|
||||
from django.conf import settings
|
||||
from django.contrib.auth.forms import AuthenticationForm
|
||||
from django.contrib.auth.models import User
|
||||
from django.forms import CheckboxSelectMultiple
|
||||
|
@ -77,6 +81,38 @@ class ImageForm(forms.Form):
|
|||
width = forms.FloatField(widget=forms.HiddenInput())
|
||||
height = forms.FloatField(widget=forms.HiddenInput())
|
||||
|
||||
def clean(self):
|
||||
"""Load image and crop"""
|
||||
cleaned_data = super().clean()
|
||||
|
||||
# Image size is limited by Django DATA_UPLOAD_MAX_MEMORY_SIZE
|
||||
image = cleaned_data.get('image')
|
||||
if image:
|
||||
# Let Pillow detect and load image
|
||||
try:
|
||||
im = Image.open(image)
|
||||
except OSError:
|
||||
# Rare case in which Django consider the upload file as an image
|
||||
# but Pil is unable to load it
|
||||
raise forms.ValidationError(_('This image cannot be loaded.'))
|
||||
|
||||
# Crop image
|
||||
x = cleaned_data.get('x', 0)
|
||||
y = cleaned_data.get('y', 0)
|
||||
w = cleaned_data.get('width', 200)
|
||||
h = cleaned_data.get('height', 200)
|
||||
im = im.crop((x, y, x + w, y + h))
|
||||
im = im.resize(
|
||||
(settings.PIC_WIDTH, settings.PIC_RATIO * settings.PIC_WIDTH),
|
||||
Image.ANTIALIAS,
|
||||
)
|
||||
|
||||
# Save
|
||||
image.file = io.BytesIO()
|
||||
im.save(image.file, "PNG")
|
||||
|
||||
return cleaned_data
|
||||
|
||||
|
||||
class ClubForm(forms.ModelForm):
|
||||
def clean(self):
|
||||
|
|
|
@ -32,8 +32,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||
<span class="glyphicon glyphicon-zoom-out"></span>
|
||||
</button>
|
||||
</div>
|
||||
<button type="button" class="btn btn-default" data-dismiss="modal">Nevermind</button>
|
||||
<button type="button" class="btn btn-primary js-crop-and-upload">Crop and upload</button>
|
||||
<button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Nevermind" %}</button>
|
||||
<button type="button" class="btn btn-primary js-crop-and-upload">{% trans "Crop and upload" %}</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -55,12 +55,18 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||
/* SCRIPT TO OPEN THE MODAL WITH THE PREVIEW */
|
||||
$("#id_image").change(function (e) {
|
||||
if (this.files && this.files[0]) {
|
||||
var reader = new FileReader();
|
||||
reader.onload = function (e) {
|
||||
$("#modal-image").attr("src", e.target.result);
|
||||
$("#modalCrop").modal("show");
|
||||
// Check the image size
|
||||
if (this.files[0].size > 2*1024*1024) {
|
||||
alert("Ce fichier est trop volumineux.")
|
||||
} else {
|
||||
// Read the selected image file
|
||||
var reader = new FileReader();
|
||||
reader.onload = function (e) {
|
||||
$("#modal-image").attr("src", e.target.result);
|
||||
$("#modalCrop").modal("show");
|
||||
}
|
||||
reader.readAsDataURL(this.files[0]);
|
||||
}
|
||||
reader.readAsDataURL(this.files[0]);
|
||||
}
|
||||
});
|
||||
|
||||
|
@ -104,4 +110,4 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||
});
|
||||
});
|
||||
</script>
|
||||
{% endblock %}
|
||||
{% endblock %}
|
||||
|
|
|
@ -1,10 +1,8 @@
|
|||
# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
import io
|
||||
from datetime import timedelta, date
|
||||
|
||||
from PIL import Image
|
||||
from django.conf import settings
|
||||
from django.contrib.auth import logout
|
||||
from django.contrib.auth.mixins import LoginRequiredMixin
|
||||
|
@ -263,6 +261,7 @@ class PictureUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin, Det
|
|||
return context
|
||||
|
||||
def get_success_url(self):
|
||||
"""Redirect to profile page after upload"""
|
||||
return reverse_lazy('member:user_detail', kwargs={'pk': self.object.id})
|
||||
|
||||
def post(self, request, *args, **kwargs):
|
||||
|
@ -271,26 +270,9 @@ class PictureUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin, Det
|
|||
return self.form_valid(form) if form.is_valid() else self.form_invalid(form)
|
||||
|
||||
def form_valid(self, form):
|
||||
"""Save image to note"""
|
||||
image_field = form.cleaned_data['image']
|
||||
x = form.cleaned_data['x']
|
||||
y = form.cleaned_data['y']
|
||||
w = form.cleaned_data['width']
|
||||
h = form.cleaned_data['height']
|
||||
# image crop and resize
|
||||
image_file = io.BytesIO(image_field.read())
|
||||
# ext = image_field.name.split('.')[-1].lower()
|
||||
# TODO: support GIF format
|
||||
image = Image.open(image_file)
|
||||
image = image.crop((x, y, x + w, y + h))
|
||||
image_clean = image.resize((settings.PIC_WIDTH,
|
||||
settings.PIC_RATIO * settings.PIC_WIDTH),
|
||||
Image.ANTIALIAS)
|
||||
image_file = io.BytesIO()
|
||||
image_clean.save(image_file, "PNG")
|
||||
image_field.file = image_file
|
||||
# renaming
|
||||
filename = "{}_pic.png".format(self.object.note.pk)
|
||||
image_field.name = filename
|
||||
image_field.name = "{}_pic.png".format(self.object.note.pk)
|
||||
self.object.note.display_image = image_field
|
||||
self.object.note.save()
|
||||
return super().form_valid(form)
|
||||
|
|
|
@ -127,7 +127,12 @@ class ConsumerSerializer(serializers.ModelSerializer):
|
|||
# If the user has no right to see the note, then we only display the note identifier
|
||||
return NotePolymorphicSerializer().to_representation(obj.note)\
|
||||
if PermissionBackend.check_perm(get_current_authenticated_user(), "note.view_note", obj.note)\
|
||||
else dict(id=obj.note.id, name=str(obj.note))
|
||||
else dict(
|
||||
id=obj.note.id,
|
||||
name=str(obj.note),
|
||||
is_active=obj.note.is_active,
|
||||
display_image=obj.note.display_image.url,
|
||||
)
|
||||
|
||||
def get_email_confirmed(self, obj):
|
||||
if isinstance(obj.note, NoteUser):
|
||||
|
|
|
@ -2639,7 +2639,7 @@
|
|||
"note",
|
||||
"noteclub"
|
||||
],
|
||||
"query": "{\"pk\": [\"club\", \"pk\"]}",
|
||||
"query": "{\"club\": [\"club\"]}",
|
||||
"type": "change",
|
||||
"mask": 1,
|
||||
"field": "display_image",
|
||||
|
@ -2778,6 +2778,8 @@
|
|||
62,
|
||||
127,
|
||||
133,
|
||||
135,
|
||||
136,
|
||||
141,
|
||||
142,
|
||||
150,
|
||||
|
|
|
@ -7,7 +7,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: \n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-09-04 07:44+0200\n"
|
||||
"POT-Creation-Date: 2020-09-06 12:32+0200\n"
|
||||
"PO-Revision-Date: 2020-09-03 23:47+0200\n"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
|
@ -18,42 +18,42 @@ msgstr ""
|
|||
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
||||
"X-Generator: Poedit 2.3\n"
|
||||
|
||||
#: apps/activity/apps.py:10 apps/activity/models.py:145
|
||||
#: apps/activity/models.py:161
|
||||
#: apps/activity/apps.py:10 apps/activity/models.py:150
|
||||
#: apps/activity/models.py:166
|
||||
msgid "activity"
|
||||
msgstr "Veranstaltung"
|
||||
|
||||
#: apps/activity/forms.py:35 apps/activity/models.py:130
|
||||
#: apps/activity/forms.py:35 apps/activity/models.py:131
|
||||
msgid "The end date must be after the start date."
|
||||
msgstr "Das Abschlussdatum muss nach das Anfangsdatum sein."
|
||||
|
||||
#: apps/activity/forms.py:76 apps/activity/models.py:257
|
||||
#: apps/activity/forms.py:76 apps/activity/models.py:262
|
||||
msgid "You can't invite someone once the activity is started."
|
||||
msgstr ""
|
||||
"Sie dürfen nicht jemandem einladen wenn die Veranstaltung angefangen hat."
|
||||
|
||||
#: apps/activity/forms.py:79 apps/activity/models.py:260
|
||||
#: apps/activity/forms.py:79 apps/activity/models.py:265
|
||||
msgid "This activity is not validated yet."
|
||||
msgstr "Diese Veranstaltung ist noch nicht bestätigt."
|
||||
|
||||
#: apps/activity/forms.py:89 apps/activity/models.py:268
|
||||
#: apps/activity/forms.py:89 apps/activity/models.py:273
|
||||
msgid "This person has been already invited 5 times this year."
|
||||
msgstr "Diese Person wurde schon 5 mal dieses Jahr eingeladen."
|
||||
|
||||
#: apps/activity/forms.py:93 apps/activity/models.py:272
|
||||
#: apps/activity/forms.py:93 apps/activity/models.py:277
|
||||
msgid "This person is already invited."
|
||||
msgstr "Diese Person wurde schon eingeladen."
|
||||
|
||||
#: apps/activity/forms.py:97 apps/activity/models.py:276
|
||||
#: apps/activity/forms.py:97 apps/activity/models.py:281
|
||||
msgid "You can't invite more than 3 people to this activity."
|
||||
msgstr "Sie dürfen höchstens 3 Leute zu dieser Veranstaltung einladen."
|
||||
|
||||
#: apps/activity/models.py:27 apps/activity/models.py:62
|
||||
#: apps/activity/models.py:28 apps/activity/models.py:63
|
||||
#: apps/member/models.py:200
|
||||
#: apps/member/templates/member/includes/club_info.html:4
|
||||
#: apps/member/templates/member/includes/profile_info.html:4
|
||||
#: apps/note/models/notes.py:247 apps/note/models/transactions.py:26
|
||||
#: apps/note/models/transactions.py:46 apps/note/models/transactions.py:302
|
||||
#: apps/note/models/notes.py:253 apps/note/models/transactions.py:26
|
||||
#: apps/note/models/transactions.py:46 apps/note/models/transactions.py:303
|
||||
#: apps/permission/models.py:329
|
||||
#: apps/registration/templates/registration/future_profile_detail.html:16
|
||||
#: apps/wei/models.py:66 apps/wei/models.py:118
|
||||
|
@ -62,161 +62,161 @@ msgstr "Sie dürfen höchstens 3 Leute zu dieser Veranstaltung einladen."
|
|||
msgid "name"
|
||||
msgstr "Name"
|
||||
|
||||
#: apps/activity/models.py:32
|
||||
#: apps/activity/models.py:33
|
||||
msgid "manage entries"
|
||||
msgstr "Einträge verwalten"
|
||||
|
||||
#: apps/activity/models.py:33
|
||||
#: apps/activity/models.py:34
|
||||
msgid "Enable the support of entries for this activity."
|
||||
msgstr "Aktivieren Sie die Eintrittmöglichkeit für diese Aktivität."
|
||||
|
||||
#: apps/activity/models.py:38
|
||||
#: apps/activity/models.py:39
|
||||
#: apps/activity/templates/activity/includes/activity_info.html:42
|
||||
msgid "can invite"
|
||||
msgstr "Darf einladen"
|
||||
|
||||
#: apps/activity/models.py:43
|
||||
#: apps/activity/models.py:44
|
||||
#: apps/activity/templates/activity/includes/activity_info.html:46
|
||||
msgid "guest entry fee"
|
||||
msgstr "Gasteintrittspreis"
|
||||
|
||||
#: apps/activity/models.py:48
|
||||
#: apps/activity/models.py:49
|
||||
msgid "activity type"
|
||||
msgstr "Veranstaltungart"
|
||||
|
||||
#: apps/activity/models.py:49
|
||||
#: apps/activity/models.py:50
|
||||
msgid "activity types"
|
||||
msgstr "Vearnstaltungarte"
|
||||
|
||||
#: apps/activity/models.py:67
|
||||
#: apps/activity/models.py:68
|
||||
#: apps/activity/templates/activity/includes/activity_info.html:19
|
||||
#: apps/note/models/transactions.py:81 apps/permission/models.py:110
|
||||
#: apps/permission/models.py:189 apps/wei/models.py:72 apps/wei/models.py:129
|
||||
msgid "description"
|
||||
msgstr "Beschreibung"
|
||||
|
||||
#: apps/activity/models.py:71
|
||||
#: apps/activity/models.py:72
|
||||
msgid "location"
|
||||
msgstr "Ort"
|
||||
|
||||
#: apps/activity/models.py:75
|
||||
#: apps/activity/models.py:76
|
||||
msgid "Place where the activity is organized, eg. Kfet."
|
||||
msgstr "Wo findet die Veranstaltung statt ? (z.B Kfet)"
|
||||
|
||||
#: apps/activity/models.py:82
|
||||
#: apps/activity/models.py:83
|
||||
#: apps/activity/templates/activity/includes/activity_info.html:22
|
||||
#: apps/note/models/notes.py:223 apps/note/models/transactions.py:66
|
||||
#: apps/note/models/notes.py:229 apps/note/models/transactions.py:66
|
||||
#: apps/permission/models.py:164
|
||||
msgid "type"
|
||||
msgstr "Type"
|
||||
|
||||
#: apps/activity/models.py:88 apps/logs/models.py:22 apps/member/models.py:305
|
||||
#: apps/note/models/notes.py:138 apps/treasury/models.py:267
|
||||
#: apps/activity/models.py:89 apps/logs/models.py:22 apps/member/models.py:305
|
||||
#: apps/note/models/notes.py:144 apps/treasury/models.py:267
|
||||
#: apps/treasury/templates/treasury/sogecredit_detail.html:14
|
||||
#: apps/wei/models.py:160 apps/wei/templates/wei/survey.html:15
|
||||
msgid "user"
|
||||
msgstr "User"
|
||||
|
||||
#: apps/activity/models.py:95
|
||||
#: apps/activity/models.py:96
|
||||
#: apps/activity/templates/activity/includes/activity_info.html:36
|
||||
msgid "organizer"
|
||||
msgstr "Veranstalter"
|
||||
|
||||
#: apps/activity/models.py:96
|
||||
#: apps/activity/models.py:97
|
||||
msgid "Club that organizes the activity. The entry fees will go to this club."
|
||||
msgstr ""
|
||||
"Die Veranstaltung wurde von einem Club organisert. Die Eintrittsbeiträge "
|
||||
"gehen an diesen Club."
|
||||
|
||||
#: apps/activity/models.py:103
|
||||
#: apps/activity/models.py:104
|
||||
#: apps/activity/templates/activity/includes/activity_info.html:39
|
||||
msgid "attendees club"
|
||||
msgstr "Teilnehmer"
|
||||
|
||||
#: apps/activity/models.py:104
|
||||
#: apps/activity/models.py:105
|
||||
msgid "Club that is authorized to join the activity. Mostly the Kfet club."
|
||||
msgstr "Club die an die Veranstaltung teilnehmen können."
|
||||
|
||||
#: apps/activity/models.py:108
|
||||
#: apps/activity/models.py:109
|
||||
#: apps/activity/templates/activity/includes/activity_info.html:25
|
||||
msgid "start date"
|
||||
msgstr "Anfangsdatum"
|
||||
|
||||
#: apps/activity/models.py:112
|
||||
#: apps/activity/models.py:113
|
||||
#: apps/activity/templates/activity/includes/activity_info.html:28
|
||||
msgid "end date"
|
||||
msgstr "Abschlussdatum"
|
||||
|
||||
#: apps/activity/models.py:117
|
||||
#: apps/activity/models.py:118
|
||||
#: apps/activity/templates/activity/includes/activity_info.html:50
|
||||
#: apps/note/models/transactions.py:146
|
||||
msgid "valid"
|
||||
msgstr "gültig"
|
||||
|
||||
#: apps/activity/models.py:122
|
||||
#: apps/activity/models.py:123
|
||||
#: apps/activity/templates/activity/includes/activity_info.html:65
|
||||
msgid "open"
|
||||
msgstr "geöffnet"
|
||||
|
||||
#: apps/activity/models.py:146
|
||||
#: apps/activity/models.py:151
|
||||
msgid "activities"
|
||||
msgstr "Veranstaltungen"
|
||||
|
||||
#: apps/activity/models.py:166
|
||||
#: apps/activity/models.py:171
|
||||
msgid "entry time"
|
||||
msgstr "Eintrittzeit"
|
||||
|
||||
#: apps/activity/models.py:172 apps/note/apps.py:14
|
||||
#: apps/activity/models.py:177 apps/note/apps.py:14
|
||||
#: apps/note/models/notes.py:78
|
||||
msgid "note"
|
||||
msgstr "Note"
|
||||
|
||||
#: apps/activity/models.py:183
|
||||
#: apps/activity/models.py:188
|
||||
#: apps/activity/templates/activity/activity_entry.html:46
|
||||
msgid "entry"
|
||||
msgstr "Eintritt"
|
||||
|
||||
#: apps/activity/models.py:184
|
||||
#: apps/activity/models.py:189
|
||||
#: apps/activity/templates/activity/activity_entry.html:46
|
||||
msgid "entries"
|
||||
msgstr "Eintritte"
|
||||
|
||||
#: apps/activity/models.py:190
|
||||
#: apps/activity/models.py:195
|
||||
msgid "Already entered on "
|
||||
msgstr "Schon eingetretten "
|
||||
|
||||
#: apps/activity/models.py:190 apps/activity/tables.py:54
|
||||
#: apps/activity/models.py:195 apps/activity/tables.py:54
|
||||
msgid "{:%Y-%m-%d %H:%M:%S}"
|
||||
msgstr "{:%Y-%m-%d %H:%M:%S}"
|
||||
|
||||
#: apps/activity/models.py:198
|
||||
#: apps/activity/models.py:203
|
||||
msgid "The balance is negative."
|
||||
msgstr "Kontostand ist im Rot."
|
||||
|
||||
#: apps/activity/models.py:228
|
||||
#: apps/activity/models.py:233
|
||||
msgid "last name"
|
||||
msgstr "Nachname"
|
||||
|
||||
#: apps/activity/models.py:233
|
||||
#: apps/activity/models.py:238
|
||||
#: apps/member/templates/member/includes/profile_info.html:4
|
||||
#: apps/registration/templates/registration/future_profile_detail.html:16
|
||||
#: apps/wei/templates/wei/weimembership_form.html:14
|
||||
msgid "first name"
|
||||
msgstr "Vorname"
|
||||
|
||||
#: apps/activity/models.py:240
|
||||
#: apps/activity/models.py:245
|
||||
msgid "inviter"
|
||||
msgstr "Einlader"
|
||||
|
||||
#: apps/activity/models.py:284
|
||||
#: apps/activity/models.py:289
|
||||
msgid "guest"
|
||||
msgstr "Gast"
|
||||
|
||||
#: apps/activity/models.py:285
|
||||
#: apps/activity/models.py:290
|
||||
msgid "guests"
|
||||
msgstr "Gäste"
|
||||
|
||||
#: apps/activity/models.py:297
|
||||
#: apps/activity/models.py:302
|
||||
msgid "Invitation"
|
||||
msgstr "Einladung"
|
||||
|
||||
|
@ -244,15 +244,15 @@ msgstr "entfernen"
|
|||
msgid "Type"
|
||||
msgstr "Type"
|
||||
|
||||
#: apps/activity/tables.py:82 apps/member/forms.py:131
|
||||
#: apps/registration/forms.py:81 apps/treasury/forms.py:135
|
||||
#: apps/activity/tables.py:82 apps/member/forms.py:167
|
||||
#: apps/registration/forms.py:81 apps/treasury/forms.py:129
|
||||
#: apps/wei/forms/registration.py:96
|
||||
msgid "Last name"
|
||||
msgstr "Nachname"
|
||||
|
||||
#: apps/activity/tables.py:84 apps/member/forms.py:136
|
||||
#: apps/activity/tables.py:84 apps/member/forms.py:172
|
||||
#: apps/note/templates/note/transaction_form.html:134
|
||||
#: apps/registration/forms.py:86 apps/treasury/forms.py:137
|
||||
#: apps/registration/forms.py:86 apps/treasury/forms.py:131
|
||||
#: apps/wei/forms/registration.py:101
|
||||
msgid "First name"
|
||||
msgstr "Vorname"
|
||||
|
@ -270,7 +270,7 @@ msgid "Guests list"
|
|||
msgstr "Gastliste"
|
||||
|
||||
#: apps/activity/templates/activity/activity_entry.html:14
|
||||
#: apps/note/models/transactions.py:259
|
||||
#: apps/note/models/transactions.py:260
|
||||
#: apps/note/templates/note/transaction_form.html:16
|
||||
#: apps/note/templates/note/transaction_form.html:148
|
||||
#: note_kfet/templates/base.html:69
|
||||
|
@ -278,13 +278,13 @@ msgid "Transfer"
|
|||
msgstr "Überweisen"
|
||||
|
||||
#: apps/activity/templates/activity/activity_entry.html:18
|
||||
#: apps/note/models/transactions.py:318
|
||||
#: apps/note/models/transactions.py:319
|
||||
#: apps/note/templates/note/transaction_form.html:21
|
||||
msgid "Credit"
|
||||
msgstr "Kredit"
|
||||
|
||||
#: apps/activity/templates/activity/activity_entry.html:21
|
||||
#: apps/note/models/transactions.py:318
|
||||
#: apps/note/models/transactions.py:319
|
||||
#: apps/note/templates/note/transaction_form.html:25
|
||||
msgid "Debit"
|
||||
msgstr "Soll"
|
||||
|
@ -302,7 +302,7 @@ msgstr "Zurück zur Veranstaltungseite"
|
|||
#: apps/member/templates/member/add_members.html:32
|
||||
#: apps/member/templates/member/club_form.html:16
|
||||
#: apps/note/templates/note/transactiontemplate_form.html:18
|
||||
#: apps/treasury/forms.py:93 apps/treasury/forms.py:147
|
||||
#: apps/treasury/forms.py:87 apps/treasury/forms.py:141
|
||||
#: apps/treasury/templates/treasury/invoice_form.html:74
|
||||
#: apps/wei/templates/wei/bus_form.html:17
|
||||
#: apps/wei/templates/wei/busteam_form.html:17
|
||||
|
@ -356,7 +356,7 @@ msgid "validate"
|
|||
msgstr "validate"
|
||||
|
||||
#: apps/activity/templates/activity/includes/activity_info.html:71
|
||||
#: apps/logs/models.py:62 apps/note/tables.py:194
|
||||
#: apps/logs/models.py:62 apps/note/tables.py:195
|
||||
msgid "edit"
|
||||
msgstr "bearbeiten"
|
||||
|
||||
|
@ -364,39 +364,39 @@ msgstr "bearbeiten"
|
|||
msgid "Invite"
|
||||
msgstr "Einladen"
|
||||
|
||||
#: apps/activity/views.py:29
|
||||
#: apps/activity/views.py:33
|
||||
msgid "Create new activity"
|
||||
msgstr "Neue Veranstaltung schaffen"
|
||||
|
||||
#: apps/activity/views.py:59 note_kfet/templates/base.html:87
|
||||
#: apps/activity/views.py:63 note_kfet/templates/base.html:87
|
||||
msgid "Activities"
|
||||
msgstr "Veranstaltungen"
|
||||
|
||||
#: apps/activity/views.py:87
|
||||
#: apps/activity/views.py:91
|
||||
msgid "Activity detail"
|
||||
msgstr "Veranstaltunginfo"
|
||||
|
||||
#: apps/activity/views.py:107
|
||||
#: apps/activity/views.py:111
|
||||
msgid "Update activity"
|
||||
msgstr "Veranstaltung bearbeiten"
|
||||
|
||||
#: apps/activity/views.py:134
|
||||
#: apps/activity/views.py:138
|
||||
msgid "Invite guest to the activity \"{}\""
|
||||
msgstr "Gast zur Veranstaltung \"{}\" einladen"
|
||||
|
||||
#: apps/activity/views.py:168
|
||||
#: apps/activity/views.py:172
|
||||
msgid "You are not allowed to display the entry interface for this activity."
|
||||
msgstr "Sie haben nicht das Recht diese Seite zu benuzten."
|
||||
|
||||
#: apps/activity/views.py:171
|
||||
#: apps/activity/views.py:175
|
||||
msgid "This activity does not support activity entries."
|
||||
msgstr "Diese Veranstaltung braucht nicht Eintritt."
|
||||
|
||||
#: apps/activity/views.py:174
|
||||
#: apps/activity/views.py:178
|
||||
msgid "This activity is closed."
|
||||
msgstr "Diese Veranstaltung ist geschlossen."
|
||||
|
||||
#: apps/activity/views.py:272
|
||||
#: apps/activity/views.py:274
|
||||
msgid "Entry for activity \"{}\""
|
||||
msgstr "Eintritt zur Veranstaltung \"{}\""
|
||||
|
||||
|
@ -432,7 +432,7 @@ msgstr "neue Daten"
|
|||
msgid "create"
|
||||
msgstr "schaffen"
|
||||
|
||||
#: apps/logs/models.py:63 apps/note/tables.py:164 apps/note/tables.py:200
|
||||
#: apps/logs/models.py:63 apps/note/tables.py:165 apps/note/tables.py:201
|
||||
#: apps/permission/models.py:127 apps/treasury/tables.py:38
|
||||
#: apps/wei/tables.py:75
|
||||
msgid "delete"
|
||||
|
@ -480,69 +480,73 @@ msgstr "Preis"
|
|||
msgid "member"
|
||||
msgstr "Mitglied"
|
||||
|
||||
#: apps/member/forms.py:41
|
||||
#: apps/member/forms.py:45
|
||||
msgid "Report frequency"
|
||||
msgstr "Bericht Frequenz"
|
||||
|
||||
#: apps/member/forms.py:43
|
||||
#: apps/member/forms.py:47
|
||||
msgid "Last report date"
|
||||
msgstr "Letzen Bericht Datum"
|
||||
|
||||
#: apps/member/forms.py:48
|
||||
#: apps/member/forms.py:52
|
||||
msgid "You can't register to the note if you come from the future."
|
||||
msgstr "Sie dürfen nicht einloggen wenn sie aus der Zukunft kommen."
|
||||
|
||||
#: apps/member/forms.py:73
|
||||
#: apps/member/forms.py:77
|
||||
msgid "select an image"
|
||||
msgstr "Wählen sie ein Bild aus"
|
||||
|
||||
#: apps/member/forms.py:74
|
||||
#: apps/member/forms.py:78
|
||||
msgid "Maximal size: 2MB"
|
||||
msgstr "Maximal Größe: 2MB"
|
||||
|
||||
#: apps/member/forms.py:87 apps/member/views.py:100
|
||||
#: apps/member/forms.py:97
|
||||
msgid "This image cannot be loaded."
|
||||
msgstr "Dieses Bild kann nicht geladen werden."
|
||||
|
||||
#: apps/member/forms.py:123 apps/member/views.py:98
|
||||
#: apps/registration/forms.py:33 apps/registration/views.py:237
|
||||
msgid "An alias with a similar name already exists."
|
||||
msgstr "Ein ähnliches Alias ist schon benutzt."
|
||||
|
||||
#: apps/member/forms.py:110 apps/registration/forms.py:61
|
||||
#: apps/member/forms.py:146 apps/registration/forms.py:61
|
||||
msgid "Inscription paid by Société Générale"
|
||||
msgstr "Mitgliedschaft von der Société Générale bezahlt"
|
||||
|
||||
#: apps/member/forms.py:112 apps/registration/forms.py:63
|
||||
#: apps/member/forms.py:148 apps/registration/forms.py:63
|
||||
msgid "Check this case is the Société Générale paid the inscription."
|
||||
msgstr "Die Société Générale die Mitgliedschaft bezahlt."
|
||||
|
||||
#: apps/member/forms.py:117 apps/registration/forms.py:68
|
||||
#: apps/member/forms.py:153 apps/registration/forms.py:68
|
||||
#: apps/wei/forms/registration.py:83
|
||||
msgid "Credit type"
|
||||
msgstr "Kredittype"
|
||||
|
||||
#: apps/member/forms.py:118 apps/registration/forms.py:69
|
||||
#: apps/member/forms.py:154 apps/registration/forms.py:69
|
||||
#: apps/wei/forms/registration.py:84
|
||||
msgid "No credit"
|
||||
msgstr "Kein Kredit"
|
||||
|
||||
#: apps/member/forms.py:120
|
||||
#: apps/member/forms.py:156
|
||||
msgid "You can credit the note of the user."
|
||||
msgstr "Sie dûrfen diese Note kreditieren."
|
||||
|
||||
#: apps/member/forms.py:124 apps/registration/forms.py:74
|
||||
#: apps/member/forms.py:160 apps/registration/forms.py:74
|
||||
#: apps/wei/forms/registration.py:89
|
||||
msgid "Credit amount"
|
||||
msgstr "Kreditanzahl"
|
||||
|
||||
#: apps/member/forms.py:141 apps/note/templates/note/transaction_form.html:140
|
||||
#: apps/registration/forms.py:91 apps/treasury/forms.py:139
|
||||
#: apps/member/forms.py:177 apps/note/templates/note/transaction_form.html:140
|
||||
#: apps/registration/forms.py:91 apps/treasury/forms.py:133
|
||||
#: apps/wei/forms/registration.py:106
|
||||
msgid "Bank"
|
||||
msgstr "Bank"
|
||||
|
||||
#: apps/member/forms.py:168
|
||||
#: apps/member/forms.py:204
|
||||
msgid "User"
|
||||
msgstr "User"
|
||||
|
||||
#: apps/member/forms.py:182
|
||||
#: apps/member/forms.py:218
|
||||
msgid "Roles"
|
||||
msgstr "Rollen"
|
||||
|
||||
|
@ -770,7 +774,7 @@ msgstr ""
|
|||
"Maximales Datum einer Mitgliedschaft, nach dem Mitglieder es erneuern müssen."
|
||||
|
||||
#: apps/member/models.py:286 apps/member/models.py:311
|
||||
#: apps/note/models/notes.py:179
|
||||
#: apps/note/models/notes.py:185
|
||||
msgid "club"
|
||||
msgstr "Club"
|
||||
|
||||
|
@ -791,7 +795,7 @@ msgstr "Mitgliedschaft endet am"
|
|||
msgid "The role {role} does not apply to the club {club}."
|
||||
msgstr "Die Rolle {role} ist nicht erlaubt für das Club {club}."
|
||||
|
||||
#: apps/member/models.py:384 apps/member/views.py:669
|
||||
#: apps/member/models.py:384 apps/member/views.py:651
|
||||
msgid "User is already a member of the club"
|
||||
msgstr "User ist schon ein Mitglied dieser club"
|
||||
|
||||
|
@ -804,7 +808,7 @@ msgstr "User ist noch nicht Mitglied des Urclubs"
|
|||
msgid "Membership of {user} for the club {club}"
|
||||
msgstr "Mitgliedschaft von {user} für das Club {club}"
|
||||
|
||||
#: apps/member/models.py:483 apps/note/models/transactions.py:359
|
||||
#: apps/member/models.py:483 apps/note/models/transactions.py:360
|
||||
msgid "membership"
|
||||
msgstr "Mitgliedschaft"
|
||||
|
||||
|
@ -842,7 +846,7 @@ msgid "Account #"
|
|||
msgstr "Konto #"
|
||||
|
||||
#: apps/member/templates/member/base.html:48
|
||||
#: apps/member/templates/member/base.html:62 apps/member/views.py:59
|
||||
#: apps/member/templates/member/base.html:62 apps/member/views.py:57
|
||||
#: apps/registration/templates/registration/future_profile_detail.html:48
|
||||
#: apps/wei/templates/wei/weimembership_form.html:117
|
||||
msgid "Update Profile"
|
||||
|
@ -886,7 +890,7 @@ msgstr ""
|
|||
"zu aufschliessen."
|
||||
|
||||
#: apps/member/templates/member/base.html:110
|
||||
#: apps/member/templates/member/base.html:137 apps/treasury/forms.py:95
|
||||
#: apps/member/templates/member/base.html:137 apps/treasury/forms.py:89
|
||||
msgid "Close"
|
||||
msgstr "Schluss"
|
||||
|
||||
|
@ -902,8 +906,8 @@ msgstr ""
|
|||
"erlaubt."
|
||||
|
||||
#: apps/member/templates/member/club_alias.html:10
|
||||
#: apps/member/templates/member/profile_alias.html:10 apps/member/views.py:238
|
||||
#: apps/member/views.py:443
|
||||
#: apps/member/templates/member/profile_alias.html:10 apps/member/views.py:236
|
||||
#: apps/member/views.py:425
|
||||
msgid "Note aliases"
|
||||
msgstr "Note Aliases"
|
||||
|
||||
|
@ -967,7 +971,7 @@ msgstr "Kontostand"
|
|||
|
||||
#: apps/member/templates/member/includes/club_info.html:47
|
||||
#: apps/member/templates/member/includes/profile_info.html:20
|
||||
#: apps/note/models/notes.py:270 apps/wei/templates/wei/base.html:66
|
||||
#: apps/note/models/notes.py:276 apps/wei/templates/wei/base.html:66
|
||||
msgid "aliases"
|
||||
msgstr "Aliases"
|
||||
|
||||
|
@ -1006,6 +1010,14 @@ msgstr "Neue"
|
|||
msgid "Regenerate token"
|
||||
msgstr "Token erneuern"
|
||||
|
||||
#: apps/member/templates/member/picture_update.html:35
|
||||
msgid "Nevermind"
|
||||
msgstr "Vergessen"
|
||||
|
||||
#: apps/member/templates/member/picture_update.html:36
|
||||
msgid "Crop and upload"
|
||||
msgstr "Beschneiden und hochladen"
|
||||
|
||||
#: apps/member/templates/member/profile_detail.html:11
|
||||
#: apps/registration/templates/registration/future_profile_detail.html:28
|
||||
#: apps/wei/templates/wei/weimembership_form.html:26
|
||||
|
@ -1030,47 +1042,47 @@ msgstr "Speichern"
|
|||
msgid "Registrations"
|
||||
msgstr "Anmeldung"
|
||||
|
||||
#: apps/member/views.py:72 apps/registration/forms.py:23
|
||||
#: apps/member/views.py:70 apps/registration/forms.py:23
|
||||
msgid "This address must be valid."
|
||||
msgstr "Diese Adresse muss gültig sein."
|
||||
|
||||
#: apps/member/views.py:137
|
||||
#: apps/member/views.py:135
|
||||
msgid "Profile detail"
|
||||
msgstr "Profile detail"
|
||||
|
||||
#: apps/member/views.py:197
|
||||
#: apps/member/views.py:195
|
||||
msgid "Search user"
|
||||
msgstr "User finden"
|
||||
|
||||
#: apps/member/views.py:258
|
||||
#: apps/member/views.py:256
|
||||
msgid "Update note picture"
|
||||
msgstr "Notebild ändern"
|
||||
|
||||
#: apps/member/views.py:311
|
||||
#: apps/member/views.py:293
|
||||
msgid "Manage auth token"
|
||||
msgstr "Auth token bearbeiten"
|
||||
|
||||
#: apps/member/views.py:338
|
||||
#: apps/member/views.py:320
|
||||
msgid "Create new club"
|
||||
msgstr "Neue Club"
|
||||
|
||||
#: apps/member/views.py:357
|
||||
#: apps/member/views.py:339
|
||||
msgid "Search club"
|
||||
msgstr "Club finden"
|
||||
|
||||
#: apps/member/views.py:390
|
||||
#: apps/member/views.py:372
|
||||
msgid "Club detail"
|
||||
msgstr "Club Details"
|
||||
|
||||
#: apps/member/views.py:466
|
||||
#: apps/member/views.py:448
|
||||
msgid "Update club"
|
||||
msgstr "Club bearbeiten"
|
||||
|
||||
#: apps/member/views.py:500
|
||||
#: apps/member/views.py:482
|
||||
msgid "Add new member to the club"
|
||||
msgstr "Neue Mitglieder"
|
||||
|
||||
#: apps/member/views.py:660 apps/wei/views.py:922
|
||||
#: apps/member/views.py:642 apps/wei/views.py:922
|
||||
msgid ""
|
||||
"This user don't have enough money to join this club, and can't have a "
|
||||
"negative balance."
|
||||
|
@ -1078,25 +1090,25 @@ msgstr ""
|
|||
"Diese User hat nicht genug Geld um Mitglied zu werden, und darf nich im Rot "
|
||||
"sein."
|
||||
|
||||
#: apps/member/views.py:673
|
||||
#: apps/member/views.py:655
|
||||
msgid "The membership must start after {:%m-%d-%Y}."
|
||||
msgstr "Die Mitgliedschaft muss nach {:%m-%d-Y} anfängen."
|
||||
|
||||
#: apps/member/views.py:678
|
||||
#: apps/member/views.py:660
|
||||
msgid "The membership must begin before {:%m-%d-%Y}."
|
||||
msgstr "Die Mitgliedschaft muss vor {:%m-%d-Y} anfängen."
|
||||
|
||||
#: apps/member/views.py:694 apps/member/views.py:696 apps/member/views.py:698
|
||||
#: apps/member/views.py:676 apps/member/views.py:678 apps/member/views.py:680
|
||||
#: apps/registration/views.py:287 apps/registration/views.py:289
|
||||
#: apps/registration/views.py:291 apps/wei/views.py:927 apps/wei/views.py:931
|
||||
msgid "This field is required."
|
||||
msgstr "Dies ist ein Pflichtfeld."
|
||||
|
||||
#: apps/member/views.py:771
|
||||
#: apps/member/views.py:753
|
||||
msgid "Manage roles of an user in the club"
|
||||
msgstr "Rollen in diesen Club bearbeiten"
|
||||
|
||||
#: apps/member/views.py:796
|
||||
#: apps/member/views.py:778
|
||||
msgid "Members of the club"
|
||||
msgstr "Mitlglieder dieses Club"
|
||||
|
||||
|
@ -1114,7 +1126,7 @@ msgstr "Empfänger"
|
|||
msgid "amount"
|
||||
msgstr "Anzahl"
|
||||
|
||||
#: apps/note/api/serializers.py:178 apps/note/api/serializers.py:184
|
||||
#: apps/note/api/serializers.py:183 apps/note/api/serializers.py:189
|
||||
#: apps/note/models/transactions.py:224
|
||||
msgid ""
|
||||
"The transaction can't be saved since the source note or the destination note "
|
||||
|
@ -1207,68 +1219,68 @@ msgstr "The note is blocked by the the BDE and can't be manually reactivated."
|
|||
msgid "notes"
|
||||
msgstr "Notes"
|
||||
|
||||
#: apps/note/models/notes.py:122
|
||||
#: apps/note/models/notes.py:128
|
||||
msgid "This alias is already taken."
|
||||
msgstr "Dieses Alias ist schon benutzt."
|
||||
|
||||
#: apps/note/models/notes.py:142
|
||||
#: apps/note/models/notes.py:148
|
||||
msgid "one's note"
|
||||
msgstr "Jemand Note"
|
||||
|
||||
#: apps/note/models/notes.py:143
|
||||
#: apps/note/models/notes.py:149
|
||||
msgid "users note"
|
||||
msgstr "User Note"
|
||||
|
||||
#: apps/note/models/notes.py:149
|
||||
#: apps/note/models/notes.py:155
|
||||
#, python-format
|
||||
msgid "%(user)s's note"
|
||||
msgstr "%(user)s's note"
|
||||
|
||||
#: apps/note/models/notes.py:183
|
||||
#: apps/note/models/notes.py:189
|
||||
msgid "club note"
|
||||
msgstr "Club Note"
|
||||
|
||||
#: apps/note/models/notes.py:184
|
||||
#: apps/note/models/notes.py:190
|
||||
msgid "clubs notes"
|
||||
msgstr "Club Notes"
|
||||
|
||||
#: apps/note/models/notes.py:190
|
||||
#: apps/note/models/notes.py:196
|
||||
#, python-format
|
||||
msgid "Note of %(club)s club"
|
||||
msgstr "%(club)s Note"
|
||||
|
||||
#: apps/note/models/notes.py:229
|
||||
#: apps/note/models/notes.py:235
|
||||
msgid "special note"
|
||||
msgstr "Sondernote"
|
||||
|
||||
#: apps/note/models/notes.py:230
|
||||
#: apps/note/models/notes.py:236
|
||||
msgid "special notes"
|
||||
msgstr "Sondernoten"
|
||||
|
||||
#: apps/note/models/notes.py:253
|
||||
#: apps/note/models/notes.py:259
|
||||
msgid "Invalid alias"
|
||||
msgstr "Unerlaublt Alias"
|
||||
|
||||
#: apps/note/models/notes.py:269
|
||||
#: apps/note/models/notes.py:275
|
||||
msgid "alias"
|
||||
msgstr "Alias"
|
||||
|
||||
#: apps/note/models/notes.py:293
|
||||
#: apps/note/models/notes.py:299
|
||||
msgid "Alias is too long."
|
||||
msgstr "Alias ist zu lang."
|
||||
|
||||
#: apps/note/models/notes.py:296
|
||||
#: apps/note/models/notes.py:302
|
||||
msgid ""
|
||||
"This alias contains only complex character. Please use a more simple alias."
|
||||
msgstr ""
|
||||
"Dieser Alias enthält nur komplexe Zeichen. Bitte verwenden Sie einen "
|
||||
"einfacheren Alias."
|
||||
|
||||
#: apps/note/models/notes.py:300
|
||||
#: apps/note/models/notes.py:306
|
||||
msgid "An alias with a similar name already exists: {} "
|
||||
msgstr "Ein Alias mit einem ähnlichen Namen existiert bereits: {} "
|
||||
|
||||
#: apps/note/models/notes.py:313
|
||||
#: apps/note/models/notes.py:319
|
||||
msgid "You can't delete your main alias."
|
||||
msgstr "Sie können Ihren Hauptalias nicht löschen."
|
||||
|
||||
|
@ -1313,7 +1325,7 @@ msgstr "Anzahl"
|
|||
msgid "reason"
|
||||
msgstr "Grund"
|
||||
|
||||
#: apps/note/models/transactions.py:151 apps/note/tables.py:139
|
||||
#: apps/note/models/transactions.py:151 apps/note/tables.py:140
|
||||
msgid "invalidity reason"
|
||||
msgstr "Ungültigkeit Grund"
|
||||
|
||||
|
@ -1343,34 +1355,34 @@ msgstr ""
|
|||
"Die Notenguthaben müssen zwischen - 92 233 720 368 547 758,08 € und 92 233 "
|
||||
"720 368 547 758,07 € liegen."
|
||||
|
||||
#: apps/note/models/transactions.py:279
|
||||
#: apps/note/models/transactions.py:280
|
||||
msgid ""
|
||||
"The destination of this transaction must equal to the destination of the "
|
||||
"template."
|
||||
msgstr ""
|
||||
"Der Empfänger dieser Transaktion muss dem Empfänger der Vorlage entsprechen."
|
||||
|
||||
#: apps/note/models/transactions.py:288
|
||||
#: apps/note/models/transactions.py:289
|
||||
msgid "Template"
|
||||
msgstr "Vorlage"
|
||||
|
||||
#: apps/note/models/transactions.py:291
|
||||
#: apps/note/models/transactions.py:292
|
||||
msgid "recurrent transaction"
|
||||
msgstr "wiederkehrende Transaktion"
|
||||
|
||||
#: apps/note/models/transactions.py:292
|
||||
#: apps/note/models/transactions.py:293
|
||||
msgid "recurrent transactions"
|
||||
msgstr "wiederkehrende Transaktionen"
|
||||
|
||||
#: apps/note/models/transactions.py:307
|
||||
#: apps/note/models/transactions.py:308
|
||||
msgid "first_name"
|
||||
msgstr "Vorname"
|
||||
|
||||
#: apps/note/models/transactions.py:312
|
||||
#: apps/note/models/transactions.py:313
|
||||
msgid "bank"
|
||||
msgstr "Bank"
|
||||
|
||||
#: apps/note/models/transactions.py:329
|
||||
#: apps/note/models/transactions.py:330
|
||||
msgid ""
|
||||
"A special transaction is only possible between a Note associated to a "
|
||||
"payment method and a User or a Club"
|
||||
|
@ -1378,35 +1390,35 @@ msgstr ""
|
|||
"Eine Sondertransaktion ist nur zwischen einer Note, die einer "
|
||||
"Zahlungsmethode zugeordnet ist, und einem User oder einem Club möglich"
|
||||
|
||||
#: apps/note/models/transactions.py:337
|
||||
#: apps/note/models/transactions.py:338
|
||||
msgid "Special transaction"
|
||||
msgstr "Sondertransaktion"
|
||||
|
||||
#: apps/note/models/transactions.py:338
|
||||
#: apps/note/models/transactions.py:339
|
||||
msgid "Special transactions"
|
||||
msgstr "Sondertranskationen"
|
||||
|
||||
#: apps/note/models/transactions.py:354
|
||||
#: apps/note/models/transactions.py:355
|
||||
msgid "membership transaction"
|
||||
msgstr "Mitgliedschafttransaktion"
|
||||
|
||||
#: apps/note/models/transactions.py:355 apps/treasury/models.py:273
|
||||
#: apps/note/models/transactions.py:356 apps/treasury/models.py:273
|
||||
msgid "membership transactions"
|
||||
msgstr "Mitgliedschaftttransaktionen"
|
||||
|
||||
#: apps/note/tables.py:93
|
||||
#: apps/note/tables.py:94
|
||||
msgid "Click to invalidate"
|
||||
msgstr "Klicken Sie zum Ungültigmachen"
|
||||
|
||||
#: apps/note/tables.py:93
|
||||
#: apps/note/tables.py:94
|
||||
msgid "Click to validate"
|
||||
msgstr "Klicken Sie zum gültigmachen"
|
||||
|
||||
#: apps/note/tables.py:137
|
||||
#: apps/note/tables.py:138
|
||||
msgid "No reason specified"
|
||||
msgstr "Kein Grund gegeben"
|
||||
|
||||
#: apps/note/tables.py:168 apps/note/tables.py:202 apps/treasury/tables.py:39
|
||||
#: apps/note/tables.py:169 apps/note/tables.py:203 apps/treasury/tables.py:39
|
||||
#: apps/treasury/templates/treasury/invoice_confirm_delete.html:30
|
||||
#: apps/treasury/templates/treasury/sogecredit_detail.html:59
|
||||
#: apps/wei/tables.py:76 apps/wei/tables.py:103
|
||||
|
@ -1414,7 +1426,7 @@ msgstr "Kein Grund gegeben"
|
|||
msgid "Delete"
|
||||
msgstr "Löschen"
|
||||
|
||||
#: apps/note/tables.py:196 apps/note/templates/note/conso_form.html:132
|
||||
#: apps/note/tables.py:197 apps/note/templates/note/conso_form.html:132
|
||||
#: apps/wei/tables.py:47 apps/wei/tables.py:48
|
||||
#: apps/wei/templates/wei/base.html:89
|
||||
#: apps/wei/templates/wei/bus_detail.html:20
|
||||
|
@ -1487,7 +1499,7 @@ msgid "Action"
|
|||
msgstr "Aktion"
|
||||
|
||||
#: apps/note/templates/note/transaction_form.html:112
|
||||
#: apps/treasury/forms.py:141 apps/treasury/tables.py:67
|
||||
#: apps/treasury/forms.py:135 apps/treasury/tables.py:67
|
||||
#: apps/treasury/tables.py:135
|
||||
#: apps/treasury/templates/treasury/remittance_form.html:23
|
||||
msgid "Amount"
|
||||
|
@ -1938,15 +1950,20 @@ msgstr "Ungültige Vorregistrierung"
|
|||
msgid "Treasury"
|
||||
msgstr "Quaestor"
|
||||
|
||||
#: apps/treasury/forms.py:104
|
||||
#: apps/treasury/forms.py:24 apps/treasury/models.py:89
|
||||
#: apps/treasury/templates/treasury/invoice_form.html:22
|
||||
msgid "This invoice is locked and can no longer be edited."
|
||||
msgstr "Diese Rechnung ist gesperrt und kann nicht mehr bearbeitet werden."
|
||||
|
||||
#: apps/treasury/forms.py:98
|
||||
msgid "Remittance is already closed."
|
||||
msgstr "Überweisung ist bereits geschlossen."
|
||||
|
||||
#: apps/treasury/forms.py:109
|
||||
#: apps/treasury/forms.py:103
|
||||
msgid "You can't change the type of the remittance."
|
||||
msgstr "Sie können die Art der Überweisung nicht ändern."
|
||||
|
||||
#: apps/treasury/forms.py:129 apps/treasury/models.py:252
|
||||
#: apps/treasury/forms.py:123 apps/treasury/models.py:252
|
||||
#: apps/treasury/tables.py:97 apps/treasury/tables.py:105
|
||||
#: apps/treasury/templates/treasury/invoice_list.html:16
|
||||
#: apps/treasury/templates/treasury/remittance_list.html:16
|
||||
|
@ -1954,7 +1971,7 @@ msgstr "Sie können die Art der Überweisung nicht ändern."
|
|||
msgid "Remittance"
|
||||
msgstr "Überweisung"
|
||||
|
||||
#: apps/treasury/forms.py:130
|
||||
#: apps/treasury/forms.py:124
|
||||
msgid "No attached remittance"
|
||||
msgstr "Keine beigefügte Überweisung"
|
||||
|
||||
|
@ -1998,11 +2015,6 @@ msgstr "Eine Rechnung kann nicht bearbeitet werden, wenn sie gesperrt ist."
|
|||
msgid "tex source"
|
||||
msgstr "Tex Quelle"
|
||||
|
||||
#: apps/treasury/models.py:89
|
||||
#: apps/treasury/templates/treasury/invoice_form.html:22
|
||||
msgid "This invoice is locked and can no longer be edited."
|
||||
msgstr "Diese Rechnung ist gesperrt und kann nicht mehr bearbeitet werden."
|
||||
|
||||
#: apps/treasury/models.py:109 apps/treasury/models.py:122
|
||||
msgid "invoice"
|
||||
msgstr "Rechnung"
|
||||
|
@ -2112,11 +2124,12 @@ msgid "Yes"
|
|||
msgstr "Ja"
|
||||
|
||||
#: apps/treasury/templates/treasury/invoice_confirm_delete.html:10
|
||||
#: apps/treasury/views.py:166
|
||||
#: apps/treasury/views.py:176
|
||||
msgid "Delete invoice"
|
||||
msgstr "Rechnung löschen"
|
||||
|
||||
#: apps/treasury/templates/treasury/invoice_confirm_delete.html:15
|
||||
#: apps/treasury/views.py:180
|
||||
msgid "This invoice is locked and can't be deleted."
|
||||
msgstr "Eine Rechnung kann nicht gelöscht werden, wenn sie gesperrt ist."
|
||||
|
||||
|
@ -2286,40 +2299,40 @@ msgstr ""
|
|||
msgid "Create new invoice"
|
||||
msgstr "Neue Rechnung"
|
||||
|
||||
#: apps/treasury/views.py:89
|
||||
#: apps/treasury/views.py:94
|
||||
msgid "Invoices list"
|
||||
msgstr "Rechnunglist"
|
||||
|
||||
#: apps/treasury/views.py:104 apps/treasury/views.py:265
|
||||
#: apps/treasury/views.py:391
|
||||
#: apps/treasury/views.py:109 apps/treasury/views.py:282
|
||||
#: apps/treasury/views.py:408
|
||||
msgid "You are not able to see the treasury interface."
|
||||
msgstr "Sie können die Quaestor-App nicht sehen."
|
||||
|
||||
#: apps/treasury/views.py:114
|
||||
#: apps/treasury/views.py:119
|
||||
msgid "Update an invoice"
|
||||
msgstr "Rechnung bearbeiten"
|
||||
|
||||
#: apps/treasury/views.py:226
|
||||
#: apps/treasury/views.py:243
|
||||
msgid "Create a new remittance"
|
||||
msgstr "Neue Überweisung"
|
||||
|
||||
#: apps/treasury/views.py:253
|
||||
#: apps/treasury/views.py:270
|
||||
msgid "Remittances list"
|
||||
msgstr "Überweisungliste"
|
||||
|
||||
#: apps/treasury/views.py:316
|
||||
#: apps/treasury/views.py:333
|
||||
msgid "Update a remittance"
|
||||
msgstr "Überweisung bearbeiten"
|
||||
|
||||
#: apps/treasury/views.py:339
|
||||
#: apps/treasury/views.py:356
|
||||
msgid "Attach a transaction to a remittance"
|
||||
msgstr "Fügen Sie einer Überweisung eine Transaktion hinzu"
|
||||
|
||||
#: apps/treasury/views.py:383
|
||||
#: apps/treasury/views.py:400
|
||||
msgid "List of credits from the Société générale"
|
||||
msgstr "Kreditliste von Société générale"
|
||||
|
||||
#: apps/treasury/views.py:426
|
||||
#: apps/treasury/views.py:443
|
||||
msgid "Manage credits from the Société générale"
|
||||
msgstr "Krediten von der Société générale handeln"
|
||||
|
||||
|
@ -2939,7 +2952,7 @@ msgstr "Users"
|
|||
|
||||
#: note_kfet/templates/base.html:81
|
||||
msgid "Clubs"
|
||||
msgstr "CLubs"
|
||||
msgstr "Clubs"
|
||||
|
||||
#: note_kfet/templates/base.html:110
|
||||
msgid "Admin"
|
||||
|
|
|
@ -7,7 +7,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: \n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-09-04 07:44+0200\n"
|
||||
"POT-Creation-Date: 2020-09-06 12:32+0200\n"
|
||||
"PO-Revision-Date: 2020-09-02 23:18+0200\n"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
|
@ -18,42 +18,42 @@ msgstr ""
|
|||
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
|
||||
"X-Generator: Poedit 2.3\n"
|
||||
|
||||
#: apps/activity/apps.py:10 apps/activity/models.py:145
|
||||
#: apps/activity/models.py:161
|
||||
#: apps/activity/apps.py:10 apps/activity/models.py:150
|
||||
#: apps/activity/models.py:166
|
||||
msgid "activity"
|
||||
msgstr "activité"
|
||||
|
||||
#: apps/activity/forms.py:35 apps/activity/models.py:130
|
||||
#: apps/activity/forms.py:35 apps/activity/models.py:131
|
||||
msgid "The end date must be after the start date."
|
||||
msgstr "La date de fin doit être après celle de début."
|
||||
|
||||
#: apps/activity/forms.py:76 apps/activity/models.py:257
|
||||
#: apps/activity/forms.py:76 apps/activity/models.py:262
|
||||
msgid "You can't invite someone once the activity is started."
|
||||
msgstr ""
|
||||
"Vous ne pouvez pas inviter quelqu'un une fois que l'activité a démarré."
|
||||
|
||||
#: apps/activity/forms.py:79 apps/activity/models.py:260
|
||||
#: apps/activity/forms.py:79 apps/activity/models.py:265
|
||||
msgid "This activity is not validated yet."
|
||||
msgstr "Cette activité n'est pas encore validée."
|
||||
|
||||
#: apps/activity/forms.py:89 apps/activity/models.py:268
|
||||
#: apps/activity/forms.py:89 apps/activity/models.py:273
|
||||
msgid "This person has been already invited 5 times this year."
|
||||
msgstr "Cette personne a déjà été invitée 5 fois cette année."
|
||||
|
||||
#: apps/activity/forms.py:93 apps/activity/models.py:272
|
||||
#: apps/activity/forms.py:93 apps/activity/models.py:277
|
||||
msgid "This person is already invited."
|
||||
msgstr "Cette personne est déjà invitée."
|
||||
|
||||
#: apps/activity/forms.py:97 apps/activity/models.py:276
|
||||
#: apps/activity/forms.py:97 apps/activity/models.py:281
|
||||
msgid "You can't invite more than 3 people to this activity."
|
||||
msgstr "Vous ne pouvez pas inviter plus de 3 personnes à cette activité."
|
||||
|
||||
#: apps/activity/models.py:27 apps/activity/models.py:62
|
||||
#: apps/activity/models.py:28 apps/activity/models.py:63
|
||||
#: apps/member/models.py:200
|
||||
#: apps/member/templates/member/includes/club_info.html:4
|
||||
#: apps/member/templates/member/includes/profile_info.html:4
|
||||
#: apps/note/models/notes.py:247 apps/note/models/transactions.py:26
|
||||
#: apps/note/models/transactions.py:46 apps/note/models/transactions.py:302
|
||||
#: apps/note/models/notes.py:253 apps/note/models/transactions.py:26
|
||||
#: apps/note/models/transactions.py:46 apps/note/models/transactions.py:303
|
||||
#: apps/permission/models.py:329
|
||||
#: apps/registration/templates/registration/future_profile_detail.html:16
|
||||
#: apps/wei/models.py:66 apps/wei/models.py:118
|
||||
|
@ -62,161 +62,161 @@ msgstr "Vous ne pouvez pas inviter plus de 3 personnes à cette activité."
|
|||
msgid "name"
|
||||
msgstr "nom"
|
||||
|
||||
#: apps/activity/models.py:32
|
||||
#: apps/activity/models.py:33
|
||||
msgid "manage entries"
|
||||
msgstr "gérer les entrées"
|
||||
|
||||
#: apps/activity/models.py:33
|
||||
#: apps/activity/models.py:34
|
||||
msgid "Enable the support of entries for this activity."
|
||||
msgstr "Activer le support des entrées pour cette activité."
|
||||
|
||||
#: apps/activity/models.py:38
|
||||
#: apps/activity/models.py:39
|
||||
#: apps/activity/templates/activity/includes/activity_info.html:42
|
||||
msgid "can invite"
|
||||
msgstr "peut inviter"
|
||||
|
||||
#: apps/activity/models.py:43
|
||||
#: apps/activity/models.py:44
|
||||
#: apps/activity/templates/activity/includes/activity_info.html:46
|
||||
msgid "guest entry fee"
|
||||
msgstr "cotisation de l'entrée invité"
|
||||
|
||||
#: apps/activity/models.py:48
|
||||
#: apps/activity/models.py:49
|
||||
msgid "activity type"
|
||||
msgstr "type d'activité"
|
||||
|
||||
#: apps/activity/models.py:49
|
||||
#: apps/activity/models.py:50
|
||||
msgid "activity types"
|
||||
msgstr "types d'activité"
|
||||
|
||||
#: apps/activity/models.py:67
|
||||
#: apps/activity/models.py:68
|
||||
#: apps/activity/templates/activity/includes/activity_info.html:19
|
||||
#: apps/note/models/transactions.py:81 apps/permission/models.py:110
|
||||
#: apps/permission/models.py:189 apps/wei/models.py:72 apps/wei/models.py:129
|
||||
msgid "description"
|
||||
msgstr "description"
|
||||
|
||||
#: apps/activity/models.py:71
|
||||
#: apps/activity/models.py:72
|
||||
msgid "location"
|
||||
msgstr "lieu"
|
||||
|
||||
#: apps/activity/models.py:75
|
||||
#: apps/activity/models.py:76
|
||||
msgid "Place where the activity is organized, eg. Kfet."
|
||||
msgstr "Lieu où l'activité est organisée, par exemple la Kfet."
|
||||
|
||||
#: apps/activity/models.py:82
|
||||
#: apps/activity/models.py:83
|
||||
#: apps/activity/templates/activity/includes/activity_info.html:22
|
||||
#: apps/note/models/notes.py:223 apps/note/models/transactions.py:66
|
||||
#: apps/note/models/notes.py:229 apps/note/models/transactions.py:66
|
||||
#: apps/permission/models.py:164
|
||||
msgid "type"
|
||||
msgstr "type"
|
||||
|
||||
#: apps/activity/models.py:88 apps/logs/models.py:22 apps/member/models.py:305
|
||||
#: apps/note/models/notes.py:138 apps/treasury/models.py:267
|
||||
#: apps/activity/models.py:89 apps/logs/models.py:22 apps/member/models.py:305
|
||||
#: apps/note/models/notes.py:144 apps/treasury/models.py:267
|
||||
#: apps/treasury/templates/treasury/sogecredit_detail.html:14
|
||||
#: apps/wei/models.py:160 apps/wei/templates/wei/survey.html:15
|
||||
msgid "user"
|
||||
msgstr "utilisateur"
|
||||
|
||||
#: apps/activity/models.py:95
|
||||
#: apps/activity/models.py:96
|
||||
#: apps/activity/templates/activity/includes/activity_info.html:36
|
||||
msgid "organizer"
|
||||
msgstr "organisateur"
|
||||
|
||||
#: apps/activity/models.py:96
|
||||
#: apps/activity/models.py:97
|
||||
msgid "Club that organizes the activity. The entry fees will go to this club."
|
||||
msgstr ""
|
||||
"Le club qui organise l'activité. Les coûts d'invitation iront pour ce club."
|
||||
|
||||
#: apps/activity/models.py:103
|
||||
#: apps/activity/models.py:104
|
||||
#: apps/activity/templates/activity/includes/activity_info.html:39
|
||||
msgid "attendees club"
|
||||
msgstr "club attendu"
|
||||
|
||||
#: apps/activity/models.py:104
|
||||
#: apps/activity/models.py:105
|
||||
msgid "Club that is authorized to join the activity. Mostly the Kfet club."
|
||||
msgstr ""
|
||||
"Club qui est autorisé à rejoindre l'activité. Très souvent le club Kfet."
|
||||
|
||||
#: apps/activity/models.py:108
|
||||
#: apps/activity/models.py:109
|
||||
#: apps/activity/templates/activity/includes/activity_info.html:25
|
||||
msgid "start date"
|
||||
msgstr "date de début"
|
||||
|
||||
#: apps/activity/models.py:112
|
||||
#: apps/activity/models.py:113
|
||||
#: apps/activity/templates/activity/includes/activity_info.html:28
|
||||
msgid "end date"
|
||||
msgstr "date de fin"
|
||||
|
||||
#: apps/activity/models.py:117
|
||||
#: apps/activity/models.py:118
|
||||
#: apps/activity/templates/activity/includes/activity_info.html:50
|
||||
#: apps/note/models/transactions.py:146
|
||||
msgid "valid"
|
||||
msgstr "valide"
|
||||
|
||||
#: apps/activity/models.py:122
|
||||
#: apps/activity/models.py:123
|
||||
#: apps/activity/templates/activity/includes/activity_info.html:65
|
||||
msgid "open"
|
||||
msgstr "ouvrir"
|
||||
|
||||
#: apps/activity/models.py:146
|
||||
#: apps/activity/models.py:151
|
||||
msgid "activities"
|
||||
msgstr "activités"
|
||||
|
||||
#: apps/activity/models.py:166
|
||||
#: apps/activity/models.py:171
|
||||
msgid "entry time"
|
||||
msgstr "heure d'entrée"
|
||||
|
||||
#: apps/activity/models.py:172 apps/note/apps.py:14
|
||||
#: apps/activity/models.py:177 apps/note/apps.py:14
|
||||
#: apps/note/models/notes.py:78
|
||||
msgid "note"
|
||||
msgstr "note"
|
||||
|
||||
#: apps/activity/models.py:183
|
||||
#: apps/activity/models.py:188
|
||||
#: apps/activity/templates/activity/activity_entry.html:46
|
||||
msgid "entry"
|
||||
msgstr "entrée"
|
||||
|
||||
#: apps/activity/models.py:184
|
||||
#: apps/activity/models.py:189
|
||||
#: apps/activity/templates/activity/activity_entry.html:46
|
||||
msgid "entries"
|
||||
msgstr "entrées"
|
||||
|
||||
#: apps/activity/models.py:190
|
||||
#: apps/activity/models.py:195
|
||||
msgid "Already entered on "
|
||||
msgstr "Déjà rentré le "
|
||||
|
||||
#: apps/activity/models.py:190 apps/activity/tables.py:54
|
||||
#: apps/activity/models.py:195 apps/activity/tables.py:54
|
||||
msgid "{:%Y-%m-%d %H:%M:%S}"
|
||||
msgstr "{:%d/%m/%Y %H:%M:%S}"
|
||||
|
||||
#: apps/activity/models.py:198
|
||||
#: apps/activity/models.py:203
|
||||
msgid "The balance is negative."
|
||||
msgstr "La note est en négatif."
|
||||
|
||||
#: apps/activity/models.py:228
|
||||
#: apps/activity/models.py:233
|
||||
msgid "last name"
|
||||
msgstr "nom de famille"
|
||||
|
||||
#: apps/activity/models.py:233
|
||||
#: apps/activity/models.py:238
|
||||
#: apps/member/templates/member/includes/profile_info.html:4
|
||||
#: apps/registration/templates/registration/future_profile_detail.html:16
|
||||
#: apps/wei/templates/wei/weimembership_form.html:14
|
||||
msgid "first name"
|
||||
msgstr "prénom"
|
||||
|
||||
#: apps/activity/models.py:240
|
||||
#: apps/activity/models.py:245
|
||||
msgid "inviter"
|
||||
msgstr "hôte"
|
||||
|
||||
#: apps/activity/models.py:284
|
||||
#: apps/activity/models.py:289
|
||||
msgid "guest"
|
||||
msgstr "invité"
|
||||
|
||||
#: apps/activity/models.py:285
|
||||
#: apps/activity/models.py:290
|
||||
msgid "guests"
|
||||
msgstr "invités"
|
||||
|
||||
#: apps/activity/models.py:297
|
||||
#: apps/activity/models.py:302
|
||||
msgid "Invitation"
|
||||
msgstr "Invitation"
|
||||
|
||||
|
@ -244,15 +244,15 @@ msgstr "supprimer"
|
|||
msgid "Type"
|
||||
msgstr "Type"
|
||||
|
||||
#: apps/activity/tables.py:82 apps/member/forms.py:131
|
||||
#: apps/registration/forms.py:81 apps/treasury/forms.py:135
|
||||
#: apps/activity/tables.py:82 apps/member/forms.py:167
|
||||
#: apps/registration/forms.py:81 apps/treasury/forms.py:129
|
||||
#: apps/wei/forms/registration.py:96
|
||||
msgid "Last name"
|
||||
msgstr "Nom de famille"
|
||||
|
||||
#: apps/activity/tables.py:84 apps/member/forms.py:136
|
||||
#: apps/activity/tables.py:84 apps/member/forms.py:172
|
||||
#: apps/note/templates/note/transaction_form.html:134
|
||||
#: apps/registration/forms.py:86 apps/treasury/forms.py:137
|
||||
#: apps/registration/forms.py:86 apps/treasury/forms.py:131
|
||||
#: apps/wei/forms/registration.py:101
|
||||
msgid "First name"
|
||||
msgstr "Prénom"
|
||||
|
@ -270,7 +270,7 @@ msgid "Guests list"
|
|||
msgstr "Liste des invités"
|
||||
|
||||
#: apps/activity/templates/activity/activity_entry.html:14
|
||||
#: apps/note/models/transactions.py:259
|
||||
#: apps/note/models/transactions.py:260
|
||||
#: apps/note/templates/note/transaction_form.html:16
|
||||
#: apps/note/templates/note/transaction_form.html:148
|
||||
#: note_kfet/templates/base.html:69
|
||||
|
@ -278,13 +278,13 @@ msgid "Transfer"
|
|||
msgstr "Virement"
|
||||
|
||||
#: apps/activity/templates/activity/activity_entry.html:18
|
||||
#: apps/note/models/transactions.py:318
|
||||
#: apps/note/models/transactions.py:319
|
||||
#: apps/note/templates/note/transaction_form.html:21
|
||||
msgid "Credit"
|
||||
msgstr "Crédit"
|
||||
|
||||
#: apps/activity/templates/activity/activity_entry.html:21
|
||||
#: apps/note/models/transactions.py:318
|
||||
#: apps/note/models/transactions.py:319
|
||||
#: apps/note/templates/note/transaction_form.html:25
|
||||
msgid "Debit"
|
||||
msgstr "Débit"
|
||||
|
@ -302,7 +302,7 @@ msgstr "Retour à la page de l'activité"
|
|||
#: apps/member/templates/member/add_members.html:32
|
||||
#: apps/member/templates/member/club_form.html:16
|
||||
#: apps/note/templates/note/transactiontemplate_form.html:18
|
||||
#: apps/treasury/forms.py:93 apps/treasury/forms.py:147
|
||||
#: apps/treasury/forms.py:87 apps/treasury/forms.py:141
|
||||
#: apps/treasury/templates/treasury/invoice_form.html:74
|
||||
#: apps/wei/templates/wei/bus_form.html:17
|
||||
#: apps/wei/templates/wei/busteam_form.html:17
|
||||
|
@ -356,7 +356,7 @@ msgid "validate"
|
|||
msgstr "valider"
|
||||
|
||||
#: apps/activity/templates/activity/includes/activity_info.html:71
|
||||
#: apps/logs/models.py:62 apps/note/tables.py:194
|
||||
#: apps/logs/models.py:62 apps/note/tables.py:195
|
||||
msgid "edit"
|
||||
msgstr "modifier"
|
||||
|
||||
|
@ -364,41 +364,41 @@ msgstr "modifier"
|
|||
msgid "Invite"
|
||||
msgstr "Inviter"
|
||||
|
||||
#: apps/activity/views.py:29
|
||||
#: apps/activity/views.py:33
|
||||
msgid "Create new activity"
|
||||
msgstr "Créer une nouvelle activité"
|
||||
|
||||
#: apps/activity/views.py:59 note_kfet/templates/base.html:87
|
||||
#: apps/activity/views.py:63 note_kfet/templates/base.html:87
|
||||
msgid "Activities"
|
||||
msgstr "Activités"
|
||||
|
||||
#: apps/activity/views.py:87
|
||||
#: apps/activity/views.py:91
|
||||
msgid "Activity detail"
|
||||
msgstr "Détails de l'activité"
|
||||
|
||||
#: apps/activity/views.py:107
|
||||
#: apps/activity/views.py:111
|
||||
msgid "Update activity"
|
||||
msgstr "Modifier l'activité"
|
||||
|
||||
#: apps/activity/views.py:134
|
||||
#: apps/activity/views.py:138
|
||||
msgid "Invite guest to the activity \"{}\""
|
||||
msgstr "Invitation pour l'activité « {} »"
|
||||
|
||||
#: apps/activity/views.py:168
|
||||
#: apps/activity/views.py:172
|
||||
msgid "You are not allowed to display the entry interface for this activity."
|
||||
msgstr ""
|
||||
"Vous n'êtes pas autorisé à afficher l'interface des entrées pour cette "
|
||||
"activité."
|
||||
|
||||
#: apps/activity/views.py:171
|
||||
#: apps/activity/views.py:175
|
||||
msgid "This activity does not support activity entries."
|
||||
msgstr "Cette activité ne requiert pas d'entrées."
|
||||
|
||||
#: apps/activity/views.py:174
|
||||
#: apps/activity/views.py:178
|
||||
msgid "This activity is closed."
|
||||
msgstr "Cette activité est fermée."
|
||||
|
||||
#: apps/activity/views.py:272
|
||||
#: apps/activity/views.py:274
|
||||
msgid "Entry for activity \"{}\""
|
||||
msgstr "Entrées pour l'activité « {} »"
|
||||
|
||||
|
@ -434,7 +434,7 @@ msgstr "ouvelles données"
|
|||
msgid "create"
|
||||
msgstr "créer"
|
||||
|
||||
#: apps/logs/models.py:63 apps/note/tables.py:164 apps/note/tables.py:200
|
||||
#: apps/logs/models.py:63 apps/note/tables.py:165 apps/note/tables.py:201
|
||||
#: apps/permission/models.py:127 apps/treasury/tables.py:38
|
||||
#: apps/wei/tables.py:75
|
||||
msgid "delete"
|
||||
|
@ -482,69 +482,73 @@ msgstr "cotisation"
|
|||
msgid "member"
|
||||
msgstr "adhérent"
|
||||
|
||||
#: apps/member/forms.py:41
|
||||
#: apps/member/forms.py:45
|
||||
msgid "Report frequency"
|
||||
msgstr "Fréquence des rapports (en jours)"
|
||||
|
||||
#: apps/member/forms.py:43
|
||||
#: apps/member/forms.py:47
|
||||
msgid "Last report date"
|
||||
msgstr "Date de dernier rapport"
|
||||
|
||||
#: apps/member/forms.py:48
|
||||
#: apps/member/forms.py:52
|
||||
msgid "You can't register to the note if you come from the future."
|
||||
msgstr "Vous ne pouvez pas vous inscrire à la note si vous venez du futur."
|
||||
|
||||
#: apps/member/forms.py:73
|
||||
#: apps/member/forms.py:77
|
||||
msgid "select an image"
|
||||
msgstr "choisissez une image"
|
||||
|
||||
#: apps/member/forms.py:74
|
||||
#: apps/member/forms.py:78
|
||||
msgid "Maximal size: 2MB"
|
||||
msgstr "Taille maximale : 2 Mo"
|
||||
|
||||
#: apps/member/forms.py:87 apps/member/views.py:100
|
||||
#: apps/member/forms.py:97
|
||||
msgid "This image cannot be loaded."
|
||||
msgstr "Cette image ne peut pas être chargée."
|
||||
|
||||
#: apps/member/forms.py:123 apps/member/views.py:98
|
||||
#: apps/registration/forms.py:33 apps/registration/views.py:237
|
||||
msgid "An alias with a similar name already exists."
|
||||
msgstr "Un alias avec un nom similaire existe déjà."
|
||||
|
||||
#: apps/member/forms.py:110 apps/registration/forms.py:61
|
||||
#: apps/member/forms.py:146 apps/registration/forms.py:61
|
||||
msgid "Inscription paid by Société Générale"
|
||||
msgstr "Inscription payée par la Société générale"
|
||||
|
||||
#: apps/member/forms.py:112 apps/registration/forms.py:63
|
||||
#: apps/member/forms.py:148 apps/registration/forms.py:63
|
||||
msgid "Check this case is the Société Générale paid the inscription."
|
||||
msgstr "Cochez cette case si la Société Générale a payé l'inscription."
|
||||
|
||||
#: apps/member/forms.py:117 apps/registration/forms.py:68
|
||||
#: apps/member/forms.py:153 apps/registration/forms.py:68
|
||||
#: apps/wei/forms/registration.py:83
|
||||
msgid "Credit type"
|
||||
msgstr "Type de rechargement"
|
||||
|
||||
#: apps/member/forms.py:118 apps/registration/forms.py:69
|
||||
#: apps/member/forms.py:154 apps/registration/forms.py:69
|
||||
#: apps/wei/forms/registration.py:84
|
||||
msgid "No credit"
|
||||
msgstr "Pas de rechargement"
|
||||
|
||||
#: apps/member/forms.py:120
|
||||
#: apps/member/forms.py:156
|
||||
msgid "You can credit the note of the user."
|
||||
msgstr "Vous pouvez créditer la note de l'utisateur avant l'adhésion."
|
||||
|
||||
#: apps/member/forms.py:124 apps/registration/forms.py:74
|
||||
#: apps/member/forms.py:160 apps/registration/forms.py:74
|
||||
#: apps/wei/forms/registration.py:89
|
||||
msgid "Credit amount"
|
||||
msgstr "Montant à créditer"
|
||||
|
||||
#: apps/member/forms.py:141 apps/note/templates/note/transaction_form.html:140
|
||||
#: apps/registration/forms.py:91 apps/treasury/forms.py:139
|
||||
#: apps/member/forms.py:177 apps/note/templates/note/transaction_form.html:140
|
||||
#: apps/registration/forms.py:91 apps/treasury/forms.py:133
|
||||
#: apps/wei/forms/registration.py:106
|
||||
msgid "Bank"
|
||||
msgstr "Banque"
|
||||
|
||||
#: apps/member/forms.py:168
|
||||
#: apps/member/forms.py:204
|
||||
msgid "User"
|
||||
msgstr "Utilisateur"
|
||||
|
||||
#: apps/member/forms.py:182
|
||||
#: apps/member/forms.py:218
|
||||
msgid "Roles"
|
||||
msgstr "Rôles"
|
||||
|
||||
|
@ -772,7 +776,7 @@ msgstr ""
|
|||
"renouveler."
|
||||
|
||||
#: apps/member/models.py:286 apps/member/models.py:311
|
||||
#: apps/note/models/notes.py:179
|
||||
#: apps/note/models/notes.py:185
|
||||
msgid "club"
|
||||
msgstr "club"
|
||||
|
||||
|
@ -793,7 +797,7 @@ msgstr "l'adhésion finit le"
|
|||
msgid "The role {role} does not apply to the club {club}."
|
||||
msgstr "Le rôle {role} ne s'applique pas au club {club}."
|
||||
|
||||
#: apps/member/models.py:384 apps/member/views.py:669
|
||||
#: apps/member/models.py:384 apps/member/views.py:651
|
||||
msgid "User is already a member of the club"
|
||||
msgstr "L'utilisateur est déjà membre du club"
|
||||
|
||||
|
@ -806,7 +810,7 @@ msgstr "L'utilisateur n'est pas membre du club parent"
|
|||
msgid "Membership of {user} for the club {club}"
|
||||
msgstr "Adhésion de {user} pour le club {club}"
|
||||
|
||||
#: apps/member/models.py:483 apps/note/models/transactions.py:359
|
||||
#: apps/member/models.py:483 apps/note/models/transactions.py:360
|
||||
msgid "membership"
|
||||
msgstr "adhésion"
|
||||
|
||||
|
@ -844,7 +848,7 @@ msgid "Account #"
|
|||
msgstr "Compte n°"
|
||||
|
||||
#: apps/member/templates/member/base.html:48
|
||||
#: apps/member/templates/member/base.html:62 apps/member/views.py:59
|
||||
#: apps/member/templates/member/base.html:62 apps/member/views.py:57
|
||||
#: apps/registration/templates/registration/future_profile_detail.html:48
|
||||
#: apps/wei/templates/wei/weimembership_form.html:117
|
||||
msgid "Update Profile"
|
||||
|
@ -888,7 +892,7 @@ msgstr ""
|
|||
"déverrouiller lui-même."
|
||||
|
||||
#: apps/member/templates/member/base.html:110
|
||||
#: apps/member/templates/member/base.html:137 apps/treasury/forms.py:95
|
||||
#: apps/member/templates/member/base.html:137 apps/treasury/forms.py:89
|
||||
msgid "Close"
|
||||
msgstr "Fermer"
|
||||
|
||||
|
@ -904,8 +908,8 @@ msgstr ""
|
|||
"à nouveau possible."
|
||||
|
||||
#: apps/member/templates/member/club_alias.html:10
|
||||
#: apps/member/templates/member/profile_alias.html:10 apps/member/views.py:238
|
||||
#: apps/member/views.py:443
|
||||
#: apps/member/templates/member/profile_alias.html:10 apps/member/views.py:236
|
||||
#: apps/member/views.py:425
|
||||
msgid "Note aliases"
|
||||
msgstr "Alias de la note"
|
||||
|
||||
|
@ -969,7 +973,7 @@ msgstr "solde du compte"
|
|||
|
||||
#: apps/member/templates/member/includes/club_info.html:47
|
||||
#: apps/member/templates/member/includes/profile_info.html:20
|
||||
#: apps/note/models/notes.py:270 apps/wei/templates/wei/base.html:66
|
||||
#: apps/note/models/notes.py:276 apps/wei/templates/wei/base.html:66
|
||||
msgid "aliases"
|
||||
msgstr "alias"
|
||||
|
||||
|
@ -1008,6 +1012,14 @@ msgstr "Créé le"
|
|||
msgid "Regenerate token"
|
||||
msgstr "Regénérer le jeton"
|
||||
|
||||
#: apps/member/templates/member/picture_update.html:35
|
||||
msgid "Nevermind"
|
||||
msgstr "Annuler"
|
||||
|
||||
#: apps/member/templates/member/picture_update.html:36
|
||||
msgid "Crop and upload"
|
||||
msgstr "Recadrer et envoyer"
|
||||
|
||||
#: apps/member/templates/member/profile_detail.html:11
|
||||
#: apps/registration/templates/registration/future_profile_detail.html:28
|
||||
#: apps/wei/templates/wei/weimembership_form.html:26
|
||||
|
@ -1032,47 +1044,47 @@ msgstr "Sauvegarder les changements"
|
|||
msgid "Registrations"
|
||||
msgstr "Inscriptions"
|
||||
|
||||
#: apps/member/views.py:72 apps/registration/forms.py:23
|
||||
#: apps/member/views.py:70 apps/registration/forms.py:23
|
||||
msgid "This address must be valid."
|
||||
msgstr "Cette adresse doit être valide."
|
||||
|
||||
#: apps/member/views.py:137
|
||||
#: apps/member/views.py:135
|
||||
msgid "Profile detail"
|
||||
msgstr "Détails de l'utilisateur"
|
||||
|
||||
#: apps/member/views.py:197
|
||||
#: apps/member/views.py:195
|
||||
msgid "Search user"
|
||||
msgstr "Chercher un utilisateur"
|
||||
|
||||
#: apps/member/views.py:258
|
||||
#: apps/member/views.py:256
|
||||
msgid "Update note picture"
|
||||
msgstr "Modifier la photo de la note"
|
||||
|
||||
#: apps/member/views.py:311
|
||||
#: apps/member/views.py:293
|
||||
msgid "Manage auth token"
|
||||
msgstr "Gérer les jetons d'authentification"
|
||||
|
||||
#: apps/member/views.py:338
|
||||
#: apps/member/views.py:320
|
||||
msgid "Create new club"
|
||||
msgstr "Créer un nouveau club"
|
||||
|
||||
#: apps/member/views.py:357
|
||||
#: apps/member/views.py:339
|
||||
msgid "Search club"
|
||||
msgstr "Chercher un club"
|
||||
|
||||
#: apps/member/views.py:390
|
||||
#: apps/member/views.py:372
|
||||
msgid "Club detail"
|
||||
msgstr "Détails du club"
|
||||
|
||||
#: apps/member/views.py:466
|
||||
#: apps/member/views.py:448
|
||||
msgid "Update club"
|
||||
msgstr "Modifier le club"
|
||||
|
||||
#: apps/member/views.py:500
|
||||
#: apps/member/views.py:482
|
||||
msgid "Add new member to the club"
|
||||
msgstr "Ajouter un nouveau membre au club"
|
||||
|
||||
#: apps/member/views.py:660 apps/wei/views.py:922
|
||||
#: apps/member/views.py:642 apps/wei/views.py:922
|
||||
msgid ""
|
||||
"This user don't have enough money to join this club, and can't have a "
|
||||
"negative balance."
|
||||
|
@ -1080,25 +1092,25 @@ msgstr ""
|
|||
"Cet utilisateur n'a pas assez d'argent pour rejoindre ce club et ne peut pas "
|
||||
"avoir un solde négatif."
|
||||
|
||||
#: apps/member/views.py:673
|
||||
#: apps/member/views.py:655
|
||||
msgid "The membership must start after {:%m-%d-%Y}."
|
||||
msgstr "L'adhésion doit commencer après le {:%d/%m/%Y}."
|
||||
|
||||
#: apps/member/views.py:678
|
||||
#: apps/member/views.py:660
|
||||
msgid "The membership must begin before {:%m-%d-%Y}."
|
||||
msgstr "L'adhésion doit commencer avant le {:%d/%m/%Y}."
|
||||
|
||||
#: apps/member/views.py:694 apps/member/views.py:696 apps/member/views.py:698
|
||||
#: apps/member/views.py:676 apps/member/views.py:678 apps/member/views.py:680
|
||||
#: apps/registration/views.py:287 apps/registration/views.py:289
|
||||
#: apps/registration/views.py:291 apps/wei/views.py:927 apps/wei/views.py:931
|
||||
msgid "This field is required."
|
||||
msgstr "Ce champ est requis."
|
||||
|
||||
#: apps/member/views.py:771
|
||||
#: apps/member/views.py:753
|
||||
msgid "Manage roles of an user in the club"
|
||||
msgstr "Gérer les rôles d'un utilisateur dans le club"
|
||||
|
||||
#: apps/member/views.py:796
|
||||
#: apps/member/views.py:778
|
||||
msgid "Members of the club"
|
||||
msgstr "Membres du club"
|
||||
|
||||
|
@ -1116,7 +1128,7 @@ msgstr "destination"
|
|||
msgid "amount"
|
||||
msgstr "montant"
|
||||
|
||||
#: apps/note/api/serializers.py:178 apps/note/api/serializers.py:184
|
||||
#: apps/note/api/serializers.py:183 apps/note/api/serializers.py:189
|
||||
#: apps/note/models/transactions.py:224
|
||||
msgid ""
|
||||
"The transaction can't be saved since the source note or the destination note "
|
||||
|
@ -1210,68 +1222,68 @@ msgstr ""
|
|||
msgid "notes"
|
||||
msgstr "notes"
|
||||
|
||||
#: apps/note/models/notes.py:122
|
||||
#: apps/note/models/notes.py:128
|
||||
msgid "This alias is already taken."
|
||||
msgstr "Cet alias est déjà pris."
|
||||
|
||||
#: apps/note/models/notes.py:142
|
||||
#: apps/note/models/notes.py:148
|
||||
msgid "one's note"
|
||||
msgstr "note d'un utilisateur"
|
||||
|
||||
#: apps/note/models/notes.py:143
|
||||
#: apps/note/models/notes.py:149
|
||||
msgid "users note"
|
||||
msgstr "notes des utilisateurs"
|
||||
|
||||
#: apps/note/models/notes.py:149
|
||||
#: apps/note/models/notes.py:155
|
||||
#, python-format
|
||||
msgid "%(user)s's note"
|
||||
msgstr "Note de %(user)s"
|
||||
|
||||
#: apps/note/models/notes.py:183
|
||||
#: apps/note/models/notes.py:189
|
||||
msgid "club note"
|
||||
msgstr "note d'un club"
|
||||
|
||||
#: apps/note/models/notes.py:184
|
||||
#: apps/note/models/notes.py:190
|
||||
msgid "clubs notes"
|
||||
msgstr "notes des clubs"
|
||||
|
||||
#: apps/note/models/notes.py:190
|
||||
#: apps/note/models/notes.py:196
|
||||
#, python-format
|
||||
msgid "Note of %(club)s club"
|
||||
msgstr "Note du club %(club)s"
|
||||
|
||||
#: apps/note/models/notes.py:229
|
||||
#: apps/note/models/notes.py:235
|
||||
msgid "special note"
|
||||
msgstr "note spéciale"
|
||||
|
||||
#: apps/note/models/notes.py:230
|
||||
#: apps/note/models/notes.py:236
|
||||
msgid "special notes"
|
||||
msgstr "notes spéciales"
|
||||
|
||||
#: apps/note/models/notes.py:253
|
||||
#: apps/note/models/notes.py:259
|
||||
msgid "Invalid alias"
|
||||
msgstr "Alias invalide"
|
||||
|
||||
#: apps/note/models/notes.py:269
|
||||
#: apps/note/models/notes.py:275
|
||||
msgid "alias"
|
||||
msgstr "alias"
|
||||
|
||||
#: apps/note/models/notes.py:293
|
||||
#: apps/note/models/notes.py:299
|
||||
msgid "Alias is too long."
|
||||
msgstr "L'alias est trop long."
|
||||
|
||||
#: apps/note/models/notes.py:296
|
||||
#: apps/note/models/notes.py:302
|
||||
msgid ""
|
||||
"This alias contains only complex character. Please use a more simple alias."
|
||||
msgstr ""
|
||||
"Cet alias ne contient que des caractères complexes. Merci d'utiliser un "
|
||||
"alias plus simple."
|
||||
|
||||
#: apps/note/models/notes.py:300
|
||||
#: apps/note/models/notes.py:306
|
||||
msgid "An alias with a similar name already exists: {} "
|
||||
msgstr "Un alias avec un nom similaire existe déjà : {} "
|
||||
|
||||
#: apps/note/models/notes.py:313
|
||||
#: apps/note/models/notes.py:319
|
||||
msgid "You can't delete your main alias."
|
||||
msgstr "Vous ne pouvez pas supprimer votre alias principal."
|
||||
|
||||
|
@ -1316,7 +1328,7 @@ msgstr "quantité"
|
|||
msgid "reason"
|
||||
msgstr "raison"
|
||||
|
||||
#: apps/note/models/transactions.py:151 apps/note/tables.py:139
|
||||
#: apps/note/models/transactions.py:151 apps/note/tables.py:140
|
||||
msgid "invalidity reason"
|
||||
msgstr "motif d'invalidité"
|
||||
|
||||
|
@ -1347,7 +1359,7 @@ msgstr ""
|
|||
"€ et 92 233 720 368 547 758.07 €. Ne cherchez pas à capitaliser l'argent du "
|
||||
"BDE."
|
||||
|
||||
#: apps/note/models/transactions.py:279
|
||||
#: apps/note/models/transactions.py:280
|
||||
msgid ""
|
||||
"The destination of this transaction must equal to the destination of the "
|
||||
"template."
|
||||
|
@ -1355,27 +1367,27 @@ msgstr ""
|
|||
"Le destinataire de cette transaction doit être identique à celui du bouton "
|
||||
"utilisé."
|
||||
|
||||
#: apps/note/models/transactions.py:288
|
||||
#: apps/note/models/transactions.py:289
|
||||
msgid "Template"
|
||||
msgstr "Bouton"
|
||||
|
||||
#: apps/note/models/transactions.py:291
|
||||
#: apps/note/models/transactions.py:292
|
||||
msgid "recurrent transaction"
|
||||
msgstr "transaction issue de bouton"
|
||||
|
||||
#: apps/note/models/transactions.py:292
|
||||
#: apps/note/models/transactions.py:293
|
||||
msgid "recurrent transactions"
|
||||
msgstr "transactions issues de boutons"
|
||||
|
||||
#: apps/note/models/transactions.py:307
|
||||
#: apps/note/models/transactions.py:308
|
||||
msgid "first_name"
|
||||
msgstr "prénom"
|
||||
|
||||
#: apps/note/models/transactions.py:312
|
||||
#: apps/note/models/transactions.py:313
|
||||
msgid "bank"
|
||||
msgstr "banque"
|
||||
|
||||
#: apps/note/models/transactions.py:329
|
||||
#: apps/note/models/transactions.py:330
|
||||
msgid ""
|
||||
"A special transaction is only possible between a Note associated to a "
|
||||
"payment method and a User or a Club"
|
||||
|
@ -1383,35 +1395,35 @@ msgstr ""
|
|||
"Une transaction spéciale n'est possible que entre une note associée à un "
|
||||
"mode de paiement et un utilisateur ou un club"
|
||||
|
||||
#: apps/note/models/transactions.py:337
|
||||
#: apps/note/models/transactions.py:338
|
||||
msgid "Special transaction"
|
||||
msgstr "Transaction de crédit/retrait"
|
||||
|
||||
#: apps/note/models/transactions.py:338
|
||||
#: apps/note/models/transactions.py:339
|
||||
msgid "Special transactions"
|
||||
msgstr "Transactions de crédit/retrait"
|
||||
|
||||
#: apps/note/models/transactions.py:354
|
||||
#: apps/note/models/transactions.py:355
|
||||
msgid "membership transaction"
|
||||
msgstr "transaction d'adhésion"
|
||||
|
||||
#: apps/note/models/transactions.py:355 apps/treasury/models.py:273
|
||||
#: apps/note/models/transactions.py:356 apps/treasury/models.py:273
|
||||
msgid "membership transactions"
|
||||
msgstr "transactions d'adhésion"
|
||||
|
||||
#: apps/note/tables.py:93
|
||||
#: apps/note/tables.py:94
|
||||
msgid "Click to invalidate"
|
||||
msgstr "Cliquez pour dévalider"
|
||||
|
||||
#: apps/note/tables.py:93
|
||||
#: apps/note/tables.py:94
|
||||
msgid "Click to validate"
|
||||
msgstr "Cliquez pour valider"
|
||||
|
||||
#: apps/note/tables.py:137
|
||||
#: apps/note/tables.py:138
|
||||
msgid "No reason specified"
|
||||
msgstr "Pas de motif spécifié"
|
||||
|
||||
#: apps/note/tables.py:168 apps/note/tables.py:202 apps/treasury/tables.py:39
|
||||
#: apps/note/tables.py:169 apps/note/tables.py:203 apps/treasury/tables.py:39
|
||||
#: apps/treasury/templates/treasury/invoice_confirm_delete.html:30
|
||||
#: apps/treasury/templates/treasury/sogecredit_detail.html:59
|
||||
#: apps/wei/tables.py:76 apps/wei/tables.py:103
|
||||
|
@ -1419,7 +1431,7 @@ msgstr "Pas de motif spécifié"
|
|||
msgid "Delete"
|
||||
msgstr "Supprimer"
|
||||
|
||||
#: apps/note/tables.py:196 apps/note/templates/note/conso_form.html:132
|
||||
#: apps/note/tables.py:197 apps/note/templates/note/conso_form.html:132
|
||||
#: apps/wei/tables.py:47 apps/wei/tables.py:48
|
||||
#: apps/wei/templates/wei/base.html:89
|
||||
#: apps/wei/templates/wei/bus_detail.html:20
|
||||
|
@ -1492,7 +1504,7 @@ msgid "Action"
|
|||
msgstr "Action"
|
||||
|
||||
#: apps/note/templates/note/transaction_form.html:112
|
||||
#: apps/treasury/forms.py:141 apps/treasury/tables.py:67
|
||||
#: apps/treasury/forms.py:135 apps/treasury/tables.py:67
|
||||
#: apps/treasury/tables.py:135
|
||||
#: apps/treasury/templates/treasury/remittance_form.html:23
|
||||
msgid "Amount"
|
||||
|
@ -1942,15 +1954,20 @@ msgstr "Invalider l'inscription"
|
|||
msgid "Treasury"
|
||||
msgstr "Trésorerie"
|
||||
|
||||
#: apps/treasury/forms.py:104
|
||||
#: apps/treasury/forms.py:24 apps/treasury/models.py:89
|
||||
#: apps/treasury/templates/treasury/invoice_form.html:22
|
||||
msgid "This invoice is locked and can no longer be edited."
|
||||
msgstr "Cette facture est verrouillée et ne peut plus être éditée."
|
||||
|
||||
#: apps/treasury/forms.py:98
|
||||
msgid "Remittance is already closed."
|
||||
msgstr "La remise est déjà fermée."
|
||||
|
||||
#: apps/treasury/forms.py:109
|
||||
#: apps/treasury/forms.py:103
|
||||
msgid "You can't change the type of the remittance."
|
||||
msgstr "Vous ne pouvez pas changer le type de la remise."
|
||||
|
||||
#: apps/treasury/forms.py:129 apps/treasury/models.py:252
|
||||
#: apps/treasury/forms.py:123 apps/treasury/models.py:252
|
||||
#: apps/treasury/tables.py:97 apps/treasury/tables.py:105
|
||||
#: apps/treasury/templates/treasury/invoice_list.html:16
|
||||
#: apps/treasury/templates/treasury/remittance_list.html:16
|
||||
|
@ -1958,7 +1975,7 @@ msgstr "Vous ne pouvez pas changer le type de la remise."
|
|||
msgid "Remittance"
|
||||
msgstr "Remise"
|
||||
|
||||
#: apps/treasury/forms.py:130
|
||||
#: apps/treasury/forms.py:124
|
||||
msgid "No attached remittance"
|
||||
msgstr "Pas de remise associée"
|
||||
|
||||
|
@ -2002,11 +2019,6 @@ msgstr "Une facture ne peut plus être modifiée si elle est verrouillée."
|
|||
msgid "tex source"
|
||||
msgstr "fichier TeX source"
|
||||
|
||||
#: apps/treasury/models.py:89
|
||||
#: apps/treasury/templates/treasury/invoice_form.html:22
|
||||
msgid "This invoice is locked and can no longer be edited."
|
||||
msgstr "Cette facture est verrouillée et ne peut plus être éditée."
|
||||
|
||||
#: apps/treasury/models.py:109 apps/treasury/models.py:122
|
||||
msgid "invoice"
|
||||
msgstr "facture"
|
||||
|
@ -2116,11 +2128,12 @@ msgid "Yes"
|
|||
msgstr "Oui"
|
||||
|
||||
#: apps/treasury/templates/treasury/invoice_confirm_delete.html:10
|
||||
#: apps/treasury/views.py:166
|
||||
#: apps/treasury/views.py:176
|
||||
msgid "Delete invoice"
|
||||
msgstr "Supprimer la facture"
|
||||
|
||||
#: apps/treasury/templates/treasury/invoice_confirm_delete.html:15
|
||||
#: apps/treasury/views.py:180
|
||||
msgid "This invoice is locked and can't be deleted."
|
||||
msgstr "Cette facture est verrouillée et ne peut pas être supprimée."
|
||||
|
||||
|
@ -2288,40 +2301,40 @@ msgstr ""
|
|||
msgid "Create new invoice"
|
||||
msgstr "Créer une nouvelle facture"
|
||||
|
||||
#: apps/treasury/views.py:89
|
||||
#: apps/treasury/views.py:94
|
||||
msgid "Invoices list"
|
||||
msgstr "Liste des factures"
|
||||
|
||||
#: apps/treasury/views.py:104 apps/treasury/views.py:265
|
||||
#: apps/treasury/views.py:391
|
||||
#: apps/treasury/views.py:109 apps/treasury/views.py:282
|
||||
#: apps/treasury/views.py:408
|
||||
msgid "You are not able to see the treasury interface."
|
||||
msgstr "Vous n'êtes pas autorisé à voir l'interface de trésorerie."
|
||||
|
||||
#: apps/treasury/views.py:114
|
||||
#: apps/treasury/views.py:119
|
||||
msgid "Update an invoice"
|
||||
msgstr "Modifier la facture"
|
||||
|
||||
#: apps/treasury/views.py:226
|
||||
#: apps/treasury/views.py:243
|
||||
msgid "Create a new remittance"
|
||||
msgstr "Créer une nouvelle remise"
|
||||
|
||||
#: apps/treasury/views.py:253
|
||||
#: apps/treasury/views.py:270
|
||||
msgid "Remittances list"
|
||||
msgstr "Liste des remises"
|
||||
|
||||
#: apps/treasury/views.py:316
|
||||
#: apps/treasury/views.py:333
|
||||
msgid "Update a remittance"
|
||||
msgstr "Modifier la remise"
|
||||
|
||||
#: apps/treasury/views.py:339
|
||||
#: apps/treasury/views.py:356
|
||||
msgid "Attach a transaction to a remittance"
|
||||
msgstr "Joindre une transaction à une remise"
|
||||
|
||||
#: apps/treasury/views.py:383
|
||||
#: apps/treasury/views.py:400
|
||||
msgid "List of credits from the Société générale"
|
||||
msgstr "Liste des crédits de la Société générale"
|
||||
|
||||
#: apps/treasury/views.py:426
|
||||
#: apps/treasury/views.py:443
|
||||
msgid "Manage credits from the Société générale"
|
||||
msgstr "Gérer les crédits de la Société générale"
|
||||
|
||||
|
|
10
note.cron
10
note.cron
|
@ -1,17 +1,17 @@
|
|||
# Attention, il faut *copier* ce fichier dans /etc/cron.d, owner root:root et droits 644
|
||||
# {{ ansible_managed }}
|
||||
# Les cronjobs dont a besoin la Note Kfet
|
||||
|
||||
# m h dom mon dow user command
|
||||
# Envoyer les mails en attente
|
||||
* * * * * root cd /var/www/note_kfet && env/bin/python manage.py send_mail
|
||||
* * * * * root cd /var/www/note_kfet && env/bin/python manage.py retry_deferred
|
||||
00 0 * * * root cd /var/www/note_kfet && env/bin/python manage.py purge_mail_log 7
|
||||
* * * * * root cd /var/www/note_kfet && env/bin/python manage.py send_mail -c 1
|
||||
* * * * * root cd /var/www/note_kfet && env/bin/python manage.py retry_deferred -c 1
|
||||
00 0 * * * root cd /var/www/note_kfet && env/bin/python manage.py purge_mail_log 7 -c 1
|
||||
# Faire une sauvegarde de la base de données
|
||||
00 2 * * * root cd /var/www/note_kfet && apps/scripts/shell/backup_db
|
||||
# Vérifier la cohérence de la base et mailer en cas de problème
|
||||
00 4 * * * root cd /var/www/note_kfet && env/bin/python manage.py check_consistency --sum-all --check-all --mail
|
||||
# Mettre à jour le wiki (modification sans (dé)validation, activités passées)
|
||||
#30 5 * * * root cd /var/www/note_kfet && env/bin/python manage.py refresh_activities --raw --comment refresh --wiki
|
||||
30 5 * * * root cd /var/www/note_kfet && env/bin/python manage.py refresh_activities --raw --human --comment refresh --wiki
|
||||
# Spammer les gens en négatif
|
||||
00 5 * * 2 root cd /var/www/note_kfet && env/bin/python manage.py send_mail_to_negative_balances --spam
|
||||
# Envoyer le rapport mensuel aux trésoriers et respos info
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
beautifulsoup4~=4.7.1
|
||||
Django~=2.2.15
|
||||
django-bootstrap-datepicker-plus~=3.0.5
|
||||
django-cas-server>=0.9.0
|
||||
django-cas-server>=1.2.0
|
||||
django-colorfield~=0.3.2
|
||||
django-crispy-forms~=1.7.2
|
||||
django-extensions~=2.1.4
|
||||
|
|
Loading…
Reference in New Issue