Skip to content
This repository was archived by the owner on Sep 14, 2024. It is now read-only.

Commit 68b1de2

Browse files
committed
Merge branch 'release/0.7.9'
2 parents e2df4e0 + 0b08cc3 commit 68b1de2

File tree

91 files changed

+2117
-1671
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+2117
-1671
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: "Build"
22
on:
33
pull_request:
4+
types: [review_requested, ready_for_review]
45
push:
56
jobs:
67
build:
@@ -11,7 +12,7 @@ jobs:
1112
with:
1213
java-version: '12.x'
1314
distribution: 'adopt'
14-
- uses: subosito/flutter-action@v2.7.1
15+
- uses: subosito/flutter-action@v2.8.0
1516
with:
1617
flutter-version: '3.3.0'
1718
- run: flutter pub get

.tx/config

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
[main]
22
host = https://www.transifex.com
33

4-
[nextcloud.cookbook_flutter]
4+
[o:nextcloud:p:nextcloud:r:cookbook_flutter]
55
file_filter = assets/i18n/<lang>.json
66
source_file = assets/i18n/en.json
77
source_lang = en
8-
type = KEYVALUEJSON
8+
type = KEYVALUEJSON
9+

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
![GitHub](https://img.shields.io/github/license/Teifun2/nextcloud-cookbook-flutter) ![GitHub release (latest by date)](https://img.shields.io/github/v/release/Teifun2/nextcloud-cookbook-flutter) ![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/Teifun2/nextcloud-cookbook-flutter/Build/master)
1+
![GitHub](https://img.shields.io/github/license/Teifun2/nextcloud-cookbook-flutter) ![GitHub release (latest by date)](https://img.shields.io/github/v/release/Teifun2/nextcloud-cookbook-flutter) ![GitHub Workflow Status (branch)](https://img.shields.io/github/actions/workflow/status/Teifun2/nextcloud-cookbook-flutter/build.yml?branch=master)
22

33
[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
44
alt="Get it on F-Droid"
55
height="80">](https://f-droid.org/packages/com.nextcloud_cookbook_flutter/)
6-
[<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png"
6+
[<img src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png"
77
alt="Get it on Google Play"
88
height="80">](https://play.google.com/store/apps/details?id=com.nextcloud_cookbook_flutter)
9-
[<img src="https://developer.apple.com/assets/elements/badges/download-on-the-app-store.svg"
9+
[<img src="https://user-images.githubusercontent.com/7461832/211680075-d3a9e06d-0f41-4153-8f54-7ed133f854b1.png"
1010
alt="Get it on the App Store"
11-
height="55" style="padding-bottom: 12px; padding-left: 10px">](https://apps.apple.com/us/app/nextcloud-cookbook/id1619926634)
11+
height="82" style="padding-bottom: 20px; padding-left: 10px">](https://apps.apple.com/us/app/nextcloud-cookbook/id1619926634)
12+
1213

1314
# Nextcloud Cookbook Mobile Client written in Flutter
1415

analysis_options.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# This file configures the analyzer to use the lint rule set from `package:lint`
2+
3+
include: package:lint/strict.yaml
4+
5+
linter:
6+
rules:
7+
sort_pub_dependencies: false

assets/i18n/de.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
},
166166
"recipe_font_size": {
167167
"title": "Rezept Schriftgröße",
168-
"subtitle": "Ändert die Schriftgröße von Rezeptwerkzeugen, Zutaten und Anweisungen für eine bessere Lesbarkeit."
168+
"subtitle": "Ändert die Schriftgröße von \"Utensilien\", \"Zutaten\" und \"Zubereitung\" für eine bessere Lesbarkeit."
169169
},
170170
"category_font_size": {
171171
"title": "Kategorie Schriftgröße",

assets/i18n/en_GB.json

Lines changed: 175 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,175 @@
1+
{
2+
"app_bar": {
3+
"search": "Search",
4+
"refresh": "Refresh",
5+
"logout": "Logout",
6+
"clear_all": "Clear all"
7+
},
8+
"login": {
9+
"title": "Login",
10+
"server_url": {
11+
"field": "Server URL",
12+
"validator": {
13+
"empty": "Please enter the URL to your Nextcloud instance.",
14+
"pattern": "Please enter a valid URL"
15+
}
16+
},
17+
"username": {
18+
"field": "Username"
19+
},
20+
"password": {
21+
"field": "Password"
22+
},
23+
"settings": {
24+
"title": "Advanced Settings",
25+
"app_password": "Use self generated App Password.\nNeeded for accounts with 2FA.",
26+
"self_signed_certificate": "Ignore invalid certificate.\nNeeded for self signed certificates.\n(Use at your own risk!)"
27+
},
28+
"button": "Login",
29+
"retry": "Retry Login!",
30+
"reset": "Reset Credentials!",
31+
"errors": {
32+
"not_reachable": "Cannot reach: {server_url}\n{error_msg}",
33+
"certificate_failed": "The Certificate of the server could not be verified: {server_url}\n{error_msg}",
34+
"request_failed": "App Password request failed:\n{error_msg}",
35+
"parse_failed": "Cannot parse the App Password response!\n{error_msg}",
36+
"parse_missing": "Cannot find App Password in response!\n{error_msg}",
37+
"auth_failed": "Username and / or Password is incorrect!",
38+
"authentication_not_found": "No authentication found in Storage",
39+
"failed_remove_remote": "Failed to remove remote App Password!",
40+
"failure": "Login Process could not finish properly.\n{status_code}\n{status_message}",
41+
"credentials_invalid": "The stored credentials where no longer valid an you have been logged out!",
42+
"no_internet": "Authentication check was not successful.\nMaybe there is no internet connection?\nError Message: {error_msg}",
43+
"wrong_status": "Authentication check was not successful.\nMaybe the provided server host is not correct?\nError Message: {error_msg}"
44+
}
45+
},
46+
"categories": {
47+
"title": "Cookbook",
48+
"all_categories": "All",
49+
"drawer": {
50+
"import": "Import Recipe",
51+
"settings": "Settings"
52+
},
53+
"errors": {
54+
"unknown": "Categories in unknown state",
55+
"load_failed": "Category load failed: {error_msg}",
56+
"load_no_response": "Could not retrieve the Categories from the server.",
57+
"api_version_check_failed": "Failed to check the API version of the server:\n{error_msg}",
58+
"api_version_above_confirmed": "The API version of the server was updated. Some features might not work as expected. Please wait for an update!\n{version}",
59+
"plugin_missing": "Categories could not be loaded. Make sure that the Cookbook plugin is installed on this Nextcloud instance!"
60+
}
61+
},
62+
"recipe_list": {
63+
"title_category": "Category: {category}",
64+
"errors": {
65+
"load_failed": "Failed to load Recipes Short!"
66+
}
67+
},
68+
"recipe": {
69+
"title": "Recipe:",
70+
"prep": "Preparation time",
71+
"cook": "Cooking time",
72+
"total": "Total time",
73+
"fields": {
74+
"name": "Recipe Name:",
75+
"description": "Recipe Description:",
76+
"keywords": "Keywords:",
77+
"category": "Category:",
78+
"servings": "Servings:",
79+
"source": "Source:",
80+
"source_button": "Source",
81+
"image": "Image:",
82+
"time": {
83+
"prep": "Preparation time:",
84+
"cook": "Cooking time:",
85+
"total": "Total time:",
86+
"hours": "Hours",
87+
"minutes": "Minutes"
88+
},
89+
"nutrition": {
90+
"title": "Nutrition Information",
91+
"items": {
92+
"calories": "Energy",
93+
"carbohydrateContent": "Carbohydrate",
94+
"cholesterolContent": "Cholesterol",
95+
"fatContent": "Fat total",
96+
"fiberContent": "Fiber",
97+
"proteinContent": "Protein",
98+
"saturatedFatContent": "Saturated Fat",
99+
"servingSize": "Serving size",
100+
"sodiumContent": "Sodium",
101+
"sugarContent": "Sugar",
102+
"transFatContent": "Trans-fat content",
103+
"unsaturatedFatContent": "Unsaturated-fat content"
104+
}
105+
},
106+
"tools": "Tools:",
107+
"ingredients": "Ingredients:",
108+
"instructions": "Instructions:"
109+
},
110+
"errors": {
111+
"load_failed": "Failed to load Recipe!"
112+
}
113+
},
114+
"recipe_edit": {
115+
"title": "Edit Recipe",
116+
"button": "Save",
117+
"errors": {
118+
"update_failed": "Update Failed {error_msg}"
119+
}
120+
},
121+
"recipe_create": {
122+
"title": "Create Recipe",
123+
"button": "Create",
124+
"errors": {
125+
"update_failed": "Create Failed {error_msg}"
126+
}
127+
},
128+
"recipe_import": {
129+
"title": "Import Recipe",
130+
"button": "Import",
131+
"field": "URL to Recipe",
132+
"clipboard": "Paste Clipboard",
133+
"errors": {
134+
"import_failed": "Import Failed {error_msg}"
135+
}
136+
},
137+
"search": {
138+
"title": "Search Recipe",
139+
"nothing_found": "No recipe found!",
140+
"errors": {
141+
"search_failed": "Unable to load all Recipes!\n{error_msg}"
142+
}
143+
},
144+
"timer": {
145+
"title": "Your timers",
146+
"started": "Timer started.",
147+
"finished": "is finished.",
148+
"done": "Timer is done.",
149+
"missing": "You need to set the cooking time to use a timer."
150+
},
151+
"settings": {
152+
"title": "App Settings",
153+
"dark_mode": {
154+
"title": "Dark Mode",
155+
"system": "System Default",
156+
"dark": "Always",
157+
"light": "Never"
158+
},
159+
"language": {
160+
"title": "Language"
161+
},
162+
"stay_awake": {
163+
"title": "Stay Awake",
164+
"subtitle": "Screen will stay on while on the recipe screen."
165+
},
166+
"recipe_font_size": {
167+
"title": "Recipe Font Size",
168+
"subtitle": "Changes the font size of recipe tools, ingredients and instructions for better readability."
169+
},
170+
"category_font_size": {
171+
"title": "Category Font Size",
172+
"subtitle": "Changes the font size of category title. This can be useful if you have long category names."
173+
}
174+
}
175+
}

assets/i18n/fr.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"recipe_list": {
6363
"title_category": "Catégorie : {category}",
6464
"errors": {
65-
"load_failed": "Failed to load Recipes Short!"
65+
"load_failed": "Impossible de charger le raccourci de recette!"
6666
}
6767
},
6868
"recipe": {

assets/i18n/nl.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
},
2828
"button": "Inloggen",
2929
"retry": "Retry Login!",
30-
"reset": "Reset Credentials!",
30+
"reset": "Reset inloggegevens",
3131
"errors": {
3232
"not_reachable": "Kan {server_url} niet bereiken\n {error_msg}",
3333
"certificate_failed": "Het certificaat van de server kon niet worden geverifieerd: {server_url} \n {error_msg}",
@@ -39,8 +39,8 @@
3939
"failed_remove_remote": "Kon het remote App-wachtwoord niet verwijderen!",
4040
"failure": "Het inlogproces kon niet goed eindigen.\n {status_code}\n {status_message}",
4141
"credentials_invalid": "De opgeslagen inloggegevens zijn niet meer geldig en je bent uitgelogd!",
42-
"no_internet": "Authentication check was not successful.\nMaybe there is no internet connection?\nError Message: {error_msg}",
43-
"wrong_status": "Authentication check was not successful.\nMaybe the provided server host is not correct?\nError Message: {error_msg}"
42+
"no_internet": "Authenticatie is niet gelukt.\nMisschien is er geen internetverbinding?\nFoutmelding: {error_msg}",
43+
"wrong_status": "Authenticatiecontrole is niet gelukt.\nMisschien is de opgegeven host niet correct?\nFoutmelding: {error_msg}"
4444
}
4545
},
4646
"categories": {

assets/i18n/zh_CN.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"self_signed_certificate": "忽略无效证书对自签名证书是必须的(使用风险自担!)"
2727
},
2828
"button": "登录",
29-
"retry": "Retry Login!",
29+
"retry": "重试登录!",
3030
"reset": "Reset Credentials!",
3131
"errors": {
3232
"not_reachable": "无法抵达:{server_url}{error_msg}",

build.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
targets:
2+
$default:
3+
builders:
4+
copy_with_extension_gen:
5+
enabled: true

0 commit comments

Comments
 (0)