mirror of
https://github.com/YunoHost/apps.git
synced 2024-09-03 20:06:07 +02:00
store: simplify providing the current locale and user session to the jinja templates (#2277)
This commit is contained in:
parent
1ce14086cb
commit
edb57751f5
1 changed files with 6 additions and 24 deletions
30
store/app.py
30
store/app.py
|
@ -83,6 +83,12 @@ def localize(d):
|
|||
else:
|
||||
return d["en"]
|
||||
|
||||
@app.context_processor
|
||||
def utils():
|
||||
return {
|
||||
"user": session.get("user", {}),
|
||||
"locale": get_locale(),
|
||||
}
|
||||
|
||||
###############################################################################
|
||||
|
||||
|
@ -96,8 +102,6 @@ def favicon():
|
|||
def index():
|
||||
return render_template(
|
||||
"index.html",
|
||||
locale=get_locale(),
|
||||
user=session.get("user", {}),
|
||||
catalog=get_catalog(),
|
||||
)
|
||||
|
||||
|
@ -106,12 +110,10 @@ def index():
|
|||
def browse_catalog():
|
||||
return render_template(
|
||||
"catalog.html",
|
||||
locale=get_locale(),
|
||||
init_sort=request.args.get("sort"),
|
||||
init_search=request.args.get("search"),
|
||||
init_category=request.args.get("category"),
|
||||
init_starsonly=request.args.get("starsonly"),
|
||||
user=session.get("user", {}),
|
||||
catalog=get_catalog(),
|
||||
timestamp_now=int(time.time()),
|
||||
stars=get_stars(),
|
||||
|
@ -134,8 +136,6 @@ def app_info(app_id):
|
|||
|
||||
return render_template(
|
||||
"app.html",
|
||||
locale=get_locale(),
|
||||
user=session.get("user", {}),
|
||||
app_id=app_id,
|
||||
infos=infos,
|
||||
catalog=get_catalog(),
|
||||
|
@ -187,8 +187,6 @@ def browse_wishlist():
|
|||
init_sort=request.args.get("sort"),
|
||||
init_search=request.args.get("search"),
|
||||
init_starsonly=request.args.get("starsonly"),
|
||||
locale=get_locale(),
|
||||
user=session.get("user", {}),
|
||||
wishlist=get_wishlist(),
|
||||
stars=get_stars(),
|
||||
)
|
||||
|
@ -208,8 +206,6 @@ def add_to_wishlist():
|
|||
)
|
||||
return render_template(
|
||||
"wishlist_add.html",
|
||||
locale=get_locale(),
|
||||
user=session.get("user", {}),
|
||||
csrf_token=None,
|
||||
successmsg=None,
|
||||
errormsg=errormsg,
|
||||
|
@ -220,8 +216,6 @@ def add_to_wishlist():
|
|||
errormsg = _("Invalid CSRF token, please refresh the page and try again")
|
||||
return render_template(
|
||||
"wishlist_add.html",
|
||||
locale=get_locale(),
|
||||
user=session.get("user", {}),
|
||||
csrf_token=csrf_token,
|
||||
successmsg=None,
|
||||
errormsg=errormsg,
|
||||
|
@ -315,8 +309,6 @@ def add_to_wishlist():
|
|||
if not check:
|
||||
return render_template(
|
||||
"wishlist_add.html",
|
||||
locale=get_locale(),
|
||||
user=session.get("user", {}),
|
||||
csrf_token=csrf_token,
|
||||
successmsg=None,
|
||||
errormsg=errormsg,
|
||||
|
@ -337,8 +329,6 @@ def add_to_wishlist():
|
|||
url = f"https://apps.yunohost.org/wishlist?search={slug}"
|
||||
return render_template(
|
||||
"wishlist_add.html",
|
||||
locale=get_locale(),
|
||||
user=session.get("user", {}),
|
||||
csrf_token=csrf_token,
|
||||
successmsg=None,
|
||||
errormsg=_(
|
||||
|
@ -354,8 +344,6 @@ def add_to_wishlist():
|
|||
url = f"https://apps.yunohost.org/app/{slug}"
|
||||
return render_template(
|
||||
"wishlist_add.html",
|
||||
locale=get_locale(),
|
||||
user=session.get("user", {}),
|
||||
csrf_token=csrf_token,
|
||||
successmsg=None,
|
||||
errormsg=_(
|
||||
|
@ -389,8 +377,6 @@ def add_to_wishlist():
|
|||
)
|
||||
return render_template(
|
||||
"wishlist_add.html",
|
||||
locale=get_locale(),
|
||||
user=session.get("user", {}),
|
||||
csrf_token=csrf_token,
|
||||
successmsg=None,
|
||||
errormsg=errormsg,
|
||||
|
@ -444,8 +430,6 @@ Description: {description}
|
|||
|
||||
return render_template(
|
||||
"wishlist_add.html",
|
||||
locale=get_locale(),
|
||||
user=session.get("user", {}),
|
||||
successmsg=successmsg,
|
||||
)
|
||||
else:
|
||||
|
@ -454,8 +438,6 @@ Description: {description}
|
|||
session["csrf_token"] = csrf_token
|
||||
return render_template(
|
||||
"wishlist_add.html",
|
||||
locale=get_locale(),
|
||||
user=session.get("user", {}),
|
||||
csrf_token=csrf_token,
|
||||
successmsg=None,
|
||||
errormsg=None,
|
||||
|
|
Loading…
Add table
Reference in a new issue