Squashed commit

- Only refresh contextual number/datetime info/formatting where needed (closes #513)
- Also refresh correlated stock journal entries on undo (closes #471)
- Prefill "New amount" with the current stock amount on the inventory page (closes #434)
- Ensure that the location_id of the stock and stock_log tables is never empty after migration 95 (references #421)
- Load initial values of the /stockedit form server side to improve loading performance (references #421)
- Use more or less the same input ordering as on the purchase page for the /stockedit page (references #421)
- Also display the "Compact view" button on the shopping list page when FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS is disabled (references #453)
- Ensure that the currently active sidebar menu item is visible
- Optimized sidebar menu item grouping/spacing
- Properly order the API documentation route groups and put the "by-barcode" routes into a separate group
- Updated dependencies
- Pulled translations from Transifex
- Prepared changelog for next release
This commit is contained in:
Bernd Bestel 2020-01-27 19:00:49 +01:00
parent 9221d787a5
commit 05aceb72ae
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
74 changed files with 5506 additions and 1868 deletions

View File

@ -1,4 +1,4 @@
pushd ..
call composer update
yarn upgrade
yarn upgrade --latest
popd

View File

@ -1,8 +1,8 @@
### New feature: Transfer products between locations and edit stock entries
- New menu entry in the sidebar to transfer products (or as a shortcut in the more/context menu per line on the stock overview page)
- New menu entry in the more/context menu of stock overview page lines to show the detail stock entries behind the corresponding product
- New button "Stock entries" in the header of the stock overview page (or as a shortcut in the more/context menu per line) to show the detail stock entries behind each product
- From there you can also edit the stock entries
- A huge THANK YOU goes to @kriddles for the work on this feature
- (A huge THANK YOU goes to @kriddles for the work on this feature)
### New feature: Scan mode
- Just scan one product after another, no manual input required and audio feedback is provided
@ -26,19 +26,17 @@
- => When moving a product from/to a freezer location, the best before date is changed accordingly
- There is also a new sub feature flag `FEATURE_FLAG_STOCK_PRODUCT_FREEZING` to disable this if you don't need it (defaults to `true`)
### Other new things to note
- There is now a RSS feed for this changelog, use it to get notified about new releases: https://grocy.info/changelog/feed
### Stock improvements/fixes
- The productcard gets now also refreshed after a transaction was posted (purchase/consume/etc.) (thanks @kriddles)
- The product field calories (kcal) now also allows decimal numbers
- On the inventory page, "New amount" is now prefilled with the current stock amount of the selected product
- Fixed that entering partial amounts was not possible on the inventory page (only applies if the product option "Allow partial units in stock" is enabled)
- Fixed that on purchase a wrong minimum amount was enforced for products with enabled tare weight handling in combination with different purchase/stock quantity units
- Fixed that the productcard did not load correctly when `FEATURE_FLAG_STOCK_LOCATION_TRACKING` was set to `false` (thanks @kriddles)
- Fixed that the "Add as barcode to existing product" workflow did not work twice when not switching the page inbetween
### Shopping list improvements/fixes
- Added a compact view to have better shopping list for shopping trips (new button "Compact view" in the header, additionally this is automatically enabled on mobile devices / when screen width is < 768 px)
- Added a compact view to have a better shopping list for shopping trips (new button "Compact view" in the header, additionally this is automatically enabled on mobile devices / when screen width is < 768 px)
- It's now possible to filter for only undone (not striked through) items (new option in the "Filter by status" dropdown)
- Fixed that when `FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS` was set to `false`, the shopping list appeared empty after some actions
@ -50,7 +48,7 @@
- It's now possible to products directly (also in the dropdown of the add button in the header of each day column, maybe useful in combination with the new "Self produced products" feature)
- Added that the calories per serving are now also shown
- Added that the total costs and calories per day are displayed in the header of each day column
- Added new `config.php` setting `MEAL_PLAN_FIRST_DAY_OF_WEEK` which can be used to start the meal plan on a different day (defaults to `CALENDAR_FIRST_DAY_OF_WEEK`, so no changed behavior when not configured)
- Added a new `config.php` setting `MEAL_PLAN_FIRST_DAY_OF_WEEK` which can be used to start the meal plan on a different day (defaults to `CALENDAR_FIRST_DAY_OF_WEEK`, so no changed behavior when not configured)
- Fixed that when `FEATURE_FLAG_STOCK_PRICE_TRACKING` was set to `false`, prices were still shown (thanks @kriddles)
- Fixed that the week costs were missing for the weeks 1 - 9 of a year
@ -64,16 +62,19 @@
- The endpoint `/stock` now includes also the product object itself (new field/property `product`) (thanks @gsacre)
- Fixed that the route `/stock/barcodes/external-lookup/{barcode}` did not work, because the `barcode` argument was expected as a route argument but the route was missing it (thanks @Mikhail5555 and @beetle442002)
- Fixed the response type description of the `/stock/volatile` endpoint
- New endpoints for the stock transfer & stock entry edit capabilities mentioned above
- New endpoints for the new stock transfer & stock entry edit capabilities
### General & other improvements/fixes
- It's now possible to keep the screen on always or when a "fullscreen-card" (e. g. used for recipes) is displayed
- New user options in the display settings menu in the top right corner (default is disabled)
- New user options in the display settings menu in the top right corner (defaults to disabled)
- Slightly optimized table loading & search performance (thanks @lwis)
- Added that the currently active sidebar menu item is always in view
- Reordered the sidebar menu items a little bit and grouped them by borders to waste less space
- Fixed that also the first column (where in most tables only buttons/menus are displayed) in tables was searched when using the general search field
- Fixed that the meal plan menu entry (sidebar) was not visible when the calendar was disabled (`FEATURE_FLAG_CALENDAR`) (thanks @lwis)
- Slightly optimized table loading & search performance (thanks @lwis)
- For integration: If a `GET` parameter `closeAfterCreation` is passed to the product edit page, the window will be closed on save (due to Browser restrictions, this only works when the window was opened from JavaScript) (thanks @Forceu)
- Fixed that the `update.sh` file had wrong line endings (DOS instead of Unix)
- Internal change: Demo mode is now handled via the setting `MODE` instead of checking the existence of the file `data/demo.txt`
- There is now a RSS feed for the changelog, subscribe to get notified about new releases: https://grocy.info/changelog/feed
- New translations: (thanks all the translators)
- Portuguese (Brazil) (demo available at https://pt-br.demo.grocy.info)

260
composer.lock generated
View File

@ -6,49 +6,18 @@
],
"content-hash": "eff0f8f394573d15e26d8abd3788ed72",
"packages": [
{
"name": "container-interop/container-interop",
"version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/container-interop/container-interop.git",
"reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8",
"reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8",
"shasum": ""
},
"require": {
"psr/container": "^1.0"
},
"type": "library",
"autoload": {
"psr-4": {
"Interop\\Container\\": "src/Interop/Container/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
"homepage": "https://github.com/container-interop/container-interop",
"time": "2017-02-14T19:40:03+00:00"
},
{
"name": "doctrine/inflector",
"version": "v1.3.0",
"version": "1.3.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/inflector.git",
"reference": "5527a48b7313d15261292c149e55e26eae771b0a"
"reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/inflector/zipball/5527a48b7313d15261292c149e55e26eae771b0a",
"reference": "5527a48b7313d15261292c149e55e26eae771b0a",
"url": "https://api.github.com/repos/doctrine/inflector/zipball/ec3a55242203ffa6a4b27c58176da97ff0a7aec1",
"reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1",
"shasum": ""
},
"require": {
@ -73,6 +42,10 @@
"MIT"
],
"authors": [
{
"name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com"
},
{
"name": "Roman Borschel",
"email": "roman@code-factory.org"
@ -81,10 +54,6 @@
"name": "Benjamin Eberlei",
"email": "kontakt@beberlei.de"
},
{
"name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com"
},
{
"name": "Jonathan Wage",
"email": "jonwage@gmail.com"
@ -102,7 +71,7 @@
"singularize",
"string"
],
"time": "2018-01-09T20:05:19+00:00"
"time": "2019-10-30T19:59:35+00:00"
},
{
"name": "eluceo/ical",
@ -157,16 +126,16 @@
},
{
"name": "erusev/parsedown",
"version": "1.7.3",
"version": "1.7.4",
"source": {
"type": "git",
"url": "https://github.com/erusev/parsedown.git",
"reference": "6d893938171a817f4e9bc9e86f2da1e370b7bcd7"
"reference": "cb17b6477dfff935958ba01325f2e8a2bfa6dab3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/erusev/parsedown/zipball/6d893938171a817f4e9bc9e86f2da1e370b7bcd7",
"reference": "6d893938171a817f4e9bc9e86f2da1e370b7bcd7",
"url": "https://api.github.com/repos/erusev/parsedown/zipball/cb17b6477dfff935958ba01325f2e8a2bfa6dab3",
"reference": "cb17b6477dfff935958ba01325f2e8a2bfa6dab3",
"shasum": ""
},
"require": {
@ -199,20 +168,20 @@
"markdown",
"parser"
],
"time": "2019-03-17T18:48:37+00:00"
"time": "2019-12-30T22:54:17+00:00"
},
{
"name": "gettext/gettext",
"version": "v4.6.3",
"version": "v4.8.2",
"source": {
"type": "git",
"url": "https://github.com/oscarotero/Gettext.git",
"reference": "70c6ff2fecd275e6ef9cdd542f55939a3d1904d6"
"url": "https://github.com/php-gettext/Gettext.git",
"reference": "e474f872f2c8636cf53fd283ec4ce1218f3d236a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/oscarotero/Gettext/zipball/70c6ff2fecd275e6ef9cdd542f55939a3d1904d6",
"reference": "70c6ff2fecd275e6ef9cdd542f55939a3d1904d6",
"url": "https://api.github.com/repos/php-gettext/Gettext/zipball/e474f872f2c8636cf53fd283ec4ce1218f3d236a",
"reference": "e474f872f2c8636cf53fd283ec4ce1218f3d236a",
"shasum": ""
},
"require": {
@ -261,31 +230,31 @@
"po",
"translation"
],
"time": "2019-07-15T12:56:31+00:00"
"time": "2019-12-02T10:21:14+00:00"
},
{
"name": "gettext/languages",
"version": "2.5.0",
"version": "2.6.0",
"source": {
"type": "git",
"url": "https://github.com/mlocati/cldr-to-gettext-plural-rules.git",
"reference": "78db2d17933f0765a102f368a6663f057162ddbd"
"url": "https://github.com/php-gettext/Languages.git",
"reference": "38ea0482f649e0802e475f0ed19fa993bcb7a618"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mlocati/cldr-to-gettext-plural-rules/zipball/78db2d17933f0765a102f368a6663f057162ddbd",
"reference": "78db2d17933f0765a102f368a6663f057162ddbd",
"url": "https://api.github.com/repos/php-gettext/Languages/zipball/38ea0482f649e0802e475f0ed19fa993bcb7a618",
"reference": "38ea0482f649e0802e475f0ed19fa993bcb7a618",
"shasum": ""
},
"require": {
"php": ">=5.3"
},
"require-dev": {
"phpunit/phpunit": "^4"
"friendsofphp/php-cs-fixer": "^2.16.0",
"phpunit/phpunit": "^4.8 || ^5.7 || ^6.5 || ^7.5 || ^8.4"
},
"bin": [
"bin/export-plural-rules",
"bin/export-plural-rules.php"
"bin/export-plural-rules"
],
"type": "library",
"autoload": {
@ -305,7 +274,7 @@
}
],
"description": "gettext languages with plural rules",
"homepage": "https://github.com/mlocati/cldr-to-gettext-plural-rules",
"homepage": "https://github.com/php-gettext/Languages",
"keywords": [
"cldr",
"i18n",
@ -322,7 +291,7 @@
"translations",
"unicode"
],
"time": "2018-11-13T22:06:07+00:00"
"time": "2019-11-13T10:30:21+00:00"
},
{
"name": "gumlet/php-image-resize",
@ -381,7 +350,7 @@
},
{
"name": "illuminate/container",
"version": "v5.8.35",
"version": "v5.8.36",
"source": {
"type": "git",
"url": "https://github.com/illuminate/container.git",
@ -426,7 +395,7 @@
},
{
"name": "illuminate/contracts",
"version": "v5.8.35",
"version": "v5.8.36",
"source": {
"type": "git",
"url": "https://github.com/illuminate/contracts.git",
@ -470,7 +439,7 @@
},
{
"name": "illuminate/events",
"version": "v5.8.35",
"version": "v5.8.36",
"source": {
"type": "git",
"url": "https://github.com/illuminate/events.git",
@ -515,7 +484,7 @@
},
{
"name": "illuminate/filesystem",
"version": "v5.8.35",
"version": "v5.8.36",
"source": {
"type": "git",
"url": "https://github.com/illuminate/filesystem.git",
@ -567,16 +536,16 @@
},
{
"name": "illuminate/support",
"version": "v5.8.35",
"version": "v5.8.36",
"source": {
"type": "git",
"url": "https://github.com/illuminate/support.git",
"reference": "e63a495d3bf01654f70def1046fb925c4bb56506"
"reference": "df4af6a32908f1d89d74348624b57e3233eea247"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/support/zipball/e63a495d3bf01654f70def1046fb925c4bb56506",
"reference": "e63a495d3bf01654f70def1046fb925c4bb56506",
"url": "https://api.github.com/repos/illuminate/support/zipball/df4af6a32908f1d89d74348624b57e3233eea247",
"reference": "df4af6a32908f1d89d74348624b57e3233eea247",
"shasum": ""
},
"require": {
@ -624,11 +593,11 @@
],
"description": "The Illuminate Support package.",
"homepage": "https://laravel.com",
"time": "2019-09-03T16:36:47+00:00"
"time": "2019-12-12T14:16:47+00:00"
},
{
"name": "illuminate/view",
"version": "v5.8.35",
"version": "v5.8.36",
"source": {
"type": "git",
"url": "https://github.com/illuminate/view.git",
@ -781,27 +750,27 @@
},
{
"name": "nesbot/carbon",
"version": "2.24.0",
"version": "2.29.1",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
"reference": "934459c5ac0658bc765ad1e53512c7c77adcac29"
"reference": "e509be5bf2d703390e69e14496d9a1168452b0a2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/934459c5ac0658bc765ad1e53512c7c77adcac29",
"reference": "934459c5ac0658bc765ad1e53512c7c77adcac29",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/e509be5bf2d703390e69e14496d9a1168452b0a2",
"reference": "e509be5bf2d703390e69e14496d9a1168452b0a2",
"shasum": ""
},
"require": {
"ext-json": "*",
"php": "^7.1.8 || ^8.0",
"symfony/translation": "^3.4 || ^4.0"
"symfony/translation": "^3.4 || ^4.0 || ^5.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.14 || ^3.0",
"kylekatarnls/multi-tester": "^1.1",
"phpmd/phpmd": "dev-php-7.1-compatibility",
"phpmd/phpmd": "^2.8",
"phpstan/phpstan": "^0.11",
"phpunit/phpunit": "^7.5 || ^8.0",
"squizlabs/php_codesniffer": "^3.4"
@ -811,6 +780,9 @@
],
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.x-dev"
},
"laravel": {
"providers": [
"Carbon\\Laravel\\ServiceProvider"
@ -837,14 +809,14 @@
"homepage": "http://github.com/kylekatarnls"
}
],
"description": "A API extension for DateTime that supports 281 different languages.",
"description": "An API extension for DateTime that supports 281 different languages.",
"homepage": "http://carbon.nesbot.com",
"keywords": [
"date",
"datetime",
"time"
],
"time": "2019-08-31T16:37:55+00:00"
"time": "2020-01-21T09:36:43+00:00"
},
{
"name": "nikic/fast-route",
@ -1242,16 +1214,16 @@
},
{
"name": "psr/log",
"version": "1.1.0",
"version": "1.1.2",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
"reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
"reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
"reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
"url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801",
"reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801",
"shasum": ""
},
"require": {
@ -1260,7 +1232,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
"dev-master": "1.1.x-dev"
}
},
"autoload": {
@ -1285,7 +1257,7 @@
"psr",
"psr-3"
],
"time": "2018-11-20T15:27:04+00:00"
"time": "2019-11-01T11:05:21+00:00"
},
{
"name": "psr/simple-cache",
@ -1387,20 +1359,19 @@
},
{
"name": "slim/slim",
"version": "3.12.2",
"version": "3.12.3",
"source": {
"type": "git",
"url": "https://github.com/slimphp/Slim.git",
"reference": "200c6143f15baa477601879b64ab2326847aac0b"
"reference": "1c9318a84ffb890900901136d620b4f03a59da38"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/slimphp/Slim/zipball/200c6143f15baa477601879b64ab2326847aac0b",
"reference": "200c6143f15baa477601879b64ab2326847aac0b",
"url": "https://api.github.com/repos/slimphp/Slim/zipball/1c9318a84ffb890900901136d620b4f03a59da38",
"reference": "1c9318a84ffb890900901136d620b4f03a59da38",
"shasum": ""
},
"require": {
"container-interop/container-interop": "^1.2",
"ext-json": "*",
"ext-libxml": "*",
"ext-simplexml": "*",
@ -1457,20 +1428,20 @@
"micro",
"router"
],
"time": "2019-08-20T18:46:05+00:00"
"time": "2019-11-28T17:40:33+00:00"
},
{
"name": "symfony/debug",
"version": "v4.3.4",
"version": "v4.4.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
"reference": "afcdea44a2e399c1e4b52246ec8d54c715393ced"
"reference": "89c3fd5c299b940333bc6fe9f1b8db1b0912c759"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/afcdea44a2e399c1e4b52246ec8d54c715393ced",
"reference": "afcdea44a2e399c1e4b52246ec8d54c715393ced",
"url": "https://api.github.com/repos/symfony/debug/zipball/89c3fd5c299b940333bc6fe9f1b8db1b0912c759",
"reference": "89c3fd5c299b940333bc6fe9f1b8db1b0912c759",
"shasum": ""
},
"require": {
@ -1481,12 +1452,12 @@
"symfony/http-kernel": "<3.4"
},
"require-dev": {
"symfony/http-kernel": "~3.4|~4.0"
"symfony/http-kernel": "^3.4|^4.0|^5.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.3-dev"
"dev-master": "4.4-dev"
}
},
"autoload": {
@ -1513,20 +1484,20 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
"time": "2019-08-20T14:27:59+00:00"
"time": "2020-01-08T17:29:02+00:00"
},
{
"name": "symfony/finder",
"version": "v4.3.4",
"version": "v4.4.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "86c1c929f0a4b24812e1eb109262fc3372c8e9f2"
"reference": "3a50be43515590faf812fbd7708200aabc327ec3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/86c1c929f0a4b24812e1eb109262fc3372c8e9f2",
"reference": "86c1c929f0a4b24812e1eb109262fc3372c8e9f2",
"url": "https://api.github.com/repos/symfony/finder/zipball/3a50be43515590faf812fbd7708200aabc327ec3",
"reference": "3a50be43515590faf812fbd7708200aabc327ec3",
"shasum": ""
},
"require": {
@ -1535,7 +1506,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.3-dev"
"dev-master": "4.4-dev"
}
},
"autoload": {
@ -1562,20 +1533,20 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
"time": "2019-08-14T12:26:46+00:00"
"time": "2020-01-04T13:00:46+00:00"
},
{
"name": "symfony/polyfill-mbstring",
"version": "v1.12.0",
"version": "v1.13.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17"
"reference": "7b4aab9743c30be783b73de055d24a39cf4b954f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17",
"reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7b4aab9743c30be783b73de055d24a39cf4b954f",
"reference": "7b4aab9743c30be783b73de055d24a39cf4b954f",
"shasum": ""
},
"require": {
@ -1587,7 +1558,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.12-dev"
"dev-master": "1.13-dev"
}
},
"autoload": {
@ -1621,46 +1592,47 @@
"portable",
"shim"
],
"time": "2019-08-06T08:03:45+00:00"
"time": "2019-11-27T14:18:11+00:00"
},
{
"name": "symfony/translation",
"version": "v4.3.4",
"version": "v5.0.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
"reference": "28498169dd334095fa981827992f3a24d50fed0f"
"reference": "28e1054f1ea26c63762d9260c37cb1056ea62dbb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/28498169dd334095fa981827992f3a24d50fed0f",
"reference": "28498169dd334095fa981827992f3a24d50fed0f",
"url": "https://api.github.com/repos/symfony/translation/zipball/28e1054f1ea26c63762d9260c37cb1056ea62dbb",
"reference": "28e1054f1ea26c63762d9260c37cb1056ea62dbb",
"shasum": ""
},
"require": {
"php": "^7.1.3",
"php": "^7.2.5",
"symfony/polyfill-mbstring": "~1.0",
"symfony/translation-contracts": "^1.1.6"
"symfony/translation-contracts": "^2"
},
"conflict": {
"symfony/config": "<3.4",
"symfony/dependency-injection": "<3.4",
"symfony/yaml": "<3.4"
"symfony/config": "<4.4",
"symfony/dependency-injection": "<5.0",
"symfony/http-kernel": "<5.0",
"symfony/twig-bundle": "<5.0",
"symfony/yaml": "<4.4"
},
"provide": {
"symfony/translation-implementation": "1.0"
"symfony/translation-implementation": "2.0"
},
"require-dev": {
"psr/log": "~1.0",
"symfony/config": "~3.4|~4.0",
"symfony/console": "~3.4|~4.0",
"symfony/dependency-injection": "~3.4|~4.0",
"symfony/finder": "~2.8|~3.0|~4.0",
"symfony/http-kernel": "~3.4|~4.0",
"symfony/intl": "~3.4|~4.0",
"symfony/service-contracts": "^1.1.2",
"symfony/var-dumper": "~3.4|~4.0",
"symfony/yaml": "~3.4|~4.0"
"symfony/config": "^4.4|^5.0",
"symfony/console": "^4.4|^5.0",
"symfony/dependency-injection": "^5.0",
"symfony/finder": "^4.4|^5.0",
"symfony/http-kernel": "^5.0",
"symfony/intl": "^4.4|^5.0",
"symfony/service-contracts": "^1.1.2|^2",
"symfony/yaml": "^4.4|^5.0"
},
"suggest": {
"psr/log-implementation": "To use logging capability in translator",
@ -1670,7 +1642,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.3-dev"
"dev-master": "5.0-dev"
}
},
"autoload": {
@ -1697,24 +1669,24 @@
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
"time": "2019-08-26T08:55:16+00:00"
"time": "2020-01-21T08:40:24+00:00"
},
{
"name": "symfony/translation-contracts",
"version": "v1.1.6",
"version": "v2.0.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation-contracts.git",
"reference": "325b17c24f3ee23cbecfa63ba809c6d89b5fa04a"
"reference": "8cc682ac458d75557203b2f2f14b0b92e1c744ed"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation-contracts/zipball/325b17c24f3ee23cbecfa63ba809c6d89b5fa04a",
"reference": "325b17c24f3ee23cbecfa63ba809c6d89b5fa04a",
"url": "https://api.github.com/repos/symfony/translation-contracts/zipball/8cc682ac458d75557203b2f2f14b0b92e1c744ed",
"reference": "8cc682ac458d75557203b2f2f14b0b92e1c744ed",
"shasum": ""
},
"require": {
"php": "^7.1.3"
"php": "^7.2.5"
},
"suggest": {
"symfony/translation-implementation": ""
@ -1722,7 +1694,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.1-dev"
"dev-master": "2.0-dev"
}
},
"autoload": {
@ -1754,7 +1726,7 @@
"interoperability",
"standards"
],
"time": "2019-08-02T12:15:04+00:00"
"time": "2019-11-18T17:27:11+00:00"
},
{
"name": "tuupola/callable-handler",
@ -1811,16 +1783,16 @@
},
{
"name": "tuupola/cors-middleware",
"version": "1.0.0",
"version": "1.1.1",
"source": {
"type": "git",
"url": "https://github.com/tuupola/cors-middleware.git",
"reference": "f8bee9b47729a36892c680c457ff824c04cfae70"
"reference": "a043f4f52b902ee8902f95d28aae05013a7180fc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/tuupola/cors-middleware/zipball/f8bee9b47729a36892c680c457ff824c04cfae70",
"reference": "f8bee9b47729a36892c680c457ff824c04cfae70",
"url": "https://api.github.com/repos/tuupola/cors-middleware/zipball/a043f4f52b902ee8902f95d28aae05013a7180fc",
"reference": "a043f4f52b902ee8902f95d28aae05013a7180fc",
"shasum": ""
},
"require": {
@ -1835,7 +1807,7 @@
"codedungeon/phpunit-result-printer": "^0.23.2",
"equip/dispatch": "^2.0",
"overtrue/phplint": "^1.0",
"phpstan/phpstan": "^0.11.4",
"phpstan/phpstan": "^0.11.15",
"phpunit/phpunit": "^7.4",
"squizlabs/php_codesniffer": "^3.3.1",
"zendframework/zend-diactoros": "^1.0|^2.0"
@ -1866,7 +1838,7 @@
"psr-15",
"psr-7"
],
"time": "2019-06-04T06:54:19+00:00"
"time": "2019-10-30T11:18:16+00:00"
},
{
"name": "tuupola/http-factory",

View File

@ -92,6 +92,7 @@ class StockController extends BaseController
public function StockEdit(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
{
return $this->AppContainer->view->render($response, 'stockedit', [
'stockEntry' => $this->Database->stock()->where('id', $args['entryId'])->fetch(),
'products' => $this->Database->products()->orderBy('name'),
'locations' => $this->Database->locations()->orderBy('name')
]);

View File

@ -18,6 +18,40 @@
{
"name": "Generic entity interactions",
"description": "A limited set of entities are directly exposed for convenience"
},
{
"name": "System"
},
{
"name": "User management"
},
{
"name": "User settings"
},
{
"name": "Stock"
},
{
"name": "Stock \"by-barcode\"",
"description": "Some of the *Stock* routes, but access them by the products barcode instead of its id"
},
{
"name": "Recipes"
},
{
"name": "Chores"
},
{
"name": "Batteries"
},
{
"name": "Tasks"
},
{
"name": "Calendar"
},
{
"name": "Files"
}
],
"paths": {
@ -1771,7 +1805,7 @@
"get": {
"summary": "Returns details of the given product by its barcode",
"tags": [
"Stock"
"Stock \"by-barcode\""
],
"parameters": [
{
@ -1812,7 +1846,7 @@
"post": {
"summary": "Adds the given amount of the by its barcode given product to stock",
"tags": [
"Stock"
"Stock \"by-barcode\""
],
"parameters": [
{
@ -1894,7 +1928,7 @@
"post": {
"summary": "Removes the given amount of the by its barcode given product from stock",
"tags": [
"Stock"
"Stock \"by-barcode\""
],
"parameters": [
{
@ -1977,7 +2011,7 @@
"post": {
"summary": "Transfers the given amount of the by its barcode given product from one location to another (this is currently not supported for tare weight handling enabled products)",
"tags": [
"Stock"
"Stock \"by-barcode\""
],
"parameters": [
{
@ -2053,7 +2087,7 @@
"post": {
"summary": "Inventories the by its barcode given product (adds/removes based on the given new amount)",
"tags": [
"Stock"
"Stock \"by-barcode\""
],
"parameters": [
{
@ -2125,7 +2159,7 @@
"post": {
"summary": "Marks the given amount of the by its barcode given product as opened",
"tags": [
"Stock"
"Stock \"by-barcode\""
],
"parameters": [
{

View File

@ -1,5 +1,7 @@
# Translators:
# Troels Siggaard <troels@siggaard.com>, 2019
# Rasmus Bojsen <rasmus@bojsen.cn>, 2019
# Brian Moos Lindberg <brian@blueeel.dk>, 2019
#
msgid ""
msgstr ""
@ -7,7 +9,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-05-01 17:42+0000\n"
"Last-Translator: Troels Siggaard <troels@siggaard.com>, 2019\n"
"Last-Translator: Brian Moos Lindberg <brian@blueeel.dk>, 2019\n"
"Language-Team: Danish (https://www.transifex.com/grocy/teams/93189/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -20,7 +22,7 @@ msgid "manually"
msgstr "manuelt"
msgid "dynamic-regular"
msgstr "gentagende-dynamisk"
msgstr "dynamisk-regelmæssig"
msgid "daily"
msgstr "daglig"
@ -30,3 +32,6 @@ msgstr "ugentlig"
msgid "monthly"
msgstr "månedlig"
msgid "yearly"
msgstr "årlig"

View File

@ -1,6 +1,8 @@
# Translators:
# dark159123 <r.j.hansen@protonmail.com>, 2019
# Troels Siggaard <troels@siggaard.com>, 2019
# Rasmus Bojsen <rasmus@bojsen.cn>, 2019
# Brian Moos Lindberg <brian@blueeel.dk>, 2019
#
msgid ""
msgstr ""
@ -8,7 +10,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-05-01 17:42+0000\n"
"Last-Translator: Troels Siggaard <troels@siggaard.com>, 2019\n"
"Last-Translator: Brian Moos Lindberg <brian@blueeel.dk>, 2019\n"
"Language-Team: Danish (https://www.transifex.com/grocy/teams/93189/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -37,8 +39,8 @@ msgstr "Køleskab"
msgid "Piece"
msgid_plural "Pieces"
msgstr[0] "Styk"
msgstr[1] "Stykker"
msgstr[0] "stk"
msgstr[1] "stk"
msgid "Pack"
msgid_plural "Packs"
@ -81,7 +83,7 @@ msgid "Pickles"
msgstr "Syltede agurker"
msgid "Gulash soup"
msgstr "Gulash"
msgstr "Gullashsuppe"
msgid "Yogurt"
msgstr "Yoghurt"
@ -161,14 +163,11 @@ msgstr "Tysk"
msgid "Italian"
msgstr "Italiensk"
msgid "Demo in different language"
msgstr "Demo på et andet sprog"
msgid "This is the note content of the recipe ingredient"
msgstr "Dette er indholdet af opskrift-ingrediensens notefeltet"
msgid "Demo User"
msgstr "Demo Bruger"
msgstr "Demobruger"
msgid "Gram"
msgid_plural "Grams"
@ -218,7 +217,7 @@ msgid "Vegetables/Fruits"
msgstr "Frugt og grønt"
msgid "Refrigerated products"
msgstr "Køleskabsprodukter"
msgstr "Køleskabsvarer"
msgid "Coffee machine"
msgstr "Kaffemaskine"
@ -284,27 +283,60 @@ msgid "Polish"
msgstr "Polsk"
msgid "Milk Chocolate"
msgstr ""
msgstr "Mælkechokolade"
msgid "Dark Chocolate"
msgstr ""
msgstr "Mørk chokolade"
msgid "Slice"
msgid_plural "Slices"
msgstr[0] ""
msgstr[1] ""
msgstr[0] "Skive"
msgstr[1] "Skiver"
msgid "Example userentity"
msgstr ""
msgstr "Eksempel-brugerenhed"
msgid "This is an example user entity..."
msgstr ""
msgstr "Dette er en eksempel-brugerenhed..."
msgid "Custom field"
msgstr ""
msgstr "Brugerdefineret felt"
msgid "Example field value..."
msgstr ""
msgstr "Eksempel-feltværdi..."
msgid "Waffle rolls"
msgstr "Vaffelruller"
msgid "Danish"
msgstr "Dansk"
msgid "Dutch"
msgstr "Hollandsk"
msgid "Norwegian"
msgstr "Norsk"
msgid "Demo"
msgstr "Demo"
msgid "Stable version"
msgstr "Stabil version"
msgid "Preview version"
msgstr "Forhåndsvisningsversion"
msgid "current release"
msgstr "aktuel udgivelse"
msgid "not yet released"
msgstr "Ikke frigivet endnu"
msgid "Portuguese (Brazil)"
msgstr "Portugisisk (Brasilien)"
msgid "This is a note"
msgstr ""
msgid "Freezer"
msgstr ""

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,5 @@
# Translators:
# Brian Moos Lindberg <brian@blueeel.dk>, 2019
#
msgid ""
msgstr ""
@ -5,6 +7,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-05-01 17:43+0000\n"
"Last-Translator: Brian Moos Lindberg <brian@blueeel.dk>, 2019\n"
"Language-Team: Danish (https://www.transifex.com/grocy/teams/93189/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -14,22 +17,31 @@ msgstr ""
"X-Domain: grocy/userfield_types\n"
msgid "text-single-line"
msgstr ""
msgstr "tekst-enkelt-linje"
msgid "text-multi-line"
msgstr ""
msgstr "tekst-flere-linjer"
msgid "number-integral"
msgstr ""
msgstr "tal-heltal"
msgid "number-decimal"
msgstr ""
msgstr "tal-decimal"
msgid "date"
msgstr ""
msgstr "dato"
msgid "datetime"
msgstr ""
msgstr "datotid"
msgid "checkbox"
msgstr ""
msgstr "afkrydsningsfelt"
msgid "preset-list"
msgstr "forudindstillet-liste"
msgid "preset-checklist"
msgstr "forudindstillet-tjekliste"
msgid "link"
msgstr "link"

View File

@ -1,5 +1,5 @@
# Translators:
# Bernd Bestel <bernd@berrnd.de>, 2019
# Bernd Bestel <bernd@berrnd.de>, 2020
#
msgid ""
msgstr ""
@ -7,7 +7,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-05-01 17:42+0000\n"
"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2020\n"
"Language-Team: German (https://www.transifex.com/grocy/teams/93189/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -328,3 +328,12 @@ msgstr "aktuelles Release"
msgid "not yet released"
msgstr "noch nicht freigegeben"
msgid "Portuguese (Brazil)"
msgstr "Portugiesisch (Brasilien)"
msgid "This is a note"
msgstr "Dies ist eine Notiz"
msgid "Freezer"
msgstr "Gefrierschrank"

View File

@ -1,5 +1,5 @@
# Translators:
# Bernd Bestel <bernd@berrnd.de>, 2019
# Bernd Bestel <bernd@berrnd.de>, 2020
#
msgid ""
msgstr ""
@ -7,7 +7,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-05-01 17:42+0000\n"
"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2020\n"
"Language-Team: German (https://www.transifex.com/grocy/teams/93189/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -19,6 +19,12 @@ msgstr ""
msgid "purchase"
msgstr "Einkauf"
msgid "transfer_from"
msgstr "Umlagerung von"
msgid "transfer_to"
msgstr "Umlagerung nach"
msgid "consume"
msgstr "Verbrauch"
@ -27,3 +33,12 @@ msgstr "Inventur-Korrektur"
msgid "product-opened"
msgstr "Produkt geöffnet"
msgid "stock-edit-old"
msgstr "Bestandseintrag bearbeitet (alte Werte)"
msgid "stock-edit-new"
msgstr "Bestandseintrag bearbeitet (neue Werte)"
msgid "self-production"
msgstr "Eigenproduktion"

View File

@ -1,5 +1,6 @@
# Translators:
# Bernd Bestel <bernd@berrnd.de>, 2019
# H T <github@fvbor.de>, 2020
# Bernd Bestel <bernd@berrnd.de>, 2020
#
msgid ""
msgstr ""
@ -7,7 +8,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-05-01 17:42+0000\n"
"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2020\n"
"Language-Team: German (https://www.transifex.com/grocy/teams/93189/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -676,7 +677,7 @@ msgstr ""
msgid "Consume all ingredients needed by this recipe"
msgstr ""
"Alle Zutaten, die von diesem Rezept benötigt werden, aus dem Bestand "
"enternen"
"entfernen"
msgid "Click to show technical details"
msgstr "Klick um technische Details anzuzeigen"
@ -975,12 +976,12 @@ msgid "Mark %1$s of %2$s as open"
msgstr "%1$s %2$s als geöffnet markieren"
msgid ""
"When a product was marked as opened, the best before date will be replaced "
"by today + this amount of days (a value of 0 disables this)"
"When this product was marked as opened, the best before date will be "
"replaced by today + this amount of days (a value of 0 disables this)"
msgstr ""
"Wenn ein Produkt als geöffnet markiert wurde, wird das "
"Wenn dieses Produkt als geöffnet markiert wurde, wird das "
"Mindesthaltbarkeitsdatum durch heute + diese Anzahl von Tagen ersetzt (ein "
"Wert von 0 deaktiviert dies)"
"Wert von 0 deaktiviert dies) "
msgid "Default best before days after opened"
msgstr "Standard Haltbarkeit in Tagen nach dem Öffnen"
@ -991,9 +992,6 @@ msgstr "%1$s %2$s als geöffnet markiert"
msgid "Mark as opened"
msgstr "Als geöffnet markieren"
msgid "Expires on %1$s; Bought on %2$s"
msgstr "Läuft ab am %1$s; Gekauft am %2$s"
msgid "Not opened"
msgstr "Nicht geöffnet"
@ -1309,6 +1307,9 @@ msgstr "Nicht ausreichend im Bestand"
msgid "Expiring soon days"
msgstr "\"Bald ablaufend\"-Tage"
msgid "Default location"
msgstr "Standard Standort"
msgid "Default amount for purchase"
msgstr "Standardmenge für Einkauf"
@ -1745,3 +1746,178 @@ msgid ""
msgstr ""
"Das bedeutet, dass eine erneute Ausführung der Hausarbeit nur alle %s Jahre "
"geplant wird"
msgid "Transfer"
msgstr "Umlagern"
msgid "From location"
msgstr "Von Standort"
msgid "To location"
msgstr "Nach Standort"
msgid "There are no units available at this location"
msgstr "Keine Einheiten an diesem Standort verfügbar"
msgid "Amount: %1$s; Expires on %2$s; Bought on %3$s"
msgstr "Menge: %1$s; Läuft ab am %2$s; Gekauft am %3$s "
msgid "Transfered %1$s of %2$s from %3$s to %4$s"
msgstr "%1$s %2$s von %3$s nach %4$s verschoben"
msgid "Show stock entries"
msgstr "Bestandseinträge anzeigen"
msgid "Stock entries"
msgstr "Bestandseinträge"
msgid "Best before date"
msgstr "MHD"
msgid "Purchased date"
msgstr "Einkaufsdatum"
msgid "Consume all %s for this stock entry"
msgstr "Verbrauche alle %s dieses Bestandseintrags"
msgid "The amount cannot be lower than %1$s"
msgstr "Die Menge darf nicht kleiner als %1$s sein"
msgid "Stock entry successfully updated"
msgstr "Bestandseintrag wurde erfolgreich aktualisiert"
msgid "Edit stock entry"
msgstr "Bestandseintrag bearbeiten"
msgid ""
"Camera access is on only possible when supported and allowed by your browser"
" and when grocy is served via a secure (https://) connection"
msgstr ""
"Der Kamerazugriff ist nur möglich, wenn dein Browser dies unterstützt und "
"zulässt und wenn auf grocy über eine sichere Verbindung (https://) "
"zugegriffen wird"
msgid "Keep screen on"
msgstr "Bildschirm eingeschaltet lassen"
msgid "Keep screen on while displaying a \"fullscreen-card\""
msgstr ""
"Bildschirm eingeschaltet lassen während eine \"fullscreen-card\" angezeigt "
"wird"
msgid "A purchased date is required"
msgstr "Ein Einkaufsdatum ist erforderlich"
msgid ""
"When a product is selected, one unit (per serving in purchase quantity unit)"
" will be added to stock on consuming this recipe"
msgstr ""
"Wenn ein Produkt ausgewählt ist, wird beim Verbrauch dieses Rezeptes eine "
"Einheit (pro Portion in Einkaufsmengeneinheit) dem Bestand hinzugefügt"
msgid "Produces product"
msgstr "Produziertes Produkt"
msgid "This booking cannot be undone"
msgstr "Die Buchung kann nicht rückgängig gemacht werden"
msgid "Booking does not exist or was already undone"
msgstr "Buchung existiert nicht oder wurde bereits rückgängig gemacht"
msgid "Are you sure to delete API key \"%s\"?"
msgstr "API key \"%s\" wirklich löschen?"
msgid "Add note"
msgstr "Notiz hinzufügen"
msgid "Add note to %s"
msgstr "Notiz zu %s hinzufügen"
msgid "per day"
msgstr "pro Tag"
msgid "Compact view"
msgstr "Kompakte Ansicht"
msgid "Normal view"
msgstr "Normale Ansicht"
msgid "Only undone items"
msgstr "Nur unerledigte Einträge"
msgid "Add product"
msgstr "Produkt hinzufügen"
msgid "Add product to %s"
msgstr "Produkt zu %s hinzufügen"
msgid "Consume all ingredients needed by this weeks recipes or products"
msgstr ""
"Alle Zutaten, die diese Woche von Rezepten oder Produkten benötigt werden, "
"aus dem Bestand entfernen"
msgid "Meal plan recipe"
msgstr "Speiseplan Rezept"
msgid "Meal plan note"
msgstr "Speiseplan Notiz"
msgid "Meal plan product"
msgstr "Speiseplan Produkt"
msgid "Scan mode"
msgstr "Scan-Modus"
msgid "on"
msgstr "an"
msgid "off"
msgstr "aus"
msgid ""
"Scan mode is on but not all required fields could be populated automatically"
msgstr ""
"Scan-Modus ist eingeschaltet, aber nicht alle erforderlichen Felder konnten "
"automatisch ausgefüllt werden"
msgid "Is freezer"
msgstr "Ist ein Gefrier-Standort (also z. B. ein Gefrierschrank)"
msgid ""
"When moving products from/to a freezer location, the products best before "
"date is automatically adjusted according to the product settings"
msgstr ""
"Beim Umlagen von Produkten von/zu einem Gefrier-Standort wird das "
"Mindesthaltbarkeitsdatum der Produkte automatisch entsprechend den "
"Produkteinstellungen angepasst"
msgid ""
"On moving this product to a freezer location (so when freezing it), the best"
" before date will be replaced by today + this amount of days"
msgstr ""
"Wenn dieses Produkt zu einem Gefrier-Standort umgelagert (sprich "
"eingefroren) wird, wird das Mindesthaltbarkeitsdatum durch heute + diese "
"Anzahl von Tagen ersetzt"
msgid "Default best before days after freezing"
msgstr "Standard Haltbartkeit in Tagen nach dem Einfrieren"
msgid ""
"On moving this product from a freezer location (so when thawing it), the "
"best before date will be replaced by today + this amount of days"
msgstr ""
"Wenn dieses Produkt von einem Gefrier-Standort umgelagert (sprich aufgetaut)"
" wird, wird das Mindesthaltbarkeitsdatum durch heute + diese Anzahl von "
"Tagen ersetzt"
msgid "Default best before days after thawing"
msgstr "Standard Haltbartkeit in Tagen nach dem Auftauen"
msgid "This cannot be the same as the \"From\" location"
msgstr "Dies kann nicht derselbe Standort wie \"Von Standort\" sein"
msgid "Thawed"
msgstr "Aufgetaut"
msgid "Frozen"
msgstr "Eingefroren"

View File

@ -1,3 +1,5 @@
# Translators:
# Jonathan Adams <jonathan@connockadams.uk>, 2020
#
msgid ""
msgstr ""
@ -5,6 +7,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-09-17 10:45+0000\n"
"Last-Translator: Jonathan Adams <jonathan@connockadams.uk>, 2020\n"
"Language-Team: English (United Kingdom) (https://www.transifex.com/grocy/teams/93189/en_GB/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -14,13 +17,13 @@ msgstr ""
"X-Domain: grocy/chore_assignment_types\n"
msgid "no-assignment"
msgstr ""
msgstr "no-assignment"
msgid "who-least-did-first"
msgstr ""
msgstr "who-least-did-first"
msgid "random"
msgstr ""
msgstr "random"
msgid "in-alphabetical-order"
msgstr ""
msgstr "in-alphabetical-order"

View File

@ -1,3 +1,5 @@
# Translators:
# Jonathan Adams <jonathan@connockadams.uk>, 2020
#
msgid ""
msgstr ""
@ -5,6 +7,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-05-01 17:42+0000\n"
"Last-Translator: Jonathan Adams <jonathan@connockadams.uk>, 2020\n"
"Language-Team: English (United Kingdom) (https://www.transifex.com/grocy/teams/93189/en_GB/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -14,19 +17,19 @@ msgstr ""
"X-Domain: grocy/chore_types\n"
msgid "manually"
msgstr ""
msgstr "manually"
msgid "dynamic-regular"
msgstr ""
msgstr "dynamic-regular"
msgid "daily"
msgstr ""
msgstr "daily"
msgid "weekly"
msgstr ""
msgstr "weekly"
msgid "monthly"
msgstr ""
msgstr "monthly"
msgid "yearly"
msgstr ""
msgstr "yearly"

View File

@ -1,3 +1,5 @@
# Translators:
# Jonathan Adams <jonathan@connockadams.uk>, 2020
#
msgid ""
msgstr ""
@ -5,6 +7,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-05-01 17:42+0000\n"
"Last-Translator: Jonathan Adams <jonathan@connockadams.uk>, 2020\n"
"Language-Team: English (United Kingdom) (https://www.transifex.com/grocy/teams/93189/en_GB/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -14,314 +17,323 @@ msgstr ""
"X-Domain: grocy/demo_data\n"
msgid "Cookies"
msgstr ""
msgstr "Cookies"
msgid "Chocolate"
msgstr ""
msgstr "Chocolate"
msgid "Pantry"
msgstr ""
msgstr "Pantry"
msgid "Candy cupboard"
msgstr ""
msgstr "Candy cupboard"
msgid "Tinned food cupboard"
msgstr ""
msgstr "Tinned food cupboard"
msgid "Fridge"
msgstr ""
msgstr "Fridge"
msgid "Piece"
msgid_plural "Pieces"
msgstr[0] ""
msgstr[1] ""
msgstr[0] "Piece"
msgstr[1] "Pieces"
msgid "Pack"
msgid_plural "Packs"
msgstr[0] ""
msgstr[1] ""
msgstr[0] "Pack"
msgstr[1] "Packs"
msgid "Glass"
msgid_plural "Glasses"
msgstr[0] ""
msgstr[1] ""
msgstr[0] "Glass"
msgstr[1] "Glasses"
msgid "Tin"
msgid_plural "Tins"
msgstr[0] ""
msgstr[1] ""
msgstr[0] "Tin"
msgstr[1] "Tins"
msgid "Can"
msgid_plural "Cans"
msgstr[0] ""
msgstr[1] ""
msgstr[0] "Can"
msgstr[1] "Cans"
msgid "Bunch"
msgid_plural "Bunches"
msgstr[0] ""
msgstr[1] ""
msgstr[0] "Bunch"
msgstr[1] "Bunches"
msgid "Gummy bears"
msgstr ""
msgstr "Gummy bears"
msgid "Crisps"
msgstr ""
msgstr "Crisps"
msgid "Eggs"
msgstr ""
msgstr "Eggs"
msgid "Noodles"
msgstr ""
msgstr "Noodles"
msgid "Pickles"
msgstr ""
msgstr "Pickles"
msgid "Gulash soup"
msgstr ""
msgstr "Gulash soup"
msgid "Yogurt"
msgstr ""
msgstr "Yogurt"
msgid "Cheese"
msgstr ""
msgstr "Cheese"
msgid "Cold cuts"
msgstr ""
msgstr "Cold cuts"
msgid "Paprika"
msgstr ""
msgstr "Paprika"
msgid "Cucumber"
msgstr ""
msgstr "Cucumber"
msgid "Radish"
msgstr ""
msgstr "Radish"
msgid "Tomato"
msgstr ""
msgstr "Tomato"
msgid "Changed towels in the bathroom"
msgstr ""
msgstr "Changed towels in the bathroom"
msgid "Cleaned the kitchen floor"
msgstr ""
msgstr "Cleaned the kitchen floor"
msgid "Warranty ends"
msgstr ""
msgstr "Warranty ends"
msgid "TV remote control"
msgstr ""
msgstr "TV remote control"
msgid "Alarm clock"
msgstr ""
msgstr "Alarm clock"
msgid "Heat remote control"
msgstr ""
msgstr "Heat remote control"
msgid "Lawn mowed in the garden"
msgstr ""
msgstr "Lawn mowed in the garden"
msgid "Some good snacks"
msgstr ""
msgstr "Some good snacks"
msgid "Pizza dough"
msgstr ""
msgstr "Pizza dough"
msgid "Sieved tomatoes"
msgstr ""
msgstr "Sieved tomatoes"
msgid "Salami"
msgstr ""
msgstr "Salami"
msgid "Toast"
msgstr ""
msgstr "Toast"
msgid "Minced meat"
msgstr ""
msgstr "Minced meat"
msgid "Pizza"
msgstr ""
msgstr "Pizza"
msgid "Spaghetti bolognese"
msgstr ""
msgstr "Spaghetti bolognese"
msgid "Sandwiches"
msgstr ""
msgstr "Sandwiches"
msgid "English"
msgstr ""
msgstr "English"
msgid "German"
msgstr ""
msgstr "German"
msgid "Italian"
msgstr ""
msgstr "Italian"
msgid "This is the note content of the recipe ingredient"
msgstr ""
msgstr "This is the note content of the recipe ingredient"
msgid "Demo User"
msgstr ""
msgstr "Demo User"
msgid "Gram"
msgid_plural "Grams"
msgstr[0] ""
msgstr[1] ""
msgstr[0] "Gram"
msgstr[1] "Grams"
msgid "Flour"
msgstr ""
msgstr "Flour"
msgid "Pancakes"
msgstr ""
msgstr "Pancakes"
msgid "Sugar"
msgstr ""
msgstr "Sugar"
msgid "Home"
msgstr ""
msgstr "Home"
msgid "Life"
msgstr ""
msgstr "Life"
msgid "Projects"
msgstr ""
msgstr "Projects"
msgid "Repair the garage door"
msgstr ""
msgstr "Repair the garage door"
msgid "Fork and improve grocy"
msgstr ""
msgstr "Fork and improve grocy"
msgid "Find a solution for what to do when I forget the door keys"
msgstr ""
msgstr "Find a solution for what to do when I forget the door keys"
msgid "Sweets"
msgstr ""
msgstr "Sweets"
msgid "Bakery products"
msgstr ""
msgstr "Bakery products"
msgid "Tinned food"
msgstr ""
msgstr "Tinned food"
msgid "Butchery products"
msgstr ""
msgstr "Butchery products"
msgid "Vegetables/Fruits"
msgstr ""
msgstr "Vegetables/Fruits"
msgid "Refrigerated products"
msgstr ""
msgstr "Refrigerated products"
msgid "Coffee machine"
msgstr ""
msgstr "Coffee machine"
msgid "Dishwasher"
msgstr ""
msgstr "Dishwasher"
msgid "Liter"
msgstr ""
msgstr "Liter"
msgid "Liters"
msgstr ""
msgstr "Liters"
msgid "Bottle"
msgstr ""
msgstr "Bottle"
msgid "Bottles"
msgstr ""
msgstr "Bottles"
msgid "Milk"
msgstr ""
msgstr "Milk"
msgid "Chocolate sauce"
msgstr ""
msgstr "Chocolate sauce"
msgid "Milliliters"
msgstr ""
msgstr "Milliliters"
msgid "Milliliter"
msgstr ""
msgstr "Milliliter"
msgid "Bottom"
msgstr ""
msgstr "Bottom"
msgid "Topping"
msgstr ""
msgstr "Topping"
msgid "French"
msgstr ""
msgstr "French"
msgid "Turkish"
msgstr ""
msgstr "Turkish"
msgid "Spanish"
msgstr ""
msgstr "Spanish"
msgid "Russian"
msgstr ""
msgstr "Russian"
msgid "The thing which happens on the 5th of every month"
msgstr ""
msgstr "The thing which happens on the 5th of every month"
msgid "The thing which happens daily"
msgstr ""
msgstr "The thing which happens daily"
msgid "The thing which happens on Mondays and Wednesdays"
msgstr ""
msgstr "The thing which happens on Mondays and Wednesdays"
msgid "Swedish"
msgstr ""
msgstr "Swedish"
msgid "Polish"
msgstr ""
msgstr "Polish"
msgid "Milk Chocolate"
msgstr ""
msgstr "Milk Chocolate"
msgid "Dark Chocolate"
msgstr ""
msgstr "Dark Chocolate"
msgid "Slice"
msgid_plural "Slices"
msgstr[0] ""
msgstr[1] ""
msgstr[0] "Slice"
msgstr[1] "Slices"
msgid "Example userentity"
msgstr ""
msgstr "Example userentity"
msgid "This is an example user entity..."
msgstr ""
msgstr "This is an example user entity..."
msgid "Custom field"
msgstr ""
msgstr "Custom field"
msgid "Example field value..."
msgstr ""
msgstr "Example field value..."
msgid "Waffle rolls"
msgstr ""
msgstr "Waffle rolls"
msgid "Danish"
msgstr ""
msgstr "Danish"
msgid "Dutch"
msgstr ""
msgstr "Dutch"
msgid "Norwegian"
msgstr ""
msgstr "Norwegian"
msgid "Demo"
msgstr ""
msgstr "Demo"
msgid "Stable version"
msgstr ""
msgstr "Stable version"
msgid "Preview version"
msgstr ""
msgstr "Preview version"
msgid "current release"
msgstr ""
msgstr "current release"
msgid "not yet released"
msgstr "not yet released"
msgid "Portuguese (Brazil)"
msgstr "Portuguese (Brazil)"
msgid "This is a note"
msgstr ""
msgid "Freezer"
msgstr ""

View File

@ -1,3 +1,5 @@
# Translators:
# Jonathan Adams <jonathan@connockadams.uk>, 2020
#
msgid ""
msgstr ""
@ -5,6 +7,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-05-01 17:42+0000\n"
"Last-Translator: Jonathan Adams <jonathan@connockadams.uk>, 2020\n"
"Language-Team: English (United Kingdom) (https://www.transifex.com/grocy/teams/93189/en_GB/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -14,13 +17,28 @@ msgstr ""
"X-Domain: grocy/stock_transaction_types\n"
msgid "purchase"
msgstr ""
msgstr "purchase"
msgid "transfer_from"
msgstr "transfer_from"
msgid "transfer_to"
msgstr "transfer_to"
msgid "consume"
msgstr ""
msgstr "consume"
msgid "inventory-correction"
msgstr ""
msgstr "inventory-correction"
msgid "product-opened"
msgstr "product-opened"
msgid "stock-edit-old"
msgstr "stock-edit-old"
msgid "stock-edit-new"
msgstr "stock-edit-new"
msgid "self-production"
msgstr ""

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,5 @@
# Translators:
# Jonathan Adams <jonathan@connockadams.uk>, 2020
#
msgid ""
msgstr ""
@ -5,6 +7,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-05-01 17:43+0000\n"
"Last-Translator: Jonathan Adams <jonathan@connockadams.uk>, 2020\n"
"Language-Team: English (United Kingdom) (https://www.transifex.com/grocy/teams/93189/en_GB/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -14,31 +17,31 @@ msgstr ""
"X-Domain: grocy/userfield_types\n"
msgid "text-single-line"
msgstr ""
msgstr "text-single-line"
msgid "text-multi-line"
msgstr ""
msgstr "text-multi-line"
msgid "number-integral"
msgstr ""
msgstr "number-integral"
msgid "number-decimal"
msgstr ""
msgstr "number-decimal"
msgid "date"
msgstr ""
msgstr "date"
msgid "datetime"
msgstr ""
msgstr "datetime"
msgid "checkbox"
msgstr ""
msgstr "checkbox"
msgid "preset-list"
msgstr ""
msgstr "preset-list"
msgid "preset-checklist"
msgstr ""
msgstr "preset-checklist"
msgid "link"
msgstr ""
msgstr "link"

View File

@ -1,6 +1,7 @@
# Translators:
# Bernd Bestel <bernd@berrnd.de>, 2019
# Alex Deneuvillers <alex.deneuvillers@gmail.com>, 2019
# Antonin DESFONTAINES <antonin.desfontaines@outlook.com>, 2019
#
msgid ""
msgstr ""
@ -8,7 +9,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-05-01 17:42+0000\n"
"Last-Translator: Alex Deneuvillers <alex.deneuvillers@gmail.com>, 2019\n"
"Last-Translator: Antonin DESFONTAINES <antonin.desfontaines@outlook.com>, 2019\n"
"Language-Team: French (https://www.transifex.com/grocy/teams/93189/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -31,3 +32,6 @@ msgstr "Hebdomadaire"
msgid "monthly"
msgstr "Mensuelle"
msgid "yearly"
msgstr "Annuelle"

View File

@ -2,6 +2,7 @@
# Cedric Octave <transifex@octvcdrc.fr>, 2019
# bigoudo, 2019
# Matthieu K, 2019
# Antonin DESFONTAINES <antonin.desfontaines@outlook.com>, 2019
#
msgid ""
msgstr ""
@ -9,7 +10,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-05-01 17:42+0000\n"
"Last-Translator: Matthieu K, 2019\n"
"Last-Translator: Antonin DESFONTAINES <antonin.desfontaines@outlook.com>, 2019\n"
"Language-Team: French (https://www.transifex.com/grocy/teams/93189/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -145,7 +146,7 @@ msgid "Minced meat"
msgstr "Viande hachée"
msgid "Pizza"
msgstr "PIzza"
msgstr "Pizza"
msgid "Spaghetti bolognese"
msgstr "Spaghetti bolognaise"
@ -162,9 +163,6 @@ msgstr "Allemand"
msgid "Italian"
msgstr "Italien"
msgid "Demo in different language"
msgstr "Démo dans une langue différente"
msgid "This is the note content of the recipe ingredient"
msgstr "Ceci est le contenu de la note concernant l'ingrédient de la recette"
@ -224,7 +222,7 @@ msgid "Refrigerated products"
msgstr "Produits réfrigérés"
msgid "Coffee machine"
msgstr "Machie à café"
msgstr "Machine à café"
msgid "Dishwasher"
msgstr "Lave-vaisselle"
@ -287,27 +285,60 @@ msgid "Polish"
msgstr "Polonais"
msgid "Milk Chocolate"
msgstr ""
msgstr "Chocolat au lait"
msgid "Dark Chocolate"
msgstr ""
msgstr "Chocolat noir"
msgid "Slice"
msgid_plural "Slices"
msgstr[0] ""
msgstr[1] ""
msgstr[0] "Tranche"
msgstr[1] "Tranches"
msgid "Example userentity"
msgstr ""
msgstr "Exemple entité utilisateur"
msgid "This is an example user entity..."
msgstr ""
msgstr "Ceci est un exemple d'entité utilisateur"
msgid "Custom field"
msgstr ""
msgstr "Champ personnalisé"
msgid "Example field value..."
msgstr ""
msgstr "Exemple de valeur de champ..."
msgid "Waffle rolls"
msgstr "Gaufrettes roulées"
msgid "Danish"
msgstr "Danois"
msgid "Dutch"
msgstr "Néerlandais"
msgid "Norwegian"
msgstr "Norvégien"
msgid "Demo"
msgstr "Démo"
msgid "Stable version"
msgstr "Version stable"
msgid "Preview version"
msgstr "Version d'aperçu"
msgid "current release"
msgstr "Version actuelle"
msgid "not yet released"
msgstr "pas encore publiée"
msgid "Portuguese (Brazil)"
msgstr "Portugais (Brésil)"
msgid "This is a note"
msgstr ""
msgid "Freezer"
msgstr ""

View File

@ -5,7 +5,13 @@
# Cedric Octave <transifex@octvcdrc.fr>, 2019
# Hydreliox Hydreliox <hydreliox@gmail.com>, 2019
# Matthieu K, 2019
# Jérémy Tisserand <jeremy.tisserand@gmail.com>, 2019
# Mathieu Fortin <mathieugfortin@gmail.com>, 2019
# Pierre-Emmanuel Colas <transiflex@atnock.fr>, 2019
# Antonin DESFONTAINES <antonin.desfontaines@outlook.com>, 2019
# Adrien Guillement <adrien.guillement@gmail.com>, 2019
# Matthias Baumgartner <dersoistargate@gmail.com>, 2019
# Guillaume RICHARD <giz.richard@gmail.com>, 2020
#
msgid ""
msgstr ""
@ -13,7 +19,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-05-01 17:42+0000\n"
"Last-Translator: Mathieu Fortin <mathieugfortin@gmail.com>, 2019\n"
"Last-Translator: Guillaume RICHARD <giz.richard@gmail.com>, 2020\n"
"Language-Team: French (https://www.transifex.com/grocy/teams/93189/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -66,7 +72,7 @@ msgid "Chores overview"
msgstr "Aperçu des corvées"
msgid "Batteries overview"
msgstr "Piles"
msgstr "Aperçu des piles"
msgid "Purchase"
msgstr "Achat"
@ -87,7 +93,7 @@ msgid "Battery tracking"
msgstr "Suivi des piles"
msgid "Locations"
msgstr "Emplacements"
msgstr "Il n'y a pas d'unités disponibles à cet endroit."
msgid "Quantity units"
msgstr "Formats"
@ -96,7 +102,7 @@ msgid "Chores"
msgstr "Corvées"
msgid "Batteries"
msgstr "Batteries"
msgstr "Piles"
msgid "Chore"
msgstr "Corvée"
@ -165,7 +171,7 @@ msgid "Tracked count"
msgstr "Nombre de réalisations"
msgid "Battery overview"
msgstr "Aperçu des batteries"
msgstr "Aperçu des piles"
msgid "Charge cycles count"
msgstr "Nombre de charges"
@ -243,10 +249,10 @@ msgid "Used in"
msgstr "Utilisé dans"
msgid "Create battery"
msgstr "Créer une batterie"
msgstr "Créer une pile"
msgid "Edit battery"
msgstr "Modifier une batterie"
msgstr "Modifier une pile"
msgid "Edit chore"
msgstr "Modifier une corvée"
@ -368,14 +374,14 @@ msgid "This means %s will be removed from stock"
msgstr "%s sera supprimé du stock"
msgid ""
"This means it is estimated that a new execution of this chore is tracked %s "
"days after the last was tracked"
"This means the next execution of this chore is scheduled %s days after the "
"last execution"
msgstr ""
"La prochaine exécution de cette corvée sera programmée %s jours après sa "
"La prochaine exécution de cette corvée sera programmée %s jours après la "
"dernière exécution"
msgid "Removed %1$s of %2$s from stock"
msgstr "%1$senlevé du stock de%2$s "
msgstr "%1$s enlevée du stock de%2$s "
msgid "About grocy"
msgstr "À propos de grocy"
@ -426,7 +432,7 @@ msgid "You have to select a chore"
msgstr "Vous devez sélectionner une corvée"
msgid "You have to select a battery"
msgstr "Vous devez sélectionner une batterie"
msgstr "Vous devez sélectionner une pile"
msgid "A name is required"
msgstr "Un nom est requis"
@ -790,7 +796,7 @@ msgid "View settings"
msgstr "Voir les paramètres"
msgid "Auto reload on external changes"
msgstr "Mettre à jour automatiquement lors d'un changement externe"
msgstr "MàJ automatique lors de changements externe"
msgid "Enable night mode"
msgstr "Activer le mode nuit"
@ -926,7 +932,7 @@ msgid "Batteries journal"
msgstr "Journal des batteries"
msgid "Filter by battery"
msgstr "Filtrer par batterie"
msgstr "Filtrer par pile"
msgid "Undo charge cycle"
msgstr "Annuler le cycle de charge"
@ -976,12 +982,9 @@ msgid "Mark %1$s of %2$s as open"
msgstr "Indiquer%1$s de %2$s comme ouvert"
msgid ""
"When a product was marked as opened, the best before date will be replaced "
"by today + this amount of days (a value of 0 disables this)"
"When this product was marked as opened, the best before date will be "
"replaced by today + this amount of days (a value of 0 disables this)"
msgstr ""
"Quand un produit est marqué comme ouvert, la date de péremption sera "
"remplacée par la date du jour + ce nombre de jours (une valeur de 0 "
"désactive ce changement)"
msgid "Default best before days after opened"
msgstr "Date de péremption en jours par défaut après ouverture"
@ -992,9 +995,6 @@ msgstr "Indiqué%1$s de %2$s comme ouvert"
msgid "Mark as opened"
msgstr "Indiquer comme ouvert"
msgid "Expires on %1$s; Bought on %2$s"
msgstr "Se périmera le%1$s; Acheté le %2$s"
msgid "Not opened"
msgstr "Non ouvert"
@ -1139,10 +1139,10 @@ msgid "Journal for this chore"
msgstr "Journal de la corvée"
msgid "Show battery details"
msgstr "Voir les détails"
msgstr "Voir les détails de la pile"
msgid "Journal for this battery"
msgstr "Journal individuel"
msgstr "Journal de cette pile"
msgid "System info"
msgstr "Informations système"
@ -1238,7 +1238,7 @@ msgid "Sunday"
msgstr "Dimanche"
msgid "Configure userfields"
msgstr "Configurer les attributs personalisés"
msgstr "Configurer les attributs personnalisés"
msgid "Userfields"
msgstr "Attributs personalisés"
@ -1308,6 +1308,9 @@ msgstr "Pas assez en stock"
msgid "Expiring soon days"
msgstr "Jours avant péremption"
msgid "Default location"
msgstr "Emplacement par défaut"
msgid "Default amount for purchase"
msgstr "Quantité ajoutée par défaut lors d'un achat"
@ -1367,25 +1370,529 @@ msgid "Products"
msgstr "Produits"
msgid "Marked task %s as completed on %s"
msgstr ""
msgstr "%s tâche marquée complétée sur %s"
msgid "Booking has subsequent dependent bookings, undo not possible"
msgstr "La réservation a des dépendances, impossible de revenir en arrière"
msgid "per serving"
msgstr ""
msgstr "par portion"
msgid "Never"
msgstr ""
msgstr "Jamais"
msgid "Today"
msgstr ""
msgstr "Aujourd'hui"
msgid "Consume %1$s of %2$s as spoiled"
msgstr ""
msgstr "Consommer %1$s de %2$s comme périmée"
msgid "Not all ingredients of recipe \"%s\" are in stock, nothing removed"
msgstr ""
"Des ingrédients de la recette \"%s\" sont manquants,\n"
"rien n'est retiré"
msgid "Undo task \"%s\""
msgstr "Annuler tâche \"%s\""
msgid "Due date rollover"
msgstr "Report de la date d'échéance"
msgid ""
"When enabled the chore can never be overdue, the due date will shift forward"
" each day when due"
msgstr ""
"Si activé la corvée ne sera jamais due, la date d'échéance sera avancée "
"quand atteinte."
msgid "Location Content Sheet"
msgstr "Emplacement du stock"
msgid "Print"
msgstr "Imprimer"
msgid "all locations"
msgstr "Tous les emplacements"
msgid ""
"Here you can print a page per location with the current stock, maybe to hang"
" it there and note the consumed things on it."
msgstr ""
"Ici vous pouvez imprimer une fiche du stock actuel classé par emplacement, "
"vous pouvez par exemple l'accrocher et noter les produits qui ont été "
"consommés dessus."
msgid "this location"
msgstr "Cet emplacement"
msgid "Consumend amount"
msgstr "Quantité consommé"
msgid "Time of printing"
msgstr "Temps d'impression"
msgid "Are you sure to delete equipment \"%s\"?"
msgstr "Êtes-vous certain de vouloir effacer l'équipement \"%s\"?"
msgid "Parent product"
msgstr "Produit parent"
msgid ""
"Not possible because this product is already used as a parent product in "
"another product"
msgstr ""
"Impossible, ce produit est déjà assigné comme parent sur un autre produit"
msgid "Default conversions"
msgstr "Conversions par défaut"
msgid "Factor"
msgstr "Facteur"
msgid "1 %s is the same as..."
msgstr "1 %s corresponds aussi à..."
msgid "Create QU conversion"
msgstr "Créer une conversion d'UQ"
msgid "Default for QU"
msgstr "Défaut pour l'unité de quantité"
msgid "Quantity unit from"
msgstr "De l'unité de quantité"
msgid "Quantity unit to"
msgstr "À l'unité de quantité"
msgid ""
"This cannot be lower than %1$s and must be a valid number with max. %2$s "
"decimal places"
msgstr ""
"Cela ne peut être inférieur à %1$s et doit être un nombre valide avec "
"maximum. %2$s décimales."
msgid "This cannot be equal to %s"
msgstr "Ne peut être égale à %s"
msgid "This means 1 %1$s is the same as %2$s %3$s"
msgstr "Signifie que 1 %1$s corresponds aussi à %2$s %3$s"
msgid "QU conversions"
msgstr "Conversions d'UQ"
msgid "Product overrides"
msgstr "Règles du produit"
msgid "Override for product"
msgstr "Règle pour le produit"
msgid "This equals %1$s %2$s in stock"
msgstr "Égal à %1$s%2$s en stock"
msgid "Edit QU conversion"
msgstr "Éditer la conversion d'UQ"
msgid "An assignment type is required"
msgstr "Un type de tâche est requis"
msgid "Assignment type"
msgstr "Type de tâche"
msgid ""
"This means the next execution of this chore is scheduled 1 day after the "
"last execution"
msgstr ""
"La prochaine exécution de cette corvée sera programmé 1 jour après la "
"dernière exécution"
msgid ""
"This means the next execution of this chore is scheduled 1 day after the "
"last execution, but only for the weekdays selected below"
msgstr ""
"Signifie que la prochaine exécution de cette corvée est programmé 1 jour "
"après la dernière exécution, mais uniquement pour les jours sélectionnés ci-"
"dessous"
msgid "This means the next execution of this chore is not scheduled"
msgstr "Cette corvée n'a pas d'exécution de programmée. "
msgid ""
"This means the next execution of this chore is scheduled on the below "
"selected day of each month"
msgstr ""
"Signifie que la prochaine exécution de cette corvée sera programmé à la date"
" sélectionnée ci-dessous chaque mois"
msgid ""
"This means the next execution of this chore will not be assigned to anyone"
msgstr ""
"Signifie que la prochaine exécution de cette corvée ne sera assigné à "
"personne"
msgid ""
"This means the next execution of this chore will be assigned to the one who "
"executed it least"
msgstr ""
"Signifie que la prochaine exécution de cette corvée sera assignée à celui "
"qui l'a effectué en dernier"
msgid "This means the next execution of this chore will be assigned randomly"
msgstr ""
"Signifie que la prochaine exécution de cette corvée sera assignée "
"aléatoirement"
msgid ""
"This means the next execution of this chore will be assigned to the next one"
" in alphabetical order"
msgstr ""
"Signifie que la prochaine exécution de cette corvée sera assigné au prochain"
" par ordre alphabétique"
msgid "Assign to"
msgstr "Assigné à"
msgid "This assignment type requires that at least one is assigned"
msgstr "Ce type de tâche nécessite au moins une personne assignée"
msgid "%s chore is assigned to me"
msgid_plural "%s chores are assigned to me"
msgstr[0] "%s corvée m'est assignée"
msgstr[1] "%s corvées me sont assignées"
msgid "Assigned to me"
msgstr "Assigné à moi"
msgid "assigned to %s"
msgstr "assigné à %s"
msgid "Filter by assignment"
msgstr "Filtrer par tâche"
msgid "Consume product on chore execution"
msgstr "Consommer un produit lors de l'exécution de la corvée"
msgid "Are you sure to delete user field \"%s\"?"
msgstr "Êtes-vous sûr de vouloir supprimer le champ utilisateur \"%s\" ?"
msgid "Userentities"
msgstr "Entités utilisateur"
msgid "Create userentity"
msgstr "Créer une entité utilisateur"
msgid "Show in sidebar menu"
msgstr "Afficher dans le menu latérale"
msgid "Edit userentity"
msgstr "Éditer l'entité utilisateur"
msgid "Edit %s"
msgstr "Éditer %s"
msgid "Create %s"
msgstr "Créer %s"
msgid "Are you sure to delete this userobject?"
msgstr "Êtes-vous sûr de vouloir supprimer cet objet utilisateur ?"
msgid "Icon CSS class"
msgstr "Classe CSS de l'icône"
msgid "For example"
msgstr "Par exemple"
msgid "Configure fields"
msgstr "Configurer les champs"
msgid "Quantity unit plural form testing"
msgstr "Test de la forme pluriel de l'unité de quantité"
msgid "Result"
msgstr "Résultat"
msgid "Test plural forms"
msgstr "Tester les formes pluriel"
msgid "Scan a barcode"
msgstr "Scanner un code barre"
msgid "Error while initializing the barcode scanning library"
msgstr "Erreur lors de l'initialisation de la librairie de scan de code barre"
msgid ""
"The resulting price of this ingredient will be multiplied by this factor"
msgstr "Le prix final de cet ingrédient sera multiplié par ce facteur"
msgid "Price factor"
msgstr "Facteur de prix"
msgid "Do you find grocy useful?"
msgstr "Vous trouvez grocy utile ?"
msgid "Say thanks"
msgstr "Remercier"
msgid "Search for recipes containing this product"
msgstr "Chercher des recettes contenant ce produit"
msgid "Add to shopping list"
msgstr "Ajouter à la liste de courses"
msgid "Added %1$s of %2$s to the shopping list \"%3$s\""
msgstr "%1$s de %2$s ajouté à la liste de course \"%3$s\""
msgid "Output"
msgstr "Sortie"
msgid "Energy (kcal)"
msgstr "Énergie (kcal)"
msgid "Per stock quantity unit"
msgstr "Unité de quantité par stock"
msgid "Barcode scanner testing"
msgstr "Test du scanner de code barre"
msgid "Expected barcode"
msgstr "Code barre attendu"
msgid "Scan field"
msgstr "Champ du scan"
msgid "Scanned barcodes"
msgstr "Codes barre scanné"
msgid "Hit"
msgstr "Touché"
msgid "Miss"
msgstr "Raté"
msgid "Display recipe"
msgstr "Afficher la recette"
msgid "Accumulate sub products min. stock amount"
msgstr "Accumuler le stock minimal des sous produits"
msgid ""
"If enabled, the min. stock amount of sub products will be accumulated into "
"this product, means the sub product will never be \"missing\", only this "
"product"
msgstr ""
"Si activé, la somme du stock minimal des sous produits sera accumulé sur ce "
"produit, signifiant que le sous produit ne sera jamais \"en manque\", "
"seulement ce produit"
msgid "Are you sure to remove this conversion?"
msgstr "Êtes-vous sûr de vouloir supprimer cette conversion ?"
msgid "Unit price"
msgstr "Prix unitaire"
msgid "Total price"
msgstr "Prix total"
msgid "in %s and based on the purchase quantity unit"
msgstr "dans %s et basé sur la quantité unitaire d'achat"
msgid "Unlimited"
msgstr "Illimité"
msgid "Clear"
msgstr "Vider"
msgid "Are you sure to remove the included recipe \"%s\"?"
msgstr "Êtes-vous sûr de vouloir supprimer la recette incluse \"%s\"?"
msgid "Period interval"
msgstr "Intervalle de temps"
msgid ""
"This means the next execution of this chore should only be scheduled every "
"%s days"
msgstr ""
"La prochaine exécution de cette corvée ne doit être uniquement programmée "
"que tous les %s jours"
msgid ""
"This means the next execution of this chore should only be scheduled every "
"%s weeks"
msgstr ""
"La prochaine exécution de cette corvée ne doit être uniquement programmée "
"que toutes les %s semaines"
msgid ""
"This means the next execution of this chore should only be scheduled every "
"%s months"
msgstr ""
"La prochaine exécution de cette corvée ne doit être uniquement programmée "
"que tous les %s mois"
msgid ""
"This means the next execution of this chore is scheduled 1 year after the "
"last execution"
msgstr ""
"La prochaine exécution de cette corvée sera programmé 1 an après la dernière"
" exécution"
msgid ""
"This means the next execution of this chore should only be scheduled every "
"%s years"
msgstr ""
"Signifie que la prochaine exécution de cette corvée ne doit uniquement être "
"programmé que tous les %s ans"
msgid "Transfer"
msgstr "Transfert"
msgid "From location"
msgstr "De"
msgid "To location"
msgstr "A"
msgid "There are no units available at this location"
msgstr "Il n'y a pas d'unité disponible à cet endroit."
msgid "Amount: %1$s; Expires on %2$s; Bought on %3$s"
msgstr "Quantité : %1$s; Expire le %2$s; Acheté le %3$s"
msgid "Transfered %1$s of %2$s from %3$s to %4$s"
msgstr "A transferé%1$sde %2$svenant de %3$s à %4$s"
msgid "Show stock entries"
msgstr ""
msgid "Stock entries"
msgstr ""
msgid "Best before date"
msgstr "A consommer de préférence avant le"
msgid "Purchased date"
msgstr "Date d'achat"
msgid "Consume all %s for this stock entry"
msgstr ""
msgid "The amount cannot be lower than %1$s"
msgstr "La quantité ne peut être inférieure à %s"
msgid "Stock entry successfully updated"
msgstr ""
msgid "Edit stock entry"
msgstr ""
msgid ""
"Camera access is on only possible when supported and allowed by your browser"
" and when grocy is served via a secure (https://) connection"
msgstr ""
msgid "Keep screen on"
msgstr "Garder l'écran allumé"
msgid "Keep screen on while displaying a \"fullscreen-card\""
msgstr ""
msgid "A purchased date is required"
msgstr ""
msgid ""
"When a product is selected, one unit (per serving in purchase quantity unit)"
" will be added to stock on consuming this recipe"
msgstr ""
msgid "Produces product"
msgstr ""
msgid "This booking cannot be undone"
msgstr ""
msgid "Booking does not exist or was already undone"
msgstr ""
msgid "Are you sure to delete API key \"%s\"?"
msgstr ""
msgid "Add note"
msgstr ""
msgid "Add note to %s"
msgstr ""
msgid "per day"
msgstr ""
msgid "Compact view"
msgstr ""
msgid "Normal view"
msgstr ""
msgid "Only undone items"
msgstr ""
msgid "Add product"
msgstr ""
msgid "Add product to %s"
msgstr ""
msgid "Consume all ingredients needed by this weeks recipes or products"
msgstr ""
msgid "Meal plan recipe"
msgstr ""
msgid "Meal plan note"
msgstr ""
msgid "Meal plan product"
msgstr ""
msgid "Scan mode"
msgstr ""
msgid "on"
msgstr ""
msgid "off"
msgstr ""
msgid ""
"Scan mode is on but not all required fields could be populated automatically"
msgstr ""
msgid "Is freezer"
msgstr ""
msgid ""
"When moving products from/to a freezer location, the products best before "
"date is automatically adjusted according to the product settings"
msgstr ""
msgid ""
"On moving this product to a freezer location (so when freezing it), the best"
" before date will be replaced by today + this amount of days"
msgstr ""
msgid "Default best before days after freezing"
msgstr ""
msgid ""
"On moving this product from a freezer location (so when thawing it), the "
"best before date will be replaced by today + this amount of days"
msgstr ""
msgid "Default best before days after thawing"
msgstr ""
msgid "This cannot be the same as the \"From\" location"
msgstr ""
msgid "Thawed"
msgstr ""
msgid "Frozen"
msgstr ""

View File

@ -1,5 +1,6 @@
# Translators:
# Hydreliox Hydreliox <hydreliox@gmail.com>, 2019
# Antonin DESFONTAINES <antonin.desfontaines@outlook.com>, 2019
#
msgid ""
msgstr ""
@ -7,7 +8,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-05-01 17:43+0000\n"
"Last-Translator: Hydreliox Hydreliox <hydreliox@gmail.com>, 2019\n"
"Last-Translator: Antonin DESFONTAINES <antonin.desfontaines@outlook.com>, 2019\n"
"Language-Team: French (https://www.transifex.com/grocy/teams/93189/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -39,3 +40,9 @@ msgstr "case à cocher"
msgid "preset-list"
msgstr "liste prédéfinie"
msgid "preset-checklist"
msgstr "liste multiple prédéfinie"
msgid "link"
msgstr "lien"

View File

@ -1,7 +1,7 @@
# Translators:
# Sergio Zampello <seriotv88@gmail.com>, 2019
# Bernd Bestel <bernd@berrnd.de>, 2019
# Antonino Ursino <ninus_@libero.it>, 2019
# Antonino Ursino <ninus_@libero.it>, 2020
#
msgid ""
msgstr ""
@ -9,7 +9,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-05-01 17:42+0000\n"
"Last-Translator: Antonino Ursino <ninus_@libero.it>, 2019\n"
"Last-Translator: Antonino Ursino <ninus_@libero.it>, 2020\n"
"Language-Team: Italian (https://www.transifex.com/grocy/teams/93189/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -331,3 +331,12 @@ msgstr "versione attuale"
msgid "not yet released"
msgstr "non ancora pubblicata"
msgid "Portuguese (Brazil)"
msgstr "Portoghese (Brasile)"
msgid "This is a note"
msgstr "Questa è una nota"
msgid "Freezer"
msgstr "Congelatore"

View File

@ -1,5 +1,5 @@
# Translators:
# Bernd Bestel <bernd@berrnd.de>, 2019
# Antonino Ursino <ninus_@libero.it>, 2020
#
msgid ""
msgstr ""
@ -7,7 +7,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-05-01 17:42+0000\n"
"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
"Last-Translator: Antonino Ursino <ninus_@libero.it>, 2020\n"
"Language-Team: Italian (https://www.transifex.com/grocy/teams/93189/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -17,13 +17,28 @@ msgstr ""
"X-Domain: grocy/stock_transaction_types\n"
msgid "purchase"
msgstr "Acquista"
msgstr "comprare"
msgid "transfer_from"
msgstr "trasferito_da"
msgid "transfer_to"
msgstr "trasferito_a"
msgid "consume"
msgstr "Consumare"
msgstr "consumare"
msgid "inventory-correction"
msgstr "Correzione dell'inventario"
msgstr "rettifica-inventario"
msgid "product-opened"
msgstr "Prodotto aperto"
msgstr "prodotto-aperto"
msgid "stock-edit-old"
msgstr "modifica-dispensa-vecchio"
msgid "stock-edit-new"
msgstr "modifica-dispensa-nuovo"
msgid "self-production"
msgstr "auto-produzione"

View File

@ -3,7 +3,7 @@
# Bernd Bestel <bernd@berrnd.de>, 2019
# Matteo Piotto <matteo.piotto@welaika.com>, 2019
# Matteo Parolin <matteoparolin99@gmail.com>, 2019
# Antonino Ursino <ninus_@libero.it>, 2019
# Antonino Ursino <ninus_@libero.it>, 2020
#
msgid ""
msgstr ""
@ -11,7 +11,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-05-01 17:42+0000\n"
"Last-Translator: Antonino Ursino <ninus_@libero.it>, 2019\n"
"Last-Translator: Antonino Ursino <ninus_@libero.it>, 2020\n"
"Language-Team: Italian (https://www.transifex.com/grocy/teams/93189/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -41,7 +41,8 @@ msgstr[1] "%s prodotti sono già scaduti"
msgid "%s product is below defined min. stock amount"
msgid_plural "%s products are below defined min. stock amount"
msgstr[0] "%s prodotto sotto la quantità minima di dispensa definita"
msgstr[1] "%s prodotti sono sotto la quantità minima di dispensa definita"
msgstr[1] ""
"%s prodotti sono al di sotto della quantità minima di dispensa definita"
msgid "Product"
msgstr "Prodotto"
@ -978,12 +979,12 @@ msgid "Mark %1$s of %2$s as open"
msgstr "Segna %1$s di %2$s come aperti"
msgid ""
"When a product was marked as opened, the best before date will be replaced "
"by today + this amount of days (a value of 0 disables this)"
"When this product was marked as opened, the best before date will be "
"replaced by today + this amount of days (a value of 0 disables this)"
msgstr ""
"Quando un prodotto è stato contrassegnato come aperto, la data di scadenza "
"verrà sostituita con oggi + questo numero di giorni (un valore di 0 lo "
"disabilita)"
"Quando questo prodotto è stato contrassegnato come aperto, la data di "
"scadenza verrà sostituita con: \"oggi\" + \"questo numero di giorni\" (il "
"valore 0 disabilita)"
msgid "Default best before days after opened"
msgstr "Giorni di scadenza predefiniti dopo l'apertura"
@ -994,9 +995,6 @@ msgstr "Segnato %1$s di %2$s come aperti"
msgid "Mark as opened"
msgstr "Segna come aperto"
msgid "Expires on %1$s; Bought on %2$s"
msgstr "Scade il %1$s; Comprato il %2$s"
msgid "Not opened"
msgstr "Non aperto"
@ -1312,6 +1310,9 @@ msgstr "Non abbastanza in dispensa"
msgid "Expiring soon days"
msgstr "In scadenza tra pochi giorni"
msgid "Default location"
msgstr "Posizione predefinita"
msgid "Default amount for purchase"
msgstr "Quantità predefinita per l'acquisto"
@ -1751,3 +1752,177 @@ msgid ""
msgstr ""
"Questo significa che la prossima esecuzione di questa faccenda dovrebbe "
"essere programmata solo ogni %s anni"
msgid "Transfer"
msgstr "Trasferire"
msgid "From location"
msgstr "Dalla posizione"
msgid "To location"
msgstr "Alla posizione"
msgid "There are no units available at this location"
msgstr "Non ci sono unità disponibili in questa posizione"
msgid "Amount: %1$s; Expires on %2$s; Bought on %3$s"
msgstr "Quantità: %1$s; Scade il: %2$s; Comprato il: %3$s"
msgid "Transfered %1$s of %2$s from %3$s to %4$s"
msgstr "Trasferiti %1$s di %2$s da %3$s a %4$s"
msgid "Show stock entries"
msgstr "Mostra voci di dispensa"
msgid "Stock entries"
msgstr "Voci di dispensa"
msgid "Best before date"
msgstr "Data di scadenza"
msgid "Purchased date"
msgstr "Data di acquisto"
msgid "Consume all %s for this stock entry"
msgstr "Consuma tutte le %s per questa voce di dispensa"
msgid "The amount cannot be lower than %1$s"
msgstr "La quantità non può essere inferiore a %1$s"
msgid "Stock entry successfully updated"
msgstr "Voce di dispensa aggiornata correttamente"
msgid "Edit stock entry"
msgstr "Modifica voce di dispensa"
msgid ""
"Camera access is on only possible when supported and allowed by your browser"
" and when grocy is served via a secure (https://) connection"
msgstr ""
"L'accesso alla videocamera è possibile solo se supportato e consentito dal "
"browser e quando grocy è connesso tramite una connessione sicura (https://)"
msgid "Keep screen on"
msgstr "Mantieni lo schermo acceso"
msgid "Keep screen on while displaying a \"fullscreen-card\""
msgstr ""
"Mantieni lo schermo acceso mentre visualizzi una \"scheda a schermo intero\""
msgid "A purchased date is required"
msgstr "È richiesta la data di acquisto"
msgid ""
"When a product is selected, one unit (per serving in purchase quantity unit)"
" will be added to stock on consuming this recipe"
msgstr ""
"Quando viene selezionato un prodotto, un'unità (per porzione nell'unità di "
"quantità di acquisto) verrà aggiunta alla dispensa consumando questa ricetta"
" "
msgid "Produces product"
msgstr "Produce prodotto"
msgid "This booking cannot be undone"
msgstr "Questa prenotazione non può essere annullata"
msgid "Booking does not exist or was already undone"
msgstr "La prenotazione non esiste o è stata già annullata"
msgid "Are you sure to delete API key \"%s\"?"
msgstr "Eliminare la chiave API \"%s\"?"
msgid "Add note"
msgstr "Aggiungi nota"
msgid "Add note to %s"
msgstr "Aggiungi nota a %s"
msgid "per day"
msgstr "al giorno"
msgid "Compact view"
msgstr "Vista compatta"
msgid "Normal view"
msgstr "Vista normale"
msgid "Only undone items"
msgstr "Solo oggetti annullati"
msgid "Add product"
msgstr "Aggiungi prodotto"
msgid "Add product to %s"
msgstr "Aggiungi prodotto a %s"
msgid "Consume all ingredients needed by this weeks recipes or products"
msgstr ""
"Consuma tutti gli ingredienti necessari per ricette o prodotti di questa "
"settimana"
msgid "Meal plan recipe"
msgstr "Ricetta del Piano dei pasti"
msgid "Meal plan note"
msgstr "Nota del Piano dei pasti"
msgid "Meal plan product"
msgstr "Prodotto del Piano dei pasti"
msgid "Scan mode"
msgstr "Modalità di scansione"
msgid "on"
msgstr "accesa"
msgid "off"
msgstr "spenta"
msgid ""
"Scan mode is on but not all required fields could be populated automatically"
msgstr ""
"La modalità di scansione è attiva ma non è possibile compilare "
"automaticamente tutti i campi richiesti"
msgid "Is freezer"
msgstr "È congelato"
msgid ""
"When moving products from/to a freezer location, the products best before "
"date is automatically adjusted according to the product settings"
msgstr ""
"Quando si spostano i prodotti da/verso un congelatore, la data di scadenza "
"dei prodotti viene regolata automaticamente in base alle impostazioni del "
"prodotto"
msgid ""
"On moving this product to a freezer location (so when freezing it), the best"
" before date will be replaced by today + this amount of days"
msgstr ""
"Spostando questo prodotto in una posizione di congelatore (quindi quando lo "
"si congela), la data di scadenza verrà sostituita con: \"oggi\" + \"questa "
"quantità di giorni\""
msgid "Default best before days after freezing"
msgstr "Data di scadenza predefinita dopo il congelamento"
msgid ""
"On moving this product from a freezer location (so when thawing it), the "
"best before date will be replaced by today + this amount of days"
msgstr ""
"Quando si sposta questo prodotto da una posizione del congelatore (quindi "
"quando lo si scongela), la data di scadenza verrà sostituita con: \"oggi\" +"
" \"questa quantità di giorni\""
msgid "Default best before days after thawing"
msgstr "Data di scadenza predefinita dopo lo scongelamento"
msgid "This cannot be the same as the \"From\" location"
msgstr "Non può essere uguale alla posizione \"Da\""
msgid "Thawed"
msgstr "Scongelato"
msgid "Frozen"
msgstr "Congelato"

View File

@ -1,5 +1,5 @@
# Translators:
# Antonino Ursino <ninus_@libero.it>, 2019
# Antonino Ursino <ninus_@libero.it>, 2020
#
msgid ""
msgstr ""
@ -7,7 +7,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-05-01 17:43+0000\n"
"Last-Translator: Antonino Ursino <ninus_@libero.it>, 2019\n"
"Last-Translator: Antonino Ursino <ninus_@libero.it>, 2020\n"
"Language-Team: Italian (https://www.transifex.com/grocy/teams/93189/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -44,4 +44,4 @@ msgid "preset-checklist"
msgstr "Lista di controllo predefinita"
msgid "link"
msgstr "collegamento"
msgstr "Collegamento"

View File

@ -1,3 +1,6 @@
# Translators:
# Kees van Nieuwenhuijzen <kees@vannieuwenhuijzen.com>, 2019
# Daniel Polders <zigurana@gmail.com>, 2020
#
msgid ""
msgstr ""
@ -5,6 +8,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-09-17 10:45+0000\n"
"Last-Translator: Daniel Polders <zigurana@gmail.com>, 2020\n"
"Language-Team: Dutch (https://www.transifex.com/grocy/teams/93189/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -14,13 +18,13 @@ msgstr ""
"X-Domain: grocy/chore_assignment_types\n"
msgid "no-assignment"
msgstr ""
msgstr "niet-toegewezen"
msgid "who-least-did-first"
msgstr ""
msgstr "wie-minst-gedaan-heeft-eerst"
msgid "random"
msgstr ""
msgstr "willekeurig"
msgid "in-alphabetical-order"
msgstr ""
msgstr "in-alfabetische-volgorde"

View File

@ -1,6 +1,5 @@
# Translators:
# Bernd Bestel <bernd@berrnd.de>, 2019
# Engelbert Mercelis <engelbertmercelis@gmail.com>, 2019
# Daniel Polders <zigurana@gmail.com>, 2020
#
msgid ""
msgstr ""
@ -8,7 +7,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-05-01 17:42+0000\n"
"Last-Translator: Engelbert Mercelis <engelbertmercelis@gmail.com>, 2019\n"
"Last-Translator: Daniel Polders <zigurana@gmail.com>, 2020\n"
"Language-Team: Dutch (https://www.transifex.com/grocy/teams/93189/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -18,16 +17,19 @@ msgstr ""
"X-Domain: grocy/chore_types\n"
msgid "manually"
msgstr "Handmatig"
msgstr "handmatig"
msgid "dynamic-regular"
msgstr "Dynamisch-regelmatig"
msgstr "dynamisch-regelmatig"
msgid "daily"
msgstr "Dagelijks"
msgstr "dagelijks"
msgid "weekly"
msgstr "Wekelijks"
msgstr "wekelijks"
msgid "monthly"
msgstr "Maandelijks"
msgstr "maandelijks"
msgid "yearly"
msgstr "jaarlijks"

View File

@ -1,11 +1,13 @@
# Translators:
# Llewy <carlvanoene@gmail.com>, 2019
# Adriaan Peeters <apeeters@lashout.net>, 2019
# Grocy NL, 2019
# Seppe <van.winkel.seppe@me.com>, 2019
# Engelbert Mercelis <engelbertmercelis@gmail.com>, 2019
# Niels Tholenaar <info@123quality.nl>, 2019
# Frank Klaassen <frank@frankklaassen.nl>, 2019
# gggg <bashankamp@gmail.com>, 2019
# Kees van Nieuwenhuijzen <kees@vannieuwenhuijzen.com>, 2019
# Llewy <carlvanoene@gmail.com>, 2019
#
msgid ""
msgstr ""
@ -13,7 +15,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-05-01 17:42+0000\n"
"Last-Translator: Frank Klaassen <frank@frankklaassen.nl>, 2019\n"
"Last-Translator: Llewy <carlvanoene@gmail.com>, 2019\n"
"Language-Team: Dutch (https://www.transifex.com/grocy/teams/93189/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -80,7 +82,7 @@ msgid "Eggs"
msgstr "Eieren"
msgid "Noodles"
msgstr "Noodles"
msgstr "Noedels"
msgid "Pickles"
msgstr "Augurken"
@ -166,9 +168,6 @@ msgstr "Duits"
msgid "Italian"
msgstr "Italiaans"
msgid "Demo in different language"
msgstr "Demo in een andere taal"
msgid "This is the note content of the recipe ingredient"
msgstr "Dit is de inhoud van de opmerking van het recept-ingrediënt"
@ -199,7 +198,7 @@ msgid "Projects"
msgstr "Projecten"
msgid "Repair the garage door"
msgstr "Herstel de garagepoort"
msgstr "De garagedeur repareren"
msgid "Fork and improve grocy"
msgstr "Fork en verbeter grocy"
@ -217,7 +216,7 @@ msgid "Tinned food"
msgstr "Ingeblikt voedsel"
msgid "Butchery products"
msgstr "Slagerij producten"
msgstr "Vleeswaren"
msgid "Vegetables/Fruits"
msgstr "Groenten/Fruit"
@ -289,27 +288,60 @@ msgid "Polish"
msgstr "Pools"
msgid "Milk Chocolate"
msgstr ""
msgstr "Melk Chocolade"
msgid "Dark Chocolate"
msgstr ""
msgstr "Pure Chocolade"
msgid "Slice"
msgid_plural "Slices"
msgstr[0] ""
msgstr[1] ""
msgstr[0] "Punt"
msgstr[1] "Puntjes"
msgid "Example userentity"
msgstr ""
msgstr "Voorbeeld gebruikersentiteit"
msgid "This is an example user entity..."
msgstr ""
msgstr "Dit is een voorbeeld van een gebruikers entiteit......"
msgid "Custom field"
msgstr ""
msgstr "Custom veld"
msgid "Example field value..."
msgstr ""
msgstr "Voorbeeld veld waarde...."
msgid "Waffle rolls"
msgstr "Wafel rollen"
msgid "Danish"
msgstr "Deens"
msgid "Dutch"
msgstr "Nederlands"
msgid "Norwegian"
msgstr "Norwegen"
msgid "Demo"
msgstr "Demo"
msgid "Stable version"
msgstr "Stabiele versie"
msgid "Preview version"
msgstr "Preview versie"
msgid "current release"
msgstr "Huidige versie"
msgid "not yet released"
msgstr "Nog niet uitgegeven"
msgid "Portuguese (Brazil)"
msgstr "Portugees (Brazilië)"
msgid "This is a note"
msgstr ""
msgid "Freezer"
msgstr ""

View File

@ -1,5 +1,6 @@
# Translators:
# Bernd Bestel <bernd@berrnd.de>, 2019
# Boding Clockchain <joost_nl@live.nl>, 2020
#
msgid ""
msgstr ""
@ -7,7 +8,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-05-01 17:42+0000\n"
"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
"Last-Translator: Boding Clockchain <joost_nl@live.nl>, 2020\n"
"Language-Team: Dutch (https://www.transifex.com/grocy/teams/93189/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -19,6 +20,12 @@ msgstr ""
msgid "purchase"
msgstr "Aankoop"
msgid "transfer_from"
msgstr "Overdragen van"
msgid "transfer_to"
msgstr "Overdragen naar"
msgid "consume"
msgstr "Consumeren"
@ -27,3 +34,12 @@ msgstr "Voorraadcorrectie"
msgid "product-opened"
msgstr "Product geopend"
msgid "stock-edit-old"
msgstr "Bewerk oude voorraad"
msgid "stock-edit-new"
msgstr "Bewerk oude voorraad"
msgid "self-production"
msgstr "Eigen gemaakt"

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,7 @@
# Translators:
# Bernd Bestel <bernd@berrnd.de>, 2019
# Mitchel Nijkamp <mitchelnijkamp1@msn.com>, 2019
# Kees van Nieuwenhuijzen <kees@vannieuwenhuijzen.com>, 2019
# Daniel Polders <zigurana@gmail.com>, 2020
#
msgid ""
msgstr ""
@ -8,7 +9,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-05-01 17:43+0000\n"
"Last-Translator: Mitchel Nijkamp <mitchelnijkamp1@msn.com>, 2019\n"
"Last-Translator: Daniel Polders <zigurana@gmail.com>, 2020\n"
"Language-Team: Dutch (https://www.transifex.com/grocy/teams/93189/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -18,25 +19,31 @@ msgstr ""
"X-Domain: grocy/userfield_types\n"
msgid "text-single-line"
msgstr "Tekst (één regel)"
msgstr "tekst (één regel)"
msgid "text-multi-line"
msgstr "Tekst (meerdere regels)"
msgstr "tekst (meerdere regels)"
msgid "number-integral"
msgstr "Number (héél getal)"
msgstr "nummer (héél getal)"
msgid "number-decimal"
msgstr "Nummer (decimaal)"
msgstr "nummer (decimaal)"
msgid "date"
msgstr "Getal (zonder tijd)"
msgstr "datum"
msgid "datetime"
msgstr "Datum en tijd"
msgstr "datum en tijd"
msgid "checkbox"
msgstr "Checkbox"
msgstr "selectievak"
msgid "preset-list"
msgstr "vooringestelde lijst"
msgid "preset-checklist"
msgstr "vooringestelde-lijst"
msgid "link"
msgstr "koppeling"

View File

@ -1,6 +1,6 @@
# Translators:
# Bernd Bestel <bernd@berrnd.de>, 2019
# Marius Borø <blizzwave@gmail.com>, 2019
# Marius Borø <blizzwave@gmail.com>, 2020
#
msgid ""
msgstr ""
@ -8,7 +8,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-05-01 17:42+0000\n"
"Last-Translator: Marius Borø <blizzwave@gmail.com>, 2019\n"
"Last-Translator: Marius Borø <blizzwave@gmail.com>, 2020\n"
"Language-Team: Norwegian (https://www.transifex.com/grocy/teams/93189/no/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -322,10 +322,19 @@ msgid "Stable version"
msgstr "Stabil versjon"
msgid "Preview version"
msgstr "Under utvikling versjon"
msgstr "Versjon under utvikling"
msgid "current release"
msgstr "Nåværende versjon"
msgid "not yet released"
msgstr "enda ikke gitt ut"
msgid "Portuguese (Brazil)"
msgstr "Portugisisk (Brasil)"
msgid "This is a note"
msgstr ""
msgid "Freezer"
msgstr ""

View File

@ -1,7 +1,7 @@
# Translators:
# Bernd Bestel <bernd@berrnd.de>, 2019
# Andreas Henden <chairman2s.ah@gmail.com>, 2019
# Marius Borø <blizzwave@gmail.com>, 2019
# Marius Borø <blizzwave@gmail.com>, 2020
#
msgid ""
msgstr ""
@ -9,7 +9,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-05-01 17:42+0000\n"
"Last-Translator: Marius Borø <blizzwave@gmail.com>, 2019\n"
"Last-Translator: Marius Borø <blizzwave@gmail.com>, 2020\n"
"Language-Team: Norwegian (https://www.transifex.com/grocy/teams/93189/no/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -125,7 +125,7 @@ msgid "Stock quantity unit"
msgstr "Forpakningstype i beholdningen"
msgid "Stock amount"
msgstr "Standardmengde"
msgstr "Beholdningsantall"
msgid "Last purchased"
msgstr "Sist kjøpt"
@ -830,7 +830,7 @@ msgid "Delete not possible"
msgstr "Ikke mulig å slette"
msgid "Equipment"
msgstr "Instruksjonmanualer"
msgstr "Instruksjonsmanualer"
msgid "Instruction manual"
msgstr "Instruksjonsmanual"
@ -842,17 +842,16 @@ msgid "Notes"
msgstr "Notater"
msgid "Edit equipment"
msgstr "Endre instruksjonmanualer for utstyr"
msgstr "Endre instruksjonsmanual"
msgid "Create equipment"
msgstr "Opprett instruksjonmanualer for utstyr"
msgstr "Opprett instruksjonmanualer for et utstyr"
msgid ""
"If you don't select a file, the current instruction manual will not be "
"altered"
msgstr ""
"Hvis du ikke velger en instruksjonsmanual, vil nåværende instruksjonsmanual "
"ikke bli endret"
"Om ingen ny instruksjonsmanual blir lastet opp vil nåværende bli værende"
msgid "No instruction manual available"
msgstr "Ingen instruksjonsmanual tilgjengelig"
@ -955,18 +954,16 @@ msgid ""
"The first item in this list would be picked by the default rule which is "
"\"First expiring first, then first in first out\""
msgstr ""
"Første produkt på listen vil bli konsumert først i henhold til regel: \"Går "
"ut på dato først. Deretter først inn, først ut\"."
"Første produkt på listen vil bli konsumert først i henhold til denne "
"regelen: \"Går ut på dato først, deretter først inn, først ut\"."
msgid "Mark %1$s of %2$s as open"
msgstr "Merk %1$s av %2$s som åpen"
msgid ""
"When a product was marked as opened, the best before date will be replaced "
"by today + this amount of days (a value of 0 disables this)"
"When this product was marked as opened, the best before date will be "
"replaced by today + this amount of days (a value of 0 disables this)"
msgstr ""
"Når et produkt blir merket som åpnet endres best før datoen fra i dag + "
"dette antallet av dager. (Et 0 vil deaktivere dette)"
msgid "Default best before days after opened"
msgstr "Standard best før dager etter åpnet"
@ -977,9 +974,6 @@ msgstr "Merket %1$s av %2$s som åpnet"
msgid "Mark as opened"
msgstr "Merk som åpnet"
msgid "Expires on %1$s; Bought on %2$s"
msgstr "Går ut på dato %1$s, Kjøpt %2$s"
msgid "Not opened"
msgstr "Ikke åpnet"
@ -1005,7 +999,7 @@ msgid "Show clock in header"
msgstr "Vis klokken på toppen av siden"
msgid "Stock settings"
msgstr "Beholdningsinnstillinger"
msgstr "Beholdning - innstillinger"
msgid "Shopping list to stock workflow"
msgstr "Arbeidsflyt fra handleliste til beholding"
@ -1148,8 +1142,8 @@ msgstr "Produkttelling"
msgid "Type a new product name or barcode and hit TAB to start a workflow"
msgstr ""
"Skriv inn et nytt produkt eller strekkode, trykk så TAB for å starte "
"prosessen"
"Skriv inn et nytt produkt eller scan en strekkode, trykk så TAB for å starte"
" innkjøps/ forbruksprosess"
msgid ""
"This will be used as the default setting when adding this product as a "
@ -1189,7 +1183,7 @@ msgid "Average shelf life"
msgstr "Gjennomsnittlig holdbarhetstid"
msgid "Spoil rate"
msgstr "\"Utgått på dato\" rate"
msgstr "Prosenttall for hvor mye som har utgått på dato "
msgid "Show more"
msgstr "Vis mer"
@ -1295,6 +1289,9 @@ msgstr "Ikke nok i beholdningen"
msgid "Expiring soon days"
msgstr "Går ut på dato snart dager"
msgid "Default location"
msgstr "Standard lokasjon"
msgid "Default amount for purchase"
msgstr "Standard mengde for innkjøp"
@ -1651,62 +1648,232 @@ msgid "Miss"
msgstr "Bom"
msgid "Display recipe"
msgstr ""
msgstr "Vis oppskrift"
msgid "Accumulate sub products min. stock amount"
msgstr ""
msgstr "Akkumulert underprodukter minimum beholdningsnivå"
msgid ""
"If enabled, the min. stock amount of sub products will be accumulated into "
"this product, means the sub product will never be \"missing\", only this "
"product"
msgstr ""
"Hvis aktivert vil minimum beholdningsnivå av under produkter bli akkumulert "
"inn i dette produktet. Dette betyr at under produktet aldri vil \"mangle\", "
"kunne dette produktet."
msgid "Are you sure to remove this conversion?"
msgstr ""
msgstr "Er du sikker på at du ønsker å fjerne denne konverteringen?"
msgid "Unit price"
msgstr ""
msgstr "Enhetspris"
msgid "Total price"
msgstr ""
msgstr "Totalpris"
msgid "in %s and based on the purchase quantity unit"
msgstr ""
msgstr "I %s og basert på innkjøpsforpakningen"
msgid "Unlimited"
msgstr ""
msgstr "Evig"
msgid "Clear"
msgstr ""
msgstr "Tøm"
msgid "Are you sure to remove the included recipe \"%s\"?"
msgstr ""
msgstr "Er du sikker du ønsker å slette den inkluderte oppskriften \"%s\"?"
msgid "Period interval"
msgstr ""
msgstr "Periodiskinterval"
msgid ""
"This means the next execution of this chore should only be scheduled every "
"%s days"
msgstr ""
"Dette betyr at neste gjennomføring av denne husarbeidsoppgaven skal kun "
"planlegges for hver %s dager"
msgid ""
"This means the next execution of this chore should only be scheduled every "
"%s weeks"
msgstr ""
"Dette betyr at neste gjennomføring av denne husarbeidsoppgaven skal kun "
"planlegges for hver %s uker"
msgid ""
"This means the next execution of this chore should only be scheduled every "
"%s months"
msgstr ""
"Dette betyr at neste gjennomføring av denne husarbeidsoppgaven skal kun "
"planlegges for hver %s måneder"
msgid ""
"This means the next execution of this chore is scheduled 1 year after the "
"last execution"
msgstr ""
"Dette betyr at neste gjennomføring av denne husarbeidsoppgaven skal være 1 "
"år etter forrige gjennomføring"
msgid ""
"This means the next execution of this chore should only be scheduled every "
"%s years"
msgstr ""
"Dette betyr at neste gjennomføring av denne husarbeidsoppgaven skal kun "
"planlegges for hver %s år"
msgid "Transfer"
msgstr "Flytte produkt"
msgid "From location"
msgstr "Fra lokasjon"
msgid "To location"
msgstr "Til lokasjon"
msgid "There are no units available at this location"
msgstr "Det er ingen enheter tilgjengelig på denne lokasjonen"
msgid "Amount: %1$s; Expires on %2$s; Bought on %3$s"
msgstr "Mengde: %1$s; Best før %2$s; Kjøpt %3$s"
msgid "Transfered %1$s of %2$s from %3$s to %4$s"
msgstr "Flyttet %1$s %2$s fra %3$s til %4$s"
msgid "Show stock entries"
msgstr "Vis beholdningsoppføringer"
msgid "Stock entries"
msgstr "Beholdningsoppføringer"
msgid "Best before date"
msgstr "Best før dato"
msgid "Purchased date"
msgstr "Innkjøpsdato"
msgid "Consume all %s for this stock entry"
msgstr "Forbruk alle %s for denne beholdningsoppføringen"
msgid "The amount cannot be lower than %1$s"
msgstr "Mengden kan ikke være lavere enn %1$s"
msgid "Stock entry successfully updated"
msgstr "Beholdningsoppføring oppdatert"
msgid "Edit stock entry"
msgstr "Endre beholdningsoppføring"
msgid ""
"Camera access is on only possible when supported and allowed by your browser"
" and when grocy is served via a secure (https://) connection"
msgstr ""
"Tilgang til kamera må støttes av din nettleser og grocy må serves via en "
"sikker tilkobling (https://)"
msgid "Keep screen on"
msgstr "Skjerm alltid på"
msgid "Keep screen on while displaying a \"fullscreen-card\""
msgstr "Hold skjerm på når du bruker fullskjermsoversikt"
msgid "A purchased date is required"
msgstr "En innkjøpsdato kreves"
msgid ""
"When a product is selected, one unit (per serving in purchase quantity unit)"
" will be added to stock on consuming this recipe"
msgstr ""
msgid "Produces product"
msgstr ""
msgid "This booking cannot be undone"
msgstr ""
msgid "Booking does not exist or was already undone"
msgstr ""
msgid "Are you sure to delete API key \"%s\"?"
msgstr ""
msgid "Add note"
msgstr ""
msgid "Add note to %s"
msgstr ""
msgid "per day"
msgstr ""
msgid "Compact view"
msgstr ""
msgid "Normal view"
msgstr ""
msgid "Only undone items"
msgstr ""
msgid "Add product"
msgstr ""
msgid "Add product to %s"
msgstr ""
msgid "Consume all ingredients needed by this weeks recipes or products"
msgstr ""
msgid "Meal plan recipe"
msgstr ""
msgid "Meal plan note"
msgstr ""
msgid "Meal plan product"
msgstr ""
msgid "Scan mode"
msgstr ""
msgid "on"
msgstr ""
msgid "off"
msgstr ""
msgid ""
"Scan mode is on but not all required fields could be populated automatically"
msgstr ""
msgid "Is freezer"
msgstr ""
msgid ""
"When moving products from/to a freezer location, the products best before "
"date is automatically adjusted according to the product settings"
msgstr ""
msgid ""
"On moving this product to a freezer location (so when freezing it), the best"
" before date will be replaced by today + this amount of days"
msgstr ""
msgid "Default best before days after freezing"
msgstr ""
msgid ""
"On moving this product from a freezer location (so when thawing it), the "
"best before date will be replaced by today + this amount of days"
msgstr ""
msgid "Default best before days after thawing"
msgstr ""
msgid "This cannot be the same as the \"From\" location"
msgstr ""
msgid "Thawed"
msgstr ""
msgid "Frozen"
msgstr ""

View File

@ -51,8 +51,8 @@ msgstr[1] "Vidros"
msgid "Tin"
msgid_plural "Tins"
msgstr[0] "Lata"
msgstr[1] "Latas"
msgstr[0] "Enlatado"
msgstr[1] "Enlatados"
msgid "Can"
msgid_plural "Cans"
@ -284,7 +284,7 @@ msgid "Milk Chocolate"
msgstr "Chocolate Branco"
msgid "Dark Chocolate"
msgstr "Chocolate"
msgstr "Chocolate Amargo"
msgid "Slice"
msgid_plural "Slices"
@ -329,3 +329,12 @@ msgstr "versão atual"
msgid "not yet released"
msgstr "ainda não lançado"
msgid "Portuguese (Brazil)"
msgstr "Português (Brasil)"
msgid "This is a note"
msgstr ""
msgid "Freezer"
msgstr ""

View File

@ -3,6 +3,7 @@
# Armando Neto <armando.muassab@gmail.com>, 2019
# Danilo Vieira <cebikyn@gmail.com>, 2019
# Jefferson Brito Passos dos Santos <jeffersantoss@gmail.com>, 2019
# Arthur Vieira <skytakes.arthur@gmail.com>, 2020
#
msgid ""
msgstr ""
@ -10,7 +11,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-05-01 17:42+0000\n"
"Last-Translator: Jefferson Brito Passos dos Santos <jeffersantoss@gmail.com>, 2019\n"
"Last-Translator: Arthur Vieira <skytakes.arthur@gmail.com>, 2020\n"
"Language-Team: Portuguese (Brazil) (https://www.transifex.com/grocy/teams/93189/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -972,11 +973,9 @@ msgid "Mark %1$s of %2$s as open"
msgstr "Marcar %1$s de %2$s como aberto"
msgid ""
"When a product was marked as opened, the best before date will be replaced "
"by today + this amount of days (a value of 0 disables this)"
"When this product was marked as opened, the best before date will be "
"replaced by today + this amount of days (a value of 0 disables this)"
msgstr ""
"Quando um produto for marcado como aberto, a validade será substituída por "
"hoje + esta quantidade de dias (o valor 0 desabilita)"
msgid "Default best before days after opened"
msgstr "Validade padão após aberto"
@ -987,9 +986,6 @@ msgstr "%1$s de %2$s marcado como aberto"
msgid "Mark as opened"
msgstr "Marcar como aberto"
msgid "Expires on %1$s; Bought on %2$s"
msgstr "Vence em %1$s; Comprado em %2$s"
msgid "Not opened"
msgstr "Não aberto"
@ -1739,3 +1735,161 @@ msgid ""
msgstr ""
"Isto significa que a próxima execução desta tarefa doméstica deverá somente "
"ser agendada a cada %sanos"
msgid "Transfer"
msgstr "Transferir"
msgid "From location"
msgstr "De"
msgid "To location"
msgstr "Para"
msgid "There are no units available at this location"
msgstr "Não há nenhuma unidade disponivel neste local"
msgid "Amount: %1$s; Expires on %2$s; Bought on %3$s"
msgstr "Quantidade: 1%1s; Vence em 2%2s; Comprado em 3%3s"
msgid "Transfered %1$s of %2$s from %3$s to %4$s"
msgstr "Transferido%1$s de %2$s de %3$s para %4$s"
msgid "Show stock entries"
msgstr "Mostrar os itens no estoque"
msgid "Stock entries"
msgstr "Itens no estoque"
msgid "Best before date"
msgstr "Consumir antes de"
msgid "Purchased date"
msgstr "Data de compra"
msgid "Consume all %s for this stock entry"
msgstr "Consumir todos os %s para esse item no estoque"
msgid "The amount cannot be lower than %1$s"
msgstr "A quantidade não pode ser menor que %1$s"
msgid "Stock entry successfully updated"
msgstr "Estoque atualizado com sucesso"
msgid "Edit stock entry"
msgstr "Editar item no estoque"
msgid ""
"Camera access is on only possible when supported and allowed by your browser"
" and when grocy is served via a secure (https://) connection"
msgstr ""
"Acesso a Camera só é possivel caso seja suportado e permitido pelo navegador"
" e quando Grocy for acessado por conexão segura (https://)"
msgid "Keep screen on"
msgstr "Mantenha a tela ligada"
msgid "Keep screen on while displaying a \"fullscreen-card\""
msgstr ""
"Mantenha a tela ligada quando estiver mostrando um \"Cartão de tela-cheia\""
msgid "A purchased date is required"
msgstr ""
msgid ""
"When a product is selected, one unit (per serving in purchase quantity unit)"
" will be added to stock on consuming this recipe"
msgstr ""
msgid "Produces product"
msgstr ""
msgid "This booking cannot be undone"
msgstr ""
msgid "Booking does not exist or was already undone"
msgstr ""
msgid "Are you sure to delete API key \"%s\"?"
msgstr ""
msgid "Add note"
msgstr ""
msgid "Add note to %s"
msgstr ""
msgid "per day"
msgstr ""
msgid "Compact view"
msgstr ""
msgid "Normal view"
msgstr ""
msgid "Only undone items"
msgstr ""
msgid "Add product"
msgstr ""
msgid "Add product to %s"
msgstr ""
msgid "Consume all ingredients needed by this weeks recipes or products"
msgstr ""
msgid "Meal plan recipe"
msgstr ""
msgid "Meal plan note"
msgstr ""
msgid "Meal plan product"
msgstr ""
msgid "Scan mode"
msgstr ""
msgid "on"
msgstr ""
msgid "off"
msgstr ""
msgid ""
"Scan mode is on but not all required fields could be populated automatically"
msgstr ""
msgid "Is freezer"
msgstr ""
msgid ""
"When moving products from/to a freezer location, the products best before "
"date is automatically adjusted according to the product settings"
msgstr ""
msgid ""
"On moving this product to a freezer location (so when freezing it), the best"
" before date will be replaced by today + this amount of days"
msgstr ""
msgid "Default best before days after freezing"
msgstr ""
msgid ""
"On moving this product from a freezer location (so when thawing it), the "
"best before date will be replaced by today + this amount of days"
msgstr ""
msgid "Default best before days after thawing"
msgstr ""
msgid "This cannot be the same as the \"From\" location"
msgstr ""
msgid "Thawed"
msgstr ""
msgid "Frozen"
msgstr ""

View File

@ -345,3 +345,12 @@ msgstr "текущий релиз"
msgid "not yet released"
msgstr "Пока не выпущено"
msgid "Portuguese (Brazil)"
msgstr ""
msgid "This is a note"
msgstr ""
msgid "Freezer"
msgstr ""

View File

@ -1,3 +1,6 @@
# Translators:
# Benjamin Tayehanpour <transifex@benjamin.tayehanpour.se>, 2019
# Peter Wickenberg <peter@wickenberg.nu>, 2019
#
msgid ""
msgstr ""
@ -5,6 +8,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-09-17 10:45+0000\n"
"Last-Translator: Peter Wickenberg <peter@wickenberg.nu>, 2019\n"
"Language-Team: Swedish (Sweden) (https://www.transifex.com/grocy/teams/93189/sv_SE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -14,13 +18,13 @@ msgstr ""
"X-Domain: grocy/chore_assignment_types\n"
msgid "no-assignment"
msgstr ""
msgstr "Ingen uppgift"
msgid "who-least-did-first"
msgstr ""
msgstr "Den som gjorde minst går först"
msgid "random"
msgstr ""
msgstr "Slumpmässig"
msgid "in-alphabetical-order"
msgstr ""
msgstr "I alfabetisk ordning"

View File

@ -1,5 +1,6 @@
# Translators:
# Bernd Bestel <bernd@berrnd.de>, 2019
# Peter Wickenberg <peter@wickenberg.nu>, 2019
#
msgid ""
msgstr ""
@ -7,7 +8,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-05-01 17:42+0000\n"
"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
"Last-Translator: Peter Wickenberg <peter@wickenberg.nu>, 2019\n"
"Language-Team: Swedish (Sweden) (https://www.transifex.com/grocy/teams/93189/sv_SE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -30,3 +31,6 @@ msgstr "Veckovis"
msgid "monthly"
msgstr "Månadsvis"
msgid "yearly"
msgstr "Årligen"

View File

@ -2,6 +2,7 @@
# Mathias Fröjd <info@mcfrojd.com>, 2019
# Bernd Bestel <bernd@berrnd.de>, 2019
# Fredrik Hendeberg <fredrik@hendeberg.com>, 2019
# Peter Wickenberg <peter@wickenberg.nu>, 2019
#
msgid ""
msgstr ""
@ -9,7 +10,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-05-01 17:42+0000\n"
"Last-Translator: Fredrik Hendeberg <fredrik@hendeberg.com>, 2019\n"
"Last-Translator: Peter Wickenberg <peter@wickenberg.nu>, 2019\n"
"Language-Team: Swedish (Sweden) (https://www.transifex.com/grocy/teams/93189/sv_SE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -162,9 +163,6 @@ msgstr "Tysk"
msgid "Italian"
msgstr "Italienska"
msgid "Demo in different language"
msgstr "Demo på olika språk"
msgid "This is the note content of the recipe ingredient"
msgstr "Detta är anteckningsinnehållet i receptens ingrediens"
@ -285,27 +283,60 @@ msgid "Polish"
msgstr "Polska"
msgid "Milk Chocolate"
msgstr ""
msgstr "Mjölkchoklad"
msgid "Dark Chocolate"
msgstr ""
msgstr "Mörk chocklad"
msgid "Slice"
msgid_plural "Slices"
msgstr[0] ""
msgstr[1] ""
msgstr[0] "Skiva"
msgstr[1] "Skivor"
msgid "Example userentity"
msgstr ""
msgstr "Exempel användarenhet"
msgid "This is an example user entity..."
msgstr ""
msgstr "Detta är ett exempel på en användarenhet..."
msgid "Custom field"
msgstr ""
msgstr "Anpassat fält"
msgid "Example field value..."
msgstr ""
msgstr "Anpassat fält värde..."
msgid "Waffle rolls"
msgstr "Våffelrullar"
msgid "Danish"
msgstr "Danska"
msgid "Dutch"
msgstr "Hollänska"
msgid "Norwegian"
msgstr "Norska"
msgid "Demo"
msgstr "Demo"
msgid "Stable version"
msgstr "Stabil version"
msgid "Preview version"
msgstr "Förhandsgrandskningsversion"
msgid "current release"
msgstr "Aktuell version"
msgid "not yet released"
msgstr "osläppt version"
msgid "Portuguese (Brazil)"
msgstr "Portugisiska (Brasilien)"
msgid "This is a note"
msgstr ""
msgid "Freezer"
msgstr ""

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,8 @@
# Translators:
# Bernd Bestel <bernd@berrnd.de>, 2019
# Fredrik Hendeberg <fredrik@hendeberg.com>, 2019
# Jesper Sandström <jesper@languageconsulting.se>, 2019
# Peter Wickenberg <peter@wickenberg.nu>, 2019
#
msgid ""
msgstr ""
@ -7,7 +10,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
"PO-Revision-Date: 2019-05-01 17:43+0000\n"
"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
"Last-Translator: Peter Wickenberg <peter@wickenberg.nu>, 2019\n"
"Language-Team: Swedish (Sweden) (https://www.transifex.com/grocy/teams/93189/sv_SE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -20,13 +23,13 @@ msgid "text-single-line"
msgstr "Text (en rad)"
msgid "text-multi-line"
msgstr "Text (multipla rader)"
msgstr "Text (flera rader)"
msgid "number-integral"
msgstr "Nummer (integral)"
msgstr "Antal (heltal)"
msgid "number-decimal"
msgstr "Nummer (decimal)"
msgstr "Antal (decimal)"
msgid "date"
msgstr "Datum (utan tid)"
@ -36,3 +39,12 @@ msgstr "Datum & tid"
msgid "checkbox"
msgstr "Kryssruta"
msgid "preset-list"
msgstr "mall-lista"
msgid "preset-checklist"
msgstr "förchecklista"
msgid "link"
msgstr "länk"

View File

@ -6,6 +6,10 @@ BEGIN
AND location_id IS NULL;
END;
UPDATE stock
SET location_id = (SELECT location_id FROM products where id = product_id)
WHERE location_id IS NULL;
CREATE TRIGGER set_products_default_location_if_empty_stock_log AFTER INSERT ON stock_log
BEGIN
UPDATE stock_log
@ -14,6 +18,10 @@ BEGIN
AND location_id IS NULL;
END;
UPDATE stock_log
SET location_id = (SELECT location_id FROM products where id = product_id)
WHERE location_id IS NULL;
ALTER TABLE stock_log
ADD correlation_id TEXT;

View File

@ -21,7 +21,7 @@
"datatables.net-select": "^1.3.0",
"datatables.net-select-bs4": "^1.3.0",
"fullcalendar": "^3.10.1",
"gettext-translator": "^2.1.0",
"gettext-translator": "2.1.0",
"jquery": "^3.4.1",
"jquery-lazy": "^1.7.10",
"jquery-serializejson": "^2.9.0",
@ -30,7 +30,7 @@
"nosleep.js": "^0.9.0",
"quagga": "^0.12.1",
"sprintf-js": "^1.1.2",
"startbootstrap-sb-admin": "^4.0.0",
"startbootstrap-sb-admin": "4.0.0",
"summernote": "^0.8.12",
"swagger-ui-dist": "^3.23.10",
"tempusdominus-bootstrap-4": "https://github.com/berrnd/tempusdominus-bootstrap-4.git#master",

View File

@ -144,7 +144,8 @@ input::-webkit-inner-spin-button {
border-radius: 0;
}
.navbar-nav .dropdown-divider {
.navbar-nav .dropdown-divider,
.nav-item-divider {
border-top: 2px solid !important;
border-color: #d6d6d6 !important;
}

View File

@ -145,3 +145,11 @@ function Delay(callable, delayMilliseconds)
}, delayMilliseconds || 0);
};
}
$.fn.isVisibleInViewport = function(extraHeightPadding = 0)
{
var elementTop = $(this).offset().top;
var viewportTop = $(window).scrollTop() - extraHeightPadding;
return elementTop + $(this).outerHeight() > viewportTop && elementTop < viewportTop + $(window).height();
};

View File

@ -258,11 +258,29 @@ if (!Grocy.ActiveNav.isEmpty())
var menuItem = $('#sidebarResponsive').find("[data-nav-for-page='" + Grocy.ActiveNav + "']");
menuItem.addClass('active-page');
var parentMenuSelector = menuItem.data("sub-menu-of");
if (typeof parentMenuSelector !== "undefined")
if (menuItem.length)
{
$(parentMenuSelector).collapse("show");
$(parentMenuSelector).prev(".nav-link-collapse").addClass("active-page");
var parentMenuSelector = menuItem.data("sub-menu-of");
if (typeof parentMenuSelector !== "undefined")
{
$(parentMenuSelector).collapse("show");
$(parentMenuSelector).prev(".nav-link-collapse").addClass("active-page");
$(parentMenuSelector).on("shown.bs.collapse", function (e)
{
if (!menuItem.isVisibleInViewport(75))
{
menuItem[0].scrollIntoView();
}
})
}
else
{
if (!menuItem.isVisibleInViewport(75))
{
menuItem[0].scrollIntoView();
}
}
}
}
@ -293,9 +311,9 @@ if (window.localStorage.getItem("sidebar_state") === "collapsed")
}
$.timeago.settings.allowFuture = true;
RefreshContextualTimeago = function()
RefreshContextualTimeago = function(rootSelector = "#page-content")
{
$("time.timeago").each(function()
$(rootSelector + " time.timeago").each(function()
{
var element = $(this);
@ -526,9 +544,9 @@ $("#about-dialog-link").on("click", function()
});
});
function RefreshLocaleNumberDisplay()
function RefreshLocaleNumberDisplay(rootSelector = "#page-content")
{
$(".locale-number.locale-number-currency").each(function()
$(rootSelector + " .locale-number.locale-number-currency").each(function()
{
if (isNaN(parseFloat($(this).text())))
{
@ -538,7 +556,7 @@ function RefreshLocaleNumberDisplay()
$(this).text(parseFloat($(this).text()).toLocaleString(undefined, { style: "currency", currency: Grocy.Currency }));
});
$(".locale-number.locale-number-quantity-amount").each(function()
$(rootSelector + " .locale-number.locale-number-quantity-amount").each(function()
{
if (isNaN(parseFloat($(this).text())))
{
@ -548,7 +566,7 @@ function RefreshLocaleNumberDisplay()
$(this).text(parseFloat($(this).text()).toLocaleString(undefined, { minimumFractionDigits: 0, maximumFractionDigits: 3 }));
});
$(".locale-number.locale-number-generic").each(function ()
$(rootSelector + " .locale-number.locale-number-generic").each(function ()
{
if (isNaN(parseFloat($(this).text())))
{

View File

@ -50,8 +50,8 @@ $(document).on('click', '.undo-battery-execution-button', function(e)
{
element.closest("tr").addClass("text-muted");
element.parent().siblings().find("span.name-anchor").addClass("text-strike-through").after("<br>" + __t("Undone on") + " " + moment().format("YYYY-MM-DD HH:mm:ss") + " <time class='timeago timeago-contextual' datetime='" + moment().format("YYYY-MM-DD HH:mm:ss") + "'></time>");
element.closest(".undo-stock-booking-button").addClass("disabled");
RefreshContextualTimeago();
element.closest(".undo-battery-execution-button").addClass("disabled");
RefreshContextualTimeago("#charge-cycle-" + chargeCycleId + "-row");
toastr.success(__t("Charge cycle successfully undone"));
},
function(xhr)

View File

@ -95,7 +95,7 @@ $(document).on('click', '.track-charge-cycle-button', function(e)
Grocy.FrontendHelpers.EndUiBusy();
toastr.success(__t('Tracked charge cycle of battery %1$s on %2$s', batteryName, trackedTime));
RefreshContextualTimeago();
RefreshContextualTimeago("#battery-" + batteryId + "-row");
RefreshStatistics();
},
function(xhr)

View File

@ -51,7 +51,7 @@ $(document).on('click', '.undo-chore-execution-button', function(e)
element.closest("tr").addClass("text-muted");
element.parent().siblings().find("span.name-anchor").addClass("text-strike-through").after("<br>" + __t("Undone on") + " " + moment().format("YYYY-MM-DD HH:mm:ss") + " <time class='timeago timeago-contextual' datetime='" + moment().format("YYYY-MM-DD HH:mm:ss") + "'></time>");
element.closest(".undo-stock-booking-button").addClass("disabled");
RefreshContextualTimeago();
RefreshContextualTimeago("#chore-execution-" + executionId + "-row");
toastr.success(__t("Chore execution successfully undone"));
},
function(xhr)

View File

@ -146,7 +146,7 @@ $(document).on('click', '.track-chore-button', function(e)
// Delay due to delayed/animated set of new timestamps above
setTimeout(function()
{
RefreshContextualTimeago();
RefreshContextualTimeago("#chore-" + choreId + "-row");
// Refresh the DataTable to re-apply filters
choresOverviewTable.rows().invalidate().draw(false);

View File

@ -17,7 +17,7 @@ Grocy.Components.BatteryCard.Refresh = function(batteryId)
$('#batterycard-battery-journal-button').removeClass("disabled");
EmptyElementWhenMatches('#batterycard-battery-last-charged-timeago', __t('timeago_nan'));
RefreshContextualTimeago();
RefreshContextualTimeago(".batterycard");
},
function(xhr)
{

View File

@ -26,7 +26,7 @@ Grocy.Components.ChoreCard.Refresh = function(choreId)
}
EmptyElementWhenMatches('#chorecard-chore-last-tracked-timeago', __t('timeago_nan'));
RefreshContextualTimeago();
RefreshContextualTimeago(".chorecard");
},
function(xhr)
{

View File

@ -268,7 +268,7 @@ Grocy.Components.DateTimePicker.GetInputElement().on('input', function(e)
{
$('#datetimepicker-timeago').attr("datetime", Grocy.Components.DateTimePicker.GetValue());
EmptyElementWhenMatches('#datetimepicker-timeago', __t('timeago_nan'));
RefreshContextualTimeago();
RefreshContextualTimeago(".datetimepicker");
});
$('.datetimepicker').on('update.datetimepicker', function(e)

View File

@ -79,7 +79,7 @@ if (Grocy.Components.DateTimePicker2.GetInputElement().data('limit-end-to-now')
Grocy.Components.DateTimePicker2.Init = function()
{
$('.datetimepicker').datetimepicker(
$('.datetimepicker2').datetimepicker(
{
format: Grocy.Components.DateTimePicker2.GetInputElement().data('format'),
buttons: {
@ -124,7 +124,7 @@ Grocy.Components.DateTimePicker2.Init();
Grocy.Components.DateTimePicker2.GetInputElement().on('keyup', function(e)
{
$('.datetimepicker').datetimepicker('hide');
$('.datetimepicker2').datetimepicker('hide');
var value = Grocy.Components.DateTimePicker2.GetValue();
var now = new Date();
@ -268,17 +268,17 @@ Grocy.Components.DateTimePicker2.GetInputElement().on('input', function(e)
{
$('#datetimepicker-timeago').attr("datetime", Grocy.Components.DateTimePicker2.GetValue());
EmptyElementWhenMatches('#datetimepicker-timeago', __t('timeago_nan'));
RefreshContextualTimeago();
RefreshContextualTimeago(".datetimepicker2");
});
$('.datetimepicker').on('update.datetimepicker', function(e)
$('.datetimepicker2').on('update.datetimepicker', function(e)
{
Grocy.Components.DateTimePicker2.GetInputElement().trigger('input');
Grocy.Components.DateTimePicker2.GetInputElement().trigger('change');
Grocy.Components.DateTimePicker2.GetInputElement().trigger('keypress');
});
$('.datetimepicker').on('hide.datetimepicker', function(e)
$('.datetimepicker2').on('hide.datetimepicker', function(e)
{
Grocy.Components.DateTimePicker2.GetInputElement().trigger('input');
Grocy.Components.DateTimePicker2.GetInputElement().trigger('change');

View File

@ -99,7 +99,7 @@ Grocy.Components.ProductCard.Refresh = function(productId)
EmptyElementWhenMatches('#productcard-product-last-purchased-timeago', __t('timeago_nan'));
EmptyElementWhenMatches('#productcard-product-last-used-timeago', __t('timeago_nan'));
RefreshContextualTimeago();
RefreshContextualTimeago(".productcard");
},
function(xhr)
{

View File

@ -157,7 +157,10 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
{
Grocy.Components.LocationPicker.SetId(productDetails.location.id);
}
$('#new_amount').val(productDetails.stock_amount);
$('#new_amount').focus();
$('#new_amount').trigger('keyup');
},
function(xhr)
{

View File

@ -217,8 +217,8 @@ function RefreshStockDetailRow(stockRowId)
// Needs to be delayed because of the animation above the date-text would be wrong if fired immediately...
setTimeout(function()
{
RefreshContextualTimeago();
RefreshLocaleNumberDisplay();
RefreshContextualTimeago("#stock-" + stockRowId + "-row");
RefreshLocaleNumberDisplay("#stock-" + stockRowId + "-row");
}, 600);
},
function(xhr)

View File

@ -26,14 +26,12 @@
jsonData.open = $("#open").is(":checked");
var stockRowId = GetUriParam('stockRowId');
Grocy.Api.Put("stock/entry/" + stockRowId, jsonData,
Grocy.Api.Put("stock/entry/" + Grocy.EditObjectId, jsonData,
function(result)
{
var successMessage = __t('Stock entry successfully updated') + '<br><a class="btn btn-secondary btn-sm mt-2" href="#" onclick="UndoStockBookingEntry(\'' + result.id + '\',\'' + stockRowId + '\')"><i class="fas fa-undo"></i> ' + __t("Undo") + '</a>';
var successMessage = __t('Stock entry successfully updated') + '<br><a class="btn btn-secondary btn-sm mt-2" href="#" onclick="UndoStockBookingEntry(\'' + result.id + '\',\'' + Grocy.EditObjectId + '\')"><i class="fas fa-undo"></i> ' + __t("Undo") + '</a>';
window.parent.postMessage(WindowMessageBag("StockDetailChanged", stockRowId), Grocy.BaseUrl);
window.parent.postMessage(WindowMessageBag("StockDetailChanged", Grocy.EditObjectId), Grocy.BaseUrl);
window.parent.postMessage(WindowMessageBag("ShowSuccessMessage", successMessage), Grocy.BaseUrl);
window.parent.postMessage(WindowMessageBag("Ready"), Grocy.BaseUrl);
window.parent.postMessage(WindowMessageBag("CloseAllModals"), Grocy.BaseUrl);
@ -90,55 +88,45 @@ Grocy.Components.DateTimePicker2.GetInputElement().on('keypress', function(e)
Grocy.FrontendHelpers.ValidateForm('stockedit-form');
});
var stockRowId = GetUriParam('stockRowId');
Grocy.Api.Get("stock/entry/" + stockRowId,
function (stockEntry)
Grocy.Api.Get('stock/products/' + Grocy.EditObjectProductId,
function(productDetails)
{
Grocy.Components.LocationPicker.SetId(stockEntry.location_id);
$('#amount').val(stockEntry.amount);
$('#price').val(stockEntry.price);
$("#open").prop('checked', BoolVal(stockEntry.open));
Grocy.Components.DateTimePicker.SetValue(stockEntry.best_before_date);
Grocy.Components.DateTimePicker2.SetValue(stockEntry.purchased_date);
$('#amount_qu_unit').text(productDetails.quantity_unit_stock.name);
Grocy.Api.Get('stock/products/' + stockEntry.product_id,
function (productDetails)
{
$('#amount_qu_unit').text(productDetails.quantity_unit_stock.name);
if (productDetails.product.allow_partial_units_in_stock == 1)
{
$("#amount").attr("min", "0.01");
$("#amount").attr("step", "0.01");
$("#amount").parent().find(".invalid-feedback").text(__t('The amount cannot be lower than %1$s', 0.01.toLocaleString()));
}
else
{
$("#amount").attr("min", "1");
$("#amount").attr("step", "1");
$("#amount").parent().find(".invalid-feedback").text(__t('The amount cannot be lower than %1$s', '1'));
}
if (productDetails.product.allow_partial_units_in_stock == 1)
{
$("#amount").attr("min", "0.01");
$("#amount").attr("step", "0.01");
$("#amount").parent().find(".invalid-feedback").text(__t('The amount cannot be lower than %1$s', 0.01.toLocaleString()));
}
else
{
$("#amount").attr("min", "1");
$("#amount").attr("step", "1");
$("#amount").parent().find(".invalid-feedback").text(__t('The amount cannot be lower than %1$s', '1'));
}
if (productDetails.product.enable_tare_weight_handling == 1)
{
$("#amount").attr("min", productDetails.product.tare_weight);
$("#amount").parent().find(".invalid-feedback").text(__t('The amount cannot be lower than %1$s', parseFloat(productDetails.product.tare_weight).toLocaleString({ minimumFractionDigits: 0, maximumFractionDigits: 2 })));
$("#tare-weight-handling-info").removeClass("d-none");
}
else
{
$("#tare-weight-handling-info").addClass("d-none");
}
if (productDetails.product.enable_tare_weight_handling == 1)
{
$("#amount").attr("min", productDetails.product.tare_weight);
$("#amount").parent().find(".invalid-feedback").text(__t('The amount cannot be lower than %1$s', parseFloat(productDetails.product.tare_weight).toLocaleString({ minimumFractionDigits: 0, maximumFractionDigits: 2 })));
$("#tare-weight-handling-info").removeClass("d-none");
}
else
{
$("#tare-weight-handling-info").addClass("d-none");
}
},
function (xhr)
{
console.error(xhr);
}
);
},
function (xhr)
{
console.error(xhr);
}
);
$("#amount").on("focus", function(e)
{
$(this).select();
});
$("#amount").focus();
Grocy.FrontendHelpers.ValidateForm("stockedit-form");

View File

@ -44,14 +44,21 @@ $(document).on('click', '.undo-stock-booking-button', function(e)
var element = $(e.currentTarget);
var bookingId = $(e.currentTarget).attr('data-booking-id');
var correlationId = $("#stock-booking-" + bookingId + "-row").attr("data-correlation-id");
var correspondingBookingsRoot = $("#stock-booking-" + bookingId + "-row");
if (!correlationId.isEmpty())
{
correspondingBookingsRoot = $(".stock-booking-correlation-" + correlationId);
}
Grocy.Api.Post('stock/bookings/' + bookingId.toString() + '/undo', { },
function(result)
{
element.closest("tr").addClass("text-muted");
element.parent().siblings().find("span.name-anchor").addClass("text-strike-through").after("<br>" + __t("Undone on") + " " + moment().format("YYYY-MM-DD HH:mm:ss") + " <time class='timeago timeago-contextual' datetime='" + moment().format("YYYY-MM-DD HH:mm:ss") + "'></time>");
element.closest(".undo-stock-booking-button").addClass("disabled");
RefreshContextualTimeago();
correspondingBookingsRoot.addClass("text-muted");
correspondingBookingsRoot.find("span.name-anchor").addClass("text-strike-through").after("<br>" + __t("Undone on") + " " + moment().format("YYYY-MM-DD HH:mm:ss") + " <time class='timeago timeago-contextual' datetime='" + moment().format("YYYY-MM-DD HH:mm:ss") + "'></time>");
correspondingBookingsRoot.find(".undo-stock-booking-button").addClass("disabled");
RefreshContextualTimeago("#stock-booking-" + bookingId + "-row");
toastr.success(__t("Booking successfully undone"));
},
function(xhr)

View File

@ -317,8 +317,8 @@ function RefreshProductRow(productId)
// Needs to be delayed because of the animation above the date-text would be wrong if fired immediately...
setTimeout(function()
{
RefreshContextualTimeago();
RefreshLocaleNumberDisplay();
RefreshContextualTimeago("#product-" + productId + "-row");
RefreshLocaleNumberDisplay("#product-" + productId + "-row");
}, 600);
},
function(xhr)

View File

@ -78,7 +78,7 @@ $(document).on('click', '.do-task-button', function(e)
Grocy.FrontendHelpers.EndUiBusy();
toastr.success(__t('Marked task %s as completed on %s', taskName, doneTime));
RefreshContextualTimeago();
RefreshContextualTimeago("#task-" + taskId + "-row");
RefreshStatistics();
},
function(xhr)

View File

@ -38,7 +38,7 @@ $app->group('', function()
$this->get('/consume', '\Grocy\Controllers\StockController:Consume');
$this->get('/transfer', '\Grocy\Controllers\StockController:Transfer');
$this->get('/inventory', '\Grocy\Controllers\StockController:Inventory');
$this->get('/stockedit', '\Grocy\Controllers\StockController:StockEdit');
$this->get('/stockedit/{entryId}', '\Grocy\Controllers\StockController:StockEdit');
$this->get('/products', '\Grocy\Controllers\StockController:ProductsList');
$this->get('/product/{productId}', '\Grocy\Controllers\StockController:ProductEditForm');
$this->get('/stocksettings', '\Grocy\Controllers\StockController:StockSettings');

View File

@ -39,7 +39,7 @@
</thead>
<tbody class="d-none">
@foreach($chargeCycles as $chargeCycleEntry)
<tr class="@if($chargeCycleEntry->undone == 1) text-muted @endif">
<tr id="charge-cycle-{{ $chargeCycleEntry->id }}-row" class="@if($chargeCycleEntry->undone == 1) text-muted @endif">
<td class="fit-content border-right">
<a class="btn btn-secondary btn-sm undo-battery-execution-button @if($chargeCycleEntry->undone == 1) disabled @endif" href="#" data-charge-cycle-id="{{ $chargeCycleEntry->id }}" data-toggle="tooltip" data-placement="left" title="{{ $__t('Undo charge cycle') }}">
<i class="fas fa-undo"></i>

View File

@ -42,7 +42,7 @@
</thead>
<tbody class="d-none">
@foreach($choresLog as $choreLogEntry)
<tr class="@if($choreLogEntry->undone == 1) text-muted @endif">
<tr id="chore-execution-{{ $choreLogEntry->id }}-row" class="@if($choreLogEntry->undone == 1) text-muted @endif">
<td class="fit-content border-right">
<a class="btn btn-secondary btn-sm undo-chore-execution-button @if($choreLogEntry->undone == 1) disabled @endif" href="#" data-execution-id="{{ $choreLogEntry->id }}" data-toggle="tooltip" data-placement="left" title="{{ $__t('Undo chore execution') }}">
<i class="fas fa-undo"></i>

View File

@ -2,7 +2,7 @@
<script src="{{ $U('/viewjs/components/batterycard.js', true) }}?v={{ $version }}"></script>
@endpush
<div class="card">
<div class="card batterycard">
<div class="card-header">
<i class="fas fa-battery-three-quarters"></i> {{ $__t('Battery overview') }}
<a id="batterycard-battery-edit-button" class="btn btn-sm btn-outline-info py-0 float-right disabled" href="#" data-toggle="tooltip" title="{{ $__t('Edit battery') }}">

View File

@ -2,7 +2,7 @@
<script src="{{ $U('/viewjs/components/chorecard.js', true) }}?v={{ $version }}"></script>
@endpush
<div class="card">
<div class="card chorecard">
<div class="card-header">
<i class="fas fa-home"></i> {{ $__t('Chore overview') }}
<a id="chorecard-chore-edit-button" class="btn btn-sm btn-outline-info py-0 float-right disabled" href="#" data-toggle="tooltip" title="{{ $__t('Edit chore') }}">

View File

@ -3,7 +3,7 @@
<script src="{{ $U('/viewjs/components/productcard.js', true) }}?v={{ $version }}"></script>
@endpush
<div class="card">
<div class="card productcard">
<div class="card-header">
<i class="fab fa-product-hunt"></i> {{ $__t('Product overview') }}
<a id="productcard-product-edit-button" class="btn btn-sm btn-outline-info py-0 float-right disabled" href="#" data-toggle="tooltip" title="{{ $__t('Edit product') }}">

View File

@ -85,7 +85,7 @@
@if(GROCY_AUTHENTICATED)
<div id="sidebarResponsive" class="collapse navbar-collapse">
<ul class="navbar-nav navbar-sidenav pt-2">
<ul class="navbar-nav navbar-sidenav">
@if(GROCY_FEATURE_FLAG_STOCK)
<li class="nav-item" data-toggle="tooltip" data-placement="right" title="{{ $__t('Stock overview') }}" data-nav-for-page="stockoverview">
@ -104,14 +104,22 @@
</li>
@endif
@if(GROCY_FEATURE_FLAG_RECIPES)
<div class="nav-item-divider"></div>
<li class="nav-item" data-toggle="tooltip" data-placement="right" title="{{ $__t('Recipes') }}" data-nav-for-page="recipes">
<a class="nav-link discrete-link" href="{{ $U('/recipes') }}">
<i class="fas fa-cocktail"></i>
<span class="nav-link-text">{{ $__t('Recipes') }}</span>
</a>
</li>
<li class="nav-item" data-toggle="tooltip" data-placement="right" title="{{ $__t('Meal plan') }}" data-nav-for-page="mealplan">
<a class="nav-link discrete-link" href="{{ $U('/mealplan') }}">
<i class="fas fa-paper-plane"></i>
<span class="nav-link-text">{{ $__t('Meal plan') }}</span>
</a>
</li>
@endif
@if(GROCY_FEATURE_FLAG_CHORES)
<div class="nav-item-divider"></div>
<li class="nav-item" data-toggle="tooltip" data-placement="right" title="{{ $__t('Chores overview') }}" data-nav-for-page="choresoverview">
<a class="nav-link discrete-link" href="{{ $U('/choresoverview') }}">
<i class="fas fa-home"></i>
@ -143,9 +151,19 @@
</a>
</li>
@endif
@if(GROCY_FEATURE_FLAG_CALENDAR)
<div class="nav-item-divider"></div>
<li class="nav-item" data-toggle="tooltip" data-placement="right" title="{{ $__t('Calendar') }}" data-nav-for-page="calendar">
<a class="nav-link discrete-link" href="{{ $U('/calendar') }}">
<i class="fas fa-calendar-alt"></i>
<span class="nav-link-text">{{ $__t('Calendar') }}</span>
</a>
</li>
@endif
@if(GROCY_FEATURE_FLAG_STOCK)
<li class="nav-item mt-4" data-toggle="tooltip" data-placement="right" title="{{ $__t('Purchase') }}" data-nav-for-page="purchase">
<div class="nav-item-divider"></div>
<li class="nav-item" data-toggle="tooltip" data-placement="right" title="{{ $__t('Purchase') }}" data-nav-for-page="purchase">
<a class="nav-link discrete-link" href="{{ $U('/purchase') }}">
<i class="fas fa-shopping-cart"></i>
<span class="nav-link-text">{{ $__t('Purchase') }}</span>
@ -157,7 +175,7 @@
<span class="nav-link-text">{{ $__t('Consume') }}</span>
</a>
</li>
@if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING)
@if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING)
<li class="nav-item" data-toggle="tooltip" data-placement="right" title="{{ $__t('Transfer') }}" data-nav-for-page="transfer">
<a class="nav-link discrete-link" href="{{ $U('/transfer') }}">
<i class="fas fa-exchange-alt"></i>
@ -188,22 +206,6 @@
</a>
</li>
@endif
@if(GROCY_FEATURE_FLAG_CALENDAR)
<li class="nav-item mt-4" data-toggle="tooltip" data-placement="right" title="{{ $__t('Calendar') }}" data-nav-for-page="calendar">
<a class="nav-link discrete-link" href="{{ $U('/calendar') }}">
<i class="fas fa-calendar-alt"></i>
<span class="nav-link-text">{{ $__t('Calendar') }}</span>
</a>
</li>
@endif
@if(GROCY_FEATURE_FLAG_RECIPES)
<li class="nav-item" data-toggle="tooltip" data-placement="right" title="{{ $__t('Meal plan') }}" data-nav-for-page="mealplan">
<a class="nav-link discrete-link" href="{{ $U('/mealplan') }}">
<i class="fas fa-paper-plane"></i>
<span class="nav-link-text">{{ $__t('Meal plan') }}</span>
</a>
</li>
@endif
@php $firstUserentity = true; @endphp
@foreach($userentitiesForSidebar as $userentity)
@ -216,7 +218,8 @@
@php if ($firstUserentity) { $firstUserentity = false; } @endphp
@endforeach
<li class="nav-item mt-4" data-toggle="tooltip" data-placement="right" title="{{ $__t('Manage master data') }}">
<div class="nav-item-divider"></div>
<li class="nav-item" data-toggle="tooltip" data-placement="right" title="{{ $__t('Manage master data') }}">
<a class="nav-link nav-link-collapse collapsed discrete-link" data-toggle="collapse" href="#top-nav-manager-master-data">
<i class="fas fa-table"></i>
<span class="nav-link-text">{{ $__t('Manage master data') }}</span>

View File

@ -37,7 +37,7 @@
<a id="print-shopping-list-button" class="btn btn-outline-dark responsive-button" href="#">
<i class="fas fa-print"></i> {{ $__t('Print') }}
</a>
<a id="shopping-list-compact-view-button" class="btn btn-outline-dark responsive-button float-right switch-view-mode-button" href="#">
<a id="shopping-list-compact-view-button" class="btn btn-outline-dark responsive-button switch-view-mode-button" href="#">
<i class="fas fa-compress-arrows-alt"></i> {{ $__t('Compact view') }}
</a>
<!--<div class="dropdown d-inline-block">
@ -68,6 +68,11 @@
<a id="add-all-items-to-stock-button" class="btn btn-outline-primary responsive-button" href="#">
<i class="fas fa-box"></i> {{ $__t('Add all list items to stock') }}
</a>
@if(!GROCY_FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS)
<a id="shopping-list-compact-view-button" class="btn btn-outline-dark responsive-button switch-view-mode-button" href="#">
<i class="fas fa-compress-arrows-alt"></i> {{ $__t('Compact view') }}
</a>
@endif
</h1>
<p data-status-filter="belowminstockamount" class="btn btn-lg btn-info status-filter-button responsive-button">{{ $__n(count($missingProducts), '%s product is below defined min. stock amount', '%s products are below defined min. stock amount') }}</p>
</div>

View File

@ -65,7 +65,7 @@
<i class="fas fa-box-open"></i>
</a>
@endif
<a class="btn btn-info btn-sm show-as-dialog-link" href="{{ $U('/stockedit?embedded&product=' . $currentStockEntry->product_id . '&stockRowId=' . $currentStockEntry->id) }}" data-toggle="tooltip" data-placement="left" title="{{ $__t('Edit stock entry') }}">
<a class="btn btn-info btn-sm show-as-dialog-link" href="{{ $U('/stockedit/' . $currentStockEntry->id . '?embedded') }}" data-toggle="tooltip" data-placement="left" title="{{ $__t('Edit stock entry') }}">
<i class="fas fa-edit"></i>
</a>
<div class="dropdown d-inline-block">

View File

@ -5,30 +5,20 @@
@section('viewJsName', 'stockedit')
@section('content')
<script>
Grocy.EditObjectId = {{ $stockEntry->id }};
Grocy.EditObjectProductId = {{ $stockEntry->product_id }};
</script>
<div class="row">
<div class="col-xs-12 col-md-6 col-xl-4 pb-3">
<h1>@yield('title')</h1>
<form id="stockedit-form" novalidate>
@php
$product = FindObjectInArrayByPropertyValue($products, 'id', $stockEntry->product_id);
@endphp
@if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING)
@include('components.locationpicker', array(
'locations' => $locations
))
@else
<input type="hidden" name="location_id" id="location_id" value="1">
@endif
@include('components.numberpicker', array(
'id' => 'amount',
'label' => 'Amount',
'hintId' => 'amount_qu_unit',
'invalidFeedback' => $__t('The amount cannot be lower than %s', '0'),
'additionalAttributes' => 'data-not-equal="-1"',
'additionalHtmlElements' => '<div id="stockedit-change-info" class="form-text text-muted small d-none"></div>',
'additionalHtmlContextHelp' => '<div id="tare-weight-handling-info" class="text-small text-info font-italic d-none">' . $__t('Tare weight handling enabled - please weigh the whole container, the amount to be posted will be automatically calculcated') . '</div>'
))
@php
$additionalGroupCssClasses = '';
if (!GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING)
@ -38,6 +28,7 @@
@endphp
@include('components.datetimepicker', array(
'id' => 'best_before_date',
'initialValue' => $stockEntry->best_before_date,
'label' => 'Best before',
'format' => 'YYYY-MM-DD',
'initWithNow' => false,
@ -54,13 +45,24 @@
))
@php $additionalGroupCssClasses = ''; @endphp
@include('components.numberpicker', array(
'id' => 'amount',
'value' => $stockEntry->amount,
'label' => 'Amount',
'hintId' => 'amount_qu_unit',
'invalidFeedback' => $__t('The amount cannot be lower than %s', '0'),
'additionalAttributes' => 'data-not-equal="-1"',
'additionalHtmlElements' => '<div id="stockedit-change-info" class="form-text text-muted small d-none"></div>',
'additionalHtmlContextHelp' => '<div id="tare-weight-handling-info" class="text-small text-info font-italic d-none">' . $__t('Tare weight handling enabled - please weigh the whole container, the amount to be posted will be automatically calculcated') . '</div>'
))
@if(GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING)
@include('components.numberpicker', array(
'id' => 'price',
'value' => $stockEntry->price,
'label' => 'Price',
'min' => 0,
'step' => 0.01,
'value' => '',
'hint' => $__t('in %s per purchase quantity unit', GROCY_CURRENCY),
'invalidFeedback' => $__t('The price cannot be lower than %s', '0'),
'isRequired' => false
@ -69,8 +71,18 @@
<input type="hidden" name="price" id="price" value="0">
@endif
@if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING)
@include('components.locationpicker', array(
'locations' => $locations,
'prefillById' => $stockEntry->location_id
))
@else
<input type="hidden" name="location_id" id="location_id" value="1">
@endif
@include('components.datetimepicker2', array(
'id' => 'purchase_date',
'initialValue' => $stockEntry->purchased_date,
'label' => 'Purchased date',
'format' => 'YYYY-MM-DD',
'initWithNow' => false,
@ -83,7 +95,7 @@
<div class="checkbox">
<label for="open">
<input type="checkbox" id="open" name="open"> {{ $__t('Opened') }}
<input @if($stockEntry->open == 1) checked @endif type="checkbox" id="open" name="open"> {{ $__t('Opened') }}
</label>
</div>

View File

@ -42,7 +42,7 @@
</thead>
<tbody class="d-none">
@foreach($stockLog as $stockLogEntry)
<tr class="@if($stockLogEntry->undone == 1) text-muted @endif">
<tr id="stock-booking-{{ $stockLogEntry->id }}-row" class="@if($stockLogEntry->undone == 1) text-muted @endif stock-booking-correlation-{{ $stockLogEntry->correlation_id }}" data-correlation-id="{{ $stockLogEntry->correlation_id }}">
<td class="fit-content border-right">
<a class="btn btn-secondary btn-sm undo-stock-booking-button @if($stockLogEntry->undone == 1) disabled @endif" href="#" data-booking-id="{{ $stockLogEntry->id }}" data-toggle="tooltip" data-placement="left" title="{{ $__t('Undo booking') }}">
<i class="fas fa-undo"></i>

226
yarn.lock
View File

@ -7,9 +7,9 @@
resolved "https://github.com/berrnd/bootstrap-combobox.git#fcf0110146f4daab94888234c57d198b4ca5f129"
"@fortawesome/fontawesome-free@^5.11.1":
version "5.11.1"
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.11.1.tgz#cef685a74708cf57b367c32d9f36a931c5a4e894"
integrity sha512-DtXLVYAkDU0ce1cFUgLvZaMd1R2J/LviBYih9xr4ZLhQMrgvYX7w2vOxlpKLRALfIj5GyC5zoVrcACOkLcFgvg==
version "5.12.0"
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.12.0.tgz#8ceb9f09edfb85ea18a6c7bf098f6f5dd5ffd62b"
integrity sha512-vKDJUuE2GAdBERaQWmmtsciAMzjwNrROXA5KTGSZvayAsmuTGjam5z6QNqNPCwDfVljLWuov1nEC3mEQf/n6fQ==
"TagManager@https://github.com/max-favilli/tagmanager.git#master":
version "3.0.1"
@ -17,17 +17,12 @@
dependencies:
jquery "1"
add@^2.0.6:
version "2.0.6"
resolved "https://registry.yarnpkg.com/add/-/add-2.0.6.tgz#248f0a9f6e5a528ef2295dbeec30532130ae2235"
integrity sha1-JI8Kn25aUo7yKV2+7DBTITCuIjU=
ajv@^6.5.5:
version "6.10.2"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52"
integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==
version "6.11.0"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz#c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9"
integrity sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==
dependencies:
fast-deep-equal "^2.0.1"
fast-deep-equal "^3.1.1"
fast-json-stable-stringify "^2.0.0"
json-schema-traverse "^0.4.1"
uri-js "^4.2.2"
@ -55,9 +50,9 @@ aws-sign2@~0.7.0:
integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
aws4@^1.8.0:
version "1.8.0"
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
version "1.9.1"
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e"
integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==
bcrypt-pbkdf@^1.0.0:
version "1.0.2"
@ -67,18 +62,18 @@ bcrypt-pbkdf@^1.0.0:
tweetnacl "^0.14.3"
bootbox@^5.3.2:
version "5.3.2"
resolved "https://registry.yarnpkg.com/bootbox/-/bootbox-5.3.2.tgz#f3117d80d70f4c94f1ea7724a687775fb9aef71a"
integrity sha512-D1HEziBATs5NDTFCfWnr32IsMWZijwLt631gigtItS9B631c3h1H5kJIS/jPn0q6I+tG7K4JzdMeCGZ0FCsehQ==
version "5.4.0"
resolved "https://registry.yarnpkg.com/bootbox/-/bootbox-5.4.0.tgz#2857a63c270b1b797d62e4c5597e74b497267655"
integrity sha512-GCPrDwZpJsUnqzrto3ZURVafypl13+DAyE3YZx5jR5EIoTDSyREPhr77hlCuPKvM6VvXR5Mh/34W3DYMC7JE9g==
dependencies:
bootstrap ">=3.0.0"
jquery ">=1.12.0"
popper.js ">=1.12.9"
bootstrap "^4.4.0"
jquery "^3.4.1"
popper.js "^1.16.0"
bootstrap-select@^1.13.10:
version "1.13.11"
resolved "https://registry.yarnpkg.com/bootstrap-select/-/bootstrap-select-1.13.11.tgz#d364ccc67cd6c1f9158689087f1d2d029df82c29"
integrity sha512-WPpx2DYL9jVilNoqy4Pjcfa/Q0LOq8V0+xws/pmnRDn/deS7OYjo1njvD1Cv0s9/1ZUXt77UypxuloimEnkYsA==
version "1.13.12"
resolved "https://registry.yarnpkg.com/bootstrap-select/-/bootstrap-select-1.13.12.tgz#81b9f1394cb8d7151aea16fb9030c112330dbf98"
integrity sha512-epsPt6WpgmL9Q9Y22JFntajdhhqvCwV/JKiBZF3YFvMHK9YzzDPQft/Cjqvsgq0bhF32BlvG03Qs3qA/pVRAqQ==
"bootstrap-switch-button@https://github.com/walidbagh/bootstrap-switch-button#Fix-module-export":
version "1.0.0"
@ -89,10 +84,10 @@ bootstrap@4.0.0:
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.0.0.tgz#ceb03842c145fcc1b9b4e15da2a05656ba68469a"
integrity sha512-gulJE5dGFo6Q61V/whS6VM4WIyrlydXfCgkE+Gxe5hjrJ8rXLLZlALq7zq2RPhOc45PSwQpJkrTnc2KgD6cvmA==
bootstrap@>=3.0.0, bootstrap@>=4.1.2, bootstrap@^4.3.1:
version "4.3.1"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz#280ca8f610504d99d7b6b4bfc4b68cec601704ac"
integrity sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag==
bootstrap@>=4.1.2, bootstrap@^4.3.1, bootstrap@^4.4.0:
version "4.4.1"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.4.1.tgz#8582960eea0c5cd2bede84d8b0baf3789c3e8b01"
integrity sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA==
caseless@~0.12.0:
version "0.12.0"
@ -108,9 +103,9 @@ chart.js@2.7.1:
moment "~2.18.0"
chart.js@^2.8.0:
version "2.8.0"
resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.8.0.tgz#b703b10d0f4ec5079eaefdcd6ca32dc8f826e0e9"
integrity sha512-Di3wUL4BFvqI5FB5K26aQ+hvWh8wnP9A3DWGvXHVkO13D3DSnaSsdZx29cXlEsYKVkn1E2az+ZYFS4t0zi8x0w==
version "2.9.3"
resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.9.3.tgz#ae3884114dafd381bc600f5b35a189138aac1ef7"
integrity sha512-+2jlOobSk52c1VU6fzkh3UwqHMdSlgH1xFv9FKMqHiNCpXsGPQa/+81AFa+i3jZ253Mq9aAycPwDjnn1XbRNNw==
dependencies:
chartjs-color "^2.1.0"
moment "^2.10.2"
@ -130,12 +125,12 @@ chartjs-color-string@^0.6.0:
color-name "^1.0.0"
chartjs-color@^2.1.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.3.0.tgz#0e7e1e8dba37eae8415fd3db38bf572007dd958f"
integrity sha512-hEvVheqczsoHD+fZ+tfPUE+1+RbV6b+eksp2LwAhwRTVXEjCSEavvk+Hg3H6SZfGlPh/UfmWKGIvZbtobOEm3g==
version "2.4.1"
resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.4.1.tgz#6118bba202fe1ea79dd7f7c0f9da93467296c3b0"
integrity sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w==
dependencies:
chartjs-color-string "^0.6.0"
color-convert "^0.5.3"
color-convert "^1.9.3"
chartjs-color@~2.2.0:
version "2.2.0"
@ -150,6 +145,18 @@ color-convert@^0.5.3:
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-0.5.3.tgz#bdb6c69ce660fadffe0b0007cc447e1b9f7282bd"
integrity sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=
color-convert@^1.9.3:
version "1.9.3"
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
dependencies:
color-name "1.1.3"
color-name@1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
color-name@^1.0.0:
version "1.1.4"
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
@ -195,26 +202,26 @@ datatables.net-bs4@1.10.16:
jquery ">=1.7"
datatables.net-bs4@^1.10.15, datatables.net-bs4@^1.10.19:
version "1.10.19"
resolved "https://registry.yarnpkg.com/datatables.net-bs4/-/datatables.net-bs4-1.10.19.tgz#0608dff22008cf3c7b8a68b1bc702ed255b404fb"
integrity sha512-pgeP17w4aPR7HIxIwuJghfqXULjdg1K6xMUUKDyCERJRSNNK4MRToFfELtIsluLNN555YBK4Kx8nihX5/ZT1Fw==
version "1.10.20"
resolved "https://registry.yarnpkg.com/datatables.net-bs4/-/datatables.net-bs4-1.10.20.tgz#beff1c8d3510826c0678eaa055270607c0e53882"
integrity sha512-kQmMUMsHMOlAW96ztdoFqjSbLnlGZQ63iIM82kHbmldsfYdzuyhbb4hTx6YNBi481WCO3iPSvI6YodNec46ZAw==
dependencies:
datatables.net "1.10.19"
datatables.net "1.10.20"
jquery ">=1.7"
datatables.net-colreorder-bs4@^1.5.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/datatables.net-colreorder-bs4/-/datatables.net-colreorder-bs4-1.5.1.tgz#7ded353a68296b85f0dbfb234b8cb5d8fc2bee3c"
integrity sha512-mi5wxkjnkI8fxGJ9e/Vu20E7MMZj7yK3xjLIzDrsHOHQupr6FF6eJnUoVH4gDo9Ynfb/yApVbnuW29v/YjnDKw==
version "1.5.2"
resolved "https://registry.yarnpkg.com/datatables.net-colreorder-bs4/-/datatables.net-colreorder-bs4-1.5.2.tgz#4fe1a9ffe679e7e84f3ccb58c9c4d31ac0d49a1b"
integrity sha512-L5omHV0agczRZwR9eismTOq+/9/glQqZUeRfigEc+5oMKLnubJkVHQLOanY2duDl3stvsZ6ebWbXWEh6tndgDg==
dependencies:
datatables.net-bs4 "^1.10.15"
datatables.net-colreorder "1.5.1"
datatables.net-colreorder "1.5.2"
jquery ">=1.7"
datatables.net-colreorder@1.5.1, datatables.net-colreorder@^1.5.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/datatables.net-colreorder/-/datatables.net-colreorder-1.5.1.tgz#ee5eacd7178b5fd9396aab44d4907aae35086f8c"
integrity sha512-nKV0ZBOdOG+CCrtDZZlTOvhu9NC53pr4rYR8Xhd3KIKipLZohWWdBoOFGMu+VKDvllg2Xj79oS/wicYSiNyteA==
datatables.net-colreorder@1.5.2, datatables.net-colreorder@^1.5.1:
version "1.5.2"
resolved "https://registry.yarnpkg.com/datatables.net-colreorder/-/datatables.net-colreorder-1.5.2.tgz#c425cee1f88b3246be0363c67a152be743ca6bce"
integrity sha512-77ShdeM7QjKI6M1jfWQ4ZempSYMmmpe9NqjimHBp+o9lAto789YdCLiFrW71dwn1v8Awp4qcMShqHNxGzR/HVg==
dependencies:
datatables.net "^1.10.15"
jquery ">=1.7"
@ -237,35 +244,35 @@ datatables.net-responsive@2.2.3, datatables.net-responsive@^2.2.3:
jquery ">=1.7"
datatables.net-rowgroup-bs4@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/datatables.net-rowgroup-bs4/-/datatables.net-rowgroup-bs4-1.1.0.tgz#bcaa9842bc9cf70eeba19e8af6edad190c7b896e"
integrity sha512-R2C+lLbVyPuyITVJo/1va97nHOcQ06M0kReTmN4zaR4/SRkFDfOVXz48w2jT1AJW/j65DYAh+OHwUSYgcgKisA==
version "1.1.1"
resolved "https://registry.yarnpkg.com/datatables.net-rowgroup-bs4/-/datatables.net-rowgroup-bs4-1.1.1.tgz#57c17e611f8f8ec0aa456fd325bbf466545c230d"
integrity sha512-39+6bqlF5emY2VJOTgwEfbJMBjxveKGrKnZb5ltTzCp70q5mX+OTzJVJJlKI6wXjQXx5765B6xbFHNGKIRPNHw==
dependencies:
datatables.net-bs4 "^1.10.15"
datatables.net-rowgroup "1.1.0"
datatables.net-rowgroup "1.1.1"
jquery ">=1.7"
datatables.net-rowgroup@1.1.0, datatables.net-rowgroup@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/datatables.net-rowgroup/-/datatables.net-rowgroup-1.1.0.tgz#638efb37a1a15f5b3402b7dbce89b3bcdc286f1a"
integrity sha512-OPIiiMTbIoh1hSnJ9lx3avqKpYtEPux5iA6jpWKRdyKbdYU8UQbi5ht3b096frYQplIuAQnQcwqpGmvrf77l6g==
datatables.net-rowgroup@1.1.1, datatables.net-rowgroup@^1.1.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/datatables.net-rowgroup/-/datatables.net-rowgroup-1.1.1.tgz#616531e5fb3c8642f6a51fb14801f8aff50cf90e"
integrity sha512-uGdD7t7quFZ1Qnze0ScO4qmreoxK07rp9ukU68/ITkWCQjYOfXoqB8izJP9o+TYs7P8sM4Q8ecxzPm7z5pOauw==
dependencies:
datatables.net "^1.10.15"
jquery ">=1.7"
datatables.net-select-bs4@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/datatables.net-select-bs4/-/datatables.net-select-bs4-1.3.0.tgz#f2a977fb5631cdeaa322f10c2968796cbabdeeb2"
integrity sha512-lV+CiiBn4sIILsveSJ+Q4PohpUJ5HrmmoENqV3YqPU5X/GBIFutMVDQzJobgnjbLka83J99tiKvuva2a1XQBrQ==
version "1.3.1"
resolved "https://registry.yarnpkg.com/datatables.net-select-bs4/-/datatables.net-select-bs4-1.3.1.tgz#1c39c7fd5bfb66b5c8402611c2c64fc47e3cfca4"
integrity sha512-8UOBxChTsn24nP/ZOsIMGZOdTJymQZ8WcQ81NcGgyDz6b4JlsQl8Bwb89AcVT7hncMquPJ3d5WUGG4I9WMhAlw==
dependencies:
datatables.net-bs4 "^1.10.15"
datatables.net-select "1.3.0"
datatables.net-select "1.3.1"
jquery ">=1.7"
datatables.net-select@1.3.0, datatables.net-select@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/datatables.net-select/-/datatables.net-select-1.3.0.tgz#0815efa54f09eed744af80fe6a19e236070e8cda"
integrity sha512-sj72BM+Sx2n9mTHQjPiGMrGUoAVA1PCGmD+vEuAedhlDX1PAHcnqsOnG37eWrpqIsOQR/ZcSuE8IkU7gmiQkew==
datatables.net-select@1.3.1, datatables.net-select@^1.3.0:
version "1.3.1"
resolved "https://registry.yarnpkg.com/datatables.net-select/-/datatables.net-select-1.3.1.tgz#ec2c3ad7df2bc9c13c09587d0bfd0ceba52a8bff"
integrity sha512-PeVd/hlAX58QzL0+mGvxnXP7ylLtzZMeAots/uZkQi+6c/KI6JuP8LCJoEMHAsSjQM/BnG7Uw8E1YGOz1tZpQQ==
dependencies:
datatables.net "^1.10.15"
jquery ">=1.7"
@ -277,10 +284,10 @@ datatables.net@1.10.16:
dependencies:
jquery ">=1.7"
datatables.net@1.10.19, datatables.net@^1.10.15, datatables.net@^1.10.19:
version "1.10.19"
resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.10.19.tgz#97a1ed41c85e62d61040603481b59790a172dd1f"
integrity sha512-+ljXcI6Pj3PTGy5pesp3E5Dr3x3AV45EZe0o1r0gKENN2gafBKXodVnk2ypKwl2tTmivjxbkiqoWnipTefyBTA==
datatables.net@1.10.20, datatables.net@^1.10.15, datatables.net@^1.10.19:
version "1.10.20"
resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.10.20.tgz#9d65ecc3c83cbe7baa4fa5a053405c8fe42c1350"
integrity sha512-4E4S7tTU607N3h0fZPkGmAtr9mwy462u+VJ6gxYZ8MxcRIjZqHy3Dv1GNry7i3zQCktTdWbULVKBbkAJkuHEnQ==
dependencies:
jquery ">=1.7"
@ -312,15 +319,15 @@ extsprintf@^1.2.0:
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
fast-deep-equal@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
fast-deep-equal@^3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
fast-json-stable-stringify@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
version "2.1.0"
resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
font-awesome@4.7.0:
version "4.7.0"
@ -370,7 +377,7 @@ getpass@^0.1.1:
dependencies:
assert-plus "^1.0.0"
gettext-translator@^2.1.0:
gettext-translator@2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/gettext-translator/-/gettext-translator-2.1.0.tgz#946047649b7df4ef00522787bb78792667e4de2f"
integrity sha512-RD9HifZKtlRtFScA0VWESzLKQxxRmaRU0IFg6cFZgMP0MMgzfHpWO7MipUyRbMxDFm8adbQqCcFLBV47tjT6Ug==
@ -511,22 +518,22 @@ lodash@^4.17.4:
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
mime-db@1.40.0:
version "1.40.0"
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
mime-db@1.43.0:
version "1.43.0"
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58"
integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==
mime-types@^2.0.1, mime-types@^2.1.12, mime-types@~2.1.19:
version "2.1.24"
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==
version "2.1.26"
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06"
integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==
dependencies:
mime-db "1.40.0"
mime-db "1.43.0"
moment-timezone@^0.5.11:
version "0.5.26"
resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.26.tgz#c0267ca09ae84631aa3dc33f65bedbe6e8e0d772"
integrity sha512-sFP4cgEKTCymBBKgoxZjYzlSovC20Y6J7y3nanDc5RoBIXKlZhoYwBoZGe3flwU6A372AcRwScH8KiwV6zjy1g==
version "0.5.27"
resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.27.tgz#73adec8139b6fe30452e78f210f27b1f346b8877"
integrity sha512-EIKQs7h5sAsjhPCqN6ggx6cEbs94GK050254TIJySD1bzoM5JTYDwAU1IoVOeTOL6Gm27kYJ51/uuvq1kIlrbw==
dependencies:
moment ">= 2.9.0"
@ -554,9 +561,9 @@ ndarray-pack@^1.1.1:
ndarray "^1.0.13"
ndarray@^1.0.13, ndarray@^1.0.18:
version "1.0.18"
resolved "https://registry.yarnpkg.com/ndarray/-/ndarray-1.0.18.tgz#b60d3a73224ec555d0faa79711e502448fd3f793"
integrity sha1-tg06cyJOxVXQ+qeXEeUCRI/T95M=
version "1.0.19"
resolved "https://registry.yarnpkg.com/ndarray/-/ndarray-1.0.19.tgz#6785b5f5dfa58b83e31ae5b2a058cfd1ab3f694e"
integrity sha512-B4JHA4vdyZU30ELBw3g7/p9bZupyew5a7tX1Y/gGeF2hafrPaQZhgrGQfsvgfYbgdFZjYwuEcnaobeM/WMW+HQ==
dependencies:
iota-array "^1.0.0"
is-buffer "^1.0.2"
@ -598,15 +605,15 @@ pngjs@^3.3.3:
resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f"
integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==
popper.js@>=1.12.9, popper.js@^1.14.3:
version "1.15.0"
resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.15.0.tgz#5560b99bbad7647e9faa475c6b8056621f5a4ff2"
integrity sha512-w010cY1oCUmI+9KwwlWki+r5jxKfTFDVoadl7MSrIujHU5MJ5OR6HTDj6Xo8aoR/QsA56x8jKjA59qGH4ELtrA==
popper.js@^1.14.3, popper.js@^1.16.0:
version "1.16.1"
resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b"
integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==
psl@^1.1.24:
version "1.4.0"
resolved "https://registry.yarnpkg.com/psl/-/psl-1.4.0.tgz#5dd26156cdb69fa1fdb8ab1991667d3f80ced7c2"
integrity sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==
version "1.7.0"
resolved "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz#f1c4c47a8ef97167dea5d6bbf4816d736e884a3c"
integrity sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==
punycode@^1.4.1:
version "1.4.1"
@ -692,7 +699,7 @@ sshpk@^1.7.0:
safer-buffer "^2.0.2"
tweetnacl "~0.14.0"
startbootstrap-sb-admin@^4.0.0:
startbootstrap-sb-admin@4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/startbootstrap-sb-admin/-/startbootstrap-sb-admin-4.0.0.tgz#cf141a260d031b36bdc013c68200a1c1ea6c9881"
integrity sha512-qnIu5fcjAb288+MgeaOBnZ93eq4lXb3cpUgbqGUVG2afDRFgsIX0ii3BgbWHrQ7jYZRYADEKWe580F8uUpIAHg==
@ -705,14 +712,16 @@ startbootstrap-sb-admin@^4.0.0:
jquery.easing "^1.4.1"
summernote@^0.8.12:
version "0.8.12"
resolved "https://registry.yarnpkg.com/summernote/-/summernote-0.8.12.tgz#563502ed882abde9daab9db1e7eba330d37ac020"
integrity sha512-RVEJoIyztwPpopTwZvjag1WOvbmhUGFe6Mc9RADzzcX1ogG8pIXCB88icu/vjNYihITrzj2zZsoFMcDRHSlhEA==
version "0.8.15"
resolved "https://registry.yarnpkg.com/summernote/-/summernote-0.8.15.tgz#f783f23b2c1f85c1609855ad37205595147a3c39"
integrity sha512-52DYp7BWOLsAteMLHg+1pDgQMP5e6IfXmTpl4XnfY5JIMlOLUQtq6/5xwoV4C2d8T6xjvfuYJom9W2/4z28IeQ==
dependencies:
jquery "^3.4.1"
swagger-ui-dist@^3.23.10:
version "3.23.10"
resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.23.10.tgz#122b4c584e3b67eb2fb87e5ee3c9df2dbe773cd3"
integrity sha512-lK9oNNb9HAz2HJIg6+cYZszbYC/0CTm0nWi0XX2AjEbVgu43smbW2/h5zn7yAjYstPJBaYXkt5g6ABRpO/Ncfg==
version "3.25.0"
resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.25.0.tgz#90279cdcc56e591fcfbe7b5240a9d653b989336d"
integrity sha512-vwvJPPbdooTvDwLGzjIXinOXizDJJ6U1hxnJL3y6U3aL1d2MSXDmKg2139XaLBhsVZdnQJV2bOkX4reB+RXamg==
"tempusdominus-bootstrap-4@https://github.com/berrnd/tempusdominus-bootstrap-4.git#master":
version "5.1.2"
@ -776,9 +785,9 @@ uri-js@^4.2.2:
punycode "^2.1.0"
uuid@^3.3.2:
version "3.3.3"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866"
integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==
version "3.4.0"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
verror@1.10.0:
version "1.10.0"
@ -788,8 +797,3 @@ verror@1.10.0:
assert-plus "^1.0.0"
core-util-is "1.0.2"
extsprintf "^1.2.0"
yarn@^1.21.1:
version "1.21.1"
resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.21.1.tgz#1d5da01a9a03492dc4a5957befc1fd12da83d89c"
integrity sha512-dQgmJv676X/NQczpbiDtc2hsE/pppGDJAzwlRiADMTvFzYbdxPj2WO4PcNyriSt2c4jsCMpt8UFRKHUozt21GQ==