diff --git a/docs/changelog.rst b/docs/changelog.rst index 1db197440..d732654fa 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -18,6 +18,25 @@ Please make sure you have a fresh **database backup** before upgrading! Upgradin +v1.10.0 - 2017-10-19 +^^^^^^^^^^^^^^^^^^^^ + +.. note:: + + This releases turns telegram logging **off by default**. + If you wish to continue using this feature, add ``DSMRREADER_LOG_TELEGRAMS = True`` to your ``settings.py`` and reload the application. + + +**Tickets resolved in this release:** + +- [`#363 `_] Show electricity_merged in the Total row for current month - by helmo +- [`#305 `_] Trend staafdiagrammen afgelopen week / afgelopen maand altijd gelijk +- [`#194 `_] Add timestamp to highest and lowest Watt occurance +- [`#365 `_] Turn telegram logging off by default +- [`#366 `_] Restructure docs + + + v1.9.0 - 2017-10-08 ^^^^^^^^^^^^^^^^^^^ diff --git a/docs/credits.rst b/docs/credits.rst index 7e3351f95..93b48d71c 100644 --- a/docs/credits.rst +++ b/docs/credits.rst @@ -16,6 +16,7 @@ Listed in any order, sorted by name. - `Bert-Jan Vos `_ - `dajappie `_ - `Daniel ter Horst `_ +- `dbmnl `_ - `emilkwaaitaal `_ - `fpompert `_ - `Gert Schaafsma `_ diff --git a/docs/dropbox.rst b/docs/dropbox.rst new file mode 100644 index 000000000..e156f93fd --- /dev/null +++ b/docs/dropbox.rst @@ -0,0 +1,33 @@ +Integration: Dropbox +==================== + + +.. contents:: + :depth: 2 + + +Dropbox: Automated backup sync +------------------------------ +*How can I link my Dropbox account for backups?* + +Make sure you have a Dropbox-account or sign up for one. +Now go to `Dropbox Apps `_ and click **"Create app"** in top right corner. + +.. image:: _static/faq/dropbox_apps_overview.png + :target: _static/faq/dropbox_apps_overview.png + :alt: Dropbox Apps + +Choose the following options: (1) **Dropbox API** and (2) **App folder**. +Then enter a name for your app (3), this will also be used as directory name within the Apps-folder of your Dropbox. + +.. image:: _static/faq/dropbox_create_app.png + :target: _static/faq/dropbox_create_app.png + :alt: Dropbox Apps + +The app should be created in developer-mode. You can generate an access token for yourself by clicking the **"Generate"** button somewhere below. + +.. image:: _static/faq/dropbox_app_token.png + :target: _static/faq/dropbox_app_token.png + :alt: Dropbox Apps + +Copy the generated access token to the DSMR-reader settings for the Dropbox-configuration. The DSMR-reader application should sync any backups created shortly. diff --git a/docs/faq.rst b/docs/faq.rst index f06b4f415..1c6520d41 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -33,143 +33,31 @@ It will make sure to check, fetch and apply any changes released. Summary of dep Dropbox: Automated backup sync ------------------------------ -*How can I link my Dropbox account for backups?* -Make sure you have a Dropbox-account or sign up for one. -Now go to `Dropbox Apps `_ and click **"Create app"** in top right corner. - -.. image:: _static/faq/dropbox_apps_overview.png - :target: _static/faq/dropbox_apps_overview.png - :alt: Dropbox Apps - -Choose the following options: (1) **Dropbox API** and (2) **App folder**. -Then enter a name for your app (3), this will also be used as directory name within the Apps-folder of your Dropbox. - -.. image:: _static/faq/dropbox_create_app.png - :target: _static/faq/dropbox_create_app.png - :alt: Dropbox Apps - -The app should be created in developer-mode. You can generate an access token for yourself by clicking the **"Generate"** button somewhere below. - -.. image:: _static/faq/dropbox_app_token.png - :target: _static/faq/dropbox_app_token.png - :alt: Dropbox Apps - -Copy the generated access token to the DSMR-reader settings for the Dropbox-configuration. The DSMR-reader application should sync any backups created shortly. +:doc:`More information can be found here`. Mindergas.nl: Automated gas meter position export ------------------------------------------------- -*How can I link my mindergas.nl account?* - -Make sure you have a Mindergas.nl account or `signup for one `_. -Now go to "`Meterstand API `_" and click on the button located below **"Authenticatietoken"**. - -.. image:: _static/faq/mindergas_api.png - :target: _static/faq/mindergas_api.png - :alt: Mindergas API - -Copy the authentication token generated and paste in into the DSMR-reader settings for the Mindergas.nl-configuration. -Obviously the export only works when there are any gas readings at all and you have ticked the 'export' checkbox in the Mindergas.nl-configuration as well. - -.. note:: - Please note that due to policies of mindergas.nl it's not allowed to retroactively upload meter positions using the API. - Therefor this is not supported by the application. You can however, enter them manually on their website. +:doc:`More information can be found here`. PVOutput.org: Automated electricity consumption export ------------------------------------------------------ -*How can I link my PVOutput.org account?* - -Make sure you have a PVOutput.org account, or `signup for an account `_. -You will have to configure your account and PV system(s). For any support doing that, please `see this page `_ for more information. - -In order to link DSMR-reader to your account, please write down the "API Key" and "System ID" from your PVOutput account. You can find them near the bottom of the "Settings" page in PVOutput. - - -.. image:: _static/faq/external_pvoutput_settings.png - :target: _static/faq/external_pvoutput_settings.png - :alt: PVOutput account settings - - -Enter those values in DSMR-reader's admin pages, at "PVOutput: API configuration". Make sure to enter both: - - * API Key - * System ID - - -.. image:: _static/faq/pvoutput_api.png - :target: _static/faq/pvoutput_api.png - :alt: API settings - - -Now navigate to another settings page in DSMR-reader: "PVOutput: "Add Status" configuration". - * Enable uploading the consumption. - * Choose an interval between the uploads. You can configure this as well on the PVOutput's end, in Device Settings. - * Optionally, choose an upload delay X (in minutes). If set, DSMR-reader will not use data of the past X minutes. - * Optionally, you can choose to enter a **processing delay in minutes** for PVOutput. Please note that PVOutput will only allow this when you have a **"Donation" account** on their website. If you do not have one, they will reject each API call you make, until you disable (clear) this option in DSMR-reader. - - -.. image:: _static/faq/pvoutput_add_status.png - :target: _static/faq/pvoutput_add_status.png - :alt: Add Status settings - -If you configured everything correctly, you should see some addional data in PVOutput listed under "Your Outputs" momentarily. +:doc:`More information can be found here`. Usage notification: Daily usage statistics on your smartphone ------------------------------------------------------------- -*Which services for sending notifications are supported?* - -Currently, two mobile platforms are supported: Android and iOS. -The supported app for Android is `NotifyMyAndroid `_. -The supported app for iOS is `Prowl `_. - - -*How do I setup usage notifications?* - -Make sure you either have NotifyMyAndroid or Prowl installed on your smartphone. If you don't, visit your platforms app store to download the app and sign up for an account. Then, make sure to get your API key from the notificationservice that you prefer. For instruction on obtaining the API key, please read below. - -In the DSMR-reader settings for the Usagenotifications, tick the Send Notifications checkbox and select the notification service you want to use. Then copy the API key from the notification service and paste in into the the textbox for the API key. When you save these settings, your first notification should be sent after midnight. Don't worry, the notification will be sent with low priority and will not wake you up. - - -*How do I obtain my API key for NotifyMyAndroid?* - -After you have downloaded NotifyMyAndroid and signed up for an account you should be able to `login to your NotifyMyAndroid account `_. -Now go to "`My Account `_", you should see an overview of your current API keys if you have any. To create an API key for the DSMR-reader, please click **"Generate New Key"**. - -.. image:: _static/faq/notifications-notify-my-android-create-key.png - :target: _static/faq/notifications-notify-my-android-create-key.png - :alt: NotifyMyAndroid My Account overview - -When a new key is generated, you will see it immediatly. Your key is listed like in the screenshot below (the red box marks your API key). - -.. image:: _static/faq/notifications-notify-my-android-get-key.png - :target: _static/faq/notifications-notify-my-android-get-key.png - :alt: NotifyMyAndroid Get Your API Key - - -*How do I obtain my API key for Prowl?* - -After you have downloaded Prowl and signed up for an account you should be able to `login to your Prowl account `_. -Now go to "`API Keys `_", you should see an overview of your current API keys if you have any. To create an API key for the DSMR-reader, input a name and click **"Generate Key"**. - -.. image:: _static/faq/notifications-prowl-create-key.png - :target: _static/faq/notifications-prowl-key.png - :alt: Prowl My Account overview - -When a new key is generated, you will see it immediatly. Your key is listed like in the screenshot below (the red box marks your API key). -.. image:: _static/faq/notifications-prowl-get-key.png - :target: _static/faq/notifications-prowl-get-key.png - :alt: Prowl Get Your API Key +:doc:`More information can be found here`. I only pay for a single electricity tariff but I see two! --------------------------------------------------------- -DSMR (and your energy supplier) always read both high and low tariff from your meter. +DSMR (and your energy supplier) always reads both high and low tariff from your meter. It's possible however that you are only paying for a single tariff. In that case your energy supplier will simply merge both high and low tariffs to make it look like you have a single one. diff --git a/docs/index.rst b/docs/index.rst index 2474447d7..7df1388be 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -12,8 +12,12 @@ DSMR Reader's documentation settings api mqtt - troubleshooting + mindergas + pvoutput + dropbox + notifications faq + troubleshooting changelog contributing credits diff --git a/docs/licence.rst b/docs/licence.rst index 5498bf385..d9366bb71 100644 --- a/docs/licence.rst +++ b/docs/licence.rst @@ -1,654 +1,170 @@ -Licence (GNU GPLv3) -=================== +License +======= -**Copyright (C) 2015/2016 Dennis Siemensma** +.. note:: + + **Copyright (c) 2015 - 2017 Dennis Siemensma** + + +.. seealso:: + + For other languages, see: https://creativecommons.org/licenses/by-nc/4.0/legalcode#languages .. contents:: Licence +Creative Commons Attribution-NonCommercial 4.0 International Public License +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NonCommercial 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions. + +Section 1 – Definitions. +^^^^^^^^^^^^^^^^^^^^^^^^ + +- Adapted Material means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image. + +- Adapter's License means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License. + +- Copyright and Similar Rights means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights. + +- Effective Technological Measures means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements. + +- Exceptions and Limitations means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material. + +- Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public License. + +- Licensed Rights means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license. + +- Licensor means the individual(s) or entity(ies) granting rights under this Public License. + +- NonCommercial means not primarily intended for or directed towards commercial advantage or monetary compensation. For purposes of this Public License, the exchange of the Licensed Material for other material subject to Copyright and Similar Rights by digital file-sharing or similar means is NonCommercial provided there is no payment of monetary compensation in connection with the exchange. + +- Share means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them. + +- Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world. + +- You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning. + -GNU GENERAL PUBLIC LICENSE -^^^^^^^^^^^^^^^^^^^^^^^^^^ - - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - 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. +Section 2 – Scope. +^^^^^^^^^^^^^^^^^^ + +License grant. +-------------- + +- Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to: + +- - reproduce and Share the Licensed Material, in whole or in part, for NonCommercial purposes only; and +- - produce, reproduce, and Share Adapted Material for NonCommercial purposes only. + +- Exceptions and Limitations. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions. + +- Term. The term of this Public License is specified in Section 6(a). + +- Media and formats; technical modifications allowed. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material. + +- Downstream recipients. + +- - Offer from the Licensor – Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License. +- - No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material. + +- No endorsement. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i). + +Other rights. +-------------- + +- Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise. + +- Patent and trademark rights are not licensed under this Public License. + +- To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties, including when the Licensed Material is used other than for NonCommercial purposes. + + +Section 3 – License Conditions. +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Your exercise of the Licensed Rights is expressly made subject to the following conditions. + +Attribution. ------------ -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 +- If You Share the Licensed Material (including in modified form), You must: + +- - retain the following if it is supplied by the Licensor with the Licensed Material: + +- - - identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated); +- - - a copyright notice; +- - - a notice that refers to this Public License; +- - - a notice that refers to the disclaimer of warranties; +- - - a URI or hyperlink to the Licensed Material to the extent reasonably practicable; + +- - indicate if You modified the Licensed Material and retain an indication of any previous modifications; and + +- - indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License. + +- You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information. + +- If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable. + +- If You Share Adapted Material You produce, the Adapter's License You apply must not prevent recipients of the Adapted Material from complying with this Public License. + + +Section 4 – Sui Generis Database Rights. +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material: + +- for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database for NonCommercial purposes only; + +- if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and + +- You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights. + + +Section 5 – Disclaimer of Warranties and Limitation of Liability. +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +**Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.** + +**To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.** + +The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability. + + +Section 6 – Term and Termination. +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +- This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically. + +- Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates: + +- - automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or +- - upon express reinstatement by the Licensor. + +- For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License. + +- For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License. + +- Sections 1, 5, 6, 7, and 8 survive termination of this Public License. + + +Section 7 – Other Terms and Conditions. +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed. +Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License. + + +Section 8 – Interpretation. +^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +- For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License. + +- To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions. + +- No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor. + +- Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority. \ No newline at end of file diff --git a/docs/locale/nl/LC_MESSAGES/changelog.po b/docs/locale/nl/LC_MESSAGES/changelog.po index 3b70212f1..079fdc037 100644 --- a/docs/locale/nl/LC_MESSAGES/changelog.po +++ b/docs/locale/nl/LC_MESSAGES/changelog.po @@ -53,32 +53,93 @@ msgstr "" "fixes-new-features>`_." #: ../../changelog.rst:22 -msgid "v1.9.0 - 2017-10-29" +msgid "v1.10 - 2017-xx-xx" msgstr "" #: ../../changelog.rst:26 msgid "" -"This release contains an update for the API framework, which `has a fix " -"for some timezone issues `_. You may experience different output regarding " -"to datetime formatting when using the API." +"This releases turns telegram logging **off by default**. If you wish to " +"continue using this feature, add ``DSMRREADER_LOG_TELEGRAMS = True`` to " +"your ``settings.py`` and reload the application." msgstr "" -#: ../../changelog.rst:30 ../../changelog.rst:56 ../../changelog.rst:65 -#: ../../changelog.rst:74 ../../changelog.rst:97 ../../changelog.rst:106 -#: ../../changelog.rst:116 ../../changelog.rst:138 ../../changelog.rst:156 -#: ../../changelog.rst:165 ../../changelog.rst:175 ../../changelog.rst:184 -#: ../../changelog.rst:194 ../../changelog.rst:203 ../../changelog.rst:221 -#: ../../changelog.rst:240 ../../changelog.rst:265 ../../changelog.rst:278 -#: ../../changelog.rst:293 ../../changelog.rst:301 ../../changelog.rst:312 -#: ../../changelog.rst:324 ../../changelog.rst:341 ../../changelog.rst:349 -#: ../../changelog.rst:357 ../../changelog.rst:371 +#: ../../changelog.rst:30 ../../changelog.rst:49 ../../changelog.rst:75 +#: ../../changelog.rst:84 ../../changelog.rst:93 ../../changelog.rst:116 +#: ../../changelog.rst:125 ../../changelog.rst:135 ../../changelog.rst:157 +#: ../../changelog.rst:175 ../../changelog.rst:184 ../../changelog.rst:194 +#: ../../changelog.rst:203 ../../changelog.rst:213 ../../changelog.rst:222 +#: ../../changelog.rst:240 ../../changelog.rst:259 ../../changelog.rst:284 +#: ../../changelog.rst:297 ../../changelog.rst:312 ../../changelog.rst:320 +#: ../../changelog.rst:331 ../../changelog.rst:343 ../../changelog.rst:360 +#: ../../changelog.rst:368 ../../changelog.rst:376 ../../changelog.rst:390 msgid "**Tickets resolved in this release:**" msgstr "**Tickets die opgelost zijn in deze release:**" #: ../../changelog.rst:32 #, fuzzy msgid "" +"[`#366 `_] " +"Restructure docs" +msgstr "" +"De ondersteuning voor ``Python 3.3`` is **vervallen** wegens de Django " +"upgrade (`#103 `_)." + +#: ../../changelog.rst:33 +#, fuzzy +msgid "" +"[`#365 `_] " +"Turn telegram logging off by default" +msgstr "" +"De ondersteuning voor ``Python 3.3`` is **vervallen** wegens de Django " +"upgrade (`#103 `_)." + +#: ../../changelog.rst:34 +#, fuzzy +msgid "" +"[`#305 `_] " +"Trend staafdiagrammen afgelopen week / afgelopen maand altijd gelijk" +msgstr "" +"De ondersteuning voor ``Python 3.3`` is **vervallen** wegens de Django " +"upgrade (`#103 `_)." + +#: ../../changelog.rst:35 +#, fuzzy +msgid "" +"[`#194 `_] Add" +" timestamp to highest and lowest Watt occurance" +msgstr "" +"De ondersteuning voor ``Python 3.3`` is **vervallen** wegens de Django " +"upgrade (`#103 `_)." + +#: ../../changelog.rst:36 +#, fuzzy +msgid "" +"[`#363 `_] " +"Show electricity_merged in the Total row for current month - by helmo" +msgstr "" +"De ondersteuning voor ``Python 3.3`` is **vervallen** wegens de Django " +"upgrade (`#103 `_)." + +#: ../../changelog.rst:41 +msgid "v1.9.0 - 2017-10-08" +msgstr "" + +#: ../../changelog.rst:45 +msgid "" +"This release contains an update for the API framework, which `has a fix " +"for some timezone issues `_. You may experience different output regarding " +"to datetime formatting when using the API." +msgstr "" + +#: ../../changelog.rst:51 +#, fuzzy +msgid "" "[`#9 `_] Data " "export: PVOutput" msgstr "" @@ -86,7 +147,7 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:33 +#: ../../changelog.rst:52 #, fuzzy msgid "" "[`#163 `_] " @@ -96,7 +157,7 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:34 +#: ../../changelog.rst:53 #, fuzzy msgid "" "[`#337 `_] API" @@ -106,7 +167,7 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:35 +#: ../../changelog.rst:54 #, fuzzy msgid "" "[`#284 `_] " @@ -116,7 +177,7 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:36 +#: ../../changelog.rst:55 #, fuzzy msgid "" "[`#279 `_] " @@ -127,7 +188,7 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:37 +#: ../../changelog.rst:56 #, fuzzy msgid "" "[`#245 `_] " @@ -137,7 +198,7 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:38 +#: ../../changelog.rst:57 #, fuzzy msgid "" "[`#272 `_] " @@ -147,7 +208,7 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:39 +#: ../../changelog.rst:58 #, fuzzy msgid "" "[`#273 `_] " @@ -157,7 +218,7 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:40 +#: ../../changelog.rst:59 #, fuzzy msgid "" "[`#286 `_] Na " @@ -168,7 +229,7 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:41 +#: ../../changelog.rst:60 #, fuzzy msgid "" "[`#332 `_] " @@ -178,7 +239,7 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:42 +#: ../../changelog.rst:61 #, fuzzy msgid "" "[`#276 `_] " @@ -188,7 +249,7 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:43 +#: ../../changelog.rst:62 #, fuzzy msgid "" "[`#288 `_] Add" @@ -198,7 +259,7 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:44 +#: ../../changelog.rst:63 #, fuzzy msgid "" "[`#320 `_] " @@ -208,7 +269,7 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:45 +#: ../../changelog.rst:64 #, fuzzy msgid "" "[`#314 `_] Add" @@ -218,7 +279,7 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:46 +#: ../../changelog.rst:65 #, fuzzy msgid "" "[`#358 `_] " @@ -228,7 +289,7 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:47 +#: ../../changelog.rst:66 #, fuzzy msgid "" "[`#270 `_] " @@ -238,7 +299,7 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:48 +#: ../../changelog.rst:67 #, fuzzy msgid "" "[`#231 `_] " @@ -248,7 +309,7 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:49 +#: ../../changelog.rst:68 #, fuzzy msgid "" "[`#300 `_] " @@ -258,11 +319,11 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:54 +#: ../../changelog.rst:73 msgid "v1.8.2 - 2017-08-12" msgstr "" -#: ../../changelog.rst:58 +#: ../../changelog.rst:77 #, fuzzy msgid "" "[`#346 `_] " @@ -272,11 +333,11 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:63 +#: ../../changelog.rst:82 msgid "v1.8.1 - 2017-07-04" msgstr "" -#: ../../changelog.rst:67 +#: ../../changelog.rst:86 #, fuzzy msgid "" "[`#339 `_] " @@ -286,11 +347,11 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:72 +#: ../../changelog.rst:91 msgid "v1.8.0 - 2017-06-14" msgstr "" -#: ../../changelog.rst:76 +#: ../../changelog.rst:95 #, fuzzy msgid "" "[`#141 `_] Add" @@ -300,7 +361,7 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:77 +#: ../../changelog.rst:96 #, fuzzy msgid "" "[`#331 `_] " @@ -310,7 +371,7 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:78 +#: ../../changelog.rst:97 #, fuzzy msgid "" "[`#299 `_] " @@ -320,31 +381,31 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:83 +#: ../../changelog.rst:102 msgid "v1.7.0 - 2017-05-04" msgstr "" -#: ../../changelog.rst:87 +#: ../../changelog.rst:106 msgid "" "Please note that the ``dsmr_datalogger.0007_dsmrreading_timestamp_index``" " migration **will take quite some time**, as it adds an index on one of " "the largest database tables!" msgstr "" -#: ../../changelog.rst:89 +#: ../../changelog.rst:108 msgid "" "It takes **around two minutes** on a RaspberryPi 2 & 3 with ``> 4.3 " "million`` readings on PostgreSQL. Results may differ on **slower " "RaspberryPi's** or **with MySQL**." msgstr "" -#: ../../changelog.rst:94 +#: ../../changelog.rst:113 msgid "" "The API-docs for the new v2 API `can be found here `_." msgstr "" -#: ../../changelog.rst:99 +#: ../../changelog.rst:118 #, fuzzy msgid "" "[`#230 `_] " @@ -354,11 +415,11 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:104 +#: ../../changelog.rst:123 msgid "v1.6.2 - 2017-04-23" msgstr "" -#: ../../changelog.rst:108 +#: ../../changelog.rst:127 #, fuzzy msgid "" "[`#269 `_] " @@ -368,7 +429,7 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:109 +#: ../../changelog.rst:128 #, fuzzy msgid "" "[`#303 `_] " @@ -378,11 +439,11 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:114 +#: ../../changelog.rst:133 msgid "v1.6.1 - 2017-04-06" msgstr "" -#: ../../changelog.rst:118 +#: ../../changelog.rst:137 #, fuzzy msgid "" "[`#298 `_] " @@ -392,11 +453,11 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:123 +#: ../../changelog.rst:142 msgid "v1.6.0 - 2017-03-18" msgstr "" -#: ../../changelog.rst:127 +#: ../../changelog.rst:146 msgid "" "Support for ``MySQL`` has been **deprecated** since ``DSMR-reader v1.6`` " "and will be discontinued completely in a later release. Please use a " @@ -404,14 +465,14 @@ msgid "" "supported in easily migrating to PostgreSQL in the future." msgstr "" -#: ../../changelog.rst:132 +#: ../../changelog.rst:151 msgid "" "**Change in API:** The telegram creation API now returns an ``HTTP 201`` " "response when successful. An ``HTTP 200`` was returned in former " "versions. :doc:`View API docs`." msgstr "" -#: ../../changelog.rst:140 +#: ../../changelog.rst:159 #, fuzzy msgid "" "[`#221 `_] " @@ -421,7 +482,7 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:141 +#: ../../changelog.rst:160 #, fuzzy msgid "" "[`#237 `_] " @@ -431,7 +492,7 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:142 +#: ../../changelog.rst:161 #, fuzzy msgid "" "[`#249 `_] " @@ -441,7 +502,7 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:143 +#: ../../changelog.rst:162 #, fuzzy msgid "" "[`#232 `_] " @@ -451,19 +512,19 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:144 +#: ../../changelog.rst:163 msgid "" "[`#260 `_] Add" " link to readthedocs in Django for Dropbox instructions." msgstr "" -#: ../../changelog.rst:145 +#: ../../changelog.rst:164 msgid "" "[`#211 `_] API" " request should return HTTP 201 instead of HTTP 200." msgstr "" -#: ../../changelog.rst:146 +#: ../../changelog.rst:165 #, fuzzy msgid "" "[`#191 `_] " @@ -473,7 +534,7 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:147 +#: ../../changelog.rst:166 #, fuzzy msgid "" "[`#251 `_] " @@ -483,7 +544,7 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:148 +#: ../../changelog.rst:167 #, fuzzy msgid "" "[`#257 `_] " @@ -493,7 +554,7 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:149 +#: ../../changelog.rst:168 #, fuzzy msgid "" "[`#274 `_] " @@ -503,81 +564,81 @@ msgstr "" "upgrade (`#103 `_)." -#: ../../changelog.rst:154 ../../changelog.rst:173 +#: ../../changelog.rst:173 ../../changelog.rst:192 msgid "v1.5.5 - 2017-01-19" msgstr "" -#: ../../changelog.rst:158 ../../changelog.rst:177 +#: ../../changelog.rst:177 ../../changelog.rst:196 msgid "" "Remove readonly restriction for editing statistics in admin interface " "(`#242 `_)." msgstr "" -#: ../../changelog.rst:163 ../../changelog.rst:182 +#: ../../changelog.rst:182 ../../changelog.rst:201 msgid "v1.5.4 - 2017-01-12" msgstr "" -#: ../../changelog.rst:167 ../../changelog.rst:186 +#: ../../changelog.rst:186 ../../changelog.rst:205 msgid "" "Improve datalogger for DSMR v5.0 (`#212 " "`_)." msgstr "" -#: ../../changelog.rst:168 ../../changelog.rst:187 +#: ../../changelog.rst:187 ../../changelog.rst:206 msgid "" "Fixed another bug in MinderGas API client implementation (`#228 " "`_)." msgstr "" -#: ../../changelog.rst:192 +#: ../../changelog.rst:211 msgid "v1.5.3 - 2017-01-11" msgstr "" -#: ../../changelog.rst:196 +#: ../../changelog.rst:215 msgid "" "Improve MinderGas API client implementation (`#228 " "`_)." msgstr "" -#: ../../changelog.rst:201 +#: ../../changelog.rst:220 msgid "v1.5.2 - 2017-01-09" msgstr "" -#: ../../changelog.rst:205 +#: ../../changelog.rst:224 msgid "" "Automatic refresh of dashboard charts (`#210 " "`_)." msgstr "" -#: ../../changelog.rst:206 +#: ../../changelog.rst:225 msgid "" "Mindergas.nl API: Tijdstip van verzending willekeurig maken (`#204 " "`_)." msgstr "" -#: ../../changelog.rst:207 +#: ../../changelog.rst:226 msgid "" "Extend API docs with additional example (`#185 " "`_)." msgstr "" -#: ../../changelog.rst:208 +#: ../../changelog.rst:227 msgid "" "Docs: How to restore backup (`#190 `_)." msgstr "" -#: ../../changelog.rst:209 +#: ../../changelog.rst:228 msgid "" "Log errors occured to file (`#181 `_)." msgstr "" -#: ../../changelog.rst:214 +#: ../../changelog.rst:233 msgid "v1.5.1 - 2017-01-04" msgstr "" -#: ../../changelog.rst:218 +#: ../../changelog.rst:237 msgid "" "This patch contains no new features and **only solves upgrading issues** " "for some users." @@ -585,7 +646,7 @@ msgstr "" "Deze patch bevat geen nieuwe features en **lost alleen upgrade-problemen " "op** voor sommige gebruikers." -#: ../../changelog.rst:223 +#: ../../changelog.rst:242 msgid "" "Fix for issues `#200 `_ & `#217 `_)." -#: ../../changelog.rst:233 +#: ../../changelog.rst:252 msgid "" "There is **experimental support** for ``Python 3.6`` and ``Python 3.7 " "(nightly)`` as the unittests are `now built against those versions `_ (`#167 `_)." -#: ../../changelog.rst:235 +#: ../../changelog.rst:254 msgid "**Legacy warning**" msgstr "**Waarschuwing voor legacy**" -#: ../../changelog.rst:237 +#: ../../changelog.rst:256 msgid "" "The migrations that were squashed together in (`#31 " "`_) have been " @@ -647,7 +708,7 @@ msgstr "" "**verwijderd**. Hier heb je alleen maar te maken wanneer je nog gebruik " "maakt van een dsmrreader-versie **vóór** ``v0.13 (β)``." -#: ../../changelog.rst:238 +#: ../../changelog.rst:257 msgid "" "If you are indeed still running ``< v0.13 (β)``, please upgrade to " "``v1.4`` first (!), followed by an upgrade to ``v1.5``." @@ -655,409 +716,409 @@ msgstr "" "Wanneer je nog steeds een versie van vóór ``< v0.13 (β)`` draait, upgrade" " dan eerst naar ``v1.4`` (!), gevolgd door een upgrade naar ``v1.5``." -#: ../../changelog.rst:242 +#: ../../changelog.rst:261 msgid "" "Verify telegrams' CRC (`#188 `_)." msgstr "" -#: ../../changelog.rst:243 +#: ../../changelog.rst:262 msgid "" "Display last 24 hours on dashboard (`#164 " "`_)." msgstr "" -#: ../../changelog.rst:244 +#: ../../changelog.rst:263 msgid "" "Status page visualisation (`#172 `_)." msgstr "" -#: ../../changelog.rst:245 +#: ../../changelog.rst:264 msgid "" "Store and display phases consumption (`#161 " "`_)." msgstr "" -#: ../../changelog.rst:246 +#: ../../changelog.rst:265 msgid "" "Weather graph not showing when no gas data is available (`#170 " "`_)." msgstr "" -#: ../../changelog.rst:247 +#: ../../changelog.rst:266 msgid "" "Upgrade to ChartJs 2.0 (`#127 `_)." msgstr "" -#: ../../changelog.rst:248 +#: ../../changelog.rst:267 msgid "" "Improve Statistics page performance (`#173 " "`_)." msgstr "" -#: ../../changelog.rst:249 +#: ../../changelog.rst:268 msgid "" "Version checker at github (`#166 `_)." msgstr "" -#: ../../changelog.rst:250 +#: ../../changelog.rst:269 msgid "" "Remove required login for dismissal of in-app notifications (`#179 " "`_)." msgstr "" -#: ../../changelog.rst:251 +#: ../../changelog.rst:270 msgid "" "Round numbers displayed in GUI to 2 decimals (`#183 " "`_)." msgstr "" -#: ../../changelog.rst:252 +#: ../../changelog.rst:271 msgid "" "Switch Nosetests to Pytest (+ pytest-cov) (`#167 " "`_)." msgstr "" -#: ../../changelog.rst:253 +#: ../../changelog.rst:272 msgid "" "PyLama code audit (+ pytest-cov) (`#158 " "`_)." msgstr "" -#: ../../changelog.rst:254 +#: ../../changelog.rst:273 msgid "" "Double upgrade of Django framework ``Django 1.8`` -> ``Django 1.9`` -> " "``Django 1.10`` (`#103 `_)." msgstr "" -#: ../../changelog.rst:255 +#: ../../changelog.rst:274 msgid "" "Force ``PYTHONUNBUFFERED`` for supervisor commands (`#176 " "`_)." msgstr "" -#: ../../changelog.rst:256 +#: ../../changelog.rst:275 msgid "" "Documentation updates for v1.5 (`#171 `_)." msgstr "" -#: ../../changelog.rst:257 +#: ../../changelog.rst:276 msgid "" "Requirements update for v1.5 (december 2016) (`#182 " "`_)." msgstr "" -#: ../../changelog.rst:258 +#: ../../changelog.rst:277 msgid "" "Improved backend process logging (`#184 " "`_)." msgstr "" -#: ../../changelog.rst:263 +#: ../../changelog.rst:282 msgid "v1.4.1 - 2016-12-12" msgstr "" -#: ../../changelog.rst:267 +#: ../../changelog.rst:286 msgid "" "Consumption chart hangs due to unique_key violation (`#174 " "`_)." msgstr "" -#: ../../changelog.rst:268 +#: ../../changelog.rst:287 msgid "" "NoReverseMatch at / Reverse for 'docs' (`#175 " "`_)." msgstr "" -#: ../../changelog.rst:273 +#: ../../changelog.rst:292 msgid "v1.4.0 - 2016-11-28" msgstr "" -#: ../../changelog.rst:276 +#: ../../changelog.rst:295 msgid "" "Support for ``Python 3.5`` has been added officially (`#55 " "`_)." msgstr "" -#: ../../changelog.rst:280 +#: ../../changelog.rst:299 msgid "" "Push notifications for Notify My Android / Prowl (iOS), written by Jeroen" " Peters (`#152 `_)." msgstr "" -#: ../../changelog.rst:281 +#: ../../changelog.rst:300 msgid "" "Support for both single and high/low tariff (`#130 " "`_)." msgstr "" -#: ../../changelog.rst:282 +#: ../../changelog.rst:301 msgid "" "Add new note from Dashboard has wrong time format (`#159 " "`_)." msgstr "" -#: ../../changelog.rst:283 +#: ../../changelog.rst:302 msgid "" "Display estimated price for current usage in Dashboard (`#155 " "`_)." msgstr "" -#: ../../changelog.rst:284 +#: ../../changelog.rst:303 msgid "" "Dropbox API v1 deprecated in June 2017 (`#142 " "`_)." msgstr "" -#: ../../changelog.rst:285 +#: ../../changelog.rst:304 msgid "" "Improve code coverage (`#151 `_)." msgstr "" -#: ../../changelog.rst:286 +#: ../../changelog.rst:305 msgid "" "Restyle configuration overview (`#156 `_)." msgstr "" -#: ../../changelog.rst:287 +#: ../../changelog.rst:306 msgid "" "Capability based push notifications (`#165 " "`_)." msgstr "" -#: ../../changelog.rst:292 +#: ../../changelog.rst:311 msgid "v1.3.2 - 2016-11-08" msgstr "" -#: ../../changelog.rst:295 +#: ../../changelog.rst:314 msgid "" "Requirements update (november 2016) (`#150 " "`_)." msgstr "" -#: ../../changelog.rst:300 +#: ../../changelog.rst:319 msgid "v1.3.1 - 2016-08-16" msgstr "" -#: ../../changelog.rst:303 +#: ../../changelog.rst:322 msgid "" "CSS large margin-bottom (`#144 `_)." msgstr "" -#: ../../changelog.rst:304 +#: ../../changelog.rst:323 msgid "" "Django security releases issued: 1.8.14 (`#147 " "`_)." msgstr "" -#: ../../changelog.rst:305 +#: ../../changelog.rst:324 msgid "" "Requirements update (August 2016) (`#148 " "`_)." msgstr "" -#: ../../changelog.rst:306 +#: ../../changelog.rst:325 msgid "" "Query performance improvements (`#149 `_)." msgstr "" -#: ../../changelog.rst:311 +#: ../../changelog.rst:330 msgid "v1.3.0 - 2016-07-15" msgstr "" -#: ../../changelog.rst:314 +#: ../../changelog.rst:333 msgid "" "API endpoint for datalogger (`#140 `_)." msgstr "" -#: ../../changelog.rst:315 +#: ../../changelog.rst:334 msgid "" "Colors for charts (`#137 `_)." msgstr "" -#: ../../changelog.rst:316 +#: ../../changelog.rst:335 msgid "" "Data export: Mindergas.nl (`#10 `_)." msgstr "" -#: ../../changelog.rst:317 +#: ../../changelog.rst:336 msgid "" "Requirement upgrade (`#143 `_)." msgstr "" -#: ../../changelog.rst:318 +#: ../../changelog.rst:337 msgid "" "Installation wizard for first time use (`#139 " "`_)." msgstr "" -#: ../../changelog.rst:323 +#: ../../changelog.rst:342 msgid "v1.2.0 - 2016-05-18" msgstr "" -#: ../../changelog.rst:326 +#: ../../changelog.rst:345 msgid "" "Energy supplier prices does not indicate tariff type (Django admin) " "(`#126 `_)." msgstr "" -#: ../../changelog.rst:327 +#: ../../changelog.rst:346 msgid "" "Requirements update (`#128 `_)." msgstr "" -#: ../../changelog.rst:328 +#: ../../changelog.rst:347 msgid "" "Force backup (`#123 `_)." msgstr "" -#: ../../changelog.rst:329 +#: ../../changelog.rst:348 msgid "" "Update clean-install.md (`#131 `_)." msgstr "" -#: ../../changelog.rst:330 +#: ../../changelog.rst:349 msgid "" "Improve data export field names (`#132 " "`_)." msgstr "" -#: ../../changelog.rst:331 +#: ../../changelog.rst:350 msgid "" "Display average temperature in archive (`#122 " "`_)." msgstr "" -#: ../../changelog.rst:332 +#: ../../changelog.rst:351 msgid "" "Pie charts on trends page overlap their canvas (`#136 " "`_)." msgstr "" -#: ../../changelog.rst:333 +#: ../../changelog.rst:352 msgid "" "'Slumber' consumption (`#115 `_)." msgstr "" -#: ../../changelog.rst:334 +#: ../../changelog.rst:353 msgid "" "Show lowest & highest Watt peaks (`#138 " "`_)." msgstr "" -#: ../../changelog.rst:335 +#: ../../changelog.rst:354 msgid "" "Allow day & hour statistics reset due to changing energy prices (`#95 " "`_)." msgstr "" -#: ../../changelog.rst:340 +#: ../../changelog.rst:359 msgid "v1.1.2 - 2016-05-01" msgstr "" -#: ../../changelog.rst:343 +#: ../../changelog.rst:362 msgid "" "Trends page giving errors (when lacking data) (`#125 " "`_)." msgstr "" -#: ../../changelog.rst:348 +#: ../../changelog.rst:367 msgid "v1.1.1 - 2016-04-27" msgstr "" -#: ../../changelog.rst:351 +#: ../../changelog.rst:370 msgid "" "Improve readme (`#124 `_)." msgstr "" -#: ../../changelog.rst:356 +#: ../../changelog.rst:375 msgid "v1.1.0 - 2016-04-23" msgstr "" -#: ../../changelog.rst:359 +#: ../../changelog.rst:378 msgid "" "Autorefresh dashboard (`#117 `_)." msgstr "" -#: ../../changelog.rst:360 +#: ../../changelog.rst:379 msgid "" "Improve line graphs' visibility (`#111 " "`_)." msgstr "" -#: ../../changelog.rst:361 +#: ../../changelog.rst:380 msgid "" "Easily add notes (`#110 `_)." msgstr "" -#: ../../changelog.rst:362 +#: ../../changelog.rst:381 msgid "" "Export data points in CSV format (`#2 `_)." msgstr "" -#: ../../changelog.rst:363 +#: ../../changelog.rst:382 msgid "" "Allow day/month/year comparison (`#94 `_)." msgstr "" -#: ../../changelog.rst:364 +#: ../../changelog.rst:383 msgid "" "Docs: Add FAQ and generic application info (`#113 " "`_)." msgstr "" -#: ../../changelog.rst:365 +#: ../../changelog.rst:384 msgid "" "Support for Iskra meter (DSMR 2.x) (`#120 " "`_)." msgstr "" -#: ../../changelog.rst:370 +#: ../../changelog.rst:389 msgid "v1.0.1 - 2016-04-07" msgstr "" -#: ../../changelog.rst:373 +#: ../../changelog.rst:392 msgid "" "Update licence to OSI compatible one (`#119 " "`_)." msgstr "" -#: ../../changelog.rst:378 +#: ../../changelog.rst:397 msgid "v1.0.0 - 2016-04-07" msgstr "" -#: ../../changelog.rst:379 +#: ../../changelog.rst:398 msgid "First official stable release." msgstr "Eerste officiële stabiele release." -#: ../../changelog.rst:384 +#: ../../changelog.rst:403 msgid "[β] v0.1 (2015-10-29) to 0.16 (2016-04-06)" msgstr "" -#: ../../changelog.rst:387 +#: ../../changelog.rst:406 msgid "" "All previous beta releases/changes have been combined to a single list " "below." @@ -1065,444 +1126,447 @@ msgstr "" "Alle vorige bèta releases/veranderingen zijn gecombineerd tot een enkele " "lijst hieronder." -#: ../../changelog.rst:389 +#: ../../changelog.rst:408 msgid "" "Move documentation to wiki or RTD (`#90 " "`_)." msgstr "" -#: ../../changelog.rst:390 +#: ../../changelog.rst:409 msgid "" "Translate README to Dutch (`#16 `_)." msgstr "" -#: ../../changelog.rst:391 +#: ../../changelog.rst:410 msgid "" "Delete (recent) history page (`#112 `_)." msgstr "" -#: ../../changelog.rst:392 +#: ../../changelog.rst:411 msgid "" "Display most recent temperature in dashboard (`#114 " "`_)." msgstr "" -#: ../../changelog.rst:393 +#: ../../changelog.rst:412 msgid "" "Upgrade Django to 1.8.12 (`#118 `_)." msgstr "" -#: ../../changelog.rst:395 +#: ../../changelog.rst:414 msgid "" "Redesign trends page (`#97 `_)." msgstr "" -#: ../../changelog.rst:396 +#: ../../changelog.rst:415 msgid "" "Support for summer time (`#105 `_)." msgstr "" -#: ../../changelog.rst:397 +#: ../../changelog.rst:416 msgid "" "Support for Daylight Saving Time (DST) transition (`#104 " "`_)." msgstr "" -#: ../../changelog.rst:398 +#: ../../changelog.rst:417 msgid "" "Add (error) hints to status page (`#106 " "`_)." msgstr "" -#: ../../changelog.rst:399 +#: ../../changelog.rst:418 msgid "" "Keep track of version (`#108 `_)." msgstr "" -#: ../../changelog.rst:401 +#: ../../changelog.rst:420 msgid "" "Django 1.8.11 released (`#82 `_)." msgstr "" -#: ../../changelog.rst:402 +#: ../../changelog.rst:421 msgid "" "Prevent tests from failing due to moment of execution (`#88 " "`_)." msgstr "" -#: ../../changelog.rst:403 +#: ../../changelog.rst:422 msgid "" "Statistics page meter positions are broken (`#93 " "`_)." msgstr "" -#: ../../changelog.rst:404 +#: ../../changelog.rst:423 msgid "" "Archive only shows graph untill 23:00 (11 pm) (`#77 " "`_)." msgstr "" -#: ../../changelog.rst:405 +#: ../../changelog.rst:424 msgid "" "Trends page crashes due to nullable fields average (`#100 " "`_)." msgstr "" -#: ../../changelog.rst:406 +#: ../../changelog.rst:425 msgid "" "Trends: Plot peak and off-peak relative to each other (`#99 " "`_)." msgstr "" -#: ../../changelog.rst:407 +#: ../../changelog.rst:426 msgid "" "Monitor requirements with requires.io (`#101 " "`_)." msgstr "" -#: ../../changelog.rst:408 +#: ../../changelog.rst:427 msgid "" "Terminology (`#41 `_)." msgstr "" -#: ../../changelog.rst:409 +#: ../../changelog.rst:428 msgid "" "Obsolete signals in dsmr_consumption (`#63 " "`_)." msgstr "" -#: ../../changelog.rst:410 +#: ../../changelog.rst:429 msgid "" "Individual app testing coverage (`#64 `_)." msgstr "" -#: ../../changelog.rst:411 +#: ../../changelog.rst:430 msgid "" "Support for extra devices on other M-bus (0-n:24.1) (`#92 " "`_)." msgstr "" -#: ../../changelog.rst:412 +#: ../../changelog.rst:431 msgid "" "Separate post-deployment commands (`#102 " "`_)." msgstr "" -#: ../../changelog.rst:414 +#: ../../changelog.rst:433 msgid "" "Show exceptions in production (webinterface) (`#87 " "`_)." msgstr "" -#: ../../changelog.rst:415 +#: ../../changelog.rst:434 msgid "" "Keep Supervisor processes running (`#79 " "`_)." msgstr "" -#: ../../changelog.rst:416 +#: ../../changelog.rst:435 msgid "" "Hourly stats of 22:00:00+00 every day lack gas (`#78 " "`_)." msgstr "" -#: ../../changelog.rst:417 +#: ../../changelog.rst:436 msgid "" "Test Travis-CI with MySQL + MariaDB + PostgreSQL (`#54 " "`_)." msgstr "" -#: ../../changelog.rst:418 +#: ../../changelog.rst:437 msgid "" "PostgreSQL tests + nosetests + coverage failure: unrecognized " "configuration parameter \"foreign_key_checks\" (`#62 " "`_)." msgstr "" -#: ../../changelog.rst:419 +#: ../../changelog.rst:438 msgid "" "Performance check (`#83 `_)." msgstr "" -#: ../../changelog.rst:420 +#: ../../changelog.rst:439 msgid "" "Allow month & year archive (`#66 `_)." msgstr "" -#: ../../changelog.rst:421 +#: ../../changelog.rst:440 msgid "" "Graphs keep increasing height on tablet (`#89 " "`_)." msgstr "" -#: ../../changelog.rst:423 +#: ../../changelog.rst:442 msgid "" "Delete StatsSettings(.track) settings model (`#71 " "`_)." msgstr "" -#: ../../changelog.rst:424 +#: ../../changelog.rst:443 msgid "" "Drop deprecated commands (`#22 `_)." msgstr "" -#: ../../changelog.rst:425 +#: ../../changelog.rst:444 msgid "" "Datalogger doesn't work properly with DSMR 4.2 (KAIFA-METER) (`#73 " "`_)." msgstr "" -#: ../../changelog.rst:426 +#: ../../changelog.rst:445 msgid "" "Dashboard month statistics costs does not add up (`#75 " "`_)." msgstr "" -#: ../../changelog.rst:427 +#: ../../changelog.rst:446 msgid "" "Log unhandled exceptions and errors (`#65 " "`_)." msgstr "" -#: ../../changelog.rst:428 +#: ../../changelog.rst:447 msgid "" "Datalogger crashes with IntegrityError because 'timestamp' is null (`#74 " "`_)." msgstr "" -#: ../../changelog.rst:429 +#: ../../changelog.rst:448 msgid "" "Trends are always shown in UTC (`#76 `_)." msgstr "" -#: ../../changelog.rst:430 +#: ../../changelog.rst:449 msgid "" "Squash migrations (`#31 `_)." msgstr "" -#: ../../changelog.rst:431 +#: ../../changelog.rst:450 msgid "" "Display 'electricity returned' graph in dashboard (`#81 " "`_)." msgstr "" -#: ../../changelog.rst:432 +#: ../../changelog.rst:451 msgid "" "Optional gas (and electricity returned) capabilities tracking (`#70 " "`_)." msgstr "" -#: ../../changelog.rst:433 +#: ../../changelog.rst:452 msgid "" "Add 'electricity returned' to trends page (`#84 " "`_)." msgstr "" -#: ../../changelog.rst:435 +#: ../../changelog.rst:454 msgid "" "Archive: View past days details (`#61 `_)." msgstr "" -#: ../../changelog.rst:436 +#: ../../changelog.rst:455 msgid "" "Dashboard: Consumption total for current month (`#60 " "`_)." msgstr "" -#: ../../changelog.rst:437 +#: ../../changelog.rst:456 msgid "" "Check whether gas readings are optional (`#34 " "`_)." msgstr "" -#: ../../changelog.rst:438 +#: ../../changelog.rst:457 msgid "" "Django security releases issued: 1.8.10 (`#68 " "`_)." msgstr "" -#: ../../changelog.rst:439 +#: ../../changelog.rst:458 msgid "" "Notes display in archive (`#69 `_)." msgstr "" -#: ../../changelog.rst:441 +#: ../../changelog.rst:460 msgid "" "Status page/alerts when features are disabled/unavailable (`#45 " "`_)." msgstr "" -#: ../../changelog.rst:442 +#: ../../changelog.rst:461 msgid "" "Integrate Travis CI (`#48 `_)." msgstr "" -#: ../../changelog.rst:443 +#: ../../changelog.rst:462 msgid "" "Testing coverage (`#38 `_)." msgstr "" -#: ../../changelog.rst:444 +#: ../../changelog.rst:463 msgid "" "Implement automatic backups & Dropbox cloud storage (`#44 " "`_)." msgstr "" -#: ../../changelog.rst:445 +#: ../../changelog.rst:464 msgid "" "Link code coverage service to repository (`#56 " "`_)." msgstr "" -#: ../../changelog.rst:446 +#: ../../changelog.rst:465 msgid "" "Explore timezone.localtime() as replacement for datetime.astimezone() " "(`#50 `_)." msgstr "" -#: ../../changelog.rst:447 +#: ../../changelog.rst:466 msgid "" "Align GasConsumption.read_at to represent the start of hour (`#40 " "`_)." msgstr "" -#: ../../changelog.rst:449 +#: ../../changelog.rst:468 msgid "" "Cleanup unused static files (`#47 `_)." msgstr "" -#: ../../changelog.rst:450 +#: ../../changelog.rst:469 msgid "" "Investigated mysql_tzinfo_to_sql — Load the Time Zone Tables (`#35 " "`_)." msgstr "" -#: ../../changelog.rst:451 +#: ../../changelog.rst:470 msgid "" "Make additional DSMR data optional (`#46 " "`_)." msgstr "" -#: ../../changelog.rst:452 +#: ../../changelog.rst:471 msgid "" "Localize graph x-axis (`#42 `_)." msgstr "" -#: ../../changelog.rst:453 +#: ../../changelog.rst:472 msgid "" "Added graph formatting string to gettext file (`#42 " "`_)." msgstr "" -#: ../../changelog.rst:454 +#: ../../changelog.rst:473 msgid "" "Different colors for peak & off-peak electricity (`#52 " "`_)." msgstr "" -#: ../../changelog.rst:455 +#: ../../changelog.rst:474 msgid "" "Admin: Note widget (`#51 `_)." msgstr "" -#: ../../changelog.rst:456 +#: ../../changelog.rst:475 msgid "" "Allow GUI to run without data (`#26 `_)." msgstr "" -#: ../../changelog.rst:458 +#: ../../changelog.rst:477 msgid "" "Moved project to GitHub (`#28 `_)." msgstr "" -#: ../../changelog.rst:459 +#: ../../changelog.rst:478 msgid "Added stdout to dsmr_backend to reflect progress." msgstr "" -#: ../../changelog.rst:460 +#: ../../changelog.rst:479 msgid "" "Restore note usage in GUI (`#39 `_)." msgstr "" -#: ../../changelog.rst:462 +#: ../../changelog.rst:481 msgid "" "Store daily, weekly, monthly and yearly statistics (`#3 " "`_)." msgstr "" -#: ../../changelog.rst:463 +#: ../../changelog.rst:482 msgid "" "Improved Recent History page performance a bit. (as result of `#3 " "`_)" msgstr "" -#: ../../changelog.rst:464 +#: ../../changelog.rst:483 msgid "" "Updates ChartJS library tot 1.1, disposing django-chartjs plugin. Labels " "finally work! (as result of `#3 `_)" msgstr "" -#: ../../changelog.rst:465 +#: ../../changelog.rst:484 msgid "" "Added trends page. (as result of `#3 `_)" msgstr "" -#: ../../changelog.rst:467 +#: ../../changelog.rst:486 msgid "" "Recent history setting: set range (`#29 " "`_)." msgstr "" -#: ../../changelog.rst:468 +#: ../../changelog.rst:487 msgid "" "Mock required for test: dsmr_weather.test_weather_tracking (`#32 " "`_)." msgstr "" -#: ../../changelog.rst:470 +#: ../../changelog.rst:489 msgid "" "Massive refactoring: Separating apps & using signals (`#19 " "`_)." msgstr "" -#: ../../changelog.rst:471 +#: ../../changelog.rst:490 msgid "" "README update: Exit character for cu (`#27 " "`_, by Jeroen " "Peters)." msgstr "" -#: ../../changelog.rst:472 +#: ../../changelog.rst:491 msgid "Fixed untranslated strings in admin interface." msgstr "" -#: ../../changelog.rst:473 +#: ../../changelog.rst:492 msgid "Upgraded Django to 1.8.9." msgstr "" +#~ msgid "v1.9.0 - 2017-10-29" +#~ msgstr "" + diff --git a/docs/locale/nl/LC_MESSAGES/credits.po b/docs/locale/nl/LC_MESSAGES/credits.po index 6632dc92e..e42822843 100644 --- a/docs/locale/nl/LC_MESSAGES/credits.po +++ b/docs/locale/nl/LC_MESSAGES/credits.po @@ -52,110 +52,114 @@ msgid "`Daniel ter Horst `_" msgstr "" #: ../../credits.rst:19 -msgid "`emilkwaaitaal `_" +msgid "`dbmnl `_" msgstr "" #: ../../credits.rst:20 -msgid "`fpompert `_" +msgid "`emilkwaaitaal `_" msgstr "" #: ../../credits.rst:21 -msgid "`Gert Schaafsma `_" +msgid "`fpompert `_" msgstr "" #: ../../credits.rst:22 -msgid "`goegol `_" +msgid "`Gert Schaafsma `_" msgstr "" #: ../../credits.rst:23 -msgid "`Hans-Paul Hemelaar `_" +msgid "`goegol `_" msgstr "" #: ../../credits.rst:24 -msgid "`helmo `_" +msgid "`Hans-Paul Hemelaar `_" msgstr "" #: ../../credits.rst:25 -msgid "`Jelte Leijenaar `_" +msgid "`helmo `_" msgstr "" #: ../../credits.rst:26 -msgid "`Jeroen Tielen `_" +msgid "`Jelte Leijenaar `_" msgstr "" #: ../../credits.rst:27 -msgid "Koen Volleberg" +msgid "`Jeroen Tielen `_" msgstr "" #: ../../credits.rst:28 -msgid "`MarsWarrior `_" +msgid "Koen Volleberg" msgstr "" #: ../../credits.rst:29 -msgid "`mbnn `_" +msgid "`MarsWarrior `_" msgstr "" #: ../../credits.rst:30 -msgid "`michielvisser `_" +msgid "`mbnn `_" msgstr "" #: ../../credits.rst:31 -msgid "`mkruiver `_" +msgid "`michielvisser `_" msgstr "" #: ../../credits.rst:32 -msgid "`Paul Vinken `_" +msgid "`mkruiver `_" msgstr "" #: ../../credits.rst:33 -msgid "`perryodk `_" +msgid "`Paul Vinken `_" msgstr "" #: ../../credits.rst:34 -msgid "`pyrocumulus `_" +msgid "`perryodk `_" msgstr "" #: ../../credits.rst:35 -msgid "`Sander de Leeuw `_" +msgid "`pyrocumulus `_" msgstr "" #: ../../credits.rst:36 -msgid "`Sevickson `_" +msgid "`Sander de Leeuw `_" msgstr "" #: ../../credits.rst:37 -msgid "`ThinkPadNL `_" +msgid "`Sevickson `_" msgstr "" #: ../../credits.rst:38 -msgid "`thommy101 `_" +msgid "`ThinkPadNL `_" msgstr "" #: ../../credits.rst:39 -msgid "`TopdRob `_" +msgid "`thommy101 `_" msgstr "" #: ../../credits.rst:40 -msgid "`trbs `_" +msgid "`TopdRob `_" msgstr "" #: ../../credits.rst:41 -msgid "`voipmeister `_" +msgid "`trbs `_" msgstr "" #: ../../credits.rst:42 -msgid "`WatskeBart `_" +msgid "`voipmeister `_" msgstr "" #: ../../credits.rst:43 +msgid "`WatskeBart `_" +msgstr "" + +#: ../../credits.rst:44 msgid "`xirixiz `_" msgstr "" -#: ../../credits.rst:47 +#: ../../credits.rst:48 msgid "Software used" msgstr "Gebruikte software" -#: ../../credits.rst:48 +#: ../../credits.rst:49 msgid "" "Please note and respect their licences as well, if any. Credits to the " "following software and projects:" @@ -163,119 +167,122 @@ msgstr "" "Houd rekening met eventuele licenties/restricties van deze software, " "wanneer van toepassing. Met dank aan de volgende software en projecten:" -#: ../../credits.rst:50 +#: ../../credits.rst:51 msgid "`Raspbian `_" msgstr "" -#: ../../credits.rst:51 +#: ../../credits.rst:52 msgid "`Django Project `_" msgstr "" -#: ../../credits.rst:52 +#: ../../credits.rst:53 msgid "`Django Solo `_" msgstr "" -#: ../../credits.rst:53 +#: ../../credits.rst:54 msgid "`Django Colorfield `_" msgstr "" -#: ../../credits.rst:54 +#: ../../credits.rst:55 msgid "`Supervisor `_" msgstr "" -#: ../../credits.rst:55 +#: ../../credits.rst:56 msgid "`MySQL `_" msgstr "" -#: ../../credits.rst:56 +#: ../../credits.rst:57 msgid "`MariaDB `_" msgstr "" -#: ../../credits.rst:57 +#: ../../credits.rst:58 msgid "`PostgreSQL `_" msgstr "" -#: ../../credits.rst:58 +#: ../../credits.rst:59 msgid "" "`Director Responsive Admin `_" msgstr "" -#: ../../credits.rst:59 +#: ../../credits.rst:60 msgid "" "Favicon made by `Freepik `_ from `flaticon.com " "`_" msgstr "" -#: ../../credits.rst:60 +#: ../../credits.rst:61 msgid "`Real Favicon Generator `_" msgstr "" -#: ../../credits.rst:61 +#: ../../credits.rst:62 msgid "`Bootstrap-datepicker `_" msgstr "" -#: ../../credits.rst:62 +#: ../../credits.rst:63 msgid "`Github `_" msgstr "" -#: ../../credits.rst:63 +#: ../../credits.rst:64 msgid "`TravisCI `_" msgstr "" -#: ../../credits.rst:64 +#: ../../credits.rst:65 msgid "`Codecov `_" msgstr "" -#: ../../credits.rst:65 +#: ../../credits.rst:66 msgid "`Read The Docs `_" msgstr "" -#: ../../credits.rst:66 +#: ../../credits.rst:67 msgid "`MW `_" msgstr "" -#: ../../credits.rst:67 +#: ../../credits.rst:68 msgid "" "`Full Page Screen Capture `_" msgstr "" -#: ../../credits.rst:68 +#: ../../credits.rst:69 msgid "`Buienradar `_" msgstr "" -#: ../../credits.rst:69 +#: ../../credits.rst:70 msgid "`Django REST Framework `_" msgstr "" -#: ../../credits.rst:70 +#: ../../credits.rst:71 msgid "`Swagger UI Themes `_" msgstr "" -#: ../../credits.rst:74 +#: ../../credits.rst:75 msgid "Misc" msgstr "Overig" -#: ../../credits.rst:76 +#: ../../credits.rst:77 msgid "Dutch Smart Meter reading specifications, data cables, examples and hints:" msgstr "Dutch Smart Meter reading specifications, data cables, examples and hints:" -#: ../../credits.rst:78 +#: ../../credits.rst:79 msgid "`Gé Janssen `_" msgstr "" -#: ../../credits.rst:80 +#: ../../credits.rst:81 msgid "" "`Joost van der Linde (smartmeterdashboard) " "`_" msgstr "" -#: ../../credits.rst:82 +#: ../../credits.rst:83 msgid "`SOS Solutions `_" msgstr "" -#: ../../credits.rst:84 +#: ../../credits.rst:85 msgid "`Nico Di Rocco `_" msgstr "" +#~ msgid "`dbmnl `_" +#~ msgstr "" + diff --git a/docs/locale/nl/LC_MESSAGES/dropbox.mo b/docs/locale/nl/LC_MESSAGES/dropbox.mo new file mode 100644 index 000000000..c4e19258d Binary files /dev/null and b/docs/locale/nl/LC_MESSAGES/dropbox.mo differ diff --git a/docs/locale/nl/LC_MESSAGES/dropbox.po b/docs/locale/nl/LC_MESSAGES/dropbox.po new file mode 100644 index 000000000..1c4604f32 --- /dev/null +++ b/docs/locale/nl/LC_MESSAGES/dropbox.po @@ -0,0 +1,69 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) 2016, Dennis Siemensma +# This file is distributed under the same license as the DSMR Reader +# package. +# FIRST AUTHOR , 2016. +# +msgid "" +msgstr "" +"Project-Id-Version: DSMR Reader v1.x\n" +"Report-Msgid-Bugs-To: Dennis Siemensma \n" +"Last-Translator: Dennis Siemensma \n" +"Language-Team: Dennis Siemensma \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.3.4\n" +"Language: nl\n" +"X-Generator: Poedit 1.8.7.1\n" + +#: ../../dropbox.rst:2 +msgid "Integration: Dropbox" +msgstr "Integratie: Dropbox" + +#: ../../dropbox.rst:10 +msgid "Dropbox: Automated backup sync" +msgstr "Dropbox: Automatisch backups uploaden" + +#: ../../dropbox.rst:11 +msgid "*How can I link my Dropbox account for backups?*" +msgstr "*Hoe kan ik mijn Dropbox-account koppelen voor de backups?*" + +#: ../../dropbox.rst:13 +msgid "" +"Make sure you have a Dropbox-account or sign up for one. Now go to `Dropbox " +"Apps `_ and click **\"Create app\"** " +"in top right corner." +msgstr "" +"Zorg allereerst dat je een Dropbox-account hebt. Ga vervolgens naar `Dropbox " +"Apps `_ en klik op **\"Create app\"** " +"rechtsbovenin." + +#: ../../dropbox.rst:20 +msgid "" +"Choose the following options: (1) **Dropbox API** and (2) **App folder**. Then " +"enter a name for your app (3), this will also be used as directory name within " +"the Apps-folder of your Dropbox." +msgstr "" +"Kies de volgende opties: (1) **Dropbox API** en (2) **App folder**. Voer " +"vervolgens een naam voor je app in (3), deze wordt ook gebruikt als naam van " +"de submap binnen je Apps-folder in Dropbox." + +#: ../../dropbox.rst:27 +msgid "" +"The app should be created in developer-mode. You can generate an access token " +"for yourself by clicking the **\"Generate\"** button somewhere below." +msgstr "" +"The app is als het goed is nu aangemaakt in developer-modus. Je kunt nog een " +"toegangstoken genereren door op de knop **\"Generate\"** te klikken, die " +"verderop onderaan de pagina staat." + +#: ../../dropbox.rst:33 +msgid "" +"Copy the generated access token to the DSMR-reader settings for the Dropbox-" +"configuration. The DSMR-reader application should sync any backups created " +"shortly." +msgstr "" +"Kopieer de gegenereerde toegangstoken naar de DSMR-reader instellingen onder " +"Dropbox-configuratie. DSMR-reader zou vrij vlot gemaakte backups moeten " +"uploaden naar je Dropbox-account." diff --git a/docs/locale/nl/LC_MESSAGES/faq.mo b/docs/locale/nl/LC_MESSAGES/faq.mo index e9448f488..fa97694fb 100644 Binary files a/docs/locale/nl/LC_MESSAGES/faq.mo and b/docs/locale/nl/LC_MESSAGES/faq.mo differ diff --git a/docs/locale/nl/LC_MESSAGES/faq.po b/docs/locale/nl/LC_MESSAGES/faq.po index 0a5993e74..6e4c059ca 100644 --- a/docs/locale/nl/LC_MESSAGES/faq.po +++ b/docs/locale/nl/LC_MESSAGES/faq.po @@ -97,306 +97,51 @@ msgstr "Gooit de cache leeg." msgid "Dropbox: Automated backup sync" msgstr "Dropbox: Automatisch backups uploaden" -#: ../../faq.rst:36 -msgid "*How can I link my Dropbox account for backups?*" -msgstr "*Hoe kan ik mijn Dropbox-account koppelen voor de backups?*" +#: ../../faq.rst:37 +msgid ":doc:`More information can be found here`." +msgstr ":doc:`Meer informatie kun je hier terugvinden`." -#: ../../faq.rst:38 -msgid "" -"Make sure you have a Dropbox-account or sign up for one. Now go to `Dropbox " -"Apps `_ and click **\"Create app\"** " -"in top right corner." -msgstr "" -"Zorg allereerst dat je een Dropbox-account hebt. Ga vervolgens naar `Dropbox " -"Apps `_ en klik op **\"Create app\"** " -"rechtsbovenin." - -#: ../../faq.rst:45 -msgid "" -"Choose the following options: (1) **Dropbox API** and (2) **App folder**. Then " -"enter a name for your app (3), this will also be used as directory name within " -"the Apps-folder of your Dropbox." -msgstr "" -"Kies de volgende opties: (1) **Dropbox API** en (2) **App folder**. Voer " -"vervolgens een naam voor je app in (3), deze wordt ook gebruikt als naam van " -"de submap binnen je Apps-folder in Dropbox." - -#: ../../faq.rst:52 -msgid "" -"The app should be created in developer-mode. You can generate an access token " -"for yourself by clicking the **\"Generate\"** button somewhere below." -msgstr "" -"The app is als het goed is nu aangemaakt in developer-modus. Je kunt nog een " -"toegangstoken genereren door op de knop **\"Generate\"** te klikken, die " -"verderop onderaan de pagina staat." - -#: ../../faq.rst:58 -msgid "" -"Copy the generated access token to the DSMR-reader settings for the Dropbox-" -"configuration. The DSMR-reader application should sync any backups created " -"shortly." -msgstr "" -"Kopieer de gegenereerde toegangstoken naar de DSMR-reader instellingen onder " -"Dropbox-configuratie. DSMR-reader zou vrij vlot gemaakte backups moeten " -"uploaden naar je Dropbox-account." - -#: ../../faq.rst:62 +#: ../../faq.rst:41 msgid "Mindergas.nl: Automated gas meter position export" msgstr "Mindergas.nl: Automatisch gasmeterstanden exporteren" -#: ../../faq.rst:63 -msgid "*How can I link my mindergas.nl account?*" -msgstr "*Hoe kan ik mijn mindergas.nl-account koppelen?*" - -#: ../../faq.rst:65 -msgid "" -"Make sure you have a Mindergas.nl account or `signup for one `_. Now go to \"`Meterstand API `_\" and click on the button located below **" -"\"Authenticatietoken\"**." -msgstr "" -"Zorg ervoor dat je een mindergas.nl-account hebt of `registreer je op hun " -"website `_. Ga nu naar \"`Meterstand " -"API `_\" en klik op de knop onder het " -"kopje **\"Authenticatietoken\"**." - -#: ../../faq.rst:72 -msgid "" -"Copy the authentication token generated and paste in into the DSMR-reader " -"settings for the Mindergas.nl-configuration. Obviously the export only works " -"when there are any gas readings at all and you have ticked the 'export' " -"checkbox in the Mindergas.nl-configuration as well." -msgstr "" -"Kopieer de gegenereerde authenticatietoken in de DSMR-reader instellingen " -"onder Mindergas.nl-configuratie. Vanzelfsprekend werkt deze feature alleen " -"wanneer er gas gemeten wordt, en wanneer je de optie 'Exporteer gegevens naar " -"MinderGas' aangevinkt hebt in dezelfde configuratie." - -#: ../../faq.rst:77 -msgid "" -"Please note that due to policies of mindergas.nl it's not allowed to " -"retroactively upload meter positions using the API. Therefor this is not " -"supported by the application. You can however, enter them manually on their " -"website." -msgstr "" -"N.B.: Wegens het beleid van mindergas.nl is het niet toegestaan om met " -"terugwerkende kracht meterstanden door te geven via de API. De applicatie " -"ondersteunt dat om die reden niet. Je kunt oude meterstanden echter wel via " -"hun website handmatig invoeren, indien gewenst." +#: ../../faq.rst:43 +msgid ":doc:`More information can be found here`." +msgstr ":doc:`Meer informatie kun je hier terugvinden`." -#: ../../faq.rst:82 +#: ../../faq.rst:47 msgid "PVOutput.org: Automated electricity consumption export" msgstr "PVOutput.org: Automatisch exporteren van verbruik" -#: ../../faq.rst:83 -msgid "*How can I link my PVOutput.org account?*" -msgstr "*Hoe kan ik mijn PVOutput.org-account koppelen?*" - -#: ../../faq.rst:85 -msgid "" -"Make sure you have a PVOutput.org account, or `signup for an account `_. You will have to configure your account and PV system(s). " -"For any support doing that, please `see this page `_ for more information." -msgstr "" -"Zorg ervoor dat je een PVOutput.org-account hebt, of `registreer er een " -"`_. Vervolgens zul je je account en zonnesystemen " -"moeten configureren. Voor ondersteuning hoe dat moet, `zie de documentatie " -"`_ voor meer " -"informatie." - -#: ../../faq.rst:88 -msgid "" -"In order to link DSMR-reader to your account, please write down the \"API Key" -"\" and \"System ID\" from your PVOutput account. You can find them near the " -"bottom of the \"Settings\" page in PVOutput." -msgstr "" -"Om DSMR-reader te koppelen met je account, noteer de \"API Key\" en \"System ID" -"\" zoals je PVOutput-account aangeeft. Deze zijn terug te vinden onder " -"\"Settings\", binnen PVOutput." - -#: ../../faq.rst:96 -msgid "" -"Enter those values in DSMR-reader's admin pages, at \"PVOutput: API " -"configuration\". Make sure to enter both:" -msgstr "" -"Vul deze gegevens in de configuratiepagina's van DSMR-reader in, bij: " -"\"PVOutput: API-configuratie\". Zowel:" - -#: ../../faq.rst:98 -msgid "API Key" -msgstr "API Key" - -#: ../../faq.rst:99 -msgid "System ID" -msgstr "System ID" - -#: ../../faq.rst:107 -msgid "" -"Now navigate to another settings page in DSMR-reader: \"PVOutput: \"Add Status" -"\" configuration\"." -msgstr "" -"Navigeer nu naar een andere pagina met instellingen binnen DSMR-reader, " -"genaamd \"PVOutput: Add Status configuratie\"." - -#: ../../faq.rst:109 -msgid "Enable uploading the consumption." -msgstr "Schakel het uploaden van je verbruik in." - -#: ../../faq.rst:110 -msgid "" -"Choose an interval between the uploads. You can configure this as well on the " -"PVOutput's end, in Device Settings." -msgstr "" -"Kies een interval tussen de uploads. Je kunt dit tevens instellen aan de kant " -"van PVOutput, onder Device Settings." - -#: ../../faq.rst:111 -msgid "" -"Optionally, choose an upload delay X (in minutes). If set, DSMR-reader will " -"not use data of the past X minutes." -msgstr "" -"Voer optioneel een uploadvertraging X in. Wanneer ingesteld, zal DSMR-reader " -"geen data gebruiken van de afgelopen X minuten." - -#: ../../faq.rst:112 -msgid "" -"Optionally, you can choose to enter a **processing delay in minutes** for " -"PVOutput. Please note that PVOutput will only allow this when you have a **" -"\"Donation\" account** on their website. If you do not have one, they will " -"reject each API call you make, until you disable (clear) this option in DSMR-" -"reader." -msgstr "" -"Optioneel kun je ervoor kiezen om PVOutput de gegevens **vertraagd te laten " -"verwerken**. Let op, dit is een feature van PVOutput die alleen beschikbaar is " -"wanneer je daar een **\"Donatie\" account** hebt. Indien dat niet het geval " -"is, zal PVOutput elke API-call weigeren, totdat je dit uitschakelt (veld " -"leegmaakt) in DSMR-reader." - -#: ../../faq.rst:119 -msgid "" -"If you configured everything correctly, you should see some addional data in " -"PVOutput listed under \"Your Outputs\" momentarily." -msgstr "" -"Indien je alles correct hebt ingesteld, zul je op korte termijn extra gegevens " -"moeten zien in PVOutput onder \"Your Outputs\"." +#: ../../faq.rst:49 +msgid ":doc:`More information can be found here`." +msgstr ":doc:`Meer informatie kun je hier terugvinden`." -#: ../../faq.rst:123 +#: ../../faq.rst:53 msgid "Usage notification: Daily usage statistics on your smartphone" msgstr "Verbruiksnotificaties: Dagelijkse verbruiksstatistieken op je smartphone" -#: ../../faq.rst:124 -msgid "*Which services for sending notifications are supported?*" -msgstr "*Welke services voor het sturen van notificaties worden ondersteund?*" - -#: ../../faq.rst:126 -msgid "" -"Currently, two mobile platforms are supported: Android and iOS. The supported " -"app for Android is `NotifyMyAndroid `_. The " -"supported app for iOS is `Prowl `_." -msgstr "" -"Op dit moment worden twee platforms ondersteund: Android en iOS. De " -"ondersteunde app voor Android is `NotifyMyAndroid `_. De ondersteunde app voor iOS is `Prowl `_." - -#: ../../faq.rst:131 -msgid "*How do I setup usage notifications?*" -msgstr "*Hoe stel ik verbruiksnotificaties in?*" - -#: ../../faq.rst:133 -msgid "" -"Make sure you either have NotifyMyAndroid or Prowl installed on your " -"smartphone. If you don't, visit your platforms app store to download the app " -"and sign up for an account. Then, make sure to get your API key from the " -"notificationservice that you prefer. For instruction on obtaining the API key, " -"please read below." -msgstr "" -"Zorg ervoor dat je NotifyMyAndroid of Prowl hebt geïnstalleerd op je " -"smartphone. Als dat niet het geval is, bezoek dan de app store van je " -"platform, download de gewenste app en maak daarvoor een account. Daarna haal " -"je de API key voor de notificatieservice die je wilt gebruiken op. Om te lezen " -"hoe dat werkt, lees dan de instructies bij de volgende kopjes." - -#: ../../faq.rst:135 -msgid "" -"In the DSMR-reader settings for the Usagenotifications, tick the Send " -"Notifications checkbox and select the notification service you want to use. " -"Then copy the API key from the notification service and paste in into the the " -"textbox for the API key. When you save these settings, your first notification " -"should be sent after midnight. Don't worry, the notification will be sent with " -"low priority and will not wake you up." -msgstr "" -"In de DSMR-reader instellingen voor de Verbruiksnotificaties zet je een vinkje " -"bij Stuur Notificaties en selecteer daaronder welke notificatieservice je wilt " -"gebruiken. Kopieeër daarna de API key van de notificatieservice en plak deze " -"in het tekstveld voor de API key. Als je deze instellingen opslaat zul je na " -"middernacht je eerste notificatie ontvangen. Geen nood, de notificatie wordt " -"altijd verstuurd met lage prioriteit, deze maakt je dus niet wakker." - -#: ../../faq.rst:138 -msgid "*How do I obtain my API key for NotifyMyAndroid?*" -msgstr "*Hoe haal ik de API key op voor NotifyMyAndroid?*" +#: ../../faq.rst:55 +msgid ":doc:`More information can be found here`." +msgstr ":doc:`Meer informatie kun je hier terugvinden`." -#: ../../faq.rst:140 -msgid "" -"After you have downloaded NotifyMyAndroid and signed up for an account you " -"should be able to `login to your NotifyMyAndroid account `_. Now go to \"`My Account `_\", you should see an overview of your " -"current API keys if you have any. To create an API key for the DSMR-reader, " -"please click **\"Generate New Key\"**." -msgstr "" -"Nadat je NotifyMyAndroid hebt gedownload en een account hebt aangemaakt zou je " -"moeten kunnen `inloggen op je NotifyMyAndroid-account `_. Ga nu naar \"`My Account `_\" om een overzicht van je account de API " -"keys te krijgen als je deze al hebt. Om een API key voor de DSMR-reader te " -"genereren klik je op **\"Generate New Key\"**." - -#: ../../faq.rst:147 ../../faq.rst:163 -msgid "" -"When a new key is generated, you will see it immediatly. Your key is listed " -"like in the screenshot below (the red box marks your API key)." -msgstr "" -"Als er een nieuwe key is gegenereerd, zie je deze direct. De key is te vinden " -"zoals in onderstaande screenshot (er staat een rood kader om de key)." - -#: ../../faq.rst:154 -msgid "*How do I obtain my API key for Prowl?*" -msgstr "*Hoe haal ik de API key op voor Prowl?*" - -#: ../../faq.rst:156 -msgid "" -"After you have downloaded Prowl and signed up for an account you should be " -"able to `login to your Prowl account `_. " -"Now go to \"`API Keys `_\", you " -"should see an overview of your current API keys if you have any. To create an " -"API key for the DSMR-reader, input a name and click **\"Generate Key\"**." -msgstr "" -"Nadat je Prowl hebt gedownload en een account hebt aangemaakt zou je moeten " -"kunnen `inloggen op je Prowl-account `_. " -"Ga nu naar \"`API Keys `_\" om een " -"overzicht van je API keys te krijgen als je deze al hebt. Om een API key voor " -"de DSMR-reader te genereren geef je een naam op en klik je op **\"Generate Key" -"\"**." - -#: ../../faq.rst:171 +#: ../../faq.rst:59 msgid "I only pay for a single electricity tariff but I see two!" msgstr "Ik betaal voor een enkel tarief maar ik zie er twee!" -#: ../../faq.rst:172 +#: ../../faq.rst:60 msgid "" -"DSMR (and your energy supplier) always read both high and low tariff from your " -"meter. It's possible however that you are only paying for a single tariff. In " -"that case your energy supplier will simply merge both high and low tariffs to " -"make it look like you have a single one." +"DSMR (and your energy supplier) always reads both high and low tariff from " +"your meter. It's possible however that you are only paying for a single " +"tariff. In that case your energy supplier will simply merge both high and low " +"tariffs to make it look like you have a single one." msgstr "" "DSMR (en je energieleverancier) lezen altijd zowel hoog als laag tarief van je " "meter uit. Het is desondanks mogelijk dat je betaalt voor slechts één tarief. " "In dat geval voegt jouw energieleverancier het hoge en lage tarief samen zodat " "het lijkt alsof je een enkel tarief hebt." -#: ../../faq.rst:176 +#: ../../faq.rst:64 msgid "" "This application displays separate tariffs by default, but supports merging " "them to a single one as well. Just make sure that you apply the **same price " @@ -409,11 +154,11 @@ msgstr "" "elektriciteit** en dat je de optie ``Voeg tarieven samen`` aanzet in de " "interfaceconfiguratie." -#: ../../faq.rst:181 +#: ../../faq.rst:69 msgid "I want to see the load of each electricity phase as well" msgstr "Ik wil het elektriciteitsverbruik per fase ook kunnen zien" -#: ../../faq.rst:182 +#: ../../faq.rst:70 msgid "" "Since ``DSMR-reader v1.5`` it's possible to track your ``P+`` (consumption) " "phases as well. You will need to enable this in the ``Datalogger " @@ -427,11 +172,11 @@ msgstr "" "elektriciteitsfasen bij``. Zodra ingeschakeld, zal de applicatie het verbruik " "per fase vastleggen in tonen in een grafiek in het Dashboard." -#: ../../faq.rst:185 +#: ../../faq.rst:73 msgid "Please keep in mind:" msgstr "Houd in gedachten:" -#: ../../faq.rst:187 +#: ../../faq.rst:75 msgid "" "This will **not work retroactively**. The datalogger always discards all data " "not used." @@ -439,7 +184,7 @@ msgstr "" "Dit werkt **niet met terugwerkende kracht**. De datalogger gooit namelijk alle " "gegevens weg die niet nodig zijn." -#: ../../faq.rst:188 +#: ../../faq.rst:76 msgid "" "This feature will only work when your smart meter is connected to **three " "phases**. Even when having the setting enabled." @@ -447,7 +192,7 @@ msgstr "" "Deze feature werkt alleen wanneer je slimme meter ook daadwerkelijk is " "aangesloten op **drie fasen**. Zelfs wanneer de optie is ingeschakeld." -#: ../../faq.rst:189 +#: ../../faq.rst:77 msgid "" "When having tracking phases enabled, you should see a button in the Dashboard " "called ``Display electricity phases``. Click on it to show the graph." @@ -456,15 +201,15 @@ msgstr "" "een knop genaamd ``Toon elektriciteitsfasen``. Klik die aan om de grafiek te " "tonen." -#: ../../faq.rst:191 +#: ../../faq.rst:79 msgid "You should see something similar to:" msgstr "Je zult iets zien in de trend van:" -#: ../../faq.rst:199 +#: ../../faq.rst:87 msgid "Recalculate prices retroactively" msgstr "Prijzen opnieuw berekenen met terugwerkende kracht" -#: ../../faq.rst:200 +#: ../../faq.rst:88 msgid "" "*I've adjusted my energy prices but there are no changes! How can I regenerate " "them with my new prices?*" @@ -472,7 +217,7 @@ msgstr "" "*Ik heb zojuist mijn energieprijzen aangepast, maar ik zie geen verschil! Hoe " "kan ik de nieuwe prijzen doorvoeren?*" -#: ../../faq.rst:202 +#: ../../faq.rst:90 msgid "" "Statistics for each day are generated once, the day after. However, you can " "flush your statistics by executing:" @@ -480,11 +225,11 @@ msgstr "" "Dagstatistieken worden dagelijks eenmalig gegenereerd. Het is echter wel " "mogelijk om deze te resetten door het volgende te doen:" -#: ../../faq.rst:204 +#: ../../faq.rst:92 msgid "``./manage.py dsmr_backend_delete_aggregated_data``" msgstr "``./manage.py dsmr_backend_delete_aggregated_data``" -#: ../../faq.rst:206 +#: ../../faq.rst:94 msgid "" "The application will delete all statistics and (slowly) regenerate them in the " "background. Just make sure the source data is still there." @@ -492,11 +237,11 @@ msgstr "" "De applicatie verwijdert alle statistieken en genereert ze (langzaam) weer op " "de achtergrond. Zorg er wel voor dat alle brongegevens intact zijn." -#: ../../faq.rst:210 +#: ../../faq.rst:98 msgid "I'm not seeing any gas readings" msgstr "Ik zie geen gasverbruik" -#: ../../faq.rst:211 +#: ../../faq.rst:99 msgid "" "Please make sure that your meter supports reading gas consumption and that " "you've waited for a few hours for any graphs to render. The gas meter " @@ -508,11 +253,11 @@ msgstr "" "sowieso slechts een keer per uur bijgewerkt (voor DSMR v4). De Status-pagina " "geeft je hier overigens ook inzicht in." -#: ../../faq.rst:217 +#: ../../faq.rst:105 msgid "How do I restore a database backup?" msgstr "Hoe zet ik een databaseback-up terug?" -#: ../../faq.rst:221 +#: ../../faq.rst:109 msgid "" "Restoring a backup will replace any existing data stored in the database and " "is irreversible!" @@ -520,7 +265,7 @@ msgstr "" "Het herstellen van een back-up vervangt de bestaande data in de database en is " "onomkeerbaar!" -#: ../../faq.rst:225 +#: ../../faq.rst:113 msgid "" "Do you need a complete reinstall of DSMR-reader as well? Then please :doc:" "`follow the install guide` and restore the database backup " @@ -530,11 +275,11 @@ msgstr "" "dan de installatiehandleiding` en herstel de databaseback-up " "volgens **de notities aan het einde van hoofdstuk 1**." -#: ../../faq.rst:228 +#: ../../faq.rst:116 msgid "Only want to restore the database?" msgstr "Wil je alleen een databaseback-up terugzetten?" -#: ../../faq.rst:230 +#: ../../faq.rst:118 msgid "" "This asumes you are still running the same application version as the backup " "was created in." @@ -542,7 +287,7 @@ msgstr "" "Dit gaat er overigens wel van uit dat je dezelfde applicatie-versie draait als " "waarmee de back-up is gemaakt." -#: ../../faq.rst:232 +#: ../../faq.rst:120 msgid "" "Stop the application first with ``sudo supervisorctl stop all``. This will " "disconnect it from the database as well." @@ -550,7 +295,7 @@ msgstr "" "Stop als eerste de applicatie met ``sudo supervisorctl stop all``. Dit zorgt " "er ook voor dat de databaseverbinding van de applicatie verdwijnt." -#: ../../faq.rst:234 +#: ../../faq.rst:122 msgid "" "Importing the data could take a long time. It took MySQL 15 minutes to import " "nearly 3 million readings, from a compressed backup, on a RaspberryPi 3." @@ -559,19 +304,19 @@ msgstr "" "het ongeveer een kwartier om 3 miljoen metingen te importeren, vanuit een " "gecomprimeerde back-up op een RaspberryPi 3." -#: ../../faq.rst:236 +#: ../../faq.rst:124 msgid "For **PostgreSQL** restores::" msgstr "Voor herstellen van **PostgreSQL**::" -#: ../../faq.rst:250 +#: ../../faq.rst:138 msgid "For **MySQL** restores::" msgstr "Voor herstellen van **MySQL**::" -#: ../../faq.rst:264 +#: ../../faq.rst:152 msgid "Start the application again with ``sudo supervisorctl start all``." msgstr "Start de applicatie weer met ``sudo supervisorctl start all``." -#: ../../faq.rst:268 +#: ../../faq.rst:156 msgid "" "In case the version differs, you can try forcing a deployment reload by: " "``sudo su - dsmr`` and then executing ``./post-deploy.sh``." @@ -580,18 +325,261 @@ msgstr "" "herladen. Log in met: ``sudo su - dsmr`` en voer vervolgens ``./post-deploy." "sh`` uit." -#: ../../faq.rst:272 +#: ../../faq.rst:160 msgid "Feature/bug report" msgstr "Verzoek/fout melden" -#: ../../faq.rst:273 +#: ../../faq.rst:161 msgid "*How can I propose a feature or report a bug I've found?*" msgstr "*Hoe kan ik een verzoek indienen of een fout melden?*" -#: ../../faq.rst:277 +#: ../../faq.rst:165 msgid "" "`Just create a ticket at Github `_." msgstr "" "`Maak een ticket aan op Github `_." + +#~ msgid "*How can I link my Dropbox account for backups?*" +#~ msgstr "*Hoe kan ik mijn Dropbox-account koppelen voor de backups?*" + +#~ msgid "" +#~ "Make sure you have a Dropbox-account or sign up for one. Now go to `Dropbox " +#~ "Apps `_ and click **\"Create app" +#~ "\"** in top right corner." +#~ msgstr "" +#~ "Zorg allereerst dat je een Dropbox-account hebt. Ga vervolgens naar " +#~ "`Dropbox Apps `_ en klik op **" +#~ "\"Create app\"** rechtsbovenin." + +#~ msgid "" +#~ "Choose the following options: (1) **Dropbox API** and (2) **App folder**. " +#~ "Then enter a name for your app (3), this will also be used as directory " +#~ "name within the Apps-folder of your Dropbox." +#~ msgstr "" +#~ "Kies de volgende opties: (1) **Dropbox API** en (2) **App folder**. Voer " +#~ "vervolgens een naam voor je app in (3), deze wordt ook gebruikt als naam " +#~ "van de submap binnen je Apps-folder in Dropbox." + +#~ msgid "" +#~ "The app should be created in developer-mode. You can generate an access " +#~ "token for yourself by clicking the **\"Generate\"** button somewhere below." +#~ msgstr "" +#~ "The app is als het goed is nu aangemaakt in developer-modus. Je kunt nog " +#~ "een toegangstoken genereren door op de knop **\"Generate\"** te klikken, " +#~ "die verderop onderaan de pagina staat." + +#~ msgid "" +#~ "Copy the generated access token to the DSMR-reader settings for the Dropbox-" +#~ "configuration. The DSMR-reader application should sync any backups created " +#~ "shortly." +#~ msgstr "" +#~ "Kopieer de gegenereerde toegangstoken naar de DSMR-reader instellingen " +#~ "onder Dropbox-configuratie. DSMR-reader zou vrij vlot gemaakte backups " +#~ "moeten uploaden naar je Dropbox-account." + +#~ msgid "*How can I link my mindergas.nl account?*" +#~ msgstr "*Hoe kan ik mijn mindergas.nl-account koppelen?*" + +#~ msgid "" +#~ "Make sure you have a Mindergas.nl account or `signup for one `_. Now go to \"`Meterstand API `_\" and click on the button located below **" +#~ "\"Authenticatietoken\"**." +#~ msgstr "" +#~ "Zorg ervoor dat je een mindergas.nl-account hebt of `registreer je op hun " +#~ "website `_. Ga nu naar " +#~ "\"`Meterstand API `_\" en klik op de " +#~ "knop onder het kopje **\"Authenticatietoken\"**." + +#~ msgid "" +#~ "Copy the authentication token generated and paste in into the DSMR-reader " +#~ "settings for the Mindergas.nl-configuration. Obviously the export only " +#~ "works when there are any gas readings at all and you have ticked the " +#~ "'export' checkbox in the Mindergas.nl-configuration as well." +#~ msgstr "" +#~ "Kopieer de gegenereerde authenticatietoken in de DSMR-reader instellingen " +#~ "onder Mindergas.nl-configuratie. Vanzelfsprekend werkt deze feature alleen " +#~ "wanneer er gas gemeten wordt, en wanneer je de optie 'Exporteer gegevens " +#~ "naar MinderGas' aangevinkt hebt in dezelfde configuratie." + +#~ msgid "" +#~ "Please note that due to policies of mindergas.nl it's not allowed to " +#~ "retroactively upload meter positions using the API. Therefor this is not " +#~ "supported by the application. You can however, enter them manually on their " +#~ "website." +#~ msgstr "" +#~ "N.B.: Wegens het beleid van mindergas.nl is het niet toegestaan om met " +#~ "terugwerkende kracht meterstanden door te geven via de API. De applicatie " +#~ "ondersteunt dat om die reden niet. Je kunt oude meterstanden echter wel via " +#~ "hun website handmatig invoeren, indien gewenst." + +#~ msgid "*How can I link my PVOutput.org account?*" +#~ msgstr "*Hoe kan ik mijn PVOutput.org-account koppelen?*" + +#~ msgid "" +#~ "Make sure you have a PVOutput.org account, or `signup for an account " +#~ "`_. You will have to configure your account and PV " +#~ "system(s). For any support doing that, please `see this page `_ for more information." +#~ msgstr "" +#~ "Zorg ervoor dat je een PVOutput.org-account hebt, of `registreer er een " +#~ "`_. Vervolgens zul je je account en zonnesystemen " +#~ "moeten configureren. Voor ondersteuning hoe dat moet, `zie de documentatie " +#~ "`_ voor meer " +#~ "informatie." + +#~ msgid "" +#~ "In order to link DSMR-reader to your account, please write down the \"API " +#~ "Key\" and \"System ID\" from your PVOutput account. You can find them near " +#~ "the bottom of the \"Settings\" page in PVOutput." +#~ msgstr "" +#~ "Om DSMR-reader te koppelen met je account, noteer de \"API Key\" en " +#~ "\"System ID\" zoals je PVOutput-account aangeeft. Deze zijn terug te vinden " +#~ "onder \"Settings\", binnen PVOutput." + +#~ msgid "" +#~ "Enter those values in DSMR-reader's admin pages, at \"PVOutput: API " +#~ "configuration\". Make sure to enter both:" +#~ msgstr "" +#~ "Vul deze gegevens in de configuratiepagina's van DSMR-reader in, bij: " +#~ "\"PVOutput: API-configuratie\". Zowel:" + +#~ msgid "API Key" +#~ msgstr "API Key" + +#~ msgid "System ID" +#~ msgstr "System ID" + +#~ msgid "" +#~ "Now navigate to another settings page in DSMR-reader: \"PVOutput: \"Add " +#~ "Status\" configuration\"." +#~ msgstr "" +#~ "Navigeer nu naar een andere pagina met instellingen binnen DSMR-reader, " +#~ "genaamd \"PVOutput: Add Status configuratie\"." + +#~ msgid "Enable uploading the consumption." +#~ msgstr "Schakel het uploaden van je verbruik in." + +#~ msgid "" +#~ "Choose an interval between the uploads. You can configure this as well on " +#~ "the PVOutput's end, in Device Settings." +#~ msgstr "" +#~ "Kies een interval tussen de uploads. Je kunt dit tevens instellen aan de " +#~ "kant van PVOutput, onder Device Settings." + +#~ msgid "" +#~ "Optionally, choose an upload delay X (in minutes). If set, DSMR-reader will " +#~ "not use data of the past X minutes." +#~ msgstr "" +#~ "Voer optioneel een uploadvertraging X in. Wanneer ingesteld, zal DSMR-" +#~ "reader geen data gebruiken van de afgelopen X minuten." + +#~ msgid "" +#~ "Optionally, you can choose to enter a **processing delay in minutes** for " +#~ "PVOutput. Please note that PVOutput will only allow this when you have a **" +#~ "\"Donation\" account** on their website. If you do not have one, they will " +#~ "reject each API call you make, until you disable (clear) this option in " +#~ "DSMR-reader." +#~ msgstr "" +#~ "Optioneel kun je ervoor kiezen om PVOutput de gegevens **vertraagd te laten " +#~ "verwerken**. Let op, dit is een feature van PVOutput die alleen beschikbaar " +#~ "is wanneer je daar een **\"Donatie\" account** hebt. Indien dat niet het " +#~ "geval is, zal PVOutput elke API-call weigeren, totdat je dit uitschakelt " +#~ "(veld leegmaakt) in DSMR-reader." + +#~ msgid "" +#~ "If you configured everything correctly, you should see some addional data " +#~ "in PVOutput listed under \"Your Outputs\" momentarily." +#~ msgstr "" +#~ "Indien je alles correct hebt ingesteld, zul je op korte termijn extra " +#~ "gegevens moeten zien in PVOutput onder \"Your Outputs\"." + +#~ msgid "*Which services for sending notifications are supported?*" +#~ msgstr "*Welke services voor het sturen van notificaties worden ondersteund?*" + +#~ msgid "" +#~ "Currently, two mobile platforms are supported: Android and iOS. The " +#~ "supported app for Android is `NotifyMyAndroid `_. The supported app for iOS is `Prowl `_." +#~ msgstr "" +#~ "Op dit moment worden twee platforms ondersteund: Android en iOS. De " +#~ "ondersteunde app voor Android is `NotifyMyAndroid `_. De ondersteunde app voor iOS is `Prowl `_." + +#~ msgid "*How do I setup usage notifications?*" +#~ msgstr "*Hoe stel ik verbruiksnotificaties in?*" + +#~ msgid "" +#~ "Make sure you either have NotifyMyAndroid or Prowl installed on your " +#~ "smartphone. If you don't, visit your platforms app store to download the " +#~ "app and sign up for an account. Then, make sure to get your API key from " +#~ "the notificationservice that you prefer. For instruction on obtaining the " +#~ "API key, please read below." +#~ msgstr "" +#~ "Zorg ervoor dat je NotifyMyAndroid of Prowl hebt geïnstalleerd op je " +#~ "smartphone. Als dat niet het geval is, bezoek dan de app store van je " +#~ "platform, download de gewenste app en maak daarvoor een account. Daarna " +#~ "haal je de API key voor de notificatieservice die je wilt gebruiken op. Om " +#~ "te lezen hoe dat werkt, lees dan de instructies bij de volgende kopjes." + +#~ msgid "" +#~ "In the DSMR-reader settings for the Usagenotifications, tick the Send " +#~ "Notifications checkbox and select the notification service you want to use. " +#~ "Then copy the API key from the notification service and paste in into the " +#~ "the textbox for the API key. When you save these settings, your first " +#~ "notification should be sent after midnight. Don't worry, the notification " +#~ "will be sent with low priority and will not wake you up." +#~ msgstr "" +#~ "In de DSMR-reader instellingen voor de Verbruiksnotificaties zet je een " +#~ "vinkje bij Stuur Notificaties en selecteer daaronder welke " +#~ "notificatieservice je wilt gebruiken. Kopieeër daarna de API key van de " +#~ "notificatieservice en plak deze in het tekstveld voor de API key. Als je " +#~ "deze instellingen opslaat zul je na middernacht je eerste notificatie " +#~ "ontvangen. Geen nood, de notificatie wordt altijd verstuurd met lage " +#~ "prioriteit, deze maakt je dus niet wakker." + +#~ msgid "*How do I obtain my API key for NotifyMyAndroid?*" +#~ msgstr "*Hoe haal ik de API key op voor NotifyMyAndroid?*" + +#~ msgid "" +#~ "After you have downloaded NotifyMyAndroid and signed up for an account you " +#~ "should be able to `login to your NotifyMyAndroid account `_. Now go to \"`My Account `_\", you should see an overview of your " +#~ "current API keys if you have any. To create an API key for the DSMR-reader, " +#~ "please click **\"Generate New Key\"**." +#~ msgstr "" +#~ "Nadat je NotifyMyAndroid hebt gedownload en een account hebt aangemaakt zou " +#~ "je moeten kunnen `inloggen op je NotifyMyAndroid-account `_. Ga nu naar \"`My Account `_\" om een overzicht van je account de API " +#~ "keys te krijgen als je deze al hebt. Om een API key voor de DSMR-reader te " +#~ "genereren klik je op **\"Generate New Key\"**." + +#~ msgid "" +#~ "When a new key is generated, you will see it immediatly. Your key is listed " +#~ "like in the screenshot below (the red box marks your API key)." +#~ msgstr "" +#~ "Als er een nieuwe key is gegenereerd, zie je deze direct. De key is te " +#~ "vinden zoals in onderstaande screenshot (er staat een rood kader om de key)." + +#~ msgid "*How do I obtain my API key for Prowl?*" +#~ msgstr "*Hoe haal ik de API key op voor Prowl?*" + +#~ msgid "" +#~ "After you have downloaded Prowl and signed up for an account you should be " +#~ "able to `login to your Prowl account `_. Now go to \"`API Keys `_" +#~ "\", you should see an overview of your current API keys if you have any. To " +#~ "create an API key for the DSMR-reader, input a name and click **\"Generate " +#~ "Key\"**." +#~ msgstr "" +#~ "Nadat je Prowl hebt gedownload en een account hebt aangemaakt zou je moeten " +#~ "kunnen `inloggen op je Prowl-account `_. Ga nu naar \"`API Keys `_" +#~ "\" om een overzicht van je API keys te krijgen als je deze al hebt. Om een " +#~ "API key voor de DSMR-reader te genereren geef je een naam op en klik je op " +#~ "**\"Generate Key\"**." diff --git a/docs/locale/nl/LC_MESSAGES/mindergas.mo b/docs/locale/nl/LC_MESSAGES/mindergas.mo new file mode 100644 index 000000000..0e61e2ade Binary files /dev/null and b/docs/locale/nl/LC_MESSAGES/mindergas.mo differ diff --git a/docs/locale/nl/LC_MESSAGES/mindergas.po b/docs/locale/nl/LC_MESSAGES/mindergas.po new file mode 100644 index 000000000..4d865c840 --- /dev/null +++ b/docs/locale/nl/LC_MESSAGES/mindergas.po @@ -0,0 +1,66 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) 2016, Dennis Siemensma +# This file is distributed under the same license as the DSMR Reader +# package. +# FIRST AUTHOR , 2016. +# +msgid "" +msgstr "" +"Project-Id-Version: DSMR Reader v1.x\n" +"Report-Msgid-Bugs-To: Dennis Siemensma \n" +"Last-Translator: Dennis Siemensma \n" +"Language-Team: Dennis Siemensma \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.3.4\n" +"Language: nl\n" +"X-Generator: Poedit 1.8.7.1\n" + +#: ../../mindergas.rst:2 +msgid "Integration: MinderGas.nl" +msgstr "Integratie: MinderGas.nl" + +#: ../../mindergas.rst:10 +msgid "Mindergas.nl: Automated gas meter position export" +msgstr "Mindergas.nl: Automatisch gasmeterstanden exporteren" + +#: ../../mindergas.rst:11 +msgid "*How can I link my mindergas.nl account?*" +msgstr "*Hoe kan ik mijn mindergas.nl-account koppelen?*" + +#: ../../mindergas.rst:13 +msgid "" +"Make sure you have a Mindergas.nl account or `signup for one `_. Now go to \"`Meterstand API `_\" and click on the button located below **" +"\"Authenticatietoken\"**." +msgstr "" +"Zorg ervoor dat je een mindergas.nl-account hebt of `registreer je op hun " +"website `_. Ga nu naar \"`Meterstand " +"API `_\" en klik op de knop onder het " +"kopje **\"Authenticatietoken\"**." + +#: ../../mindergas.rst:20 +msgid "" +"Copy the authentication token generated and paste in into the DSMR-reader " +"settings for the Mindergas.nl-configuration. Obviously the export only works " +"when there are any gas readings at all and you have ticked the 'export' " +"checkbox in the Mindergas.nl-configuration as well." +msgstr "" +"Kopieer de gegenereerde authenticatietoken in de DSMR-reader instellingen " +"onder Mindergas.nl-configuratie. Vanzelfsprekend werkt deze feature alleen " +"wanneer er gas gemeten wordt, en wanneer je de optie 'Exporteer gegevens naar " +"MinderGas' aangevinkt hebt in dezelfde configuratie." + +#: ../../mindergas.rst:25 +msgid "" +"Please note that due to policies of mindergas.nl it's not allowed to " +"retroactively upload meter positions using the API. Therefor this is not " +"supported by the application. You can however, enter them manually on their " +"website." +msgstr "" +"N.B.: Wegens het beleid van mindergas.nl is het niet toegestaan om met " +"terugwerkende kracht meterstanden door te geven via de API. De applicatie " +"ondersteunt dat om die reden niet. Je kunt oude meterstanden echter wel via " +"hun website handmatig invoeren, indien gewenst." diff --git a/docs/locale/nl/LC_MESSAGES/notifications.mo b/docs/locale/nl/LC_MESSAGES/notifications.mo new file mode 100644 index 000000000..18e7f1f0e Binary files /dev/null and b/docs/locale/nl/LC_MESSAGES/notifications.mo differ diff --git a/docs/locale/nl/LC_MESSAGES/notifications.po b/docs/locale/nl/LC_MESSAGES/notifications.po new file mode 100644 index 000000000..a38419ed3 --- /dev/null +++ b/docs/locale/nl/LC_MESSAGES/notifications.po @@ -0,0 +1,121 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) 2016, Dennis Siemensma +# This file is distributed under the same license as the DSMR Reader +# package. +# FIRST AUTHOR , 2016. +# +msgid "" +msgstr "" +"Project-Id-Version: DSMR Reader v1.x\n" +"Report-Msgid-Bugs-To: Dennis Siemensma \n" +"Last-Translator: Dennis Siemensma \n" +"Language-Team: Dennis Siemensma \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.3.4\n" +"Language: nl\n" +"X-Generator: Poedit 1.8.7.1\n" + +#: ../../notifications.rst:2 +msgid "Integration: Notifications" +msgstr "Integratie: Notificaties" + +#: ../../notifications.rst:10 +msgid "Usage notification: Daily usage statistics on your smartphone" +msgstr "Verbruiksnotificaties: Dagelijkse verbruiksstatistieken op je smartphone" + +#: ../../notifications.rst:11 +msgid "*Which services for sending notifications are supported?*" +msgstr "*Welke services voor het sturen van notificaties worden ondersteund?*" + +#: ../../notifications.rst:13 +msgid "" +"Currently, two mobile platforms are supported: Android and iOS. The supported " +"app for Android is `NotifyMyAndroid `_. The " +"supported app for iOS is `Prowl `_." +msgstr "" +"Op dit moment worden twee platforms ondersteund: Android en iOS. De " +"ondersteunde app voor Android is `NotifyMyAndroid `_. De ondersteunde app voor iOS is `Prowl `_." + +#: ../../notifications.rst:18 +msgid "*How do I setup usage notifications?*" +msgstr "*Hoe stel ik verbruiksnotificaties in?*" + +#: ../../notifications.rst:20 +msgid "" +"Make sure you either have NotifyMyAndroid or Prowl installed on your " +"smartphone. If you don't, visit your platforms app store to download the app " +"and sign up for an account. Then, make sure to get your API key from the " +"notificationservice that you prefer. For instruction on obtaining the API key, " +"please read below." +msgstr "" +"Zorg ervoor dat je NotifyMyAndroid of Prowl hebt geïnstalleerd op je " +"smartphone. Als dat niet het geval is, bezoek dan de app store van je " +"platform, download de gewenste app en maak daarvoor een account. Daarna haal " +"je de API key voor de notificatieservice die je wilt gebruiken op. Om te lezen " +"hoe dat werkt, lees dan de instructies bij de volgende kopjes." + +#: ../../notifications.rst:22 +msgid "" +"In the DSMR-reader settings for the Usagenotifications, tick the Send " +"Notifications checkbox and select the notification service you want to use. " +"Then copy the API key from the notification service and paste in into the the " +"textbox for the API key. When you save these settings, your first notification " +"should be sent after midnight. Don't worry, the notification will be sent with " +"low priority and will not wake you up." +msgstr "" +"In de DSMR-reader instellingen voor de Verbruiksnotificaties zet je een vinkje " +"bij Stuur Notificaties en selecteer daaronder welke notificatieservice je wilt " +"gebruiken. Kopieeër daarna de API key van de notificatieservice en plak deze " +"in het tekstveld voor de API key. Als je deze instellingen opslaat zul je na " +"middernacht je eerste notificatie ontvangen. Geen nood, de notificatie wordt " +"altijd verstuurd met lage prioriteit, deze maakt je dus niet wakker." + +#: ../../notifications.rst:25 +msgid "*How do I obtain my API key for NotifyMyAndroid?*" +msgstr "*Hoe haal ik de API key op voor NotifyMyAndroid?*" + +#: ../../notifications.rst:27 +msgid "" +"After you have downloaded NotifyMyAndroid and signed up for an account you " +"should be able to `login to your NotifyMyAndroid account `_. Now go to \"`My Account `_\", you should see an overview of your " +"current API keys if you have any. To create an API key for the DSMR-reader, " +"please click **\"Generate New Key\"**." +msgstr "" +"Nadat je NotifyMyAndroid hebt gedownload en een account hebt aangemaakt zou je " +"moeten kunnen `inloggen op je NotifyMyAndroid-account `_. Ga nu naar \"`My Account `_\" om een overzicht van je account de API " +"keys te krijgen als je deze al hebt. Om een API key voor de DSMR-reader te " +"genereren klik je op **\"Generate New Key\"**." + +#: ../../notifications.rst:34 ../../notifications.rst:50 +msgid "" +"When a new key is generated, you will see it immediatly. Your key is listed " +"like in the screenshot below (the red box marks your API key)." +msgstr "" +"Als er een nieuwe key is gegenereerd, zie je deze direct. De key is te vinden " +"zoals in onderstaande screenshot (er staat een rood kader om de key)." + +#: ../../notifications.rst:41 +msgid "*How do I obtain my API key for Prowl?*" +msgstr "*Hoe haal ik de API key op voor Prowl?*" + +#: ../../notifications.rst:43 +msgid "" +"After you have downloaded Prowl and signed up for an account you should be " +"able to `login to your Prowl account `_. " +"Now go to \"`API Keys `_\", you " +"should see an overview of your current API keys if you have any. To create an " +"API key for the DSMR-reader, input a name and click **\"Generate Key\"**." +msgstr "" +"Nadat je Prowl hebt gedownload en een account hebt aangemaakt zou je moeten " +"kunnen `inloggen op je Prowl-account `_. " +"Ga nu naar \"`API Keys `_\" om een " +"overzicht van je API keys te krijgen als je deze al hebt. Om een API key voor " +"de DSMR-reader te genereren geef je een naam op en klik je op **\"Generate Key" +"\"**." diff --git a/docs/locale/nl/LC_MESSAGES/pvoutput.mo b/docs/locale/nl/LC_MESSAGES/pvoutput.mo new file mode 100644 index 000000000..256611378 Binary files /dev/null and b/docs/locale/nl/LC_MESSAGES/pvoutput.mo differ diff --git a/docs/locale/nl/LC_MESSAGES/pvoutput.po b/docs/locale/nl/LC_MESSAGES/pvoutput.po new file mode 100644 index 000000000..5972b1192 --- /dev/null +++ b/docs/locale/nl/LC_MESSAGES/pvoutput.po @@ -0,0 +1,119 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) 2016, Dennis Siemensma +# This file is distributed under the same license as the DSMR Reader +# package. +# FIRST AUTHOR , 2016. +# +msgid "" +msgstr "" +"Project-Id-Version: DSMR Reader v1.x\n" +"Report-Msgid-Bugs-To: Dennis Siemensma \n" +"Last-Translator: Dennis Siemensma \n" +"Language-Team: Dennis Siemensma \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.3.4\n" +"Language: nl\n" +"X-Generator: Poedit 1.8.7.1\n" + +#: ../../pvoutput.rst:2 +msgid "Integration: PVOutput" +msgstr "Integratie: PVOutput" + +#: ../../pvoutput.rst:10 +msgid "PVOutput.org: Automated electricity consumption export" +msgstr "PVOutput.org: Automatisch exporteren van verbruik" + +#: ../../pvoutput.rst:11 +msgid "*How can I link my PVOutput.org account?*" +msgstr "*Hoe kan ik mijn PVOutput.org-account koppelen?*" + +#: ../../pvoutput.rst:13 +msgid "" +"Make sure you have a PVOutput.org account, or `signup for an account `_. You will have to configure your account and PV system(s). " +"For any support doing that, please `see this page `_ for more information." +msgstr "" +"Zorg ervoor dat je een PVOutput.org-account hebt, of `registreer er een " +"`_. Vervolgens zul je je account en zonnesystemen " +"moeten configureren. Voor ondersteuning hoe dat moet, `zie de documentatie " +"`_ voor meer " +"informatie." + +#: ../../pvoutput.rst:16 +msgid "" +"In order to link DSMR-reader to your account, please write down the \"API Key" +"\" and \"System ID\" from your PVOutput account. You can find them near the " +"bottom of the \"Settings\" page in PVOutput." +msgstr "" +"Om DSMR-reader te koppelen met je account, noteer de \"API Key\" en \"System ID" +"\" zoals je PVOutput-account aangeeft. Deze zijn terug te vinden onder " +"\"Settings\", binnen PVOutput." + +#: ../../pvoutput.rst:24 +msgid "" +"Enter those values in DSMR-reader's admin pages, at \"PVOutput: API " +"configuration\". Make sure to enter both:" +msgstr "" +"Vul deze gegevens in de configuratiepagina's van DSMR-reader in, bij: " +"\"PVOutput: API-configuratie\". Zowel:" + +#: ../../pvoutput.rst:26 +msgid "API Key" +msgstr "API Key" + +#: ../../pvoutput.rst:27 +msgid "System ID" +msgstr "System ID" + +#: ../../pvoutput.rst:35 +msgid "" +"Now navigate to another settings page in DSMR-reader: \"PVOutput: \"Add Status" +"\" configuration\"." +msgstr "" +"Navigeer nu naar een andere pagina met instellingen binnen DSMR-reader, " +"genaamd \"PVOutput: Add Status configuratie\"." + +#: ../../pvoutput.rst:37 +msgid "Enable uploading the consumption." +msgstr "Schakel het uploaden van je verbruik in." + +#: ../../pvoutput.rst:38 +msgid "" +"Choose an interval between the uploads. You can configure this as well on the " +"PVOutput's end, in Device Settings." +msgstr "" +"Kies een interval tussen de uploads. Je kunt dit tevens instellen aan de kant " +"van PVOutput, onder Device Settings." + +#: ../../pvoutput.rst:39 +msgid "" +"Optionally, choose an upload delay X (in minutes). If set, DSMR-reader will " +"not use data of the past X minutes." +msgstr "" +"Voer optioneel een uploadvertraging X in. Wanneer ingesteld, zal DSMR-reader " +"geen data gebruiken van de afgelopen X minuten." + +#: ../../pvoutput.rst:40 +msgid "" +"Optionally, you can choose to enter a **processing delay in minutes** for " +"PVOutput. Please note that PVOutput will only allow this when you have a **" +"\"Donation\" account** on their website. If you do not have one, they will " +"reject each API call you make, until you disable (clear) this option in DSMR-" +"reader." +msgstr "" +"Optioneel kun je ervoor kiezen om PVOutput de gegevens **vertraagd te laten " +"verwerken**. Let op, dit is een feature van PVOutput die alleen beschikbaar is " +"wanneer je daar een **\"Donatie\" account** hebt. Indien dat niet het geval " +"is, zal PVOutput elke API-call weigeren, totdat je dit uitschakelt (veld " +"leegmaakt) in DSMR-reader." + +#: ../../pvoutput.rst:47 +msgid "" +"If you configured everything correctly, you should see some addional data in " +"PVOutput listed under \"Your Outputs\" momentarily." +msgstr "" +"Indien je alles correct hebt ingesteld, zul je op korte termijn extra gegevens " +"moeten zien in PVOutput onder \"Your Outputs\"." diff --git a/docs/locale/nl/LC_MESSAGES/settings.mo b/docs/locale/nl/LC_MESSAGES/settings.mo index ceb6862a5..ba715a2d6 100644 Binary files a/docs/locale/nl/LC_MESSAGES/settings.mo and b/docs/locale/nl/LC_MESSAGES/settings.mo differ diff --git a/docs/locale/nl/LC_MESSAGES/settings.po b/docs/locale/nl/LC_MESSAGES/settings.po index 9a47b41bb..a47d76965 100644 --- a/docs/locale/nl/LC_MESSAGES/settings.po +++ b/docs/locale/nl/LC_MESSAGES/settings.po @@ -14,22 +14,22 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.3.4\n" -"Language: nl\n" -"X-Generator: Poedit 1.8.7.1\n" #: ../../settings.rst:2 -msgid "Settings" -msgstr "Instellingen" +#, fuzzy +msgid "Backend settings" +msgstr "Database/Django instellingen" #: ../../settings.rst:4 msgid "" -"The application has several settings available, which you can edit in the " -"Configuration page. The default settings should work fine, although it's " -"recommended to enable syncing backups using Dropbox." +"The application has several settings available, which you can edit in the" +" Configuration page. The default settings should work fine, although it's" +" recommended to enable syncing backups using Dropbox." msgstr "" "De applicatie heeft diverse instellingen die je kunt bewerken in de " -"Configuratie-pagina. De standaardinstellingen zouden afdoende moeten werken, " -"al is het wel aan te raden de back-ups te synchroniseren via Dropbox." +"Configuratie-pagina. De standaardinstellingen zouden afdoende moeten " +"werken, al is het wel aan te raden de back-ups te synchroniseren via " +"Dropbox." #: ../../settings.rst:11 msgid "Database/Django settings" @@ -42,18 +42,20 @@ msgstr "``dsmrreader/settings.py``" #: ../../settings.rst:14 msgid "" "In case you want to alter the database settings, or any other Django " -"settings, please modify (or add) them to the ``dsmrreader/settings.py`` file." +"settings, please modify (or add) them to the ``dsmrreader/settings.py`` " +"file." msgstr "" -"Wanneer je de database-instellingen (of die van Django) wilt wijzigen, voer " -"deze dan door in ``dsmrreader/settings.py``." +"Wanneer je de database-instellingen (of die van Django) wilt wijzigen, " +"voer deze dan door in ``dsmrreader/settings.py``." #: ../../settings.rst:16 msgid "" -"Make sure to reload the application afterwards to persist the changes you've " -"made, by executing ``./reload.sh`` or restarting the Supervisor processes." +"Make sure to reload the application afterwards to persist the changes " +"you've made, by executing ``./reload.sh`` or restarting the Supervisor " +"processes." msgstr "" -"Zorg ervoor dat je de applicatie herlaad na je wijzigingen, door ``./reload." -"sh`` uit te voeren, of de Supervisor-processen te herstarten." +"Zorg ervoor dat je de applicatie herlaad na je wijzigingen, door " +"``./reload.sh`` uit te voeren, of de Supervisor-processen te herstarten." #: ../../settings.rst:20 msgid "API configuration" @@ -64,8 +66,8 @@ msgid "" "The application does have an API, but it's disabled by default. You can " "enable it by activating the \"Allow API calls\" option." msgstr "" -"De applicatie heeft een API, maar die is standaard uitgeschakeld. Je kunt " -"deze inschakelen met de \"Sta API-calls toe\" optie." +"De applicatie heeft een API, maar die is standaard uitgeschakeld. Je kunt" +" deze inschakelen met de \"Sta API-calls toe\" optie." #: ../../settings.rst:26 msgid "``Allow API calls``" @@ -90,11 +92,12 @@ msgstr "Backupconfiguratie" #: ../../settings.rst:37 msgid "" "The application creates a daily database backup by default. You choose " -"whether you want to have it compressed or in raw SQL form. The timestamp of " -"the backup can be altered as well." +"whether you want to have it compressed or in raw SQL form. The timestamp " +"of the backup can be altered as well." msgstr "" -"De applicatie maakt standaard dagelijks een databaseback-up. Je kunt hiermee " -"aangegeven in welke compressievorm en tevens het tijdstip van de back-up." +"De applicatie maakt standaard dagelijks een databaseback-up. Je kunt " +"hiermee aangegeven in welke compressievorm en tevens het tijdstip van de " +"back-up." #: ../../settings.rst:42 msgid "``Backup daily``" @@ -131,8 +134,8 @@ msgstr "Dropbox-configuratie" #: ../../settings.rst:58 msgid "" "There is a Dropbox integration available to safely transfer each daily " -"backup into your Dropbox account. :doc:`More information about this feature " -"can be found in the FAQ`." +"backup into your Dropbox account. :doc:`More information about this " +"feature can be found in the FAQ`." msgstr "" "Er is een koppeling mogelijk met je eigen Dropbox-account om de back-ups " "veilig te stellen. :doc:`Meer informatie over deze feature kun je " @@ -147,8 +150,8 @@ msgid "" "Enter your Dropbox access token here. Leave blank or clear to disable " "Dropbox integration." msgstr "" -"Voer hier je Dropbox-access token in. Laat leeg om de Dropbox-koppeling uit " -"te schakelen." +"Voer hier je Dropbox-access token in. Laat leeg om de Dropbox-koppeling " +"uit te schakelen." #: ../../settings.rst:68 msgid "Consumption configuration" @@ -160,8 +163,9 @@ msgid "" "separate readings. The default behaviour is to group all readings each " "minute. This can be disabled." msgstr "" -"De verbruiksinstellingen bepalen hoe de applicatie omgaat met de individuele " -"metingen. Standaard groepeert de applicatie de metingen per minuut." +"De verbruiksinstellingen bepalen hoe de applicatie omgaat met de " +"individuele metingen. Standaard groepeert de applicatie de metingen per " +"minuut." #: ../../settings.rst:73 msgid "``Compactor grouping type``" @@ -169,8 +173,7 @@ msgstr "``Metingen groeperen``" #: ../../settings.rst:74 msgid "The density of the readings, visible in the application as consumption." -msgstr "" -"De dichtheid van de metingen, zoals getoond als verbruik in de applicatie." +msgstr "De dichtheid van de metingen, zoals getoond als verbruik in de applicatie." #: ../../settings.rst:79 msgid "Energy supplier prices" @@ -178,13 +181,14 @@ msgstr "Tarieven energieleverancier" #: ../../settings.rst:80 msgid "" -"You can enter all your energy contract prices here. The application will use " -"them (when available) to calculate the consumption of each day. :doc:`See " -"the FAQ on how to retroactivily adjust prices (if needed)`." +"You can enter all your energy contract prices here. The application will " +"use them (when available) to calculate the consumption of each day. " +":doc:`See the FAQ on how to retroactivily adjust prices (if " +"needed)`." msgstr "" -"Je kunt hier je energietarieven invoeren. De applicatie gebruikt deze dan om " -"je dagelijkse verbruik te berekenen. :doc:`Zie de FAQ hoe je dit eventueel " -"met terugwerkende kracht kan doen (indien nodig)`." +"Je kunt hier je energietarieven invoeren. De applicatie gebruikt deze dan" +" om je dagelijkse verbruik te berekenen. :doc:`Zie de FAQ hoe je dit " +"eventueel met terugwerkende kracht kan doen (indien nodig)`." #: ../../settings.rst:87 msgid "Datalogger configuration" @@ -208,11 +212,12 @@ msgstr "``Houd elektriciteitsfasen bij``" #: ../../settings.rst:96 msgid "" -"Whether you want to track phases. :doc:`More information about this feature " -"can be found in the FAQ`." +"Whether you want to track phases. :doc:`More information about this " +"feature can be found in the FAQ`." msgstr "" -"Geeft aan of we de elektriciteitsfasen moeten bijhouden (wanneer aanwezig). :" -"doc:`Meer informatie over deze feature kun je terugvinden in de FAQ`." +"Geeft aan of we de elektriciteitsfasen moeten bijhouden (wanneer " +"aanwezig). :doc:`Meer informatie over deze feature kun je terugvinden in " +"de FAQ`." #: ../../settings.rst:100 msgid "``Verify telegram CRC``" @@ -220,8 +225,8 @@ msgstr "``Controleer de CRC van telegrammen``" #: ../../settings.rst:101 msgid "" -"Whether the application should verify the incoming data. Only available for " -"DSMR 4+." +"Whether the application should verify the incoming data. Only available " +"for DSMR 4+." msgstr "" "Geeft aan of we de CRC (checksum) van binnenkomende telegrammen moeten " "controleren. Alleen beschikbaar voor DSMR 4+." @@ -235,8 +240,8 @@ msgid "" "The DSMR version your smart meter has. Used to determine how the serial " "connection should work." msgstr "" -"De DSMR-versie die je slimme meter ondersteunt. Wordt gebruikt om te bepalen " -"hoe de seriele verbinding werkt." +"De DSMR-versie die je slimme meter ondersteunt. Wordt gebruikt om te " +"bepalen hoe de seriele verbinding werkt." #: ../../settings.rst:108 msgid "``COM-port``" @@ -260,12 +265,12 @@ msgstr "``Voeg tarieven samen``" #: ../../settings.rst:119 msgid "" -"Whether to merge the high and low tariffs. :doc:`More information about this " -"feature can be found in the FAQ`." +"Whether to merge the high and low tariffs. :doc:`More information about " +"this feature can be found in the FAQ`." msgstr "" -"Bepaalt of de elektriciteitstarieven samengevoegd moeten worden (wanneer je " -"voor een enkel tarief betaalt). :doc:`Meer informatie over deze feature kun " -"je terugvinden in de FAQ`." +"Bepaalt of de elektriciteitstarieven samengevoegd moeten worden (wanneer " +"je voor een enkel tarief betaalt). :doc:`Meer informatie over deze " +"feature kun je terugvinden in de FAQ`." #: ../../settings.rst:123 msgid "``**** color``" @@ -284,8 +289,8 @@ msgid "" "Optional connection with your account at MinderGas.nl. :doc:`More " "information about this feature can be found in the FAQ`." msgstr "" -"Optionele integratie met je MinderGas.nl-account. :doc:`Meer informatie over " -"deze feature kun je terugvinden in de FAQ`." +"Optionele integratie met je MinderGas.nl-account. :doc:`Meer informatie " +"over deze feature kun je terugvinden in de FAQ`." #: ../../settings.rst:135 msgid "``Export data to MinderGas``" @@ -316,8 +321,8 @@ msgid "" "You can leave personal notes for yourself here. Such as when you were on " "holiday or experimented with the heater settings." msgstr "" -"Je kunt hier persoonlijke notities voor jezelf achterlaten. Zoals wanneer je " -"op vakantie bent of hebt geëxperimenteerd met de verwarming." +"Je kunt hier persoonlijke notities voor jezelf achterlaten. Zoals wanneer" +" je op vakantie bent of hebt geëxperimenteerd met de verwarming." #: ../../settings.rst:152 msgid "Notification configuration" @@ -365,8 +370,8 @@ msgstr "Weergegevensconfiguratie" #: ../../settings.rst:171 msgid "" "There is support for tracking outside temperatures for a fixed number of " -"weather stations. :doc:`More information about this feature can be found in " -"the FAQ`." +"weather stations. :doc:`More information about this feature can be found " +"in the FAQ`." msgstr "" "Er is ondersteuning voor het uitlezen van de temperatuur :doc:`Meer " "informatie over deze feature kun je terugvinden in de FAQ`." @@ -382,3 +387,7 @@ msgstr "``Buienradar weerstation``" #: ../../settings.rst:180 msgid "The fixed weather station you wish to use." msgstr "Het weerstation die je wilt gebruiken." + +#~ msgid "Settings" +#~ msgstr "Instellingen" + diff --git a/docs/locale/nl/LC_MESSAGES/troubleshooting.mo b/docs/locale/nl/LC_MESSAGES/troubleshooting.mo index b9cef592b..226dad1cf 100644 Binary files a/docs/locale/nl/LC_MESSAGES/troubleshooting.mo and b/docs/locale/nl/LC_MESSAGES/troubleshooting.mo differ diff --git a/docs/locale/nl/LC_MESSAGES/troubleshooting.po b/docs/locale/nl/LC_MESSAGES/troubleshooting.po index 807241ad5..f0aa0a763 100644 --- a/docs/locale/nl/LC_MESSAGES/troubleshooting.po +++ b/docs/locale/nl/LC_MESSAGES/troubleshooting.po @@ -83,20 +83,33 @@ msgid "" "The application has it's own logfiles as well. You can find them in the " "``logs`` directory inside the project folder. The ``django.log`` will " "list any internal errors regarding the Django framework it's using. The " -"other logfile ``dsmrreader.log`` contains all readings it received, in " -"base64 format." +"other logfile ``dsmrreader.log`` contains application logging, if " +"enabled." msgstr "" "De applicatie heeft zelf ook logfiles. Deze vindt je in de ``logs`` " "directory binnenin het project. De ``django.log`` bevat alle interne " "fouten m.b.t. het gebruikte Django framework. De andere logfile, " "``dsmrreader.log`` bevat doorgaans alle ontvangen metingen, in base64-" -"formaat." +"formaat en wanneer ingeschakeld." -#: ../../troubleshooting.rst:35 +#: ../../troubleshooting.rst:32 +msgid "" +"You can log all telegrams received, in base64 format, by adding " +"``DSMRREADER_LOG_TELEGRAMS = True`` to your ``dsmrreader/settings.py`` " +"config. Make sure that you execute ``./reload.sh`` after changing the " +"settings. It should now log the telegrams into ``dsmrreader.log``." +msgstr "" +"Je kunt alle ontvangen telegrammen loggen, in base64-formaat, door de " +"regel ``DSMRREADER_LOG_TELEGRAMS = True`` toe te voegen aan je " +"instellingen in ``dsmrreader/settings.py``. Zorg er wel voor dat je ``./" +"reload.sh`` uitvoert na het doorvoeren van je wijzigingen. Als het goed " +"is worden nu de telegrammen gelogd in ``dsmrreader.log``." + +#: ../../troubleshooting.rst:38 msgid "Contact" msgstr "Contact" -#: ../../troubleshooting.rst:36 +#: ../../troubleshooting.rst:39 msgid "" "Are you unable to resolve your problem or do you need any help? :doc:" "`More information can be found here`." diff --git a/docs/mindergas.rst b/docs/mindergas.rst new file mode 100644 index 000000000..d4d3b5179 --- /dev/null +++ b/docs/mindergas.rst @@ -0,0 +1,26 @@ +Integration: MinderGas.nl +========================= + + +.. contents:: + :depth: 2 + + +Mindergas.nl: Automated gas meter position export +------------------------------------------------- +*How can I link my mindergas.nl account?* + +Make sure you have a Mindergas.nl account or `signup for one `_. +Now go to "`Meterstand API `_" and click on the button located below **"Authenticatietoken"**. + +.. image:: _static/faq/mindergas_api.png + :target: _static/faq/mindergas_api.png + :alt: Mindergas API + +Copy the authentication token generated and paste in into the DSMR-reader settings for the Mindergas.nl-configuration. +Obviously the export only works when there are any gas readings at all and you have ticked the 'export' checkbox in the Mindergas.nl-configuration as well. + +.. note:: + + Please note that due to policies of mindergas.nl it's not allowed to retroactively upload meter positions using the API. + Therefor this is not supported by the application. You can however, enter them manually on their website. diff --git a/docs/notifications.rst b/docs/notifications.rst new file mode 100644 index 000000000..b3058628c --- /dev/null +++ b/docs/notifications.rst @@ -0,0 +1,54 @@ +Integration: Notifications +========================== + + +.. contents:: + :depth: 2 + + +Usage notification: Daily usage statistics on your smartphone +------------------------------------------------------------- +*Which services for sending notifications are supported?* + +Currently, two mobile platforms are supported: Android and iOS. +The supported app for Android is `NotifyMyAndroid `_. +The supported app for iOS is `Prowl `_. + + +*How do I setup usage notifications?* + +Make sure you either have NotifyMyAndroid or Prowl installed on your smartphone. If you don't, visit your platforms app store to download the app and sign up for an account. Then, make sure to get your API key from the notificationservice that you prefer. For instruction on obtaining the API key, please read below. + +In the DSMR-reader settings for the Usagenotifications, tick the Send Notifications checkbox and select the notification service you want to use. Then copy the API key from the notification service and paste in into the the textbox for the API key. When you save these settings, your first notification should be sent after midnight. Don't worry, the notification will be sent with low priority and will not wake you up. + + +*How do I obtain my API key for NotifyMyAndroid?* + +After you have downloaded NotifyMyAndroid and signed up for an account you should be able to `login to your NotifyMyAndroid account `_. +Now go to "`My Account `_", you should see an overview of your current API keys if you have any. To create an API key for the DSMR-reader, please click **"Generate New Key"**. + +.. image:: _static/faq/notifications-notify-my-android-create-key.png + :target: _static/faq/notifications-notify-my-android-create-key.png + :alt: NotifyMyAndroid My Account overview + +When a new key is generated, you will see it immediatly. Your key is listed like in the screenshot below (the red box marks your API key). + +.. image:: _static/faq/notifications-notify-my-android-get-key.png + :target: _static/faq/notifications-notify-my-android-get-key.png + :alt: NotifyMyAndroid Get Your API Key + + +*How do I obtain my API key for Prowl?* + +After you have downloaded Prowl and signed up for an account you should be able to `login to your Prowl account `_. +Now go to "`API Keys `_", you should see an overview of your current API keys if you have any. To create an API key for the DSMR-reader, input a name and click **"Generate Key"**. + +.. image:: _static/faq/notifications-prowl-create-key.png + :target: _static/faq/notifications-prowl-key.png + :alt: Prowl My Account overview + +When a new key is generated, you will see it immediatly. Your key is listed like in the screenshot below (the red box marks your API key). + +.. image:: _static/faq/notifications-prowl-get-key.png + :target: _static/faq/notifications-prowl-get-key.png + :alt: Prowl Get Your API Key diff --git a/docs/pvoutput.rst b/docs/pvoutput.rst new file mode 100644 index 000000000..9522d6056 --- /dev/null +++ b/docs/pvoutput.rst @@ -0,0 +1,47 @@ +Integration: PVOutput +===================== + + +.. contents:: + :depth: 2 + + +PVOutput.org: Automated electricity consumption export +------------------------------------------------------ +*How can I link my PVOutput.org account?* + +Make sure you have a PVOutput.org account, or `signup for an account `_. +You will have to configure your account and PV system(s). For any support doing that, please `see this page `_ for more information. + +In order to link DSMR-reader to your account, please write down the "API Key" and "System ID" from your PVOutput account. You can find them near the bottom of the "Settings" page in PVOutput. + + +.. image:: _static/faq/external_pvoutput_settings.png + :target: _static/faq/external_pvoutput_settings.png + :alt: PVOutput account settings + + +Enter those values in DSMR-reader's admin pages, at "PVOutput: API configuration". Make sure to enter both: + + * API Key + * System ID + + +.. image:: _static/faq/pvoutput_api.png + :target: _static/faq/pvoutput_api.png + :alt: API settings + + +Now navigate to another settings page in DSMR-reader: "PVOutput: "Add Status" configuration". + + * Enable uploading the consumption. + * Choose an interval between the uploads. You can configure this as well on the PVOutput's end, in Device Settings. + * Optionally, choose an upload delay X (in minutes). If set, DSMR-reader will not use data of the past X minutes. + * Optionally, you can choose to enter a **processing delay in minutes** for PVOutput. Please note that PVOutput will only allow this when you have a **"Donation" account** on their website. If you do not have one, they will reject each API call you make, until you disable (clear) this option in DSMR-reader. + + +.. image:: _static/faq/pvoutput_add_status.png + :target: _static/faq/pvoutput_add_status.png + :alt: Add Status settings + +If you configured everything correctly, you should see some addional data in PVOutput listed under "Your Outputs" momentarily. diff --git a/docs/settings.rst b/docs/settings.rst index c5f3d785d..ff24096e0 100644 --- a/docs/settings.rst +++ b/docs/settings.rst @@ -1,5 +1,5 @@ -Settings -======== +Backend settings +================ The application has several settings available, which you can edit in the Configuration page. The default settings should work fine, although it's recommended to enable syncing backups using Dropbox. diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst index 53151b3b9..d1cbd827c 100644 --- a/docs/troubleshooting.rst +++ b/docs/troubleshooting.rst @@ -27,7 +27,10 @@ Appplication / Django The application has it's own logfiles as well. You can find them in the ``logs`` directory inside the project folder. The ``django.log`` will list any internal errors regarding the Django framework it's using. -The other logfile ``dsmrreader.log`` contains all readings it received, in base64 format. +The other logfile ``dsmrreader.log`` contains application logging, if enabled. + +You can log all telegrams received, in base64 format, by adding ``DSMRREADER_LOG_TELEGRAMS = True`` to your ``dsmrreader/settings.py`` config. +Make sure that you execute ``./reload.sh`` after changing the settings. It should now log the telegrams into ``dsmrreader.log``. diff --git a/dsmr_consumption/services.py b/dsmr_consumption/services.py index 523b76627..a472e6dbe 100644 --- a/dsmr_consumption/services.py +++ b/dsmr_consumption/services.py @@ -2,8 +2,8 @@ from decimal import Decimal, ROUND_UP import pytz -from django.utils import timezone from django.db.models import Avg, Min, Max, Count +from django.utils import timezone, formats from dsmr_consumption.models.consumption import ElectricityConsumption, GasConsumption from dsmr_consumption.models.settings import ConsumptionSettings @@ -279,19 +279,37 @@ def calculate_slumber_consumption_watt(): def calculate_min_max_consumption_watt(): - """ Returns the lowest and highest Wattage consumed. """ - min_max = ElectricityConsumption.objects.filter( - currently_delivered__gt=0 - ).aggregate( - min_watt=Min('currently_delivered'), - max_watt=Max('currently_delivered') - ) - - for x in min_max.keys(): - if min_max[x]: - min_max[x] = int(min_max[x] * 1000) - - return min_max + """ Returns the lowest and highest Wattage consumed for each phase. """ + FIELDS = { + 'total_min': ('currently_delivered', ''), + 'total_max': ('currently_delivered', '-'), + 'l1_max': ('phase_currently_delivered_l1', '-'), + 'l2_max': ('phase_currently_delivered_l2', '-'), + 'l3_max': ('phase_currently_delivered_l3', '-'), + } + data = {} + + for name, args in FIELDS.items(): + field, sorting = args + + try: + read_at, value = ElectricityConsumption.objects.filter(**{ + '{}__gt'.format(field): 0, # Skip (obvious) zero values. + '{}__isnull'.format(field): False, # And skip empty data. + }).order_by( + '{}{}'.format(sorting, field) + ).values_list('read_at', field)[0] + except IndexError: + continue + + data.update({ + name: ( + formats.date_format(timezone.localtime(read_at), 'DSMR_GRAPH_LONG_DATE_FORMAT'), + int(value * 1000) + ) + }) + + return data def clear_consumption(): diff --git a/dsmr_consumption/tests/models/test_consumption.py b/dsmr_consumption/tests/models/test_consumption.py index eaa2616a9..2b666abe2 100644 --- a/dsmr_consumption/tests/models/test_consumption.py +++ b/dsmr_consumption/tests/models/test_consumption.py @@ -20,6 +20,33 @@ def test_str(self): """ Model should override string formatting. """ self.assertNotEqual(str(self.instance), 'ElectricityConsumption') + def test_sub(self): + """ Custom substraction operator. """ + ec1 = ElectricityConsumption.objects.create( + read_at=timezone.now(), + delivered_1=1, + returned_1=2, + delivered_2=3, + returned_2=4, + currently_delivered=0, + currently_returned=0, + ) + ec2 = ElectricityConsumption.objects.create( + read_at=timezone.now() + timezone.timedelta(minutes=1), + delivered_1=10, + returned_1=15, + delivered_2=20, + returned_2=25, + currently_delivered=0, + currently_returned=0, + ) + diff = ec2 - ec1 + + self.assertEqual(diff['delivered_1'], 9) + self.assertEqual(diff['delivered_2'], 17) + self.assertEqual(diff['returned_1'], 13) + self.assertEqual(diff['returned_2'], 21) + class TestGasConsumption(TestCase): def setUp(self): diff --git a/dsmr_consumption/tests/test_services.py b/dsmr_consumption/tests/test_services.py index 8ff0f5a2d..6ea1c2ec0 100644 --- a/dsmr_consumption/tests/test_services.py +++ b/dsmr_consumption/tests/test_services.py @@ -15,9 +15,11 @@ class TestServices(InterceptStdoutMixin, TestCase): fixtures = ['dsmr_consumption/test_dsmrreading.json', 'dsmr_consumption/test_energysupplierprice.json'] support_gas_readings = None + support_prices = None def setUp(self): self.support_gas_readings = True + self.support_prices = True self.assertEqual(DsmrReading.objects.all().count(), 3) MeterStatistics.get_solo() MeterStatistics.objects.all().update(dsmr_version='42') @@ -171,9 +173,15 @@ def test_day_consumption(self): self.assertEqual(data['electricity2_returned'], Decimal('3.5')) self.assertEqual(data['electricity_merged'], 4) self.assertEqual(data['electricity_returned_merged'], 5) - self.assertEqual(data['electricity1_cost'], Decimal('0.25')) - self.assertEqual(data['electricity2_cost'], Decimal('0.75')) - self.assertEqual(data['total_cost'], 1) + + if self.support_prices: + self.assertEqual(data['electricity1_cost'], Decimal('0.25')) + self.assertEqual(data['electricity2_cost'], Decimal('0.75')) + self.assertEqual(data['total_cost'], 1) + else: + self.assertEqual(data['electricity1_cost'], 0) + self.assertEqual(data['electricity2_cost'], 0) + self.assertEqual(data['total_cost'], 0) GasConsumption.objects.create( read_at=now, # Now. @@ -238,42 +246,62 @@ def test_calculate_slumber_consumption_watt(self): # Average = 250 + 250 + 1000 / 3 = 500. self.assertEqual(most_common, 500) - def test_calculate_min_max_consumption_watt(self): - min_max = dsmr_consumption.services.calculate_min_max_consumption_watt() - self.assertIsNone(min_max['min_watt']) - self.assertIsNone(min_max['max_watt']) + @mock.patch('django.utils.timezone.now') + def test_calculate_min_max_consumption_watt(self, now_mock): + now_mock.return_value = timezone.localtime(timezone.make_aware( + timezone.datetime(2017, 1, 1, hour=12) + )) + + result = dsmr_consumption.services.calculate_min_max_consumption_watt() + self.assertNotIn('total_min', result) + self.assertNotIn('total_max', result) ElectricityConsumption.objects.create( read_at=timezone.now(), - delivered_1=1, - returned_1=1, - delivered_2=2, - returned_2=2, + delivered_1=0, + returned_1=0, + delivered_2=0, + returned_2=0, currently_delivered=0.25, currently_returned=0, + phase_currently_delivered_l1=0.5, ) ElectricityConsumption.objects.create( - read_at=timezone.now() + timezone.timedelta(minutes=1), - delivered_1=1, - returned_1=1, - delivered_2=2, - returned_2=2, - currently_delivered=0.25, + read_at=timezone.now() + timezone.timedelta(hours=24), + delivered_1=0, + returned_1=0, + delivered_2=0, + returned_2=0, + currently_delivered=1.35, currently_returned=0, + phase_currently_delivered_l2=0.75, ) ElectricityConsumption.objects.create( - read_at=timezone.now() + timezone.timedelta(minutes=2), - delivered_1=1, - returned_1=1, - delivered_2=2, - returned_2=2, + read_at=timezone.now() + timezone.timedelta(hours=48), + delivered_1=0, + returned_1=0, + delivered_2=0, + returned_2=0, currently_delivered=6.123, currently_returned=0, + phase_currently_delivered_l3=1.5, ) - min_max = dsmr_consumption.services.calculate_min_max_consumption_watt() + result = dsmr_consumption.services.calculate_min_max_consumption_watt() + + self.assertEqual(result['total_min'][0], 'Sunday January 1st, 2017') + self.assertEqual(result['total_min'][1], 250) + + self.assertEqual(result['total_max'][0], 'Tuesday January 3rd, 2017') + self.assertEqual(result['total_max'][1], 6123) - self.assertEqual(min_max['min_watt'], 250) - self.assertEqual(min_max['max_watt'], 6123) + self.assertEqual(result['l1_max'][0], 'Sunday January 1st, 2017') + self.assertEqual(result['l1_max'][1], 500) + + self.assertEqual(result['l2_max'][0], 'Monday January 2nd, 2017') + self.assertEqual(result['l2_max'][1], 750) + + self.assertEqual(result['l3_max'][0], 'Tuesday January 3rd, 2017') + self.assertEqual(result['l3_max'][1], 1500) def test_clear_consumption(self): # Prepare some test data that should be deleted. @@ -343,3 +371,11 @@ class TestServicesWithoutGas(TestServices): def setUp(self): super(TestServicesWithoutGas, self).setUp() self.support_gas_readings = False + + +class TestServicesWithoutPrices(TestServices): + fixtures = ['dsmr_consumption/test_dsmrreading.json'] + + def setUp(self): + super(TestServicesWithoutPrices, self).setUp() + self.support_prices = False diff --git a/dsmr_datalogger/management/commands/dsmr_fake_datasource.py b/dsmr_datalogger/management/commands/dsmr_fake_datasource.py index 06cca1fe1..236e2b0a6 100644 --- a/dsmr_datalogger/management/commands/dsmr_fake_datasource.py +++ b/dsmr_datalogger/management/commands/dsmr_fake_datasource.py @@ -125,12 +125,12 @@ def _generate_data(self, with_gas, with_electricity_returned, hour_offset): "1-0:31.7.0(000*A)\r\n", "1-0:51.7.0(000*A)\r\n", "1-0:71.7.0(001*A)\r\n", - "1-0:21.7.0(00.000*kW)\r\n", - "1-0:41.7.0(00.000*kW)\r\n", + "1-0:21.7.0({}*kW)\r\n".format(self._round_precision(currently_delivered * 0.5, 6)), + "1-0:41.7.0({}*kW)\r\n".format(self._round_precision(currently_delivered * 0.75, 6)), "1-0:61.7.0({}*kW)\r\n".format(self._round_precision(currently_delivered, 6)), - "1-0:22.7.0(00.000*kW)\r\n", - "1-0:42.7.0(00.000*kW)\r\n", - "1-0:62.7.0(00.000*kW)\r\n", + "1-0:22.7.0({}*kW)\r\n".format(self._round_precision(currently_returned * 0.5, 6)), + "1-0:42.7.0({}*kW)\r\n".format(self._round_precision(currently_returned * 0.75, 6)), + "1-0:62.7.0({}*kW)\r\n".format(self._round_precision(currently_returned, 6)), ] if with_gas: diff --git a/dsmr_datalogger/services.py b/dsmr_datalogger/services.py index 76c19d2c8..de90b2476 100644 --- a/dsmr_datalogger/services.py +++ b/dsmr_datalogger/services.py @@ -264,7 +264,9 @@ def telegram_to_reading(data): # noqa: C901 # Broadcast this telegram as signal. dsmr_datalogger.signals.raw_telegram.send_robust(sender=None, data=data) - dsmrreader_logger.info('Received telegram (base64 encoded): {}'.format(base64_data)) + if settings.DSMRREADER_LOG_TELEGRAMS: + dsmrreader_logger.info('Received telegram (base64 encoded): {}'.format(base64_data)) + return new_reading diff --git a/dsmr_datalogger/tests/datalogger/test_generic.py b/dsmr_datalogger/tests/datalogger/test_generic.py index c6a78f825..b6c8e0932 100644 --- a/dsmr_datalogger/tests/datalogger/test_generic.py +++ b/dsmr_datalogger/tests/datalogger/test_generic.py @@ -292,6 +292,12 @@ def test_verify_telegram_checksum(self): telegram[-1] = "!58C8\n" dsmr_datalogger.services.verify_telegram_checksum(data=''.join(telegram)) + @mock.patch('django.conf.settings.DSMRREADER_LOG_TELEGRAMS') + def test_telegram_logging_setting_coverage(self, settings_mock): + """ Purely a coverage test. """ + settings_mock.return_value = True + dsmr_datalogger.services.telegram_to_reading(data=self.fake_telegram) + class TestDsmrVersionMapping(InterceptStdoutMixin, TestCase): def test_dsmr_version_2(self): diff --git a/dsmr_frontend/templates/dsmr_frontend/dashboard.html b/dsmr_frontend/templates/dsmr_frontend/dashboard.html index e558c3e50..712117f05 100644 --- a/dsmr_frontend/templates/dsmr_frontend/dashboard.html +++ b/dsmr_frontend/templates/dsmr_frontend/dashboard.html @@ -135,7 +135,8 @@ {% endif %} {% trans "Total" %} -   + {% if capabilities.electricity %}{{ month_statistics.electricity_merged|default:'-'|floatformat:2 }} {% endif %} + {% if capabilities.electricity_returned %}{{ month_statistics.electricity_returned_merged|default:'-'|floatformat:2 }}{% endif %} {{ month_statistics.total_cost|default:'-' }} diff --git a/dsmr_frontend/templates/dsmr_frontend/statistics.html b/dsmr_frontend/templates/dsmr_frontend/statistics.html index 40163908f..1989d77f2 100644 --- a/dsmr_frontend/templates/dsmr_frontend/statistics.html +++ b/dsmr_frontend/templates/dsmr_frontend/statistics.html @@ -171,25 +171,57 @@ - {% trans "Lowest electricity consumption read" %} - + {% trans "Lowest wattage" %} +   {% trans 'Show' %} -     {% trans "Watt" %} +     {% trans "Watt" %}   -   - {% trans "Highest electricity consumption read" %} - + {% trans "Highest wattage" %} +   {% trans 'Show' %} -     {% trans "Watt" %} +     {% trans "Watt" %}   -   + {% if datalogger_settings.track_phases and capabilities.multi_phases %} + + {% trans "Highest wattage (L1)" %} + +   {% trans 'Show' %} + + +     {% trans "Watt" %}   -   + + + + + {% trans "Highest wattage (L2)" %} + +   {% trans 'Show' %} + + +     {% trans "Watt" %}   -   + + + + + {% trans "Highest wattage (L3)" %} + +   {% trans 'Show' %} + + +     {% trans "Watt" %}   -   + + + + {% endif %} @@ -264,9 +296,35 @@ $("#total_reading_count").html(response.total_reading_count); $("#slumber_consumption_watt").html(response.slumber_consumption_watt); - $("#min_consumption_watt").html(response.min_consumption_watt); - $("#max_consumption_watt").html(response.max_consumption_watt); + if (response.total_min) { + $("#total_min_consumption_timestamp").html(response.total_min[0]); + $("#total_min_consumption_watt").html(response.total_min[1]); + } + + if (response.total_max) { + $("#total_max_consumption_timestamp").html(response.total_max[0]); + $("#total_max_consumption_watt").html(response.total_max[1]); + } + + if (response.l1_max) { + $("#l1_max_consumption_timestamp").html(response.l1_max[0]); + $("#l1_max_consumption_watt").html(response.l1_max[1]); + $("#l1_max_consumption").removeClass("hidden").show(); + } + + if (response.l2_max) { + $("#l2_max_consumption_timestamp").html(response.l2_max[0]); + $("#l2_max_consumption_watt").html(response.l2_max[1]); + $("#l2_max_consumption").removeClass("hidden").show(); + } + + if (response.l3_max) { + $("#l3_max_consumption_timestamp").html(response.l3_max[0]); + $("#l3_max_consumption_watt").html(response.l3_max[1]); + $("#l3_max_consumption").removeClass("hidden").show(); + } + $(".xhr-hidden").show(); }); } diff --git a/dsmr_frontend/templates/dsmr_frontend/trends.html b/dsmr_frontend/templates/dsmr_frontend/trends.html index a933aa750..41ddf5a8f 100644 --- a/dsmr_frontend/templates/dsmr_frontend/trends.html +++ b/dsmr_frontend/templates/dsmr_frontend/trends.html @@ -162,7 +162,7 @@ ], borderWidth: 1, data: [ - {{ electricity_by_tariff_week.electricity2|floatformat:"0" }} + electricity2 ], }, { @@ -175,7 +175,7 @@ ], borderWidth: 1, data: [ - {{ electricity_by_tariff_week.electricity1|floatformat:"0" }} + electricity1 ], } ] diff --git a/dsmr_frontend/tests/webinterface/test_statistics.py b/dsmr_frontend/tests/webinterface/test_statistics.py index 3aa091899..e28230464 100644 --- a/dsmr_frontend/tests/webinterface/test_statistics.py +++ b/dsmr_frontend/tests/webinterface/test_statistics.py @@ -52,9 +52,14 @@ def test_statistics_xhr_data(self): json_response = json.loads(response.content.decode("utf-8")) self.assertIn('total_reading_count', json_response) - self.assertIn('slumber_consumption_watt', json_response) - self.assertIn('min_consumption_watt', json_response) - self.assertIn('max_consumption_watt', json_response) + + if self.support_data: + self.assertIn('slumber_consumption_watt', json_response) + self.assertIn('total_min', json_response) + self.assertIn('total_max', json_response) + self.assertIn('l1_max', json_response) + self.assertIn('l2_max', json_response) + self.assertIn('l3_max', json_response) class TestViewsWithoutData(TestViews): diff --git a/dsmr_frontend/tests/webinterface/test_trends.py b/dsmr_frontend/tests/webinterface/test_trends.py index 732ddb8a8..2c9eeda8e 100644 --- a/dsmr_frontend/tests/webinterface/test_trends.py +++ b/dsmr_frontend/tests/webinterface/test_trends.py @@ -1,22 +1,13 @@ from unittest import mock -import json -import io from django.test import TestCase, Client -from django.utils import timezone, formats +from django.utils import timezone from django.core.urlresolvers import reverse from django.contrib.auth.models import User from dsmr_consumption.models.consumption import ElectricityConsumption, GasConsumption from dsmr_consumption.models.energysupplier import EnergySupplierPrice -from dsmr_datalogger.models.reading import DsmrReading -from dsmr_datalogger.models.statistics import MeterStatistics -from dsmr_datalogger.models.settings import DataloggerSettings -from dsmr_frontend.models.settings import FrontendSettings -from dsmr_weather.models.settings import WeatherSettings from dsmr_stats.models.statistics import DayStatistics -from dsmr_frontend.models.message import Notification -from dsmr_frontend.forms import ExportAsCsvForm import dsmr_consumption.services @@ -38,212 +29,6 @@ def setUp(self): self.user = User.objects.create_user('testuser', 'unknown@localhost', 'passwd') dsmr_consumption.services.compact_all() - def test_admin(self): - response = self.client.get( - reverse('admin:index') - ) - self.assertEqual(response.status_code, 302) - self.assertEqual( - response['Location'], '/admin/login/?next=/admin/' - ) - - @mock.patch('dsmr_frontend.views.dashboard.Dashboard.get_context_data') - def test_http_500_production(self, get_context_data_mock): - get_context_data_mock.side_effect = SyntaxError('Meh') - response = self.client.get( - reverse('{}:dashboard'.format(self.namespace)) - ) - self.assertEqual(response.status_code, 500) - - @mock.patch('django.conf.settings.DEBUG') - @mock.patch('dsmr_frontend.views.dashboard.Dashboard.get_context_data') - def test_http_500_development(self, get_context_data_mock, debug_setting_mock): - """ Verify that the middleware is allowing Django to jump in when not in production. """ - get_context_data_mock.side_effect = SyntaxError('Meh') - debug_setting_mock.return_value = True - - with self.assertRaises(SyntaxError): - self.client.get( - reverse('{}:dashboard'.format(self.namespace)) - ) - - @mock.patch('django.utils.timezone.now') - def test_dashboard(self, now_mock): - now_mock.return_value = timezone.make_aware(timezone.datetime(2015, 11, 15)) - - weather_settings = WeatherSettings.get_solo() - weather_settings.track = True - weather_settings.save() - - response = self.client.get( - reverse('{}:dashboard'.format(self.namespace)) - ) - self.assertEqual(response.status_code, 200) - self.assertIn('track_temperature', response.context) - - if self.support_data: - self.assertIn('consumption', response.context) - - @mock.patch('django.utils.timezone.now') - def test_dashboard_xhr_header(self, now_mock): - now_mock.return_value = timezone.make_aware(timezone.datetime(2015, 11, 15)) - - # This makes sure all possible code paths are covered. - for current_tariff in (None, 1, 2): - if MeterStatistics.objects.exists(): - meter_statistics = MeterStatistics.get_solo() - meter_statistics.electricity_tariff = current_tariff - meter_statistics.save() - - response = self.client.get( - reverse('{}:dashboard-xhr-header'.format(self.namespace)) - ) - self.assertEqual(response.status_code, 200, response.content) - self.assertEqual(response['Content-Type'], 'application/json') - - # No response when no data at all. - if self.support_data: - json_response = json.loads(response.content.decode("utf-8")) - self.assertIn('timestamp', json_response) - self.assertIn('currently_delivered', json_response) - self.assertIn('currently_returned', json_response) - - # Costs only makes sense when set. - if EnergySupplierPrice.objects.exists() and MeterStatistics.objects.exists() \ - and current_tariff is not None: - self.assertIn('latest_electricity_cost', json_response) - self.assertEqual( - json_response['latest_electricity_cost'], '0.23' if current_tariff == 1 else '0.46' - ) - - @mock.patch('django.utils.timezone.now') - def test_dashboard_xhr_graphs(self, now_mock): - now_mock.return_value = timezone.make_aware(timezone.datetime(2015, 11, 15)) - - if self.support_data: - weather_settings = WeatherSettings.get_solo() - weather_settings.track = True - weather_settings.save() - - # Test with phases feature switched on as well. - DataloggerSettings.get_solo() - DataloggerSettings.objects.update(track_phases=True) - - # Send seperate offset as well. - response = self.client.get( - reverse('{}:dashboard-xhr-graphs'.format(self.namespace)), - data={'electricity_offset': 24} - ) - self.assertEqual(response.status_code, 200, response.content) - - # Send invalid offset. - response = self.client.get( - reverse('{}:dashboard-xhr-graphs'.format(self.namespace)), - data={'electricity_offset': 'abc'} - ) - self.assertEqual(response.status_code, 400) - - response = self.client.get( - reverse('{}:dashboard-xhr-graphs'.format(self.namespace)) - ) - self.assertEqual(response.status_code, 200, response.content) - json_content = json.loads(response.content.decode("utf8")) - - if self.support_data: - self.assertGreater( - len(json_content['electricity_x']), 0 - ) - self.assertGreater( - len(json_content['electricity_y']), 0 - ) - - self.assertIn('phases_l1_y', json_content) - self.assertIn('phases_l2_y', json_content) - self.assertIn('phases_l3_y', json_content) - - if self.support_gas: - self.assertGreater(len(json_content['gas_x']), 0) - self.assertGreater(len(json_content['gas_y']), 0) - - def test_dashboard_xhr_notification_read(self): - view_url = reverse('{}:dashboard-xhr-notification-read'.format(self.namespace)) - notification = Notification.objects.create(message='TEST', redirect_to='fake') - self.assertFalse(notification.read) - - response = self.client.post(view_url, data={'notification_id': notification.pk}) - self.assertEqual(response.status_code, 200) - - # Notification should be altered now. - notification.refresh_from_db() - self.assertTrue(notification.read) - - @mock.patch('django.utils.timezone.now') - def test_archive(self, now_mock): - now_mock.return_value = timezone.make_aware(timezone.datetime(2016, 1, 1)) - response = self.client.get( - reverse('{}:archive'.format(self.namespace)) - ) - self.assertEqual(response.status_code, 200) - self.assertIn('capabilities', response.context) - - # XHR's. - data = { - 'date': formats.date_format(timezone.now().date(), 'DSMR_DATEPICKER_DATE_FORMAT'), - } - for current_level in ('days', 'months', 'years'): - # Test both with tariffs sparated and merged. - for merge in (False, True): - frontend_settings = FrontendSettings.get_solo() - frontend_settings.merge_electricity_tariffs = merge - frontend_settings.save() - - data.update({'level': current_level}) - response = self.client.get( - reverse('{}:archive-xhr-summary'.format(self.namespace)), data=data - ) - self.assertEqual(response.status_code, 200) - - response = self.client.get( - reverse('{}:archive-xhr-graphs'.format(self.namespace)), data=data - ) - self.assertEqual(response.status_code, 200, response.content) - - # Invalid XHR. - data.update({'level': 'INVALID DATA'}) - response = self.client.get( - reverse('{}:archive-xhr-summary'.format(self.namespace)), data=data - ) - self.assertEqual(response.status_code, 500) - response = self.client.get( - reverse('{}:archive-xhr-graphs'.format(self.namespace)), data=data - ) - self.assertEqual(response.status_code, 500) - - @mock.patch('django.utils.timezone.now') - def test_statistics(self, now_mock): - now_mock.return_value = timezone.make_aware(timezone.datetime(2016, 1, 1)) - response = self.client.get( - reverse('{}:statistics'.format(self.namespace)) - ) - self.assertEqual(response.status_code, 200) - self.assertIn('capabilities', response.context) - - if DsmrReading.objects.exists(): - self.assertIn('latest_reading', response.context) - - def test_statistics_xhr_data(self): - response = self.client.get( - reverse('{}:statistics-xhr-data'.format(self.namespace)) - ) - self.assertEqual(response.status_code, 200, response.content) - self.assertEqual(response['Content-Type'], 'application/json') - - json_response = json.loads(response.content.decode("utf-8")) - self.assertIn('total_reading_count', json_response) - self.assertIn('slumber_consumption_watt', json_response) - self.assertIn('min_consumption_watt', json_response) - self.assertIn('max_consumption_watt', json_response) - @mock.patch('django.utils.timezone.now') def test_trends(self, now_mock): now_mock.return_value = timezone.make_aware(timezone.datetime(2016, 1, 1)) @@ -267,117 +52,6 @@ def test_trends(self, now_mock): self.assertEqual(response.status_code, 200) self.assertFalse(response.context['capabilities']['electricity_returned']) - @mock.patch('django.utils.timezone.now') - def test_compare(self, now_mock): - """ Basicly the same view (context vars) as the archive view. """ - now_mock.return_value = timezone.make_aware(timezone.datetime(2016, 1, 1)) - response = self.client.get( - reverse('{}:compare'.format(self.namespace)) - ) - self.assertEqual(response.status_code, 200) - self.assertIn('capabilities', response.context) - - @mock.patch('django.utils.timezone.now') - def test_status(self, now_mock): - now_mock.return_value = timezone.make_aware(timezone.datetime(2016, 1, 1)) - response = self.client.get( - reverse('{}:status'.format(self.namespace)) - ) - self.assertEqual(response.status_code, 200) - - self.assertIn('capabilities', response.context) - self.assertIn('unprocessed_readings', response.context) - - if self.support_data: - self.assertIn('latest_day_statistics', response.context) - self.assertIn('days_since_latest_day_statistics', response.context) - - if 'latest_reading' in response.context: - self.assertIn('delta_since_latest_reading', response.context) - - if 'latest_ec' in response.context: - self.assertIn('latest_ec', response.context) - self.assertIn('minutes_since_latest_ec', response.context) - - if 'latest_gc' in response.context: - self.assertIn('latest_gc', response.context) - self.assertIn('hours_since_latest_gc', response.context) - - @mock.patch('dsmr_backend.services.is_latest_version') - def test_status_xhr_update_checker(self, is_latest_version_mock): - for boolean in (True, False): - is_latest_version_mock.return_value = boolean - - response = self.client.get( - reverse('{}:status-xhr-check-for-updates'.format(self.namespace)) - ) - self.assertEqual(response.status_code, 200, response.content) - self.assertEqual(response['Content-Type'], 'application/json') - - json_response = json.loads(response.content.decode("utf-8")) - self.assertIn('update_available', json_response) - self.assertEqual(json_response['update_available'], not boolean) # Inverted, because latest = no updates. - - def test_export(self): - view_url = reverse('{}:export'.format(self.namespace)) - # Check login required. - response = self.client.get(view_url) - self.assertEqual(response.status_code, 302) - self.assertEqual( - response['Location'], '/admin/login/?next={}'.format(view_url) - ) - - # Login and retest - self.client.login(username='testuser', password='passwd') - response = self.client.get(view_url) - self.assertEqual(response.status_code, 200) - self.assertIn('start_date', response.context) - self.assertIn('end_date', response.context) - - def test_export_as_csv(self): - view_url = reverse('{}:export-as-csv'.format(self.namespace)) - post_data = { - 'data_type': ExportAsCsvForm.DATA_TYPE_DAY, - 'export_format': ExportAsCsvForm.EXPORT_FORMAT_CSV, - 'start_date': '2016-01-01', - 'end_date': '2016-02-01', - } - - # Check login required. - response = self.client.post(view_url) - self.assertEqual(response.status_code, 302) - self.assertEqual( - response['Location'], '/admin/login/?next={}'.format(view_url) - ) - - # Login and retest, without post data. - self.client.login(username='testuser', password='passwd') - response = self.client.post(view_url,) - self.assertEqual(response.status_code, 302) - self.assertEqual( - # Invalid form redirects to previous page. - response['Location'], '{}'.format( - reverse('{}:export'.format(self.namespace)) - ) - ) - - # Day export. - response = self.client.post(view_url, data=post_data) - self.assertEqual(response.status_code, 200) - io.BytesIO(b"".join(response.streaming_content)) # Force generator evaluation. - - # Hour export. - post_data['data_type'] = ExportAsCsvForm.DATA_TYPE_HOUR - response = self.client.post(view_url, data=post_data) - self.assertEqual(response.status_code, 200) - io.BytesIO(b"".join(response.streaming_content)) # Force generator evaluation. - - def test_read_the_docs_redirects(self): - for current in ('docs', 'feedback'): - response = self.client.get(reverse('{}:{}-redirect'.format(self.namespace, current))) - self.assertEqual(response.status_code, 302) - self.assertTrue(response['Location'].startswith('https://dsmr-reader.readthedocs.io')) - class TestViewsWithoutData(TestViews): """ Same tests as above, but without any data as it's flushed in setUp(). """ diff --git a/dsmr_frontend/views/statistics.py b/dsmr_frontend/views/statistics.py index 374c2d8d2..45075f771 100644 --- a/dsmr_frontend/views/statistics.py +++ b/dsmr_frontend/views/statistics.py @@ -40,13 +40,12 @@ def get_context_data(self, **kwargs): class StatisticsXhrData(View): """ XHR view for fetching the dashboard header, displaying latest readings and price estimate, JSON response. """ def get(self, request): - min_max_consumption_watt = dsmr_consumption.services.calculate_min_max_consumption_watt() - data = { 'total_reading_count': intcomma(DsmrReading.objects.all().count()), 'slumber_consumption_watt': dsmr_consumption.services.calculate_slumber_consumption_watt(), - 'min_consumption_watt': min_max_consumption_watt['min_watt'], - 'max_consumption_watt': min_max_consumption_watt['max_watt'], } + min_max_consumption_watt = dsmr_consumption.services.calculate_min_max_consumption_watt() + data.update(min_max_consumption_watt) + return HttpResponse(json.dumps(data), content_type='application/json') diff --git a/dsmrreader/__init__.py b/dsmrreader/__init__.py index ab354126a..bca3fa6ef 100644 --- a/dsmrreader/__init__.py +++ b/dsmrreader/__init__.py @@ -17,6 +17,6 @@ from django.utils.version import get_version -VERSION = (1, 9, 0, 'final', 0) +VERSION = (1, 10, 0, 'final', 0) __version__ = get_version(VERSION) diff --git a/dsmrreader/config/base.py b/dsmrreader/config/base.py index baf67117c..28c3b27b4 100644 --- a/dsmrreader/config/base.py +++ b/dsmrreader/config/base.py @@ -197,3 +197,6 @@ DSMRREADER_LATEST_VERSION_FILE = 'https://raw.githubusercontent.com/dennissiemensma/dsmr-reader/master/dsmrreader/__init__.py' DSMRREADER_REST_FRAMEWORK_API_USER = 'api-user' + +# Whether telegrams are logged, in base64 format. Only required for debugging. +DSMRREADER_LOG_TELEGRAMS = False diff --git a/dsmrreader/locales/nl/LC_MESSAGES/django.mo b/dsmrreader/locales/nl/LC_MESSAGES/django.mo index eef492a3c..3e2d1f0ee 100644 Binary files a/dsmrreader/locales/nl/LC_MESSAGES/django.mo and b/dsmrreader/locales/nl/LC_MESSAGES/django.mo differ diff --git a/dsmrreader/locales/nl/LC_MESSAGES/django.po b/dsmrreader/locales/nl/LC_MESSAGES/django.po index ae3a038ac..b13180382 100644 --- a/dsmrreader/locales/nl/LC_MESSAGES/django.po +++ b/dsmrreader/locales/nl/LC_MESSAGES/django.po @@ -742,11 +742,20 @@ msgstr "Veelvoorkomend elektriciteitsverbruik" msgid "Average calculated among the top five most common electricity consumption read. This might also be the (minimum) constant electricity consumption in your home." msgstr "Gemiddeld elektriciteitsverbruik berekend over de vijf meest voorkomende waardes. Dit is vaak ook het (minimale) elektriciteitsverbruik van je woning." -msgid "Lowest electricity consumption read" -msgstr "Laagst gemeten elektriciteitsverbruik" +msgid "Lowest wattage" +msgstr "Laagste wattage" -msgid "Highest electricity consumption read" -msgstr "Hoogst gemeten elektriciteitsverbruik" +msgid "Highest wattage" +msgstr "Hoogste wattage" + +msgid "Highest wattage (L1)" +msgstr "Hoogste wattage (L1)" + +msgid "Highest wattage (L2)" +msgstr "Hoogste wattage (L2)" + +msgid "Highest wattage (L3)" +msgstr "Hoogste wattage (L3)" msgid "Current energy prices" msgstr "Huidige energietarieven" @@ -1423,6 +1432,12 @@ msgstr "Nederlands" msgid "English" msgstr "Engels" +#~ msgid "Lowest electricity consumption read" +#~ msgstr "Laagst gemeten elektriciteitsverbruik" + +#~ msgid "Highest electricity consumption read" +#~ msgstr "Hoogst gemeten elektriciteitsverbruik" + #~ msgid "PVOutput: Delay" #~ msgstr "PVOutput: Vertraging"