diff options
author | Matthew Lemon <y@yulqen.org> | 2024-12-31 16:12:42 +0000 |
---|---|---|
committer | Matthew Lemon <y@yulqen.org> | 2024-12-31 16:12:42 +0000 |
commit | 38f02f15781eb251cfd94f6467d2fc8e7fdf9556 (patch) | |
tree | 1a8b680497238a46ecf47cb7dc17856f087dc878 | |
parent | c74ea9e6b4af97be26029334868fa3264032c2d3 (diff) |
More comprehensive cleanup and refactor
- **Removal of Unused Files and Directories:** Deleted multiple files and directories that were no longer in use, including configuration files (e.g., `.gitattributes`, `.gitlab-ci.yml`, Docker-related configurations, and documentation files).
- **Script and Build Configuration Cleanup:** Removed deployment scripts and Dockerfiles that were outdated, redundant, or no longer aligned with current project requirements.
- **Documentation Purge:** Cleared out the documentation directory, including various Sphinx configuration files and content, which are no longer deemed necessary for the project's current state.
- **Localization Files Delete:** Removed translation files across multiple languages that were not in use, streamlining localization efforts.
- **Test Files Deletion:** Cleaned up test-related files that had no relevance to the remaining codebase.
This clean-up aims to enhance project clarity, reduce unnecessary clutter, and set the stage for a more efficient development environment moving forward.
39 files changed, 0 insertions, 2156 deletions
diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 176a458..0000000 --- a/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -* text=auto diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 5e32d2a..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,39 +0,0 @@ -stages: - - lint - - test - -variables: - POSTGRES_USER: 'pyblackbird_cc' - POSTGRES_PASSWORD: '' - POSTGRES_DB: 'test_pyblackbird_cc' - POSTGRES_HOST_AUTH_METHOD: trust - CELERY_BROKER_URL: 'redis://redis:6379/0' - -precommit: - stage: lint - image: python:3.12 - variables: - PRE_COMMIT_HOME: ${CI_PROJECT_DIR}/.cache/pre-commit - cache: - paths: - - ${PRE_COMMIT_HOME} - before_script: - - pip install -q pre-commit - script: - - pre-commit run --show-diff-on-failure --color=always --all-files - -pytest: - stage: test - image: docker:25.0 - tags: - - docker - services: - - docker:dind - before_script: - - docker compose -f local.yml build - - docker compose -f docs.yml build - # Ensure celerybeat does not crash due to non-existent tables - - docker compose -f local.yml run --rm django python manage.py migrate - - docker compose -f local.yml up -d - script: - - docker compose -f local.yml run django pytest diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml deleted file mode 100644 index d3cb20e..0000000 --- a/.pre-commit-config.yaml +++ /dev/null @@ -1,49 +0,0 @@ -exclude: '^docs/|/migrations/|devcontainer.json' -default_stages: [commit] - -default_language_version: - python: python3.11 - -repos: - - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.6.0 - hooks: - - id: trailing-whitespace - - id: end-of-file-fixer - - id: check-json - - id: check-toml - - id: check-xml - - id: check-yaml - - id: debug-statements - - id: check-builtin-literals - - id: check-case-conflict - - id: check-docstring-first - - id: detect-private-key - - - repo: https://github.com/adamchainz/django-upgrade - rev: '1.17.0' - hooks: - - id: django-upgrade - args: ['--target-version', '4.2'] - - # Run the Ruff linter. - - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.4.4 - hooks: - # Linter - - id: ruff - args: [--fix, --exit-non-zero-on-fix] - # Formatter - #- id: ruff-format - - - repo: https://github.com/Riverside-Healthcare/djLint - rev: v1.34.1 - hooks: - - id: djlint-reformat-django - - id: djlint-django - -# sets up .pre-commit-ci.yaml to ensure pre-commit dependencies stay up to date -ci: - autoupdate_schedule: weekly - skip: [] - submodules: false diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt deleted file mode 100644 index 9861cf4..0000000 --- a/CONTRIBUTORS.txt +++ /dev/null @@ -1 +0,0 @@ -Matthew Lemon diff --git a/COPYING b/COPYING deleted file mode 100644 index 94a9ed0..0000000 --- a/COPYING +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. <http://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 <http://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 -<http://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 -<http://www.gnu.org/philosophy/why-not-lgpl.html>. diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 1495125..0000000 --- a/Dockerfile +++ /dev/null @@ -1,59 +0,0 @@ -FROM docker.io/python:3.12.3-slim-bookworm as python - -FROM python as python-build-stage - -ARG BUILD_ENVIRONMENT=requirements - -RUN apt-get update && apt-get install --no-install-recommends -y \ - # dependencies for building Python packages - build-essential \ - # psycopg dependencies - libpq-dev - -COPY ./requirements.txt . -COPY ./wait-for-it.sh . -RUN chmod +x ./wait-for-it.sh - -RUN pip wheel --wheel-dir /usr/src/app/wheels \ - -r ${BUILD_ENVIRONMENT}.txt - - -FROM python as python-run-stage - -ARG BUILD_ENVIRONMENT=production -ARG APP_HOME=/app - -ENV PYTHONUNBUFFERED 1 -ENV PYTHONDONTWRITEBYTECODE 1 -ENV BUILD_ENV ${BUILD_ENVIRONMENT} - -WORKDIR ${APP_HOME} - -RUN addgroup --system django \ - && adduser --system --ingroup django django - - -RUN apt-get update && apt-get install --no-install-recommends -y \ - libmagic1 \ - # psycopg dependencies - libpq-dev \ - # Translations dependencies - gettext \ - # cleaning up unused files - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && rm -rf /var/lib/apt/lists/* - -COPY --from=python-build-stage /usr/src/app/wheels /wheels/ - -RUN pip install --no-cache-dir --no-index --find-links=/wheels/ /wheels/* \ - && rm -rf /wheels/ - -COPY --chown=django:django . ${APP_HOME} - -# make django owner of the WORKDIR directory as well. -RUN chown -R django:django ${APP_HOME} - -USER django - -RUN chmod +x docker-entrypoint.sh -ENTRYPOINT ["/app/docker-entrypoint.sh"] diff --git a/cookies.txt b/cookies.txt deleted file mode 100644 index 6bef457..0000000 --- a/cookies.txt +++ /dev/null @@ -1,5 +0,0 @@ -# Netscape HTTP Cookie File -# https://curl.se/docs/http-cookies.html -# This file was generated by libcurl! Edit at your own risk. - -#HttpOnly_127.0.0.1 FALSE / FALSE 1765141225 csrftoken ZvMDpDcXBf12tnCdJGlR0i8AcBUnh0rX diff --git a/docker-compose.yaml b/docker-compose.yaml deleted file mode 100644 index 6266d70..0000000 --- a/docker-compose.yaml +++ /dev/null @@ -1,38 +0,0 @@ -services: - db: - image: postgres:14 - volumes: - - postgres_data:/var/lib/postgresql/data/ - healthcheck: - test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER}"] - interval: 10s - timeout: 5s - retries: 5 - environment: - POSTGRES_DB: ${POSTGRES_DB} - POSTGRES_USER: ${POSTGRES_USER} - POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} - networks: - - app-network - - web: - build: . - command: gunicorn config.wsgi:application --bind 0.0.0.0:3000 - environment: - DJANGO_READ_DOT_ENV_FILE: True - volumes: - - .:/code - ports: - - "3000:3000" - depends_on: - - db - # env_file: - # - .env - networks: - - app-network - -volumes: - postgres_data: - -networks: - app-network: diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh deleted file mode 100755 index 34b6867..0000000 --- a/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -echo "Running migrations..." -./wait-for-it.sh db:5432 --timeout=30 --strict -- echo "Postgres is up" - -cd /app -python manage.py migrate -python manage.py collectstatic --noinput -exec gunicorn --bind ':3000' --worker-tmp-dir /dev/shm --workers 3 config.wsgi:application diff --git a/docs/Makefile b/docs/Makefile deleted file mode 100644 index 6957700..0000000 --- a/docs/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# Minimal makefile for Sphinx documentation -# - -# You can set these variables from the command line, and also -# from the environment for the first two. -SPHINXOPTS ?= -SPHINXBUILD ?= sphinx-build -SOURCEDIR = . -BUILDDIR = ./_build -APP = /app - -.PHONY: help livehtml apidocs Makefile - -# Put it first so that "make" without argument is like "make help". -help: - @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) -c . - -# Build, watch and serve docs with live reload -livehtml: - sphinx-autobuild -b html --host 0.0.0.0 --port 9000 --watch $(APP) -c . $(SOURCEDIR) $(BUILDDIR)/html - -# Outputs rst files from django application code -apidocs: - sphinx-apidoc -o $(SOURCEDIR)/api $(APP) - -# Catch-all target: route all unknown targets to Sphinx using the new -# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). -%: Makefile - @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) -c . diff --git a/docs/__init__.py b/docs/__init__.py deleted file mode 100644 index 8772c82..0000000 --- a/docs/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# Included so that Django's startproject comment runs against the docs directory diff --git a/docs/conf.py b/docs/conf.py deleted file mode 100644 index 3dc1bc6..0000000 --- a/docs/conf.py +++ /dev/null @@ -1,64 +0,0 @@ -# ruff: noqa -# Configuration file for the Sphinx documentation builder. -# -# This file only contains a selection of the most common options. For a full -# list see the documentation: -# https://www.sphinx-doc.org/en/master/usage/configuration.html - -# -- Path setup -------------------------------------------------------------- - -# If extensions (or modules to document with autodoc) are in another directory, -# add these directories to sys.path here. If the directory is relative to the -# documentation root, use os.path.abspath to make it absolute, like shown here. - -import os -import sys -import django - -if os.getenv("READTHEDOCS", default=False) == "True": - sys.path.insert(0, os.path.abspath("..")) - os.environ["DJANGO_READ_DOT_ENV_FILE"] = "True" - os.environ["USE_DOCKER"] = "no" -else: - sys.path.insert(0, os.path.abspath("/app")) -os.environ["DATABASE_URL"] = "sqlite:///readthedocs.db" -os.environ["CELERY_BROKER_URL"] = os.getenv("REDIS_URL", "redis://redis:6379") -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.local") -django.setup() - -# -- Project information ----------------------------------------------------- - -project = "pyblackbird-cc" -copyright = """2024, Matthew Lemon""" -author = "Matthew Lemon" - - -# -- General configuration --------------------------------------------------- - -# Add any Sphinx extension module names here, as strings. They can be -# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom -# ones. -extensions = [ - "sphinx.ext.autodoc", - "sphinx.ext.napoleon", -] - -# Add any paths that contain templates here, relative to this directory. -# templates_path = ["_templates"] - -# List of patterns, relative to source directory, that match files and -# directories to ignore when looking for source files. -# This pattern also affects html_static_path and html_extra_path. -exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"] - -# -- Options for HTML output ------------------------------------------------- - -# The theme to use for HTML and HTML Help pages. See the documentation for -# a list of builtin themes. -# -html_theme = "alabaster" - -# Add any paths that contain custom static files (such as style sheets) here, -# relative to this directory. They are copied after the builtin static files, -# so a file named "default.css" will overwrite the builtin "default.css". -# html_static_path = ["_static"] diff --git a/docs/howto.rst b/docs/howto.rst deleted file mode 100644 index 5858a25..0000000 --- a/docs/howto.rst +++ /dev/null @@ -1,38 +0,0 @@ -How To - Project Documentation -====================================================================== - -Get Started ----------------------------------------------------------------------- - -Documentation can be written as rst files in `alphabetlearning/docs`. - - -To build and serve docs, use the commands:: - - docker compose -f local.yml up docs - - - -Changes to files in `docs/_source` will be picked up and reloaded automatically. - -`Sphinx <https://www.sphinx-doc.org/>`_ is the tool used to build documentation. - -Docstrings to Documentation ----------------------------------------------------------------------- - -The sphinx extension `apidoc <https://www.sphinx-doc.org/en/master/man/sphinx-apidoc.html>`_ is used to automatically document code using signatures and docstrings. - -Numpy or Google style docstrings will be picked up from project files and available for documentation. See the `Napoleon <https://sphinxcontrib-napoleon.readthedocs.io/en/latest/>`_ extension for details. - -For an in-use example, see the `page source <_sources/users.rst.txt>`_ for :ref:`users`. - -To compile all docstrings automatically into documentation source files, use the command: - :: - - make apidocs - - -This can be done in the docker container: - :: - - docker run --rm docs make apidocs diff --git a/docs/index.rst b/docs/index.rst deleted file mode 100644 index afb7889..0000000 --- a/docs/index.rst +++ /dev/null @@ -1,24 +0,0 @@ -.. pyblackbird-cc documentation master file, created by - sphinx-quickstart. - You can adapt this file completely to your liking, but it should at least - contain the root `toctree` directive. - -Welcome to pyblackbird-cc's documentation! -====================================================================== - -.. toctree:: - :maxdepth: 2 - :caption: Contents: - - howto - pycharm/configuration - users - - - -Indices and tables -================== - -* :ref:`genindex` -* :ref:`modindex` -* :ref:`search` diff --git a/docs/make.bat b/docs/make.bat deleted file mode 100644 index 7e05187..0000000 --- a/docs/make.bat +++ /dev/null @@ -1,46 +0,0 @@ -@ECHO OFF - -pushd %~dp0 - -REM Command file for Sphinx documentation - - -if "%SPHINXBUILD%" == "" ( - set SPHINXBUILD=sphinx-build -c . -) -set SOURCEDIR=_source -set BUILDDIR=_build -set APP=..\alphabetlearning - -if "%1" == "" goto help - -%SPHINXBUILD% >NUL 2>NUL -if errorlevel 9009 ( - echo. - echo.The 'sphinx-build' command was not found. Make sure you have Sphinx - echo.installed, then set the SPHINXBUILD environment variable to point - echo.to the full path of the 'sphinx-build' executable. Alternatively you - echo.may add the Sphinx directory to PATH. - echo. - echo.Install sphinx-autobuild for live serving. - echo.If you don't have Sphinx installed, grab it from - echo.http://sphinx-doc.org/ - exit /b 1 -) - -%SPHINXBUILD% -b %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O% -goto end - -:livehtml -sphinx-autobuild -b html --open-browser -p 9000 --watch %APP% -c . %SOURCEDIR% %BUILDDIR%/html -GOTO :EOF - -:apidocs -sphinx-apidoc -o %SOURCEDIR%/api %APP% -GOTO :EOF - -:help -%SPHINXBUILD% -b help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O% - -:end -popd diff --git a/docs/pycharm/configuration.rst b/docs/pycharm/configuration.rst deleted file mode 100644 index ffc7f61..0000000 --- a/docs/pycharm/configuration.rst +++ /dev/null @@ -1,70 +0,0 @@ -Docker Remote Debugging -======================= - -To connect to python remote interpreter inside docker, you have to make sure first, that Pycharm is aware of your docker. - -Go to *Settings > Build, Execution, Deployment > Docker*. If you are on linux, you can use docker directly using its socket `unix:///var/run/docker.sock`, if you are on Windows or Mac, make sure that you have docker-machine installed, then you can simply *Import credentials from Docker Machine*. - -.. image:: images/1.png - -Configure Remote Python Interpreter ------------------------------------ - -This repository comes with already prepared "Run/Debug Configurations" for docker. - -.. image:: images/2.png - -But as you can see, at the beginning there is something wrong with them. They have red X on django icon, and they cannot be used, without configuring remote python interpreter. To do that, you have to go to *Settings > Build, Execution, Deployment* first. - - -Next, you have to add new remote python interpreter, based on already tested deployment settings. Go to *Settings > Project > Project Interpreter*. Click on the cog icon, and click *Add Remote*. - -.. image:: images/3.png - -Switch to *Docker Compose* and select `local.yml` file from directory of your project, next set *Service name* to `django` - -.. image:: images/4.png - -Having that, click *OK*. Close *Settings* panel, and wait few seconds... - -.. image:: images/7.png - -After few seconds, all *Run/Debug Configurations* should be ready to use. - -.. image:: images/8.png - -**Things you can do with provided configuration**: - -* run and debug python code - -.. image:: images/f1.png - -* run and debug tests - -.. image:: images/f2.png -.. image:: images/f3.png - -* run and debug migrations or different django management commands - -.. image:: images/f4.png - -* and many others.. - -Known issues ------------- - -* Pycharm hangs on "Connecting to Debugger" - -.. image:: images/issue1.png - -This might be fault of your firewall. Take a look on this ticket - https://youtrack.jetbrains.com/issue/PY-18913 - -* Modified files in `.idea` directory - -Most of the files from `.idea/` were added to `.gitignore` with a few exceptions, which were made, to provide "ready to go" configuration. After adding remote interpreter some of these files are altered by PyCharm: - -.. image:: images/issue2.png - -In theory you can remove them from repository, but then, other people will lose a ability to initialize a project from provided configurations as you did. To get rid of this annoying state, you can run command:: - - $ git update-index --assume-unchanged alphabetlearning.iml diff --git a/docs/pycharm/images/1.png b/docs/pycharm/images/1.png Binary files differdeleted file mode 100644 index 06908a1..0000000 --- a/docs/pycharm/images/1.png +++ /dev/null diff --git a/docs/pycharm/images/2.png b/docs/pycharm/images/2.png Binary files differdeleted file mode 100644 index 1fb8cf1..0000000 --- a/docs/pycharm/images/2.png +++ /dev/null diff --git a/docs/pycharm/images/3.png b/docs/pycharm/images/3.png Binary files differdeleted file mode 100644 index 32c9335..0000000 --- a/docs/pycharm/images/3.png +++ /dev/null diff --git a/docs/pycharm/images/4.png b/docs/pycharm/images/4.png Binary files differdeleted file mode 100644 index cf07f9d..0000000 --- a/docs/pycharm/images/4.png +++ /dev/null diff --git a/docs/pycharm/images/7.png b/docs/pycharm/images/7.png Binary files differdeleted file mode 100644 index 4f8807e..0000000 --- a/docs/pycharm/images/7.png +++ /dev/null diff --git a/docs/pycharm/images/8.png b/docs/pycharm/images/8.png Binary files differdeleted file mode 100644 index 05946f2..0000000 --- a/docs/pycharm/images/8.png +++ /dev/null diff --git a/docs/pycharm/images/f1.png b/docs/pycharm/images/f1.png Binary files differdeleted file mode 100644 index 2d8c4b6..0000000 --- a/docs/pycharm/images/f1.png +++ /dev/null diff --git a/docs/pycharm/images/f2.png b/docs/pycharm/images/f2.png Binary files differdeleted file mode 100644 index b123a47..0000000 --- a/docs/pycharm/images/f2.png +++ /dev/null diff --git a/docs/pycharm/images/f3.png b/docs/pycharm/images/f3.png Binary files differdeleted file mode 100644 index 713ab54..0000000 --- a/docs/pycharm/images/f3.png +++ /dev/null diff --git a/docs/pycharm/images/f4.png b/docs/pycharm/images/f4.png Binary files differdeleted file mode 100644 index 11668ec..0000000 --- a/docs/pycharm/images/f4.png +++ /dev/null diff --git a/docs/pycharm/images/issue1.png b/docs/pycharm/images/issue1.png Binary files differdeleted file mode 100644 index 1bb68ee..0000000 --- a/docs/pycharm/images/issue1.png +++ /dev/null diff --git a/docs/pycharm/images/issue2.png b/docs/pycharm/images/issue2.png Binary files differdeleted file mode 100644 index 174f6fd..0000000 --- a/docs/pycharm/images/issue2.png +++ /dev/null diff --git a/docs/users.rst b/docs/users.rst deleted file mode 100644 index 0fac7bf..0000000 --- a/docs/users.rst +++ /dev/null @@ -1,15 +0,0 @@ - .. _users: - -Users -====================================================================== - -Starting a new project, it’s highly recommended to set up a custom user model, -even if the default User model is sufficient for you. - -This model behaves identically to the default user model, -but you’ll be able to customize it in the future if the need arises. - -.. automodule:: alphabetlearning.users.models - :members: - :noindex: - diff --git a/locale/README.md b/locale/README.md deleted file mode 100644 index 9911fec..0000000 --- a/locale/README.md +++ /dev/null @@ -1,32 +0,0 @@ -# Translations - -Start by configuring the `LANGUAGES` settings in `base.py`, by uncommenting languages you are willing to support. Then, translations strings will be placed in this folder when running: - -```bash -docker compose -f local.yml run --rm django python manage.py makemessages -all --no-location -``` - -This should generate `django.po` (stands for Portable Object) files under each locale `<locale name>/LC_MESSAGES/django.po`. Each translatable string in the codebase is collected with its `msgid` and need to be translated as `msgstr`, for example: - -```po -msgid "users" -msgstr "utilisateurs" -``` - -Once all translations are done, they need to be compiled into `.mo` files (stands for Machine Object), which are the actual binary files used by the application: - -```bash -docker compose -f local.yml run --rm django python manage.py compilemessages -``` - -Note that the `.po` files are NOT used by the application directly, so if the `.mo` files are out of dates, the content won't appear as translated even if the `.po` files are up-to-date. - -## Production - -The production image runs `compilemessages` automatically at build time, so as long as your translated source files (PO) are up-to-date, you're good to go. - -## Add a new language - -1. Update the [`LANGUAGES` setting](https://docs.djangoproject.com/en/stable/ref/settings/#std-setting-LANGUAGES) to your project's base settings. -2. Create the locale folder for the language next to this file, e.g. `fr_FR` for French. Make sure the case is correct. -3. Run `makemessages` (as instructed above) to generate the PO files for the new language. diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po deleted file mode 100644 index 5730dc9..0000000 --- a/locale/en_US/LC_MESSAGES/django.po +++ /dev/null @@ -1,12 +0,0 @@ -# Translations for the pyblackbird-cc project -# Copyright (C) 2024 Matthew Lemon -# Matthew Lemon <y@yulqen.org>, 2024. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: 0.1.0\n" -"Language: en-US\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po deleted file mode 100644 index daac1e7..0000000 --- a/locale/fr_FR/LC_MESSAGES/django.po +++ /dev/null @@ -1,335 +0,0 @@ -# Translations for the pyblackbird-cc project -# Copyright (C) 2024 Matthew Lemon -# Matthew Lemon <y@yulqen.org>, 2024. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: 0.1.0\n" -"Language: fr-FR\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: alphabetlearning/templates/account/account_inactive.html:5 -#: alphabetlearning/templates/account/account_inactive.html:8 -msgid "Account Inactive" -msgstr "Compte inactif" - -#: alphabetlearning/templates/account/account_inactive.html:10 -msgid "This account is inactive." -msgstr "Ce compte est inactif." - -#: alphabetlearning/templates/account/email.html:7 -msgid "Account" -msgstr "Compte" - -#: alphabetlearning/templates/account/email.html:10 -msgid "E-mail Addresses" -msgstr "Adresses e-mail" - -#: alphabetlearning/templates/account/email.html:13 -msgid "The following e-mail addresses are associated with your account:" -msgstr "Les adresses e-mail suivantes sont associées à votre compte :" - -#: alphabetlearning/templates/account/email.html:27 -msgid "Verified" -msgstr "Vérifié" - -#: alphabetlearning/templates/account/email.html:29 -msgid "Unverified" -msgstr "Non vérifié" - -#: alphabetlearning/templates/account/email.html:31 -msgid "Primary" -msgstr "Primaire" - -#: alphabetlearning/templates/account/email.html:37 -msgid "Make Primary" -msgstr "Changer Primaire" - -#: alphabetlearning/templates/account/email.html:38 -msgid "Re-send Verification" -msgstr "Renvoyer vérification" - -#: alphabetlearning/templates/account/email.html:39 -msgid "Remove" -msgstr "Supprimer" - -#: alphabetlearning/templates/account/email.html:46 -msgid "Warning:" -msgstr "Avertissement:" - -#: alphabetlearning/templates/account/email.html:46 -msgid "" -"You currently do not have any e-mail address set up. You should really add " -"an e-mail address so you can receive notifications, reset your password, etc." -msgstr "" -"Vous n'avez actuellement aucune adresse e-mail configurée. Vous devriez ajouter " -"une adresse e-mail pour reçevoir des notifications, réinitialiser votre mot " -"de passe, etc." - -#: alphabetlearning/templates/account/email.html:51 -msgid "Add E-mail Address" -msgstr "Ajouter une adresse e-mail" - -#: alphabetlearning/templates/account/email.html:56 -msgid "Add E-mail" -msgstr "Ajouter e-mail" - -#: alphabetlearning/templates/account/email.html:66 -msgid "Do you really want to remove the selected e-mail address?" -msgstr "Voulez-vous vraiment supprimer l'adresse e-mail sélectionnée ?" - -#: alphabetlearning/templates/account/email_confirm.html:6 -#: alphabetlearning/templates/account/email_confirm.html:10 -msgid "Confirm E-mail Address" -msgstr "Confirmez votre adresse email" - -#: alphabetlearning/templates/account/email_confirm.html:16 -#, python-format -msgid "" -"Please confirm that <a href=\"mailto:%(email)s\">%(email)s</a> is an e-mail " -"address for user %(user_display)s." -msgstr "" -"Veuillez confirmer que <a href=\"mailto:%(email)s\">%(email)s</a> est un e-mail " -"adresse de l'utilisateur %(user_display)s." - -#: alphabetlearning/templates/account/email_confirm.html:20 -msgid "Confirm" -msgstr "Confirm" - -#: alphabetlearning/templates/account/email_confirm.html:27 -#, python-format -msgid "" -"This e-mail confirmation link expired or is invalid. Please <a href=" -"\"%(email_url)s\">issue a new e-mail confirmation request</a>." -msgstr "" -"Ce lien de confirmation par e-mail a expiré ou n'est pas valide. Veuillez" - "<a href=\"%(email_url)s\">émettre une nouvelle demande de confirmation " -"par e-mail</a>." - -#: alphabetlearning/templates/account/login.html:7 -#: alphabetlearning/templates/account/login.html:11 -#: alphabetlearning/templates/account/login.html:56 -#: alphabetlearning/templates/base.html:72 -msgid "Sign In" -msgstr "S'identifier" - -#: alphabetlearning/templates/account/login.html:17 -msgid "Please sign in with one of your existing third party accounts:" -msgstr "Veuillez vous connecter avec l'un de vos comptes tiers existants :" - -#: alphabetlearning/templates/account/login.html:19 -#, python-format -msgid "" -"Or, <a href=\"%(signup_url)s\">sign up</a> for a %(site_name)s account and " -"sign in below:" -msgstr "" -"Ou, <a href=\"%(signup_url)s\">créez</a> un compte %(site_name)s et " -"connectez-vous ci-dessous :" - -#: alphabetlearning/templates/account/login.html:32 -msgid "or" -msgstr "ou" - -#: alphabetlearning/templates/account/login.html:41 -#, python-format -msgid "" -"If you have not created an account yet, then please <a href=\"%(signup_url)s" -"\">sign up</a> first." -msgstr "" -"Si vous n'avez pas encore créé de compte, veuillez d'abord <a href=\"%(signup_url)s" -"\">vous inscrire</a>." - -#: alphabetlearning/templates/account/login.html:55 -msgid "Forgot Password?" -msgstr "Mot de passe oublié?" - -#: alphabetlearning/templates/account/logout.html:5 -#: alphabetlearning/templates/account/logout.html:8 -#: alphabetlearning/templates/account/logout.html:17 -#: alphabetlearning/templates/base.html:61 -msgid "Sign Out" -msgstr "Se déconnecter" - -#: alphabetlearning/templates/account/logout.html:10 -msgid "Are you sure you want to sign out?" -msgstr "Êtes-vous certain de vouloir vous déconnecter?" - -#: alphabetlearning/templates/account/password_change.html:6 -#: alphabetlearning/templates/account/password_change.html:9 -#: alphabetlearning/templates/account/password_change.html:14 -#: alphabetlearning/templates/account/password_reset_from_key.html:5 -#: alphabetlearning/templates/account/password_reset_from_key.html:8 -#: alphabetlearning/templates/account/password_reset_from_key_done.html:4 -#: alphabetlearning/templates/account/password_reset_from_key_done.html:7 -msgid "Change Password" -msgstr "Changer le mot de passe" - -#: alphabetlearning/templates/account/password_reset.html:7 -#: alphabetlearning/templates/account/password_reset.html:11 -#: alphabetlearning/templates/account/password_reset_done.html:6 -#: alphabetlearning/templates/account/password_reset_done.html:9 -msgid "Password Reset" -msgstr "Réinitialisation du mot de passe" - -#: alphabetlearning/templates/account/password_reset.html:16 -msgid "" -"Forgotten your password? Enter your e-mail address below, and we'll send you " -"an e-mail allowing you to reset it." -msgstr "" -"Mot de passe oublié? Entrez votre adresse e-mail ci-dessous, et nous vous " -"enverrons un e-mail vous permettant de le réinitialiser." - -#: alphabetlearning/templates/account/password_reset.html:21 -msgid "Reset My Password" -msgstr "Réinitialiser mon mot de passe" - -#: alphabetlearning/templates/account/password_reset.html:24 -msgid "Please contact us if you have any trouble resetting your password." -msgstr "" -"Veuillez nous contacter si vous rencontrez des difficultés pour réinitialiser" -"votre mot de passe." - -#: alphabetlearning/templates/account/password_reset_done.html:15 -msgid "" -"We have sent you an e-mail. Please contact us if you do not receive it " -"within a few minutes." -msgstr "" -"Nous vous avons envoyé un e-mail. Veuillez nous contacter si vous ne le " -"recevez pas d'ici quelques minutes." - -#: alphabetlearning/templates/account/password_reset_from_key.html:8 -msgid "Bad Token" -msgstr "Token Invalide" - -#: alphabetlearning/templates/account/password_reset_from_key.html:12 -#, python-format -msgid "" -"The password reset link was invalid, possibly because it has already been " -"used. Please request a <a href=\"%(passwd_reset_url)s\">new password reset</" -"a>." -msgstr "" -"Le lien de réinitialisation du mot de passe n'était pas valide, peut-être parce " -"qu'il a déjà été utilisé. Veuillez faire une <a href=\"%(passwd_reset_url)s\"> " -"nouvelle demande de réinitialisation de mot de passe</a>." - -#: alphabetlearning/templates/account/password_reset_from_key.html:18 -msgid "change password" -msgstr "changer le mot de passe" - -#: alphabetlearning/templates/account/password_reset_from_key.html:21 -#: alphabetlearning/templates/account/password_reset_from_key_done.html:8 -msgid "Your password is now changed." -msgstr "Votre mot de passe est maintenant modifié." - -#: alphabetlearning/templates/account/password_set.html:6 -#: alphabetlearning/templates/account/password_set.html:9 -#: alphabetlearning/templates/account/password_set.html:14 -msgid "Set Password" -msgstr "Définir le mot de passe" - -#: alphabetlearning/templates/account/signup.html:6 -msgid "Signup" -msgstr "S'inscrire" - -#: alphabetlearning/templates/account/signup.html:9 -#: alphabetlearning/templates/account/signup.html:19 -#: alphabetlearning/templates/base.html:67 -msgid "Sign Up" -msgstr "S'inscrire" - -#: alphabetlearning/templates/account/signup.html:11 -#, python-format -msgid "" -"Already have an account? Then please <a href=\"%(login_url)s\">sign in</a>." -msgstr "" -"Vous avez déjà un compte? Alors veuillez <a href=\"%(login_url)s\">vous connecter</a>." - -#: alphabetlearning/templates/account/signup_closed.html:5 -#: alphabetlearning/templates/account/signup_closed.html:8 -msgid "Sign Up Closed" -msgstr "Inscriptions closes" - -#: alphabetlearning/templates/account/signup_closed.html:10 -msgid "We are sorry, but the sign up is currently closed." -msgstr "Désolé, mais l'inscription est actuellement fermée." - -#: alphabetlearning/templates/account/verification_sent.html:5 -#: alphabetlearning/templates/account/verification_sent.html:8 -#: alphabetlearning/templates/account/verified_email_required.html:5 -#: alphabetlearning/templates/account/verified_email_required.html:8 -msgid "Verify Your E-mail Address" -msgstr "Vérifiez votre adresse e-mail" - -#: alphabetlearning/templates/account/verification_sent.html:10 -msgid "" -"We have sent an e-mail to you for verification. Follow the link provided to " -"finalize the signup process. Please contact us if you do not receive it " -"within a few minutes." -msgstr "Nous vous avons envoyé un e-mail pour vérification. Suivez le lien fourni " -"pour finalisez le processus d'inscription. Veuillez nous contacter si vous ne le " -"recevez pas d'ici quelques minutes." - -#: alphabetlearning/templates/account/verified_email_required.html:12 -msgid "" -"This part of the site requires us to verify that\n" -"you are who you claim to be. For this purpose, we require that you\n" -"verify ownership of your e-mail address. " -msgstr "" -"Cette partie du site nous oblige à vérifier que\n" -"vous êtes qui vous prétendez être. Nous vous demandons donc de\n" -"vérifier la propriété de votre adresse e-mail." - -#: alphabetlearning/templates/account/verified_email_required.html:16 -msgid "" -"We have sent an e-mail to you for\n" -"verification. Please click on the link inside this e-mail. Please\n" -"contact us if you do not receive it within a few minutes." -msgstr "" -"Nous vous avons envoyé un e-mail pour\n" -"vérification. Veuillez cliquer sur le lien contenu dans cet e-mail. Veuillez nous\n" -"contacter si vous ne le recevez pas d'ici quelques minutes." - -#: alphabetlearning/templates/account/verified_email_required.html:20 -#, python-format -msgid "" -"<strong>Note:</strong> you can still <a href=\"%(email_url)s\">change your e-" -"mail address</a>." -msgstr "" -"<strong>Remarque :</strong> vous pouvez toujours <a href=\"%(email_url)s\">changer votre e-" -"adresse e-mail</a>." - -#: alphabetlearning/templates/base.html:57 -msgid "My Profile" -msgstr "Mon Profil" - -#: alphabetlearning/users/admin.py:17 -msgid "Personal info" -msgstr "Personal info" - -#: alphabetlearning/users/admin.py:19 -msgid "Permissions" -msgstr "Permissions" - -#: alphabetlearning/users/admin.py:30 -msgid "Important dates" -msgstr "Dates importantes" - -#: alphabetlearning/users/apps.py:7 -msgid "Users" -msgstr "Utilisateurs" - -#: alphabetlearning/users/forms.py:24 -#: alphabetlearning/users/tests/test_forms.py:36 -msgid "This username has already been taken." -msgstr "Ce nom d'utilisateur est déjà pris." - -#: alphabetlearning/users/models.py:15 -msgid "Name of User" -msgstr "Nom de l'utilisateur" - -#: alphabetlearning/users/views.py:23 -msgid "Information successfully updated" -msgstr "Informations mises à jour avec succès" diff --git a/locale/pt_BR/LC_MESSAGES/django.po b/locale/pt_BR/LC_MESSAGES/django.po deleted file mode 100644 index 7ec3e9d..0000000 --- a/locale/pt_BR/LC_MESSAGES/django.po +++ /dev/null @@ -1,315 +0,0 @@ -# Translations for the pyblackbird-cc project -# Copyright (C) 2024 Matthew Lemon -# Matthew Lemon <y@yulqen.org>, 2024. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: 0.1.0\n" -"Language: pt-BR\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: alphabetlearning/templates/account/account_inactive.html:5 -#: alphabetlearning/templates/account/account_inactive.html:8 -msgid "Account Inactive" -msgstr "Conta Inativa" - -#: alphabetlearning/templates/account/account_inactive.html:10 -msgid "This account is inactive." -msgstr "Esta conta está inativa." - -#: alphabetlearning/templates/account/email.html:7 -msgid "Account" -msgstr "Conta" - -#: alphabetlearning/templates/account/email.html:10 -msgid "E-mail Addresses" -msgstr "Endereços de E-mail" - -#: alphabetlearning/templates/account/email.html:13 -msgid "The following e-mail addresses are associated with your account:" -msgstr "Os seguintes endereços de e-mail estão associados à sua conta:" - -#: alphabetlearning/templates/account/email.html:27 -msgid "Verified" -msgstr "Verificado" - -#: alphabetlearning/templates/account/email.html:29 -msgid "Unverified" -msgstr "Não verificado" - -#: alphabetlearning/templates/account/email.html:31 -msgid "Primary" -msgstr "Primário" - -#: alphabetlearning/templates/account/email.html:37 -msgid "Make Primary" -msgstr "Tornar Primário" - -#: alphabetlearning/templates/account/email.html:38 -msgid "Re-send Verification" -msgstr "Reenviar verificação" - -#: alphabetlearning/templates/account/email.html:39 -msgid "Remove" -msgstr "Remover" - -#: alphabetlearning/templates/account/email.html:46 -msgid "Warning:" -msgstr "Aviso:" - -#: alphabetlearning/templates/account/email.html:46 -msgid "" -"You currently do not have any e-mail address set up. You should really add " -"an e-mail address so you can receive notifications, reset your password, etc." -msgstr "" -"No momento, você não tem nenhum endereço de e-mail configurado. Você " -"realmente deve adicionar um endereço de e-mail para receber notificações, " -"redefinir sua senha etc." - -#: alphabetlearning/templates/account/email.html:51 -msgid "Add E-mail Address" -msgstr "Adicionar Endereço de E-mail" - -#: alphabetlearning/templates/account/email.html:56 -msgid "Add E-mail" -msgstr "Adicionar E-mail" - -#: alphabetlearning/templates/account/email.html:66 -msgid "Do you really want to remove the selected e-mail address?" -msgstr "Você realmente deseja remover o endereço de e-mail selecionado?" - -#: alphabetlearning/templates/account/email_confirm.html:6 -#: alphabetlearning/templates/account/email_confirm.html:10 -msgid "Confirm E-mail Address" -msgstr "Confirme o endereço de e-mail" - -#: alphabetlearning/templates/account/email_confirm.html:16 -#, python-format -msgid "" -"Please confirm that <a href=\"mailto:%(email)s\">%(email)s</a> is an e-mail " -"address for user %(user_display)s." -msgstr "" -"Confirme se <a href=\"mailto:%(email)s\">%(email)s</a> é um endereço de " -"e-mail do usuário %(user_display)s." - -#: alphabetlearning/templates/account/email_confirm.html:20 -msgid "Confirm" -msgstr "Confirmar" - -#: alphabetlearning/templates/account/email_confirm.html:27 -#, python-format -msgid "" -"This e-mail confirmation link expired or is invalid. Please <a href=" -"\"%(email_url)s\">issue a new e-mail confirmation request</a>." -msgstr "Este link de confirmação de e-mail expirou ou é inválido. " -"Por favor, <a href=\"%(email_url)s\">emita um novo pedido de confirmação por e-mail</a>." - -#: alphabetlearning/templates/account/login.html:7 -#: alphabetlearning/templates/account/login.html:11 -#: alphabetlearning/templates/account/login.html:56 -#: alphabetlearning/templates/base.html:72 -msgid "Sign In" -msgstr "Entrar" - -#: alphabetlearning/templates/account/login.html:17 -msgid "Please sign in with one of your existing third party accounts:" -msgstr "Faça login com uma de suas contas de terceiros existentes:" - -#: alphabetlearning/templates/account/login.html:19 -#, python-format -msgid "" -"Or, <a href=\"%(signup_url)s\">sign up</a> for a %(site_name)s account and " -"sign in below:" -msgstr "Ou, <a href=\"%(signup_url)s\">cadastre-se</a> para uma conta em %(site_name)s e entre abaixo:" - -#: alphabetlearning/templates/account/login.html:32 -msgid "or" -msgstr "ou" - -#: alphabetlearning/templates/account/login.html:41 -#, python-format -msgid "" -"If you have not created an account yet, then please <a href=\"%(signup_url)s" -"\">sign up</a> first." -msgstr "Se você ainda não criou uma conta, <a href=\"%(signup_url)s" -"\">registre-se primeiro</a>." - -#: alphabetlearning/templates/account/login.html:55 -msgid "Forgot Password?" -msgstr "Esqueceu sua senha?" - -#: alphabetlearning/templates/account/logout.html:5 -#: alphabetlearning/templates/account/logout.html:8 -#: alphabetlearning/templates/account/logout.html:17 -#: alphabetlearning/templates/base.html:61 -msgid "Sign Out" -msgstr "Sair" - -#: alphabetlearning/templates/account/logout.html:10 -msgid "Are you sure you want to sign out?" -msgstr "Você tem certeza que deseja sair?" - -#: alphabetlearning/templates/account/password_change.html:6 -#: alphabetlearning/templates/account/password_change.html:9 -#: alphabetlearning/templates/account/password_change.html:14 -#: alphabetlearning/templates/account/password_reset_from_key.html:5 -#: alphabetlearning/templates/account/password_reset_from_key.html:8 -#: alphabetlearning/templates/account/password_reset_from_key_done.html:4 -#: alphabetlearning/templates/account/password_reset_from_key_done.html:7 -msgid "Change Password" -msgstr "Alterar Senha" - -#: alphabetlearning/templates/account/password_reset.html:7 -#: alphabetlearning/templates/account/password_reset.html:11 -#: alphabetlearning/templates/account/password_reset_done.html:6 -#: alphabetlearning/templates/account/password_reset_done.html:9 -msgid "Password Reset" -msgstr "Redefinição de senha" - -#: alphabetlearning/templates/account/password_reset.html:16 -msgid "" -"Forgotten your password? Enter your e-mail address below, and we'll send you " -"an e-mail allowing you to reset it." -msgstr "Esqueceu sua senha? Digite seu endereço de e-mail abaixo e enviaremos um e-mail permitindo que você o redefina." - -#: alphabetlearning/templates/account/password_reset.html:21 -msgid "Reset My Password" -msgstr "Redefinir minha senha" - -#: alphabetlearning/templates/account/password_reset.html:24 -msgid "Please contact us if you have any trouble resetting your password." -msgstr "Entre em contato conosco se tiver algum problema para redefinir sua senha." - -#: alphabetlearning/templates/account/password_reset_done.html:15 -msgid "" -"We have sent you an e-mail. Please contact us if you do not receive it " -"within a few minutes." -msgstr "Enviamos um e-mail para você. Entre em contato conosco se você não recebê-lo dentro de alguns minutos." - -#: alphabetlearning/templates/account/password_reset_from_key.html:8 -msgid "Bad Token" -msgstr "Token Inválido" - -#: alphabetlearning/templates/account/password_reset_from_key.html:12 -#, python-format -msgid "" -"The password reset link was invalid, possibly because it has already been " -"used. Please request a <a href=\"%(passwd_reset_url)s\">new password reset</" -"a>." -msgstr "O link de redefinição de senha era inválido, possivelmente porque já foi usado. " -"<a href=\"%(passwd_reset_url)s\">Solicite uma nova redefinição de senha</a>." - -#: alphabetlearning/templates/account/password_reset_from_key.html:18 -msgid "change password" -msgstr "alterar senha" - -#: alphabetlearning/templates/account/password_reset_from_key.html:21 -#: alphabetlearning/templates/account/password_reset_from_key_done.html:8 -msgid "Your password is now changed." -msgstr "Sua senha agora foi alterada." - -#: alphabetlearning/templates/account/password_set.html:6 -#: alphabetlearning/templates/account/password_set.html:9 -#: alphabetlearning/templates/account/password_set.html:14 -msgid "Set Password" -msgstr "Definir Senha" - -#: alphabetlearning/templates/account/signup.html:6 -msgid "Signup" -msgstr "Cadastro" - -#: alphabetlearning/templates/account/signup.html:9 -#: alphabetlearning/templates/account/signup.html:19 -#: alphabetlearning/templates/base.html:67 -msgid "Sign Up" -msgstr "Cadastro" - -#: alphabetlearning/templates/account/signup.html:11 -#, python-format -msgid "" -"Already have an account? Then please <a href=\"%(login_url)s\">sign in</a>." -msgstr "já tem uma conta? Então, por favor, faça <a href=\"%(login_url)s\">login</a>." - -#: alphabetlearning/templates/account/signup_closed.html:5 -#: alphabetlearning/templates/account/signup_closed.html:8 -msgid "Sign Up Closed" -msgstr "Inscrições encerradas" - -#: alphabetlearning/templates/account/signup_closed.html:10 -msgid "We are sorry, but the sign up is currently closed." -msgstr "Lamentamos, mas as inscrições estão encerradas no momento." - -#: alphabetlearning/templates/account/verification_sent.html:5 -#: alphabetlearning/templates/account/verification_sent.html:8 -#: alphabetlearning/templates/account/verified_email_required.html:5 -#: alphabetlearning/templates/account/verified_email_required.html:8 -msgid "Verify Your E-mail Address" -msgstr "Verifique seu endereço de e-mail" - -#: alphabetlearning/templates/account/verification_sent.html:10 -msgid "" -"We have sent an e-mail to you for verification. Follow the link provided to " -"finalize the signup process. Please contact us if you do not receive it " -"within a few minutes." -msgstr "Enviamos um e-mail para você para verificação. Siga o link fornecido para finalizar o processo de inscrição. Entre em contato conosco se você não recebê-lo dentro de alguns minutos." - -#: alphabetlearning/templates/account/verified_email_required.html:12 -msgid "" -"This part of the site requires us to verify that\n" -"you are who you claim to be. For this purpose, we require that you\n" -"verify ownership of your e-mail address. " -msgstr "Esta parte do site exige que verifiquemos se você é quem afirma ser.\n" -"Para esse fim, exigimos que você verifique a propriedade\n" -"do seu endereço de e-mail." - -#: alphabetlearning/templates/account/verified_email_required.html:16 -msgid "" -"We have sent an e-mail to you for\n" -"verification. Please click on the link inside this e-mail. Please\n" -"contact us if you do not receive it within a few minutes." -msgstr "Enviamos um e-mail para você para verificação.\n" -"Por favor, clique no link dentro deste e-mail.\n" -"Entre em contato conosco se você não recebê-lo dentro de alguns minutos." - -#: alphabetlearning/templates/account/verified_email_required.html:20 -#, python-format -msgid "" -"<strong>Note:</strong> you can still <a href=\"%(email_url)s\">change your e-" -"mail address</a>." -msgstr "<strong>Nota</strong>: você ainda pode <a href=\"%(email_url)s\">alterar seu endereço de e-mail</a>." - -#: alphabetlearning/templates/base.html:57 -msgid "My Profile" -msgstr "Meu perfil" - -#: alphabetlearning/users/admin.py:17 -msgid "Personal info" -msgstr "Informação pessoal" - -#: alphabetlearning/users/admin.py:19 -msgid "Permissions" -msgstr "Permissões" - -#: alphabetlearning/users/admin.py:30 -msgid "Important dates" -msgstr "Datas importantes" - -#: alphabetlearning/users/apps.py:7 -msgid "Users" -msgstr "Usuários" - -#: alphabetlearning/users/forms.py:24 -#: alphabetlearning/users/tests/test_forms.py:36 -msgid "This username has already been taken." -msgstr "Este nome de usuário já foi usado." - -#: alphabetlearning/users/models.py:15 -msgid "Name of User" -msgstr "Nome do Usuário" - -#: alphabetlearning/users/views.py:23 -msgid "Information successfully updated" -msgstr "Informação atualizada com sucesso" diff --git a/merge_production_dotenvs_in_dotenv.py b/merge_production_dotenvs_in_dotenv.py deleted file mode 100644 index c83ed71..0000000 --- a/merge_production_dotenvs_in_dotenv.py +++ /dev/null @@ -1,27 +0,0 @@ -# ruff: noqa -import os -from collections.abc import Sequence -from pathlib import Path - -BASE_DIR = Path(__file__).parent.resolve() -PRODUCTION_DOTENVS_DIR = BASE_DIR / ".envs" / ".production" -PRODUCTION_DOTENV_FILES = [ - PRODUCTION_DOTENVS_DIR / ".django", - PRODUCTION_DOTENVS_DIR / ".postgres", -] -DOTENV_FILE = BASE_DIR / ".env" - - -def merge( - output_file: Path, - files_to_merge: Sequence[Path], -) -> None: - merged_content = "" - for merge_file in files_to_merge: - merged_content += merge_file.read_text() - merged_content += os.linesep - output_file.write_text(merged_content) - - -if __name__ == "__main__": - merge(DOTENV_FILE, PRODUCTION_DOTENV_FILES) diff --git a/scripts/deploy.pl b/scripts/deploy.pl deleted file mode 100644 index 81f3957..0000000 --- a/scripts/deploy.pl +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env -S perl -w - -use warnings; -use strict; - -# Get environment variables from .env file -print "The .env-prod file is critical for the deployment.\n"; -print ".env file exists in the project directory.\n" if -e "../.env"; -print "It contains the following environment variables:\n\n"; - -my $live_db_url; -my $commented_db_url; - -open my $envf, "<", "../.env" or die "Cannot open .env file: $!"; -while ( my $line = <$envf>) { - # TODO fix this regex - it will omit commented lines to start with - if ($line =~ /^[A-Z_]+=/) { - if ($line =~ /^DATABASE_URL/) { - my @live_url = split(/=/, $line); - $live_db_url = $live_url[1]; - } - if ($line =~ /^#DATABASE_URL/) { - my @commented_url = split(/=/, $line); - $commented_db_url = $commented_url[1]; - } - print $line; - } -} - -print "\n\nDATABASE_URL is $live_db_url"; -print "\n\nCommented DATABASE_URL is $commented_db_url" if defined; - - -close($envf); diff --git a/scripts/deploy.sh b/scripts/deploy.sh deleted file mode 100755 index b7ecf74..0000000 --- a/scripts/deploy.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -# Assign arguments to variables -IMAGE_NAME="pyblackbird" -TAG="latest" # Adjust tagging strategy as needed -DOCKER_REGISTRY="registry.gitlab.com/yulqen" # Docker registry URL - -SERVER_HOST="substracker-web" - -# SSH into server to pull the image, restart the container, and configure NGINX and Certbot -#ssh -i $SSH_KEY_PATH $SSH_USER@$SERVER_HOST << EOF -ssh $SERVER_HOST << EOF - -# Stop and remove the existing container if it exists -docker stop $IMAGE_NAME || true -docker rm $IMAGE_NAME || true -docker rmi $DOCKER_REGISTRY/$IMAGE_NAME:$TAG || true - -# run using the .env file for config settings -cd code/pyblackbird && docker run -d --rm --name pyblackbird --mount type=bind,src=/home/surge/code/pyblackbird/data,dst=/app/data --env-file .env -p 8080:8080 $DOCKER_REGISTRY/$IMAGE_NAME:$TAG - -EOF - -echo "Deployment complete." diff --git a/tests/__init__.py b/tests/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/tests/__init__.py +++ /dev/null diff --git a/tests/test_merge_production_dotenvs_in_dotenv.py b/tests/test_merge_production_dotenvs_in_dotenv.py deleted file mode 100644 index c0e68f6..0000000 --- a/tests/test_merge_production_dotenvs_in_dotenv.py +++ /dev/null @@ -1,34 +0,0 @@ -from pathlib import Path - -import pytest - -from merge_production_dotenvs_in_dotenv import merge - - -@pytest.mark.parametrize( - ("input_contents", "expected_output"), - [ - ([], ""), - ([""], "\n"), - (["JANE=doe"], "JANE=doe\n"), - (["SEP=true", "AR=ator"], "SEP=true\nAR=ator\n"), - (["A=0", "B=1", "C=2"], "A=0\nB=1\nC=2\n"), - (["X=x\n", "Y=y", "Z=z\n"], "X=x\n\nY=y\nZ=z\n\n"), - ], -) -def test_merge( - tmp_path: Path, - input_contents: list[str], - expected_output: str, -): - output_file = tmp_path / ".env" - - files_to_merge = [] - for num, input_content in enumerate(input_contents, start=1): - merge_file = tmp_path / f".service{num}" - merge_file.write_text(input_content) - files_to_merge.append(merge_file) - - merge(output_file, files_to_merge) - - assert output_file.read_text() == expected_output diff --git a/wait-for-it.sh b/wait-for-it.sh deleted file mode 100755 index d990e0d..0000000 --- a/wait-for-it.sh +++ /dev/null @@ -1,182 +0,0 @@ -#!/usr/bin/env bash -# Use this script to test if a given TCP host/port are available - -WAITFORIT_cmdname=${0##*/} - -echoerr() { if [[ $WAITFORIT_QUIET -ne 1 ]]; then echo "$@" 1>&2; fi } - -usage() -{ - cat << USAGE >&2 -Usage: - $WAITFORIT_cmdname host:port [-s] [-t timeout] [-- command args] - -h HOST | --host=HOST Host or IP under test - -p PORT | --port=PORT TCP port under test - Alternatively, you specify the host and port as host:port - -s | --strict Only execute subcommand if the test succeeds - -q | --quiet Don't output any status messages - -t TIMEOUT | --timeout=TIMEOUT - Timeout in seconds, zero for no timeout - -- COMMAND ARGS Execute command with args after the test finishes -USAGE - exit 1 -} - -wait_for() -{ - if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then - echoerr "$WAITFORIT_cmdname: waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT" - else - echoerr "$WAITFORIT_cmdname: waiting for $WAITFORIT_HOST:$WAITFORIT_PORT without a timeout" - fi - WAITFORIT_start_ts=$(date +%s) - while : - do - if [[ $WAITFORIT_ISBUSY -eq 1 ]]; then - nc -z $WAITFORIT_HOST $WAITFORIT_PORT - WAITFORIT_result=$? - else - (echo -n > /dev/tcp/$WAITFORIT_HOST/$WAITFORIT_PORT) >/dev/null 2>&1 - WAITFORIT_result=$? - fi - if [[ $WAITFORIT_result -eq 0 ]]; then - WAITFORIT_end_ts=$(date +%s) - echoerr "$WAITFORIT_cmdname: $WAITFORIT_HOST:$WAITFORIT_PORT is available after $((WAITFORIT_end_ts - WAITFORIT_start_ts)) seconds" - break - fi - sleep 1 - done - return $WAITFORIT_result -} - -wait_for_wrapper() -{ - # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692 - if [[ $WAITFORIT_QUIET -eq 1 ]]; then - timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --quiet --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT & - else - timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT & - fi - WAITFORIT_PID=$! - trap "kill -INT -$WAITFORIT_PID" INT - wait $WAITFORIT_PID - WAITFORIT_RESULT=$? - if [[ $WAITFORIT_RESULT -ne 0 ]]; then - echoerr "$WAITFORIT_cmdname: timeout occurred after waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT" - fi - return $WAITFORIT_RESULT -} - -# process arguments -while [[ $# -gt 0 ]] -do - case "$1" in - *:* ) - WAITFORIT_hostport=(${1//:/ }) - WAITFORIT_HOST=${WAITFORIT_hostport[0]} - WAITFORIT_PORT=${WAITFORIT_hostport[1]} - shift 1 - ;; - --child) - WAITFORIT_CHILD=1 - shift 1 - ;; - -q | --quiet) - WAITFORIT_QUIET=1 - shift 1 - ;; - -s | --strict) - WAITFORIT_STRICT=1 - shift 1 - ;; - -h) - WAITFORIT_HOST="$2" - if [[ $WAITFORIT_HOST == "" ]]; then break; fi - shift 2 - ;; - --host=*) - WAITFORIT_HOST="${1#*=}" - shift 1 - ;; - -p) - WAITFORIT_PORT="$2" - if [[ $WAITFORIT_PORT == "" ]]; then break; fi - shift 2 - ;; - --port=*) - WAITFORIT_PORT="${1#*=}" - shift 1 - ;; - -t) - WAITFORIT_TIMEOUT="$2" - if [[ $WAITFORIT_TIMEOUT == "" ]]; then break; fi - shift 2 - ;; - --timeout=*) - WAITFORIT_TIMEOUT="${1#*=}" - shift 1 - ;; - --) - shift - WAITFORIT_CLI=("$@") - break - ;; - --help) - usage - ;; - *) - echoerr "Unknown argument: $1" - usage - ;; - esac -done - -if [[ "$WAITFORIT_HOST" == "" || "$WAITFORIT_PORT" == "" ]]; then - echoerr "Error: you need to provide a host and port to test." - usage -fi - -WAITFORIT_TIMEOUT=${WAITFORIT_TIMEOUT:-15} -WAITFORIT_STRICT=${WAITFORIT_STRICT:-0} -WAITFORIT_CHILD=${WAITFORIT_CHILD:-0} -WAITFORIT_QUIET=${WAITFORIT_QUIET:-0} - -# Check to see if timeout is from busybox? -WAITFORIT_TIMEOUT_PATH=$(type -p timeout) -WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH) - -WAITFORIT_BUSYTIMEFLAG="" -if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then - WAITFORIT_ISBUSY=1 - # Check if busybox timeout uses -t flag - # (recent Alpine versions don't support -t anymore) - if timeout &>/dev/stdout | grep -q -e '-t '; then - WAITFORIT_BUSYTIMEFLAG="-t" - fi -else - WAITFORIT_ISBUSY=0 -fi - -if [[ $WAITFORIT_CHILD -gt 0 ]]; then - wait_for - WAITFORIT_RESULT=$? - exit $WAITFORIT_RESULT -else - if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then - wait_for_wrapper - WAITFORIT_RESULT=$? - else - wait_for - WAITFORIT_RESULT=$? - fi -fi - -if [[ $WAITFORIT_CLI != "" ]]; then - if [[ $WAITFORIT_RESULT -ne 0 && $WAITFORIT_STRICT -eq 1 ]]; then - echoerr "$WAITFORIT_cmdname: strict mode, refusing to execute subprocess" - exit $WAITFORIT_RESULT - fi - exec "${WAITFORIT_CLI[@]}" -else - exit $WAITFORIT_RESULT -fi |